Skip to content

Fix Windows installer #492

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Apr 9, 2023
Merged

Fix Windows installer #492

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8bbf798
Update release.yml
tonihele Apr 9, 2023
08f22b8
Disable pack200
tonihele Apr 9, 2023
9ffc74a
Remove pack200 stuff, add fake unpack200.exe for Windows
tonihele Apr 9, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
- name: Override Harness (custom icon)
run: ./gradlew overrideHarness -Ptag_name=${{ github.ref_name }}
- name: Build Installers
run: ant -Dstorepass="$NBM_SIGN_PASS" -Dpack200.enabled=true set-spec-version build-installers unset-spec-version
run: ant -Dstorepass="$NBM_SIGN_PASS" -Dpack200.enabled=false set-spec-version build-installers unset-spec-version
env:
BUILD_X86: true
BUILD_X64: true
Expand Down
2 changes: 1 addition & 1 deletion build.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -272,7 +272,7 @@
<!-- <property name="generate.installer.for.platforms" value="windows-x86 windows-x64 linux-x86 linux-x64 macosx"/> -->
<property name="generator-jdk-location-forward-slashes" value="${java.home}"/>
<property name="generated-installers-location-forward-slashes" value="${basedir}/build/installer"/>
<property name="pack200.enabled" value="true"/>
<property name="pack200.enabled" value="false"/>
<property name="nbi.icon.file" value="${basedir}/jmonkeyplatform.png"/>
<property name="nbi.dock.icon.file" value="${basedir}/jmonkeyplatform.icns"/>
<property name="product.description" value="${app.description}"/>
Expand Down
17 changes: 4 additions & 13 deletions jdks/download-jdks.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,12 +165,10 @@ function unpack_windows {
find . -exec chmod u+w {} \; # Make all file writable to allow uninstaller's cleaner to remove file

find . -type f \( -name "*.exe" -o -name "*.dll" \) -exec chmod u+rwx {} \; # Make them executable

find . -type f -name "*.pack" | while read eachFile; do
echo ">> Unpacking $eachFile ...";
unpack200 $eachFile ${eachFile%.pack}.jar;
rm $eachFile;
done

# Insert fake unpack200.exe
# See https://github.com/jMonkeyEngine/sdk/issues/491
touch bin/unpack200.exe

cd ../

Expand Down Expand Up @@ -248,13 +246,6 @@ function compile_other {
exit 1
fi

echo "> Creating SFX JDK package $name"
if [ -f "$1-$2/jre/lib/rt.jar" ]; then # Already packed?
echo "> PACK200 rt.jar"
pack200 -J-Xmx1024m $1-$2/jre/lib/rt.jar.pack.gz $1-$2/jre/lib/rt.jar
rm -rf $1-$2/jre/lib/rt.jar
fi

echo "> Zipping JDK"
cd $1-$2 # zip behaves differently between 7zip and Info-Zip, so simply change wd
zip -9 -qry ../jdk_tmp_sfx.zip *
Expand Down