Skip to content

Commit 1a8fa26

Browse files
authored
Merge pull request #492 from jMonkeyEngine/bugfix/issue-491
Fix Windows installer
2 parents 82b44f0 + 9ffc74a commit 1a8fa26

File tree

3 files changed

+6
-15
lines changed

3 files changed

+6
-15
lines changed

.github/workflows/release.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
- name: Override Harness (custom icon)
2525
run: ./gradlew overrideHarness -Ptag_name=${{ github.ref_name }}
2626
- name: Build Installers
27-
run: ant -Dstorepass="$NBM_SIGN_PASS" -Dpack200.enabled=true set-spec-version build-installers unset-spec-version
27+
run: ant -Dstorepass="$NBM_SIGN_PASS" -Dpack200.enabled=false set-spec-version build-installers unset-spec-version
2828
env:
2929
BUILD_X86: true
3030
BUILD_X64: true

build.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -272,7 +272,7 @@
272272
<!-- <property name="generate.installer.for.platforms" value="windows-x86 windows-x64 linux-x86 linux-x64 macosx"/> -->
273273
<property name="generator-jdk-location-forward-slashes" value="${java.home}"/>
274274
<property name="generated-installers-location-forward-slashes" value="${basedir}/build/installer"/>
275-
<property name="pack200.enabled" value="true"/>
275+
<property name="pack200.enabled" value="false"/>
276276
<property name="nbi.icon.file" value="${basedir}/jmonkeyplatform.png"/>
277277
<property name="nbi.dock.icon.file" value="${basedir}/jmonkeyplatform.icns"/>
278278
<property name="product.description" value="${app.description}"/>

jdks/download-jdks.sh

+4-13
Original file line numberDiff line numberDiff line change
@@ -165,12 +165,10 @@ function unpack_windows {
165165
find . -exec chmod u+w {} \; # Make all file writable to allow uninstaller's cleaner to remove file
166166

167167
find . -type f \( -name "*.exe" -o -name "*.dll" \) -exec chmod u+rwx {} \; # Make them executable
168-
169-
find . -type f -name "*.pack" | while read eachFile; do
170-
echo ">> Unpacking $eachFile ...";
171-
unpack200 $eachFile ${eachFile%.pack}.jar;
172-
rm $eachFile;
173-
done
168+
169+
# Insert fake unpack200.exe
170+
# See https://github.com/jMonkeyEngine/sdk/issues/491
171+
touch bin/unpack200.exe
174172

175173
cd ../
176174

@@ -248,13 +246,6 @@ function compile_other {
248246
exit 1
249247
fi
250248

251-
echo "> Creating SFX JDK package $name"
252-
if [ -f "$1-$2/jre/lib/rt.jar" ]; then # Already packed?
253-
echo "> PACK200 rt.jar"
254-
pack200 -J-Xmx1024m $1-$2/jre/lib/rt.jar.pack.gz $1-$2/jre/lib/rt.jar
255-
rm -rf $1-$2/jre/lib/rt.jar
256-
fi
257-
258249
echo "> Zipping JDK"
259250
cd $1-$2 # zip behaves differently between 7zip and Info-Zip, so simply change wd
260251
zip -9 -qry ../jdk_tmp_sfx.zip *

0 commit comments

Comments
 (0)