Generate NSIS packages with better name, move all packaging logic to actions file.

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_COPYRIGHT                 = "(C) 2011-2021 $$APP_AUTHOR"
-APP_VERSION                   = "3.8.4"
+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"

resources/desktop/com.github.rssguard.appdata.xml

@@ -30,7 +30,7 @@
   <url type="donation">https://martinrotter.github.io/donate/</url>
   <content_rating type="oars-1.1" />
   <releases>
-    <release version="3.8.4" date="2021-01-05"/>
+    <release version="3.8.4" date="2021-01-06"/>
   </releases>
   <content_rating type="oars-1.0">
     <content_attribute id="violence-cartoon">none</content_attribute>

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"

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}"

resources/scripts/7za

@@ -1 +1 @@
-Subproject commit 9c10723bfbaf6cb85107d6ee16e0324e9e487749
+Subproject commit 47f4125753452eff8800dbd6600c5a05540b15d9

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

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.
+# Prepare files for NSIS.
-win32 {
+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)))
-  seven_zip.target = 7zip
+system(xcopy /Y $$shell_path($$shell_quote($$PWD/../../resources/nsis/NSIS.template.in)) $$shell_path($$shell_quote($$OUT_PWD/)))
-  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
-}
 
 include(../../pri/install.pri)