Merge branch 'update-version-21-0322' into 'master'

Update version 21 0322

See merge request gridtracker.org/gridtracker!73

.gitlab-ci.yml

@@ -96,18 +96,19 @@ win-packaging:
                 mv $dir/`basename $file` $dir/package.nw
               done
           elif [  -f $dir ] && [[ "$dir" == *"win-x86-Setup.exe"* ]] ; then
-            echo "would delete broken installer $dir"
-            # rm $dir
+            echo "deleting broken installer $dir"
+            rm $dir
           fi
       done
-      # TODO infer new version from version.js and inject into nsis installer
-      ls dist/GridTracker-1.21.0307-win-x86/ -la
-      sed "s#GridTracker-1.21.0307-win-x86/#`pwd`/dist/GridTracker-1.21.0307-win-x86/#g" windows/setup.nsi.tmpl > windows/setup.nsi.tmp
-      sed "s#GridTracker-Installer.#`pwd`/dist/GridTracker-Installer.#g" windows/setup.nsi.tmp > windows/setup.nsi
+      sed "s#GridTracker-\${VERSION}-win-x86/#`pwd`/dist/GridTracker-\${VERSION}-win-x86/#g" windows/setup.nsi.tmpl > windows/setup.nsi.tmp.1
+      sed "s#GridTracker-Installer.#`pwd`/dist/GridTracker-Installer.#g" windows/setup.nsi.tmp.1 > windows/setup.nsi.tmp.2
+      sed "s#define VERSION <placeholder#define VERSION `node version.js`#g" windows/setup.nsi.tmp.2 > windows/setup.nsi
+
       makensis windows/setup.nsi
       # clean up generated files
       rm windows/setup.nsi
-      rm windows/setup.nsi.tmp
+      rm windows/setup.nsi.tmp.1
+      rm windows/setup.nsi.tmp.2
       (cd dist ; mv *.exe ../artifacts)
       echo -e "\e[0Ksection_end:`date +%s`:native_build\e[0K"
 

debian/changelog

@@ -1,3 +1,12 @@
+gridtracker (1.21.0322) unstable; urgency=medium
+  [Christian Bayer]
+  * Fixed windows packaging 
+  [Matthew Chambers]
+  * Fixed linux and arm packaging
+  This is the public release of 1.21.0307 release candidates
+
+ -- Matthew Chambers <nr0q@gridtracker.org>  Mon, 22 Mar 2021 20:30:00 -0500
+
 gridtracker (1.21.0307) unstable; urgency=medium
 
   [ Paul Traina ]

docker/build-all.sh

@@ -21,17 +21,20 @@ for dir in dist/*-win-* ; do
           mv $dir/`basename $file` $dir/package.nw
         done
     elif [  -f $dir ] && [[ "$dir" == *"win-x86-Setup.exe"* ]] ; then
-      echo "would delete broken installer $dir"
-      # rm $dir
+      echo "deleting broken installer $dir"
+      rm $dir
     fi
 done
-pwd
-sed "s#GridTracker-1.21.0307-win-x86/#`pwd`/dist/GridTracker-1.21.0307-win-x86/#g" windows/setup.nsi.tmpl > windows/setup.nsi.tmp
-sed "s#GridTracker-Installer.#`pwd`/dist/GridTracker-Installer.#g" windows/setup.nsi.tmp > windows/setup.nsi
+
+sed "s#GridTracker-\${VERSION}-win-x86/#`pwd`/dist/GridTracker-\${VERSION}-win-x86/#g" windows/setup.nsi.tmpl > windows/setup.nsi.tmp.1
+sed "s#GridTracker-Installer.#`pwd`/dist/GridTracker-Installer.#g" windows/setup.nsi.tmp.1 > windows/setup.nsi.tmp.2
+sed "s#define VERSION <placeholder#define VERSION `node version.js`#g" windows/setup.nsi.tmp.2 > windows/setup.nsi
+
 makensis windows/setup.nsi
 # clean up generated files
 rm windows/setup.nsi
-rm windows/setup.nsi.tmp
+rm windows/setup.nsi.tmp.1
+rm windows/setup.nsi.tmp.2
 
 mv dist/*{.exe,mac-x64.zip,.tar.gz} ../dist
 rpmbuild -D "version `node ./version.js`" --build-in-place -bb gridtracker.i386.spec

package.nw/package.json

@@ -1,7 +1,7 @@
 {
   "name": "GridTracker",
   "product_string_do_not_use": "gridtracker",
-  "version": "1.21.0307",
+  "version": "1.21.0322",
   "betaVersion": "",
   "description": "GridTracker, an amateur radio companion",
   "author": "Stephen Loomis (N0TTL) and GridTracker.org",

windows/setup.nsi.tmpl

@@ -8,7 +8,7 @@ Name "GridTracker"
 BrandingText " Gridtracker.org : GridTracker Installer "
 # General Symbol Definitions
 !define REGKEY "SOFTWARE\$(^Name)"
-!define VERSION 1.21.0307
+!define VERSION <placeholder
 !define COMPANY "Gridtracker.org"
 !define URL http://gridtracker.org
 #d
@@ -33,8 +33,7 @@ Var realkey
 
 
 # Installer pages
-#!define MUI_ICON "GridTracker-1.21.0307-win-x86/package.nw/gridview.ico"
-!define MUI_ICON "GridTracker-1.21.0307-win-x86/package.nw/gridview.ico"
+!define MUI_ICON "GridTracker-${VERSION}-win-x86/package.nw/gridview.ico"
 !define MUI_FINISHPAGE_NOAUTOCLOSE
 !define MUI_UNICON "${NSISDIR}/Contrib/Graphics/Icons/modern-uninstall-colorful.ico"
 !define MUI_UNFINISHPAGE_NOAUTOCLOSE
@@ -78,19 +77,19 @@ SetDetailsPrint none
 	RMDir /r  "$INSTDIR"
 SetDetailsPrint both
 	SetOutPath $INSTDIR
-    File /x debug.log /x package.nw.zip /x package.zip /x nw.exe "GridTracker-1.21.0307-win-x86/*"
+    File /x debug.log /x package.nw.zip /x package.zip /x nw.exe "GridTracker-${VERSION}-win-x86/*"
 	SetOutPath $INSTDIR\locales
 SetDetailsPrint none
 	SetOverwrite on
-	File /r "GridTracker-1.21.0307-win-x86/locales/*"
+	File /r "GridTracker-${VERSION}-win-x86/locales/*"
 	
 	SetOutPath $INSTDIR\package.nw
 	SetOverwrite on
-	File /r "GridTracker-1.21.0307-win-x86/package.nw/*"
+	File /r "GridTracker-${VERSION}-win-x86/package.nw/*"
 	SetOverwrite on
 	
 	SetOutPath $INSTDIR\swiftshader
-	File /r "GridTracker-1.21.0307-win-x86/swiftshader/*"
+	File /r "GridTracker-${VERSION}-win-x86/swiftshader/*"