Skip to content

Commit 1edead9

Browse files
committed
Refactor build process so installer version matches product version
1 parent b8af8b8 commit 1edead9

File tree

5 files changed

+9
-6
lines changed

5 files changed

+9
-6
lines changed

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "icarus",
3-
"version": "0.1.4",
3+
"version": "0.1.5",
44
"description": "",
55
"scripts": {
66
"build": "npm run build:web && npm run build:app && npm run build:service && npm run build:package",

resources/installer.nsi

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
!define APP_NAME "ICARUS Terminal"
88
!define COMP_NAME "ICARUS"
9-
!define VERSION "0.1.3.0"
9+
!define VERSION "${PRODUCT_VERSION}"
1010
!define COPYRIGHT "ICARUS"
1111
!define DESCRIPTION "Application"
1212
!define INSTALLER_NAME "..\dist\ICARUS Setup.exe"

scripts/build-package.js

+4-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@ const {
55
BUILD_DIR,
66
DIST_DIR,
77
INSTALLER_NSI,
8-
INSTALLER_EXE
8+
INSTALLER_EXE,
9+
PRODUCT_VERSION
910
} = require('./lib/build-options')
1011

1112
;(async () => {
@@ -24,7 +25,8 @@ async function build () {
2425
pathToMakensis: 'C:\\Program Files (x86)\\NSIS\\makensis.exe',
2526
verbose: 4,
2627
define: {
27-
SPECIAL_BUILD: false
28+
SPECIAL_BUILD: false,
29+
PRODUCT_VERSION
2830
}
2931
})
3032
console.log(installerOutput)

scripts/lib/build-options.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -80,5 +80,6 @@ module.exports = {
8080
APP_VERSION_INFO,
8181
SERVICE_VERSION_INFO,
8282
INSTALLER_NSI,
83-
INSTALLER_EXE
83+
INSTALLER_EXE,
84+
PRODUCT_VERSION
8485
}

src/web/public/launcher.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ <h1>ICARUS</h1>
5858
<button onClick="window.app_quit()">Quit Application</button>
5959
</p>
6060
<p>
61-
<small>Preview Build 0.1.4.0</small>
61+
<small>Preview Build 0.1.5.0</small>
6262
</p>
6363
</div>
6464
</body>

0 commit comments

Comments
 (0)