[scripts] Split jdk variant from version

Author: JakubVanek

README.md

@@ -33,12 +33,12 @@ sudo docker run --rm -it -v $BUILD_DIRECTORY:/build ev3dev-lang-java:jdk-build
 ```
 Please change the `$BUILD_DIRECTORY` to a valid path.
 
-5. Select the OpenJDK version you want to cross-compile (select only one):
+5. Select the OpenJDK version and VM you want to cross-compile (select only one for each variable):
 ```
-export JDKVER=9      # OpenJDK 9 with ARM32 JIT
-export JDKVER=9zero  # OpenJDK 9 with Zero interpreter
-export JDKVER=10     # OpenJDK 10 with ARM32 JIT
-export JDKVER=10zero # OpenJDK 10 with Zero interpreter
+export JDKVER=9      # OpenJDK 9
+export JDKVER=10     # OpenJDK 10
+export JDKVM=zero    # Use Zero interpreter
+export JDKVM=client  # Use ARM32 JIT
 ```
 6. Before we can start the build process, Boot JDK must be downloaded:
 ```
@@ -67,9 +67,9 @@ sudo docker build -t ev3dev-lang-java:jdk-autobuild -f scripts/Dockerfile.autoru
 4. Run the newly prepared container. You have to mount a host directory to the the `/build` directory in the container,
 otherwise the build would get discarded. The final build needs at least 6.5 GB of free space (in the build directory).
 ```
-sudo docker run --rm -it -v $BUILD_DIRECTORY:/build -e JDKVER='X' ev3dev-lang-java:jdk-autobuild
+sudo docker run --rm -it -v $BUILD_DIRECTORY:/build -e JDKVER='X' -e JDKVM='Y' ev3dev-lang-java:jdk-autobuild
 ```
-`X` can be one of `9`, `9zero`, `10` and `10zero`. Please change the `$BUILD_DIRECTORY` to a valid path.
+`X` can be one of `9` and `10`. `Y` can be one of `zero` and `client`, see above. Please change the `$BUILD_DIRECTORY` to a valid path.
 
 5. If the build was successful, JDK packages were created in `$BUILD_DIRECTORY/jri-ev3.tar.gz`, `$BUILD_DIRECTORY/jdk-ev3.tar.gz` and `$BUILD_DIRECTORY/jmods.tar.gz`.
 

scripts/config.sh

@@ -47,33 +47,19 @@ JDKDIR="/build/jdk"
 #HOSTJDK_URL="https://download.java.net/java/GA/jdk9/9.0.4/binaries/openjdk-9.0.4_linux-x64_bin.tar.gz"
 
 # OpenJDK 9
-if [ "$JDKVER" == "9" ] || [ "$JDKVER" == "9zero" ]; then
+if [ "$JDKVER" == "9" ]; then
   JAVA_REPO="http://hg.openjdk.java.net/jdk-updates/jdk9u/"
   PATCHVER="jdk9"
   AUTOGEN_PATH="./common/autoconf/autogen.sh"
-  if [ "$JDKVER" == "9zero" ]; then
-    HOTSPOT_VARIANT=zero
-    IMAGEDIR="/build/jdk/build/linux-arm-normal-zero-release/images"
-  else
-    HOTSPOT_VARIANT=client
-    IMAGEDIR="/build/jdk/build/linux-arm-normal-client-release/images"
-  fi
   HOSTJDK="$BUILDDIR/jdk-9.0.4"
   HOSTJDK_FILE="$BUILDDIR/openjdk-9.0.4_linux-x64_bin.tar.gz"
   HOSTJDK_URL="https://download.java.net/java/GA/jdk9/9.0.4/binaries/openjdk-9.0.4_linux-x64_bin.tar.gz"
 
 # OpenJDK 10
-elif [ "$JDKVER" == "10" ] || [ "$JDKVER" == "10zero" ]; then
+elif [ "$JDKVER" == "10" ]; then
   JAVA_REPO="http://hg.openjdk.java.net/jdk-updates/jdk10u/"
   PATCHVER="jdk10"
   AUTOGEN_PATH="./make/autoconf/autogen.sh"
-  if [ "$JDKVER" == "10zero" ]; then
-    HOTSPOT_VARIANT=zero
-    IMAGEDIR="/build/jdk/build/linux-arm-normal-zero-release/images"
-  else
-    HOTSPOT_VARIANT=client
-    IMAGEDIR="/build/jdk/build/linux-arm-normal-client-release/images"
-  fi
   HOSTJDK="$BUILDDIR/jdk-10"
   HOSTJDK_FILE="$BUILDDIR/openjdk-10_linux-x64_bin.tar.gz"
   HOSTJDK_URL="https://download.java.net/java/GA/jdk10/10/binaries/openjdk-10_linux-x64_bin.tar.gz"
@@ -83,8 +69,19 @@ else
   echo "Error! Please specify JDK version to compile via the JDKVER environment variable." >&2
   echo "Acceptable values:" >&2
   echo "JDKVER=9" >&2
-  echo "JDKVER=9zero" >&2
   echo "JDKVER=10" >&2
-  echo "JDKVER=10zero" >&2
   exit 1
 fi
+
+
+# invalid or unset VM
+if [ "$JDKVM" != "zero" ] && [ "$JDKVM" != "client" ]; then
+  echo "Error! Please specify JDK VM to compile via the JDKVM environment variable." >&2
+  echo "Acceptable values:" >&2
+  echo "JDKVM=client" >&2
+  echo "JDKVM=zero" >&2
+  exit 1
+fi
+
+HOTSPOT_VARIANT="$JDKVM"
+IMAGEDIR="/build/jdk/build/linux-arm-normal-${JDKVM}-release/images"