kopia lustrzana https://gitlab.com/gridtracker.org/gridtracker
Update version 21 0322
Matthew Chambers
rodzic
3813d4858f
commit
58de6413ed
|
|
@ -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"
|
||||
|
||||
|
|
|
|||
|
|
@ -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 ]
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
Plik binarny nie jest wyświetlany.
|
|
@ -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",
|
||||
|
|
|
|||
|
|
@ -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 <placeholder
|
||||
!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-${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
|
||||
|
||||
!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-${VERSION}-win-x86/*"
|
||||
SetOutPath $INSTDIR\locales
|
||||
SetDetailsPrint none
|
||||
SetOverwrite on
|
||||
File /r "GridTracker-${VERSION}-win-x86/locales/*"
|
||||
|
||||
SetOutPath $INSTDIR\package.nw
|
||||
SetOverwrite on
|
||||
File /r "GridTracker-${VERSION}-win-x86/package.nw/*"
|
||||
SetOverwrite on
|
||||
|
||||
SetOutPath $INSTDIR\swiftshader
|
||||
File /r "GridTracker-${VERSION}-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
|
||||
|
||||
|
||||
|
||||
|
|
|
|||
Ładowanie…
Reference in New Issue