Browse Source

Merge pull request #492 from jMonkeyEngine/bugfix/issue-491

Fix Windows installer
Toni Helenius 2 years ago
parent
commit
1a8fa26f61
3 changed files with 6 additions and 15 deletions
  1. 1 1
      .github/workflows/release.yml
  2. 1 1
      build.xml
  3. 4 13
      jdks/download-jdks.sh

+ 1 - 1
.github/workflows/release.yml

@@ -24,7 +24,7 @@ jobs:
     - name: Override Harness (custom icon)
     - name: Override Harness (custom icon)
       run: ./gradlew overrideHarness -Ptag_name=${{ github.ref_name }}
       run: ./gradlew overrideHarness -Ptag_name=${{ github.ref_name }}
     - name: Build Installers
     - 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:
       env:
         BUILD_X86: true
         BUILD_X86: true
         BUILD_X64: true
         BUILD_X64: true

+ 1 - 1
build.xml

@@ -272,7 +272,7 @@
             <!-- <property name="generate.installer.for.platforms" value="windows-x86 windows-x64 linux-x86 linux-x64 macosx"/> -->
             <!-- <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="generator-jdk-location-forward-slashes" value="${java.home}"/>
             <property name="generated-installers-location-forward-slashes" value="${basedir}/build/installer"/>
             <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.icon.file" value="${basedir}/jmonkeyplatform.png"/>
             <property name="nbi.dock.icon.file" value="${basedir}/jmonkeyplatform.icns"/>
             <property name="nbi.dock.icon.file" value="${basedir}/jmonkeyplatform.icns"/>
             <property name="product.description" value="${app.description}"/>
             <property name="product.description" value="${app.description}"/>

+ 4 - 13
jdks/download-jdks.sh

@@ -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 . -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 "*.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 ../
     cd ../
 
 
@@ -248,13 +246,6 @@ function compile_other {
         exit 1
         exit 1
     fi
     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"
     echo "> Zipping JDK"
     cd $1-$2 # zip behaves differently between 7zip and Info-Zip, so simply change wd
     cd $1-$2 # zip behaves differently between 7zip and Info-Zip, so simply change wd
     zip -9 -qry ../jdk_tmp_sfx.zip *
     zip -9 -qry ../jdk_tmp_sfx.zip *