Fix versioning information for all builds

.github/workflows/release-macos.yaml

@@ -59,6 +59,9 @@ jobs:
  - name: Update npm
  run: npm install -g npm
 
+ - name: Bump manifest version
+ run: node version.js ${{ github.event.release.tag_name }}
+
  - name: Build frontend assets
  run: cd frontend && npm install
 

.github/workflows/release-windows.yaml

@@ -12,6 +12,7 @@ jobs:
  matrix:
  platform:
  - windows/amd64
+ - windows/arm64
  steps:
  - name: Checkout source code
  uses: actions/checkout@v2
@@ -57,6 +58,9 @@ jobs:
  - name: Update npm
  run: npm install -g npm
 
+ - name: Bump manifest version
+ run: node version.js ${{ github.event.release.tag_name }}
+
  - name: Build frontend assets
  shell: bash
  run: cd frontend && npm install

build/darwin/Info.dev.plist

@@ -0,0 +1,32 @@
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+ <dict>
+ <key>CFBundlePackageType</key>
+ <string>APPL</string>
+ <key>CFBundleName</key>
+ <string>{{.Info.ProductName}}</string>
+ <key>CFBundleExecutable</key>
+ <string>{{.Name}}</string>
+ <key>CFBundleIdentifier</key>
+ <string>com.wails.{{.Name}}</string>
+ <key>CFBundleVersion</key>
+ <string>{{.Info.ProductVersion}}</string>
+ <key>CFBundleGetInfoString</key>
+ <string>{{.Info.Comments}}</string>
+ <key>CFBundleShortVersionString</key>
+ <string>{{.Info.ProductVersion}}</string>
+ <key>CFBundleIconFile</key>
+ <string>iconfile</string>
+ <key>LSMinimumSystemVersion</key>
+ <string>10.13.0</string>
+ <key>NSHighResolutionCapable</key>
+ <string>true</string>
+ <key>NSHumanReadableCopyright</key>
+ <string>{{.Info.Copyright}}</string>
+ <key>NSAppTransportSecurity</key>
+ <dict>
+ <key>NSAllowsLocalNetworking</key>
+ <true/>
+ </dict>
+ </dict>
+</plist>

build/darwin/Info.plist

