[scripts] upgrade to JDK 10 repo & runtime

Author: JakubVanek

README.md

@@ -1,13 +1,13 @@
-# openjdk-9-ev3
-A custom build of OpenJDK 9 for EV3, a Lego Mindstorms programmable brick featuring a ARM926EJ-S CPU.
+# OpenJDK 10 for EV3
+A custom build of OpenJDK 10 for EV3, a Lego Mindstorms programmable brick featuring a ARM926EJ-S CPU.
 
 ## Components
 The output consists of these parts:
 * JRE running on the EV3 - `jre-ev3.zip`
   * Stripped down version -- a runtime image
 * JDK built for the EV3 - `jdk-ev3.zip`
   * Basically the full build
-* [Official OpenJDK linux-amd64](http://jdk.java.net/9/) with EV3 jmods
+* [Official OpenJDK linux-amd64](http://jdk.java.net/10/) with EV3 jmods
   * Only a stripped down version -- also a runtime image
   * It can be used for creating custom JRE images. For this, jlink and the ev3 jmods are included.
   * It has `javac` (jdk.compiler module).
@@ -42,8 +42,8 @@ JShell JDI agent on the remote side, which is handled by SSH as well.
 
 0. Clone/download this repo to your computer.
 1. Install [Docker](https://docs.docker.com/engine/installation/) for your operating system.
-2. Adjust the JAVA_VERSION variable in `build/config.sh` to match the current OpenJDK tip: [OpenJDK 9 updates](http://hg.openjdk.java.net/jdk-updates/jdk9u/)
-3. Build the jdk9 cross-compilation environment:
+2. Adjust the JAVA_VERSION variable in `build/config.sh` to match the current OpenJDK tip: [OpenJDK 10 updates](http://hg.openjdk.java.net/jdk-updates/jdk10u/)
+3. Build the jdk cross-compilation environment:
 ```sh
 sudo docker build -t ev3dev-lang-java:jdk-stretch -f build/Dockerfile.system  build
 sudo docker build -t ev3dev-lang-java:jdk-build   -f build/Dockerfile.scripts build
@@ -65,5 +65,5 @@ sudo docker run --rm -it -v <path on host, where the sources should be stored>:/
 ```
 ./zip.sh
 ```
-8. If the build was successful, JDK9 packages were created in `/build/jre-ev3.zip`, `/build/jdk-ev3.zip` and `/build/jdk-pc.zip`.
+8. If the build was successful, JDK packages were created in `/build/jre-ev3.zip`, `/build/jdk-ev3.zip` and `/build/jdk-pc.zip`.
 If you have mounted `/build`, you can access the files from the host.

build/Dockerfile.system

@@ -48,9 +48,9 @@ RUN dpkg --add-architecture armel && \
         mercurial \
         zlib1g-dev
 
-# download JDK 9
+# download JDK 10
 RUN mkdir /opt/jdkcross
-RUN curl -SL http://download.java.net/java/GA/jdk9/9.0.1/binaries/openjdk-9.0.1_linux-x64_bin.tar.gz | tar -xzC /opt/jdkcross
+RUN curl -SL https://download.java.net/java/GA/jdk10/10/binaries/openjdk-10_linux-x64_bin.tar.gz | tar -xzC /opt/jdkcross
 
 # prepare a nonroot user
 COPY compiler.sudoers /etc/sudoers.d/compiler

build/build.sh

@@ -27,7 +27,7 @@ bash ./common/autoconf/autogen.sh
 #                              BUILD_NM="gcc-nm"
 
 # configure the build
-bash ./configure --with-boot-jdk="$SCRIPTDIR/jdk-9.0.1" \
+bash ./configure --with-boot-jdk="$SCRIPTDIR/jdk-10" \
                  --openjdk-target=arm-linux-gnueabi \
                  --with-abi-profile=arm-ev3 \
                  --enable-headless-only \

build/config.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
-JAVA_VERSION="10+23"
-JAVA_REPO="http://hg.openjdk.java.net/jdk10/jdk10/"
+JAVA_VERSION="10+46"
+JAVA_REPO="http://hg.openjdk.java.net/jdk-updates/jdk10u/"
 SCRIPTDIR="/opt/jdkcross"
 
 BUILDDIR="/build"

build/zip.sh

@@ -14,7 +14,7 @@ rm -rf ./jshell-support
 rm -f  ./jdk-ev3
 
 # build ev3 runtime image
-"$SCRIPTDIR/jdk-9.0.1/bin/jlink" \
+"$SCRIPTDIR/jdk-10/bin/jlink" \
    --module-path ./jmods/ \
    --endian little \
    --compress 0 \
@@ -25,8 +25,8 @@ rm -f  ./jdk-ev3
    --output ./jre-ev3
 
 # build microjdk
-"$SCRIPTDIR/jdk-9.0.1/bin/jlink" \
-   --module-path "$SCRIPTDIR/jdk-9.0.1/jmods" \
+"$SCRIPTDIR/jdk-10/bin/jlink" \
+   --module-path "$SCRIPTDIR/jdk-10/jmods" \
    --compress 2 \
    --strip-debug \
    --no-header-files \
@@ -41,8 +41,8 @@ ln -s ./jdk ./jdk-ev3
 
 # JShell hack
 mkdir jshell-support
-"$SCRIPTDIR/jdk-9.0.1/bin/javac" -d ./jshell-support "$SCRIPTDIR/jshellhack/DumpPort.java"
-"$SCRIPTDIR/jdk-9.0.1/bin/jar" cf ./jshellhack.jar -C ./jshell-support jshellhack/DumpPort.class
+"$SCRIPTDIR/jdk-10/bin/javac" -d ./jshell-support "$SCRIPTDIR/jshellhack/DumpPort.java"
+"$SCRIPTDIR/jdk-10/bin/jar" cf ./jshellhack.jar -C ./jshell-support jshellhack/DumpPort.class
 cp ./jshellhack.jar ./jdk-pc/bin
 cp "$SCRIPTDIR/jshell-launch.sh" ./jdk-pc/bin