Update Windows build system

Automate estimated size and fix Author and Version fields
zevlee · May 18, 2022 · 5e0fa3c · 5e0fa3c
1 parent b62abe5
commit 5e0fa3c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/windows/build.sh b/windows/build.sh
@@ -21,6 +21,7 @@ cd dist/$APP
 zip -r $APP.zip *
 mv $APP.zip ../..
 cd ../..
+echo $(du -sk dist/$APP | cut -f 1) > INSTALLSIZE
 
 echo "Running makensis..."
 
@@ -34,6 +35,7 @@ echo "Cleaning up..."
 deactivate
 mv $APP*.exe* ../..
 rm $APP.zip
+rm INSTALLSIZE
 rm -r build
 rm -r dist/*/*
 rm -r dist

diff --git a/windows/hello-world-gtk.nsi b/windows/hello-world-gtk.nsi
@@ -4,11 +4,11 @@
 !define FILENAME "hello-world-gtk"
 !define AUTHOR "Author Name"
 !define DESCRIPTION "Hello World GTK"
-!define INSTALLSIZE 109976
 
 Unicode True
 
 !define /file VERSION "..\VERSION"
+!define /file INSTALLSIZE "INSTALLSIZE"
 
 InstallDir "$PROGRAMFILES\${APPNAME}"
 
@@ -56,8 +56,8 @@ section "install"
 	WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}" "QuietUninstallString" "$\"$INSTDIR\uninstall.exe$\" /S"
 	WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}" "InstallLocation" "$\"$INSTDIR$\""
 	WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}" "DisplayIcon" "$\"$INSTDIR\${FILENAME}.ico$\""
-	WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}" "Publisher" "$\"${AUTHOR}$\""
-	WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}" "DisplayVersion" "$\"Version ${VERSION}$\""
+	WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}" "Publisher" "${AUTHOR}"
+	WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}" "DisplayVersion" "${VERSION}"
 	WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}" "NoModify" 1
 	WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}" "NoRepair" 1
 	WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}" "EstimatedSize" ${INSTALLSIZE}