Add experimental JShell support & amd64 Linux JDK

Author: JakubVanek

build/Dockerfile.scripts

@@ -2,7 +2,8 @@ FROM ev3dev-lang-java:jdk9-system
 
 # copy build patches & scripts
 COPY *.patch *.sh /opt/jdkcross/
-RUN chmod +x /opt/jdkcross/*.sh
+RUN chmod +x /opt/jdkcross/*.sh && mkdir /opt/jdkcross/jshellhack
+COPY DumpPort.java /opt/jdkcross/jshellhack/
 
 # this directory should be mounted
 VOLUME /build

build/DumpPort.java

@@ -0,0 +1,19 @@
+package jshellhack;
+
+import java.nio.file.*;
+import java.lang.*;
+
+import static java.nio.file.StandardOpenOption.CREATE;
+import static java.nio.file.StandardOpenOption.WRITE;
+import static java.nio.file.StandardOpenOption.TRUNCATE_EXISTING;
+
+public class DumpPort {
+
+    public static void main(String[] args) throws Exception {
+        StringBuilder build = new StringBuilder();
+        build.append(args[0]);
+        build.append("\n");
+        OpenOption[] opts = new OpenOption[] { CREATE, WRITE, TRUNCATE_EXISTING };
+        Files.write(Paths.get("/tmp/jshellargs"), build.toString().getBytes(), opts);
+    }
+}

build/jshell-launch.sh

@@ -0,0 +1,31 @@
+#!/usr/bin/env bash
+
+ARG_FIFO="/tmp/jshellargs"
+EV3_PORT="8000"
+JAR_PATH="./jshellhack.jar"
+TIMEOUT="20000"
+
+if [ "$#" -lt 1 ]; then
+  echo "Please provide SSH args." >&2
+  exit 1
+fi
+
+# cd to bin directory
+cd "$( dirname "${BASH_SOURCE[0]}" )"
+
+# (re)create fifo
+rm "$ARG_FIFO"
+mkfifo "$ARG_FIFO"
+
+if [ "$?" -ne 0 ]; then
+  echo "Creation of argument pipe failed." >&2
+  exit 2
+fi
+
+# background ssh & agent
+ssh -R "$EV3_PORT:localhost:$(cat ${ARG_FIFO})" "$@" "java" "jdk.jshell.execution.RemoteExecutionControl" "$EV3_PORT" &
+
+# foreground jshell
+CLASSPATH="$JAR_PATH" ./jshell --execution "jdi:hostname(localhost),launch(false),remoteAgent(jshellhack.DumpPort),timeout($TIMEOUT)"
+
+exit "$?"

build/zip.sh

@@ -5,23 +5,48 @@ set -e
 # enter images directory
 pushd /build/jdk9u/build/linux-arm-normal-client-release/images
 
-rm -rf jre-ev3
-rm     jdk-ev3
+# clean destinations
+rm -rf ./jre-ev3
+rm -rf ./jdk-pc
+rm -rf ./jshell-support
+rm     ./jdk-ev3
 
 # build ev3 runtime image
 /opt/jdkcross/jdk-9.0.1/bin/jlink \
    --module-path ./jmods/ \
    --endian little \
    --compress 0 \
    --strip-debug \
+   --no-header-files \
+   --no-man-pages \
    --add-modules java.se,jdk.jdwp.agent,jdk.jshell \
    --output ./jre-ev3
 
+# build microjdk
+/opt/jdkcross/jdk-9.0.1/bin/jlink \
+   --module-path /opt/jdkcross/jdk-9.0.1/jmods \
+   --compress 2 \
+   --strip-debug \
+   --no-header-files \
+   --no-man-pages \
+   --add-modules java.se,jdk.attach,jdk.jdwp.agent,jdk.jlink,jdk.jartool,jdk.compiler,jdk.jdi,jdk.jshell \
+   --output ./jdk-pc
+
+cp -r ./jmods ./jdk-pc/jmods-ev3
+
 # rename jdk directory
 ln -s ./jdk ./jdk-ev3
 
+# JShell hack
+mkdir jshell-support
+/opt/jdkcross/jdk-9.0.1/bin/javac -d ./jshell-support /opt/jdkcross/jshellhack/DumpPort.java
+/opt/jdkcross/jdk-9.0.1/bin/jar cf ./jshellhack.jar -C ./jshell-support jshellhack/DumpPort.class
+cp ./jshellhack.jar               ./jdk-pc/bin
+cp /opt/jdkcross/jshell-launch.sh ./jdk-pc/bin
+
 # create zip files
 zip -9r /build/jdk-ev3.zip jdk-ev3
 zip -9r /build/jre-ev3.zip jre-ev3
+zip -9r /build/jdk-pc.zip  jdk-pc
 
 popd