mirror
/
gridtracker
kopia lustrzana https://gitlab.com/gridtracker.org/gridtracker
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

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

Update version 21 0322

See merge request gridtracker.org/gridtracker!73
rich-presence v1.21.0322
Matthew Chambers 2021-03-23 02:37:40 +00:00
rodzic 3813d4858f 58de6413ed
commit cfa7499fed
6 zmienionych plików z 201 dodań i 189 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

15
.gitlab-ci.yml
Wyświetl plik

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

9
debian/changelog vendored
Wyświetl plik

@ -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 gridtracker (1.21.0307) unstable; urgency=medium
[ Paul Traina ] [ Paul Traina ]

15
docker/build-all.sh
Wyświetl plik

@ -21,17 +21,20 @@ for dir in dist/*-win-* ; do
mv $dir/`basename $file` $dir/package.nw mv $dir/`basename $file` $dir/package.nw
done done
elif [ -f $dir ] && [[ "$dir" == *"win-x86-Setup.exe"* ]] ; then elif [ -f $dir ] && [[ "$dir" == *"win-x86-Setup.exe"* ]] ; then
echo "would delete broken installer $dir" echo "deleting broken installer $dir"
# rm $dir rm $dir
fi fi
done 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-\${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 > windows/setup.nsi 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 makensis windows/setup.nsi
# clean up generated files # clean up generated files
rm windows/setup.nsi 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 mv dist/*{.exe,mac-x64.zip,.tar.gz} ../dist
rpmbuild -D "version `node ./version.js`" --build-in-place -bb gridtracker.i386.spec rpmbuild -D "version `node ./version.js`" --build-in-place -bb gridtracker.i386.spec

BIN
package.nw/gt_update.pdf
Wyświetl plik

Plik binarny nie jest wyświetlany.

2
package.nw/package.json
Wyświetl plik

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

349
windows/setup.nsi.tmpl
Wyświetl plik

@ -1,175 +1,174 @@
RequestExecutionLevel highest RequestExecutionLevel highest
SetCompressor /SOLID LZMA SetCompressor /SOLID LZMA
!include Sections.nsh !include Sections.nsh
!include MUI2.nsh !include MUI2.nsh
!include Registry.nsh !include Registry.nsh
Name "GridTracker" Name "GridTracker"
BrandingText " Gridtracker.org : GridTracker Installer " BrandingText " Gridtracker.org : GridTracker Installer "
# General Symbol Definitions # General Symbol Definitions
!define REGKEY "SOFTWARE\$(^Name)" !define REGKEY "SOFTWARE\$(^Name)"
!define VERSION 1.21.0307 !define VERSION <placeholder
!define COMPANY "Gridtracker.org" !define COMPANY "Gridtracker.org"
!define URL http://gridtracker.org !define URL http://gridtracker.org
#d #d
# MUI Symbol Definitions # MUI Symbol Definitions
# Included files # Included files
# Reserved Files # Reserved Files
ReserveFile "${NSISDIR}/Plugins/x86-unicode/registry.dll" ReserveFile "${NSISDIR}/Plugins/x86-unicode/registry.dll"
# Variables # Variables
Var StartMenuGroup Var StartMenuGroup
Var response Var response
Var keysearch Var keysearch
Var uninstallstring Var uninstallstring
Var realkey Var realkey
# Installer pages # Installer pages
#!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_ICON "GridTracker-1.21.0307-win-x86/package.nw/gridview.ico" !define MUI_FINISHPAGE_NOAUTOCLOSE
!define MUI_FINISHPAGE_NOAUTOCLOSE !define MUI_UNICON "${NSISDIR}/Contrib/Graphics/Icons/modern-uninstall-colorful.ico"
!define MUI_UNICON "${NSISDIR}/Contrib/Graphics/Icons/modern-uninstall-colorful.ico" !define MUI_UNFINISHPAGE_NOAUTOCLOSE
!define MUI_UNFINISHPAGE_NOAUTOCLOSE
!insertmacro MUI_PAGE_WELCOME
!insertmacro MUI_PAGE_WELCOME !insertmacro MUI_PAGE_DIRECTORY
!insertmacro MUI_PAGE_DIRECTORY !insertmacro MUI_PAGE_INSTFILES
!insertmacro MUI_PAGE_INSTFILES
!insertmacro MUI_UNPAGE_CONFIRM
!insertmacro MUI_UNPAGE_CONFIRM !insertmacro MUI_UNPAGE_INSTFILES
!insertmacro MUI_UNPAGE_INSTFILES
!insertmacro MUI_PAGE_FINISH
!insertmacro MUI_PAGE_FINISH
# Installer languages
# Installer languages !insertmacro MUI_LANGUAGE English
!insertmacro MUI_LANGUAGE English
# Installer attributes
# Installer attributes OutFile "GridTracker-Installer.${VERSION}.exe"
OutFile "GridTracker-Installer.${VERSION}.exe" InstallDir "$PROGRAMFILES\GridTracker"
InstallDir "$PROGRAMFILES\GridTracker" CRCCheck on
CRCCheck on XPStyle on
XPStyle on ShowInstDetails show
ShowInstDetails show VIProductVersion ${VERSION}.0
VIProductVersion ${VERSION}.0 VIAddVersionKey ProductName "GridTracker"
VIAddVersionKey ProductName "GridTracker" VIAddVersionKey ProductVersion "${VERSION}"
VIAddVersionKey ProductVersion "${VERSION}" VIAddVersionKey CompanyName "${COMPANY}"
VIAddVersionKey CompanyName "${COMPANY}" VIAddVersionKey CompanyWebsite "${URL}"
VIAddVersionKey CompanyWebsite "${URL}" VIAddVersionKey FileVersion "${VERSION}"
VIAddVersionKey FileVersion "${VERSION}" VIAddVersionKey FileDescription "An Amateur Radio Community"
VIAddVersionKey FileDescription "An Amateur Radio Community" VIAddVersionKey LegalCopyright "2021 Gridtracker.org"
VIAddVersionKey LegalCopyright "2021 Gridtracker.org" InstallDirRegKey HKLM "${REGKEY}" Path
InstallDirRegKey HKLM "${REGKEY}" Path ShowUninstDetails nevershow
ShowUninstDetails nevershow
# Installer sections
# Installer sections Section -Main SEC0000
Section -Main SEC0000 SetOverwrite on
SetOverwrite on
SetDetailsPrint none
SetDetailsPrint none RMDir /r "$INSTDIR"
RMDir /r "$INSTDIR" SetDetailsPrint both
SetDetailsPrint both SetOutPath $INSTDIR
SetOutPath $INSTDIR File /x debug.log /x package.nw.zip /x package.zip /x nw.exe "GridTracker-${VERSION}-win-x86/*"
File /x debug.log /x package.nw.zip /x package.zip /x nw.exe "GridTracker-1.21.0307-win-x86/*" SetOutPath $INSTDIR\locales
SetOutPath $INSTDIR\locales SetDetailsPrint none
SetDetailsPrint none SetOverwrite on
SetOverwrite on File /r "GridTracker-${VERSION}-win-x86/locales/*"
File /r "GridTracker-1.21.0307-win-x86/locales/*"
SetOutPath $INSTDIR\package.nw
SetOutPath $INSTDIR\package.nw SetOverwrite on
SetOverwrite on File /r "GridTracker-${VERSION}-win-x86/package.nw/*"
File /r "GridTracker-1.21.0307-win-x86/package.nw/*" SetOverwrite on
SetOverwrite on
SetOutPath $INSTDIR\swiftshader
SetOutPath $INSTDIR\swiftshader File /r "GridTracker-${VERSION}-win-x86/swiftshader/*"
File /r "GridTracker-1.21.0307-win-x86/swiftshader/*"
SetDetailsPrint both
SetDetailsPrint both SetOutPath $INSTDIR
SetOutPath $INSTDIR CreateDirectory "$SMPROGRAMS\GridTracker"
CreateDirectory "$SMPROGRAMS\GridTracker" SetOutPath $INSTDIR
SetOutPath $INSTDIR CreateShortCut "$SMPROGRAMS\GridTracker\GridTracker.lnk" $INSTDIR\GridTracker.exe
CreateShortCut "$SMPROGRAMS\GridTracker\GridTracker.lnk" $INSTDIR\GridTracker.exe Delete /REBOOTOK "$SMPROGRAMS\GridTracker\Quickstart Guide.lnk"
Delete /REBOOTOK "$SMPROGRAMS\GridTracker\Quickstart Guide.lnk" CreateShortCut "$DESKTOP\GridTracker.lnk" "$INSTDIR\GridTracker.exe"
CreateShortCut "$DESKTOP\GridTracker.lnk" "$INSTDIR\GridTracker.exe"
WriteRegStr HKLM "${REGKEY}\Components" Main 1
WriteRegStr HKLM "${REGKEY}\Components" Main 1
SectionEnd
SectionEnd
Section -post SEC0001
Section -post SEC0001 WriteRegStr HKLM "${REGKEY}" Path $INSTDIR
WriteRegStr HKLM "${REGKEY}" Path $INSTDIR SetOutPath $INSTDIR
SetOutPath $INSTDIR WriteUninstaller $INSTDIR\uninstall.exe
WriteUninstaller $INSTDIR\uninstall.exe SetOutPath $SMPROGRAMS\GridTracker
SetOutPath $SMPROGRAMS\GridTracker CreateShortcut "$SMPROGRAMS\GridTracker\Uninstall $(^Name).lnk" $INSTDIR\uninstall.exe
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)" DisplayName "$(^Name)" WriteRegStr HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)" DisplayVersion "${VERSION}"
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)" Publisher "${COMPANY}" WriteRegStr HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)" URLInfoAbout "${URL}"
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)" DisplayIcon $INSTDIR\uninstall.exe WriteRegStr HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)" UninstallString $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)" NoModify 1 WriteRegDWORD HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)" NoRepair 1
WriteRegDWORD HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)" NoRepair 1 SectionEnd
SectionEnd
# Macro for selecting uninstaller sections
# Macro for selecting uninstaller sections !macro SELECT_UNSECTION SECTION_NAME UNSECTION_ID
!macro SELECT_UNSECTION SECTION_NAME UNSECTION_ID Push $R0
Push $R0 ReadRegStr $R0 HKLM "${REGKEY}\Components" "${SECTION_NAME}"
ReadRegStr $R0 HKLM "${REGKEY}\Components" "${SECTION_NAME}" StrCmp $R0 1 0 next${UNSECTION_ID}
StrCmp $R0 1 0 next${UNSECTION_ID} !insertmacro SelectSection "${UNSECTION_ID}"
!insertmacro SelectSection "${UNSECTION_ID}" GoTo done${UNSECTION_ID}
GoTo done${UNSECTION_ID} next${UNSECTION_ID}:
next${UNSECTION_ID}: !insertmacro UnselectSection "${UNSECTION_ID}"
!insertmacro UnselectSection "${UNSECTION_ID}" done${UNSECTION_ID}:
done${UNSECTION_ID}: Pop $R0
Pop $R0 !macroend
!macroend
# Uninstaller sections
# Uninstaller sections Section /o -un.Main UNSEC0000
Section /o -un.Main UNSEC0000 SetDetailsPrint none
SetDetailsPrint none RmDir /r /REBOOTOK $INSTDIR
RmDir /r /REBOOTOK $INSTDIR DeleteRegValue HKLM "${REGKEY}\Components" Main
DeleteRegValue HKLM "${REGKEY}\Components" Main SectionEnd
SectionEnd
Section -un.post UNSEC0001
Section -un.post UNSEC0001 DeleteRegKey HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)"
DeleteRegKey HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)" Delete /REBOOTOK "$SMPROGRAMS\GridTracker\GridTracker.lnk"
Delete /REBOOTOK "$SMPROGRAMS\GridTracker\GridTracker.lnk" Delete /REBOOTOK "$SMPROGRAMS\GridTracker\Quickstart Guide.lnk"
Delete /REBOOTOK "$SMPROGRAMS\GridTracker\Quickstart Guide.lnk" Delete /REBOOTOK "$DESKTOP\GridTracker.lnk"
Delete /REBOOTOK "$DESKTOP\GridTracker.lnk" Delete /REBOOTOK "$SMPROGRAMS\GridTracker\Uninstall $(^Name).lnk"
Delete /REBOOTOK "$SMPROGRAMS\GridTracker\Uninstall $(^Name).lnk" Delete /REBOOTOK $INSTDIR\uninstall.exe
Delete /REBOOTOK $INSTDIR\uninstall.exe DeleteRegValue HKLM "${REGKEY}" Path
DeleteRegValue HKLM "${REGKEY}" Path DeleteRegKey /IfEmpty HKLM "${REGKEY}\Components"
DeleteRegKey /IfEmpty HKLM "${REGKEY}\Components" DeleteRegKey /IfEmpty HKLM "${REGKEY}"
DeleteRegKey /IfEmpty HKLM "${REGKEY}" SetDetailsPrint none
SetDetailsPrint none RmDir /REBOOTOK $SMPROGRAMS\GridTracker
RmDir /REBOOTOK $SMPROGRAMS\GridTracker RmDir /r $LOCALAPPDATA\GridTracker
RmDir /r $LOCALAPPDATA\GridTracker RmDir /REBOOTOK $INSTDIR
RmDir /REBOOTOK $INSTDIR SetDetailsPrint both
SetDetailsPrint both SectionEnd
SectionEnd
# Installer functions
# Installer functions
# Uninstaller functions
# Uninstaller functions Function un.onInit
Function un.onInit ReadRegStr $INSTDIR HKLM "${REGKEY}" Path
ReadRegStr $INSTDIR HKLM "${REGKEY}" Path StrCpy $StartMenuGroup "GridTracker"
StrCpy $StartMenuGroup "GridTracker" !insertmacro SELECT_UNSECTION Main ${UNSEC0000}
!insertmacro SELECT_UNSECTION Main ${UNSEC0000} FunctionEnd
FunctionEnd