From 58de6413ed6b9c1dc6479f5d3729abdff72c169d Mon Sep 17 00:00:00 2001 From: Matthew Chambers Date: Tue, 23 Mar 2021 02:37:39 +0000 Subject: [PATCH] Update version 21 0322 --- .gitlab-ci.yml | 15 +- debian/changelog | 9 + docker/build-all.sh | 15 +- package.nw/gt_update.pdf | Bin 36550 -> 36433 bytes package.nw/package.json | 2 +- windows/setup.nsi.tmpl | 349 +++++++++++++++++++-------------------- 6 files changed, 201 insertions(+), 189 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 867ff748..a0a9fe22 100644 --- a/.gitlab-ci.yml +++ b/.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 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" diff --git a/debian/changelog b/debian/changelog index 73d3549e..cb9d8739 100644 --- a/debian/changelog +++ b/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 Mon, 22 Mar 2021 20:30:00 -0500 + gridtracker (1.21.0307) unstable; urgency=medium [ Paul Traina ] diff --git a/docker/build-all.sh b/docker/build-all.sh index 699405d0..269a4c8c 100755 --- a/docker/build-all.sh +++ b/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 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 diff --git a/package.nw/gt_update.pdf b/package.nw/gt_update.pdf index 191ba3e2cb24a3815fd9853e49ffeaa4e02be684..180bdaa6549c4b20c560140e9d6471f2dabff60f 100644 GIT binary patch delta 10838 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 PFCPq@kx@!T8vXwO--;AC delta 10963 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 diff --git a/package.nw/package.json b/package.nw/package.json index 35438cbd..29d6fcb1 100644 --- a/package.nw/package.json +++ b/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", diff --git a/windows/setup.nsi.tmpl b/windows/setup.nsi.tmpl index 5622d4d0..c1450550 100644 --- a/windows/setup.nsi.tmpl +++ b/windows/setup.nsi.tmpl @@ -1,175 +1,174 @@ -RequestExecutionLevel highest -SetCompressor /SOLID LZMA -!include Sections.nsh -!include MUI2.nsh -!include Registry.nsh -Name "GridTracker" - -BrandingText " Gridtracker.org : GridTracker Installer " -# General Symbol Definitions -!define REGKEY "SOFTWARE\$(^Name)" -!define VERSION 1.21.0307 -!define COMPANY "Gridtracker.org" -!define URL http://gridtracker.org -#d - -# MUI Symbol Definitions - - -# Included files - - -# Reserved Files - -ReserveFile "${NSISDIR}/Plugins/x86-unicode/registry.dll" - -# Variables -Var StartMenuGroup -Var response -Var keysearch -Var uninstallstring -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_FINISHPAGE_NOAUTOCLOSE -!define MUI_UNICON "${NSISDIR}/Contrib/Graphics/Icons/modern-uninstall-colorful.ico" -!define MUI_UNFINISHPAGE_NOAUTOCLOSE - -!insertmacro MUI_PAGE_WELCOME -!insertmacro MUI_PAGE_DIRECTORY -!insertmacro MUI_PAGE_INSTFILES - - -!insertmacro MUI_UNPAGE_CONFIRM -!insertmacro MUI_UNPAGE_INSTFILES - - -!insertmacro MUI_PAGE_FINISH - -# Installer languages -!insertmacro MUI_LANGUAGE English - -# Installer attributes -OutFile "GridTracker-Installer.${VERSION}.exe" -InstallDir "$PROGRAMFILES\GridTracker" -CRCCheck on -XPStyle on -ShowInstDetails show -VIProductVersion ${VERSION}.0 -VIAddVersionKey ProductName "GridTracker" -VIAddVersionKey ProductVersion "${VERSION}" -VIAddVersionKey CompanyName "${COMPANY}" -VIAddVersionKey CompanyWebsite "${URL}" -VIAddVersionKey FileVersion "${VERSION}" -VIAddVersionKey FileDescription "An Amateur Radio Community" -VIAddVersionKey LegalCopyright "2021 Gridtracker.org" -InstallDirRegKey HKLM "${REGKEY}" Path -ShowUninstDetails nevershow - -# Installer sections -Section -Main SEC0000 - SetOverwrite on - -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/*" - SetOutPath $INSTDIR\locales -SetDetailsPrint none - SetOverwrite on - File /r "GridTracker-1.21.0307-win-x86/locales/*" - - SetOutPath $INSTDIR\package.nw - SetOverwrite on - File /r "GridTracker-1.21.0307-win-x86/package.nw/*" - SetOverwrite on - - SetOutPath $INSTDIR\swiftshader - File /r "GridTracker-1.21.0307-win-x86/swiftshader/*" - - - - -SetDetailsPrint both - SetOutPath $INSTDIR - CreateDirectory "$SMPROGRAMS\GridTracker" - SetOutPath $INSTDIR - CreateShortCut "$SMPROGRAMS\GridTracker\GridTracker.lnk" $INSTDIR\GridTracker.exe - Delete /REBOOTOK "$SMPROGRAMS\GridTracker\Quickstart Guide.lnk" - CreateShortCut "$DESKTOP\GridTracker.lnk" "$INSTDIR\GridTracker.exe" - - -WriteRegStr HKLM "${REGKEY}\Components" Main 1 - -SectionEnd - -Section -post SEC0001 - WriteRegStr HKLM "${REGKEY}" Path $INSTDIR - SetOutPath $INSTDIR - WriteUninstaller $INSTDIR\uninstall.exe - SetOutPath $SMPROGRAMS\GridTracker - CreateShortcut "$SMPROGRAMS\GridTracker\Uninstall $(^Name).lnk" $INSTDIR\uninstall.exe - WriteRegStr HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)" DisplayName "$(^Name)" - WriteRegStr HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)" DisplayVersion "${VERSION}" - WriteRegStr HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)" Publisher "${COMPANY}" - WriteRegStr HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)" URLInfoAbout "${URL}" - WriteRegStr HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)" DisplayIcon $INSTDIR\uninstall.exe - WriteRegStr HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)" UninstallString $INSTDIR\uninstall.exe - WriteRegDWORD HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)" NoModify 1 - WriteRegDWORD HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)" NoRepair 1 -SectionEnd - -# Macro for selecting uninstaller sections -!macro SELECT_UNSECTION SECTION_NAME UNSECTION_ID - Push $R0 - ReadRegStr $R0 HKLM "${REGKEY}\Components" "${SECTION_NAME}" - StrCmp $R0 1 0 next${UNSECTION_ID} - !insertmacro SelectSection "${UNSECTION_ID}" - GoTo done${UNSECTION_ID} -next${UNSECTION_ID}: - !insertmacro UnselectSection "${UNSECTION_ID}" -done${UNSECTION_ID}: - Pop $R0 -!macroend - -# Uninstaller sections -Section /o -un.Main UNSEC0000 -SetDetailsPrint none - RmDir /r /REBOOTOK $INSTDIR - DeleteRegValue HKLM "${REGKEY}\Components" Main -SectionEnd - -Section -un.post UNSEC0001 - DeleteRegKey HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)" - Delete /REBOOTOK "$SMPROGRAMS\GridTracker\GridTracker.lnk" - Delete /REBOOTOK "$SMPROGRAMS\GridTracker\Quickstart Guide.lnk" - Delete /REBOOTOK "$DESKTOP\GridTracker.lnk" - Delete /REBOOTOK "$SMPROGRAMS\GridTracker\Uninstall $(^Name).lnk" - Delete /REBOOTOK $INSTDIR\uninstall.exe - DeleteRegValue HKLM "${REGKEY}" Path - DeleteRegKey /IfEmpty HKLM "${REGKEY}\Components" - DeleteRegKey /IfEmpty HKLM "${REGKEY}" -SetDetailsPrint none - RmDir /REBOOTOK $SMPROGRAMS\GridTracker - RmDir /r $LOCALAPPDATA\GridTracker - RmDir /REBOOTOK $INSTDIR -SetDetailsPrint both -SectionEnd - -# Installer functions - - -# Uninstaller functions -Function un.onInit - ReadRegStr $INSTDIR HKLM "${REGKEY}" Path - StrCpy $StartMenuGroup "GridTracker" - !insertmacro SELECT_UNSECTION Main ${UNSEC0000} -FunctionEnd - - - +RequestExecutionLevel highest +SetCompressor /SOLID LZMA +!include Sections.nsh +!include MUI2.nsh +!include Registry.nsh +Name "GridTracker" + +BrandingText " Gridtracker.org : GridTracker Installer " +# General Symbol Definitions +!define REGKEY "SOFTWARE\$(^Name)" +!define VERSION