Update Windows installer scripts to include build number and branding text
- Modified `farmcontrol.nsi` to define a default build number and updated branding text to reflect versioning. - Enhanced `build-windows-nsis.ps1` to accept a build number parameter, defaulting to "dev". - Updated `finalize-desktop-artifacts.mjs` to retrieve the build number from various sources, ensuring accurate versioning in the installer.
This commit is contained in:
parent
282d0c6630
commit
35a50fa97d
@ -1,4 +1,4 @@
|
|||||||
!include "MUI2.nsh"
|
!include "MUI2.nsh"
|
||||||
!include "LogicLib.nsh"
|
!include "LogicLib.nsh"
|
||||||
!include "installer.nsh"
|
!include "installer.nsh"
|
||||||
|
|
||||||
@ -10,6 +10,10 @@
|
|||||||
!define VERSION "0.1.0"
|
!define VERSION "0.1.0"
|
||||||
!endif
|
!endif
|
||||||
|
|
||||||
|
!ifndef BUILD_NUMBER
|
||||||
|
!define BUILD_NUMBER "dev"
|
||||||
|
!endif
|
||||||
|
|
||||||
!ifndef APP_SOURCE_DIR
|
!ifndef APP_SOURCE_DIR
|
||||||
!define APP_SOURCE_DIR "app"
|
!define APP_SOURCE_DIR "app"
|
||||||
!endif
|
!endif
|
||||||
@ -21,6 +25,7 @@ InstallDirRegKey HKLM "Software\Tom Butcher\Farm Control" "InstallDir"
|
|||||||
RequestExecutionLevel admin
|
RequestExecutionLevel admin
|
||||||
|
|
||||||
!define MUI_ABORTWARNING
|
!define MUI_ABORTWARNING
|
||||||
|
!define MUI_BRANDINGTEXT "Farm Control v${VERSION}-b${BUILD_NUMBER} Installer"
|
||||||
|
|
||||||
!ifndef INSTALLER_ICON
|
!ifndef INSTALLER_ICON
|
||||||
!define INSTALLER_ICON "${NSISDIR}\Contrib\Graphics\Icons\modern-install.ico"
|
!define INSTALLER_ICON "${NSISDIR}\Contrib\Graphics\Icons\modern-install.ico"
|
||||||
|
|||||||
@ -8,6 +8,8 @@ param(
|
|||||||
[Parameter(Mandatory = $true)]
|
[Parameter(Mandatory = $true)]
|
||||||
[string]$Version,
|
[string]$Version,
|
||||||
|
|
||||||
|
[string]$BuildNumber = "dev",
|
||||||
|
|
||||||
[long]$MinInstallerBytes = 10485760
|
[long]$MinInstallerBytes = 10485760
|
||||||
)
|
)
|
||||||
|
|
||||||
@ -97,6 +99,7 @@ $makensisArgs = @(
|
|||||||
"/NOCD"
|
"/NOCD"
|
||||||
"/DOUTFILE=$localInstallerName"
|
"/DOUTFILE=$localInstallerName"
|
||||||
"/DVERSION=$Version"
|
"/DVERSION=$Version"
|
||||||
|
"/DBUILD_NUMBER=$BuildNumber"
|
||||||
"/DAPP_SOURCE_DIR=app"
|
"/DAPP_SOURCE_DIR=app"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|||||||
@ -447,6 +447,15 @@ function buildWindowsNsis(appDir, arch) {
|
|||||||
artifactDir,
|
artifactDir,
|
||||||
getReleaseArtifactName(version, arch, 'exe')
|
getReleaseArtifactName(version, arch, 'exe')
|
||||||
)
|
)
|
||||||
|
const buildInfoPath = path.join(rootDir, 'src/buildInfo.json')
|
||||||
|
const buildInfo = existsSync(buildInfoPath)
|
||||||
|
? JSON.parse(readFileSync(buildInfoPath, 'utf8'))
|
||||||
|
: {}
|
||||||
|
const buildNumber =
|
||||||
|
process.env.BUILD_NUMBER ||
|
||||||
|
process.env.VITE_BUILD_NUMBER ||
|
||||||
|
buildInfo.buildNumber ||
|
||||||
|
'dev'
|
||||||
const powershell = process.env.SystemRoot
|
const powershell = process.env.SystemRoot
|
||||||
? path.join(
|
? path.join(
|
||||||
process.env.SystemRoot,
|
process.env.SystemRoot,
|
||||||
@ -470,7 +479,9 @@ function buildWindowsNsis(appDir, arch) {
|
|||||||
'-OutputExe',
|
'-OutputExe',
|
||||||
exePath,
|
exePath,
|
||||||
'-Version',
|
'-Version',
|
||||||
version
|
version,
|
||||||
|
'-BuildNumber',
|
||||||
|
buildNumber
|
||||||
],
|
],
|
||||||
{ stdio: 'inherit' }
|
{ stdio: 'inherit' }
|
||||||
)
|
)
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user