Browse Source

Remove pack200 stuff, add fake unpack200.exe for Windows

Toni Helenius 2 years ago
parent
commit
9ffc74a6ab
1 changed files with 4 additions and 13 deletions
  1. 4 13
      jdks/download-jdks.sh

+ 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 *