diff --git a/pri/vars.pri b/pri/vars.pri index 0853d30e6..bf89b9685 100644 --- a/pri/vars.pri +++ b/pri/vars.pri @@ -3,8 +3,8 @@ APP_LOW_NAME = "rssguard" APP_REVERSE_NAME = "com.github.rssguard" APP_LOW_H_NAME = ".rssguard" APP_AUTHOR = "Martin Rotter" -APP_COPYRIGHT = "(C) 2011-2020 $$APP_AUTHOR" -APP_VERSION = "3.8.4" +APP_COPYRIGHT = "(C) 2011-2021 $$APP_AUTHOR" +APP_VERSION = "3.8.5" APP_LONG_NAME = "$$APP_NAME $$APP_VERSION" APP_EMAIL = "rotter.martinos@gmail.com" APP_URL = "https://github.com/martinrotter/rssguard" diff --git a/resources/desktop/com.github.rssguard.appdata.xml b/resources/desktop/com.github.rssguard.appdata.xml index 24fc4d295..95a19dc19 100644 --- a/resources/desktop/com.github.rssguard.appdata.xml +++ b/resources/desktop/com.github.rssguard.appdata.xml @@ -30,7 +30,7 @@ https://martinrotter.github.io/donate/ - + none diff --git a/resources/nsis/NSIS.definitions.nsh.in b/resources/nsis/NSIS.definitions.nsh.in index 65abf9cf1..cffdcf855 100755 --- a/resources/nsis/NSIS.definitions.nsh.in +++ b/resources/nsis/NSIS.definitions.nsh.in @@ -25,5 +25,4 @@ !define MUI_ICON "@PWD@\..\..\resources\graphics\@APP_LOW_NAME@.ico" !define MUI_UNICON "@PWD@\..\..\resources\graphics\@APP_LOW_NAME@.ico" !define PATCH "0" -!define OUTPUT_FILE "@OUT_PWD@\@APP_LOW_NAME@-@APP_VERSION@-@APP_REVISION@-@APP_WIN_ARCH@.exe" !define BINARY_TREE "@OUT_PWD@\app" \ No newline at end of file diff --git a/resources/nsis/NSIS.template.in b/resources/nsis/NSIS.template.in index 7f2d5b9b9..5885a6c21 100755 --- a/resources/nsis/NSIS.template.in +++ b/resources/nsis/NSIS.template.in @@ -26,7 +26,6 @@ ; Name and file. Name "${APP_NAME} portable" -OutFile "${OUTPUT_FILE}" ; Set custom branding text. BrandingText "${APP_NAME}" diff --git a/resources/scripts/7za b/resources/scripts/7za index 9c10723bf..47f412575 160000 --- a/resources/scripts/7za +++ b/resources/scripts/7za @@ -1 +1 @@ -Subproject commit 9c10723bfbaf6cb85107d6ee16e0324e9e487749 +Subproject commit 47f4125753452eff8800dbd6600c5a05540b15d9 diff --git a/resources/scripts/github-actions/build-windows.ps1 b/resources/scripts/github-actions/build-windows.ps1 index 7bbdbfd91..f573d30ec 100755 --- a/resources/scripts/github-actions/build-windows.ps1 +++ b/resources/scripts/github-actions/build-windows.ps1 @@ -4,6 +4,9 @@ $webengine = $args[1] echo "We are building for MS Windows." echo "OS: $os; WebEngine: $webengine" +$git_revlist = git rev-list --tags --max-count=1 +$git_tag = git describe --tags $git_revlist +$git_revision = git rev-parse --short HEAD $old_pwd = $pwd.Path # Prepare environment. @@ -46,5 +49,17 @@ Copy-Item -Path "$qt_path\bin\libssl*.dll" -Destination ".\app\" # Copy MySQL Qt plugin. Copy-Item -Path "$qt_path\bin\libmariadb.dll" -Destination ".\app\" -nmake.exe windows_all +if ($webengine = "true") { + $packagebase = "rssguard-${git_tag}-${git_revision}-win64" +} +else { + $packagebase = "rssguard-${git_tag}-${git_revision}-nowebengine-win64" +} + +# Create 7zip package. +& "$old_pwd\resources\scripts\7za\7za.exe" a -t7z -mx=9 -mfb=273 -ms -md=31 -myx=9 -mtm=- -mmt -mmtf -md=1536m -mmf=bt3 -mmc=10000 -mpb=0 -mlc=0 "$packagebase.7z" ".\app\*" + +# Create NSIS installation package. +& "$old_pwd\resources\scripts\nsis\makensis.exe" "/XOutFile $packagebase.exe" ".\NSIS.template.in" + ls \ No newline at end of file diff --git a/src/rssguard/rssguard.pro b/src/rssguard/rssguard.pro index f4ac63294..941a73d41 100644 --- a/src/rssguard/rssguard.pro +++ b/src/rssguard/rssguard.pro @@ -49,45 +49,8 @@ DEPENDPATH += $$PWD/../librssguard win32: LIBS += -L$$OUT_PWD/../librssguard/ -llibrssguard unix: LIBS += -L$$OUT_PWD/../librssguard/ -lrssguard -# Create new "make 7zip" target and "make zip" target. -win32 { - seven_zip.target = 7zip - seven_zip.depends = install - seven_zip.commands = $$shell_path($$shell_quote($$PWD/../../resources/scripts/7za/7za.exe)) a -t7z $$TARGET-$$APP_VERSION-$$APP_REVISION-$${APP_WIN_ARCH}.7z $$shell_path($$PREFIX/*) - - zip.target = zip - zip.depends = install - zip.commands = $$shell_path($$shell_quote($$PWD/../../resources/scripts/7za/7za.exe)) a -tzip $$TARGET-$$APP_VERSION-$$APP_REVISION-$${APP_WIN_ARCH}.zip $$shell_path($$PREFIX/*) - - QMAKE_EXTRA_TARGETS += seven_zip zip -} - -mac { - dmg.target = dmg - dmg.depends = install - dmg.commands = macdeployqt $$shell_quote($$shell_path($$PREFIX)) -dmg - - QMAKE_EXTRA_TARGETS += dmg -} - -# Create NSIS installer target on Windows. -win32 { - nsis.target = nsis - nsis.depends = install - nsis.commands = \ - $$shell_path($$shell_quote($$PWD/../../resources/scripts/sed/sed.exe)) -e \"s|@APP_VERSION@|$$APP_VERSION|g; s|@APP_WIN_ARCH@|$$APP_WIN_ARCH|g; s|@APP_REVISION@|$$APP_REVISION|g; s|@APP_NAME@|$$APP_NAME|g; s|@APP_LOW_NAME@|$$APP_LOW_NAME|g; s|@EXE_NAME@|$${APP_LOW_NAME}.exe|g; s|@PWD@|$$replace(PWD, /, \\\\)|g; s|@OUT_PWD@|$$replace(OUT_PWD, /, \\\\)|g\" $$shell_path($$shell_quote($$PWD/../../resources/nsis/NSIS.definitions.nsh.in)) > $$shell_path($$shell_quote($$OUT_PWD/NSIS.definitions.nsh)) && \ - xcopy /Y $$shell_path($$shell_quote($$PWD/../../resources/nsis/NSIS.template.in)) $$shell_path($$shell_quote($$OUT_PWD/)) && \ - $$shell_path($$shell_quote($$PWD/../../resources/scripts/nsis/makensis.exe)) $$shell_path($$shell_quote($$OUT_PWD/NSIS.template.in)) - - QMAKE_EXTRA_TARGETS += nsis -} - -win32 { - windows_all.target = windows_all - windows_all.depends = seven_zip nsis - windows_all.commands = echo "windows_all done..." - - QMAKE_EXTRA_TARGETS += windows_all -} +# Prepare files for NSIS. +system($$shell_path($$shell_quote($$PWD/../../resources/scripts/sed/sed.exe)) -e \"s|@APP_VERSION@|$$APP_VERSION|g; s|@APP_WIN_ARCH@|$$APP_WIN_ARCH|g; s|@APP_REVISION@|$$APP_REVISION|g; s|@APP_NAME@|$$APP_NAME|g; s|@APP_LOW_NAME@|$$APP_LOW_NAME|g; s|@EXE_NAME@|$${APP_LOW_NAME}.exe|g; s|@PWD@|$$replace(PWD, /, \\\\)|g; s|@OUT_PWD@|$$replace(OUT_PWD, /, \\\\)|g\" $$shell_path($$shell_quote($$PWD/../../resources/nsis/NSIS.definitions.nsh.in)) > $$shell_path($$shell_quote($$OUT_PWD/NSIS.definitions.nsh))) +system(xcopy /Y $$shell_path($$shell_quote($$PWD/../../resources/nsis/NSIS.template.in)) $$shell_path($$shell_quote($$OUT_PWD/))) include(../../pri/install.pri)