Skip to content

Commit 582085f

Browse files
committed
Try to build Windows installer in CMD so that we can use the runner's InnoSetup
1 parent d37f455 commit 582085f

2 files changed

Lines changed: 12 additions & 3 deletions

File tree

installers/build-installers.sh

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,14 @@ function build_nbpackage {
2020
echo "<< OK!"
2121
}
2222

23+
function build_nbpackage_on_cmd {
24+
echo ">> Building the NBPackage installer in CMD for $1-$2"
25+
26+
mkdir -p ../dist/installers
27+
cmd.exe /c .\\nbpackage\\bin\\nbpackage.cmd --input ../dist/jmonkeyplatform.zip --config "$1-$2/$3" --output ../dist/installers/ -v -Ppackage.version="$4"
28+
29+
echo "<< OK!"
30+
}
2331

2432
function build_linux_deb {
2533
echo "> Building the Linux DEB"
@@ -36,9 +44,10 @@ function build_windows_installer {
3644
if [ -n "$3" ];
3745
then
3846
setup_inno_setup
47+
build_nbpackage windows "$2" jmonkeyengine-windows-"$2".properties "$1"
48+
else
49+
build_nbpackage_on_cmd windows "$2" jmonkeyengine-windows-"$2".properties "$1"
3950
fi
40-
41-
build_nbpackage windows "$2" jmonkeyengine-windows-"$2".properties "$1"
4251

4352
echo "< OK!"
4453
}

installers/windows-x64/jmonkeyengine-windows-x64.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ package.publisher=${package.name}
1212
package.url=https://jmonkeyengine.org
1313
# Path to an InnoSetup compiler - can be downloaded from https://jrsoftware.org/isinfo.php (or Linux shell script to invoke via wine).
1414
# package.innosetup.tool=${CONFIG}/issc.sh (Linux)
15-
package.innosetup.tool=C:/Program Files (x86)/Inno Setup 6/ISCC.exe
15+
package.innosetup.tool=ISCC.exe
1616
# ID to uniquely identify application. Defaults to package name.
1717
package.innosetup.appid=
1818
# Path to an icon (*.ico) file for shortcut and installer.

0 commit comments

Comments
 (0)