@@ -1,14 +1,27 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0"><dict>
- <key>CFBundlePackageType</key><string>APPL</string>
- <key>CFBundleName</key><string>October</string>
- <key>CFBundleExecutable</key><string>October</string>
- <key>CFBundleIdentifier</key><string>net.utf9k.october</string>
- <key>CFBundleVersion</key><string>1.1.2</string>
- <key>CFBundleGetInfoString</key><string>Built using Wails (https://wails.app)</string>
- <key>CFBundleShortVersionString</key><string>1.1.2</string>
- <key>CFBundleIconFile</key><string>iconfile</string>
- <key>LSMinimumSystemVersion</key><string>10.13.0</string>
- <key>NSHighResolutionCapable</key><string>true</string>
- <key>NSHumanReadableCopyright</key><string>Copyright 2022 Marcus Crane ([email protected])</string>
-</dict></plist>
+<plist version="1.0">
+ <dict>
+ <key>CFBundlePackageType</key>
+ <string>APPL</string>
+ <key>CFBundleName</key>
+ <string>{{.Info.ProductName}}</string>
+ <key>CFBundleExecutable</key>
+ <string>{{.Name}}</string>
+ <key>CFBundleIdentifier</key>
+ <string>com.wails.{{.Name}}</string>
+ <key>CFBundleVersion</key>
+ <string>{{.Info.ProductVersion}}</string>
+ <key>CFBundleGetInfoString</key>
+ <string>{{.Info.Comments}}</string>
+ <key>CFBundleShortVersionString</key>
+ <string>{{.Info.ProductVersion}}</string>
+ <key>CFBundleIconFile</key>
+ <string>iconfile</string>
+ <key>LSMinimumSystemVersion</key>
+ <string>10.13.0</string>
+ <key>NSHighResolutionCapable</key>
+ <string>true</string>
+ <key>NSHumanReadableCopyright</key>
+ <string>{{.Info.Copyright}}</string>
+ </dict>
+</plist>

build/windows/October.exe.manifest

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1" xmlns:asmv3="urn:schemas-microsoft-com:asm.v3">
- <assemblyIdentity type="win32" name="MyApplication" version="1.0.0.0" processorArchitecture="amd64"/>
+ <assemblyIdentity type="win32" name="com.wails.{{.Name}}" version="{{.Info.ProductVersion}}.0" processorArchitecture="*"/>
  <dependency>
  <dependentAssembly>
  <assemblyIdentity type="win32" name="Microsoft.Windows.Common-Controls" version="6.0.0.0" processorArchitecture="*" publicKeyToken="6595b64144ccf1df" language="*"/>

build/windows/info.json

@@ -0,0 +1,15 @@
+{
+ "fixed": {
+ "file_version": "{{.Info.ProductVersion}}"
+ },
+ "info": {
+ "0000": {
+ "ProductVersion": "{{.Info.ProductVersion}}",
+ "CompanyName": "{{.Info.CompanyName}}",
+ "FileDescription": "{{.Info.ProductName}}",
+ "LegalCopyright": "{{.Info.Copyright}}",
+ "ProductName": "{{.Info.ProductName}}",
+ "Comments": "{{.Info.Comments}}"
+ }
+ }
+}

build/windows/installer/project.nsi

@@ -0,0 +1,101 @@
+Unicode true
+
+####
+## Please note: Template replacements don't work in this file. They are provided with default defines like
+## mentioned underneath.
+## If the keyword is not defined, "wails_tools.nsh" will populate them with the values from ProjectInfo. 
+## If they are defined here, "wails_tools.nsh" will not touch them. This allows to use this project.nsi manually 
+## from outside of Wails for debugging and development of the installer.
+## 
+## For development first make a wails nsis build to populate the "wails_tools.nsh":
+## > wails build --target windows/amd64 --nsis
+## Then you can call makensis on this file with specifying the path to your binary:
+## For a AMD64 only installer:
+## > makensis -DARG_WAILS_AMD64_BINARY=..\..\bin\app.exe
+## For a ARM64 only installer:
+## > makensis -DARG_WAILS_ARM64_BINARY=..\..\bin\app.exe
+## For a installer with both architectures:
+## > makensis -DARG_WAILS_AMD64_BINARY=..\..\bin\app-amd64.exe -DARG_WAILS_ARM64_BINARY=..\..\bin\app-arm64.exe
+####
+## The following information is taken from the ProjectInfo file, but they can be overwritten here. 
+####
+## !define INFO_PROJECTNAME "MyProject" # Default "{{.Name}}"
+## !define INFO_COMPANYNAME "MyCompany" # Default "{{.Info.CompanyName}}"
+## !define INFO_PRODUCTNAME "MyProduct" # Default "{{.Info.ProductName}}"
+## !define INFO_PRODUCTVERSION "1.0.0" # Default "{{.Info.ProductVersion}}"
+## !define INFO_COPYRIGHT "Copyright" # Default "{{.Info.Copyright}}"
+###
+## !define PRODUCT_EXECUTABLE "Application.exe" # Default "${INFO_PROJECTNAME}.exe"
+## !define UNINST_KEY_NAME "UninstKeyInRegistry" # Default "${INFO_COMPANYNAME}${INFO_PRODUCTNAME}"
+####
+## !define REQUEST_EXECUTION_LEVEL "admin" # Default "admin" see also https://nsis.sourceforge.io/Docs/Chapter4.html
+####
+## Include the wails tools
+####
+!include "wails_tools.nsh"
+
+# The version information for this two must consist of 4 parts
+VIProductVersion "${INFO_PRODUCTVERSION}.0"
+VIFileVersion "${INFO_PRODUCTVERSION}.0"
+
+VIAddVersionKey "CompanyName" "${INFO_COMPANYNAME}"
+VIAddVersionKey "FileDescription" "${INFO_PRODUCTNAME} Installer"
+VIAddVersionKey "ProductVersion" "${INFO_PRODUCTVERSION}"
+VIAddVersionKey "FileVersion" "${INFO_PRODUCTVERSION}"
+VIAddVersionKey "LegalCopyright" "${INFO_COPYRIGHT}"
+VIAddVersionKey "ProductName" "${INFO_PRODUCTNAME}"
+
+!include "MUI.nsh"
+
+!define MUI_ICON "..\icon.ico"
+!define MUI_UNICON "..\icon.ico"
+# !define MUI_WELCOMEFINISHPAGE_BITMAP "resources\leftimage.bmp" #Include this to add a bitmap on the left side of the Welcome Page. Must be a size of 164x314
+!define MUI_FINISHPAGE_NOAUTOCLOSE # Wait on the INSTFILES page so the user can take a look into the details of the installation steps
+!define MUI_ABORTWARNING # This will warn the user if they exit from the installer.
+
+!insertmacro MUI_PAGE_WELCOME # Welcome to the installer page.
+# !insertmacro MUI_PAGE_LICENSE "resources\eula.txt" # Adds a EULA page to the installer
+!insertmacro MUI_PAGE_DIRECTORY # In which folder install page.
+!insertmacro MUI_PAGE_INSTFILES # Installing page.
+!insertmacro MUI_PAGE_FINISH # Finished installation page.
+
+!insertmacro MUI_UNPAGE_INSTFILES # Uinstalling page
+
+!insertmacro MUI_LANGUAGE "English" # Set the Language of the installer
+
+## The following two statements can be used to sign the installer and the uninstaller. The path to the binaries are provided in %1
+#!uninstfinalize 'signtool --file "%1"'
+#!finalize 'signtool --file "%1"'
+
+Name "${INFO_PRODUCTNAME}"
+OutFile "..\..\bin\${INFO_PROJECTNAME}-${ARCH}-installer.exe" # Name of the installer's file.
+InstallDir "$PROGRAMFILES64\${INFO_COMPANYNAME}\${INFO_PRODUCTNAME}" # Default installing folder ($PROGRAMFILES is Program Files folder).
+ShowInstDetails show # This will always show the installation details.
+
+Function .onInit
+ !insertmacro wails.checkArchitecture
+FunctionEnd
+
+Section
+ !insertmacro wails.webview2runtime
+
+ SetOutPath $INSTDIR
+
+ !insertmacro wails.files
+
+ CreateShortcut "$SMPROGRAMS\${INFO_PRODUCTNAME}.lnk" "$INSTDIR\${PRODUCT_EXECUTABLE}"
+ CreateShortCut "$DESKTOP\${INFO_PRODUCTNAME}.lnk" "$INSTDIR\${PRODUCT_EXECUTABLE}"
+
+ !insertmacro wails.writeUninstaller
+SectionEnd
+
+Section "uninstall" 
+ RMDir /r "$AppData\${PRODUCT_EXECUTABLE}" # Remove the WebView2 DataPath
+
+ RMDir /r $INSTDIR
+
+ Delete "$SMPROGRAMS\${INFO_PRODUCTNAME}.lnk"
+ Delete "$DESKTOP\${INFO_PRODUCTNAME}.lnk"
+
+ !insertmacro wails.deleteUninstaller
+SectionEnd