[scripts] adapt lejos jdk archive to its update system

ev3dev-lang-java · Mar 28, 2018 · b6bb975 · b6bb975
1 parent f52254c
commit b6bb975
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/scripts/config.sh b/scripts/config.sh
@@ -59,7 +59,6 @@ if [ "$JDKVER" -eq "9" ]; then
   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"
-  LEJOS_NAME=openjdk9-jri
 
 # OpenJDK 10
 elif [ "$JDKVER" -eq "10" ]; then
@@ -70,7 +69,6 @@ elif [ "$JDKVER" -eq "10" ]; then
   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"
-  LEJOS_NAME=openjdk10-jri
 
 # invalid or unset version
 else

diff --git a/scripts/lejos/build.sh b/scripts/lejos/build.sh
@@ -5,13 +5,21 @@ cd "$(dirname ${BASH_SOURCE[0]})"
 source ../config.sh
 SCRIPTDIR="$SCRIPTDIR/.."
 
+pushd "$JDKDIR" >/dev/null
+JAVA_VERSION="$(hg log -r "." --template "{latesttag}\n" | sed 's/jdk-//')"
+popd
+LEJOS_NAME="ejre-openjdk-$JAVA_VERSION"
+
 # temp directory
 rm -rf "$LEJOSDIR"
 mkdir -p "$LEJOSDIR/deb" "$LEJOSDIR/root"
 
 echo "copy in JRI"
 cp -rf --preserve=links "$IMAGEDIR/jri-ev3" "$LEJOSDIR/jri"
 
+echo "create version file ($JAVA_VERSION)"
+echo "$JAVA_VERSION" >"$LEJOSDIR/jri/jrever"
+
 echo "download DEB packages"
 cd "$LEJOSDIR/deb"
 apt-get download `cat "$SCRIPTDIR/lejos/pkgs.txt"`
@@ -42,4 +50,4 @@ rm -rf "$LEJOSDIR/deb"
 echo "create archive"
 cd "$LEJOSDIR"
 mv "jri" "$LEJOS_NAME"
-tar -cf - "$LEJOS_NAME" | pigz -9 > "$BUILDDIR/lejos-$LEJOS_NAME.tar.gz"
+tar -cf - "$LEJOS_NAME" | pigz -9 > "$BUILDDIR/$LEJOS_NAME.tar.gz"