[script] Refactor paths to config file

Author: JakubVanek

build/build.sh

@@ -1,25 +1,14 @@
 #!/bin/bash
 set -e
 
-pushd /build/jdk9u
+cd "$(dirname ${BASH_SOURCE[0]})"
+source config.sh
+
+cd "$JDKDIR"
 
 # refresh patched build system
 bash ./common/autoconf/autogen.sh
 
-# configure the build
-bash ./configure --with-boot-jdk=/opt/jdkcross/jdk-9.0.1 \
-                 --openjdk-target=arm-linux-gnueabi \
-                 --with-abi-profile=arm-ev3 \
-                 --enable-headless-only \
-                 --with-freetype-lib=/usr/lib/arm-linux-gnueabi \
-                 --with-freetype-include=/usr/include \
-                 --with-jvm-variants=client \
-                 --with-extra-cflags="-Wno-maybe-uninitialized -D__SOFTFP__" \
-                 AR="arm-linux-gnueabi-gcc-ar" \
-                 NM="arm-linux-gnueabi-gcc-nm" \
-                 BUILD_AR="gcc-ar" \
-                 BUILD_NM="gcc-nm"
-
 ## Description ##
 # Use the downloaded JDK:      --with-boot-jdk=/opt/jdkcross/jdk-9.0.1
 # Cross-compiling for ARM:     --openjdk-target=arm-linux-gnueabi
@@ -31,12 +20,26 @@ bash ./configure --with-boot-jdk=/opt/jdkcross/jdk-9.0.1 \
 # Add extra build flags:       --with-extra-cflags="-Wno-maybe-uninitialized -D__SOFTFP__"
 #   - Fix the build on new GCC: -Wno-maybe-uninitialized
 #   - Force softfloat runtime:  -D__SOFTFP__
-# Fix the "internal" string:   --with-version-string="9.0.1"
+# Fix the "internal" string:   --with-version-string="9.0.1+11"
 # Fix for GCC and LTO objects: AR="arm-linux-gnueabi-gcc-ar"
 #                              NM="arm-linux-gnueabi-gcc-nm"
 #                              BUILD_AR="gcc-ar"
 #                              BUILD_NM="gcc-nm"
 
+# configure the build
+bash ./configure --with-boot-jdk="$SCRIPTDIR/jdk-9.0.1" \
+                 --openjdk-target=arm-linux-gnueabi \
+                 --with-abi-profile=arm-ev3 \
+                 --enable-headless-only \
+                 --with-freetype-lib=/usr/lib/arm-linux-gnueabi \
+                 --with-freetype-include=/usr/include \
+                 --with-jvm-variants=client \
+                 --with-extra-cflags="-Wno-maybe-uninitialized -D__SOFTFP__" \
+                 --with-version-string="$JAVA_VERSION" \
+                 AR="arm-linux-gnueabi-gcc-ar" \
+                 NM="arm-linux-gnueabi-gcc-nm" \
+                 BUILD_AR="gcc-ar" \
+                 BUILD_NM="gcc-nm"
 
 # start the build
 make clean images

build/config.sh

@@ -0,0 +1,9 @@
+#!/bin/bash
+
+JAVA_VERSION="9.0.1+11"
+JAVA_REPO="http://hg.openjdk.java.net/jdk-updates/jdk9u/"
+SCRIPTDIR="/opt/jdkcross"
+
+BUILDDIR="/build"
+JDKDIR="/build/jdk"
+IMAGEDIR="/build/jdk/build/linux-arm-normal-client-release/images"

build/fetch.sh

@@ -1,17 +1,19 @@
-#!/usr/bin/env bash
+#!/bin/bash
 set -e
 
+cd "$(dirname ${BASH_SOURCE[0]})"
+source config.sh
+
 # clone the root project
-pushd /build
-hg clone http://hg.openjdk.java.net/jdk-updates/jdk9u/
-pushd jdk9u
+hg clone "$JAVA_REPO" "$JDKDIR"
 
 # clone the rest of the tree
+cd "$JDKDIR"
 bash ./get_source.sh
 
 # apply the EV3-specific patches
 #  - build flags for arm926ej-s
-patch -p1            < /opt/jdkcross/ev3.patch
+patch -p1            < "$SCRIPTDIR/ev3.patch"
 #  - use the system-provided floating point implementation
-patch -p1 -d hotspot < /opt/jdkcross/float.patch
+patch -p1 -d hotspot < "$SCRIPTDIR/float.patch"
 

build/zip.sh

@@ -1,9 +1,11 @@
 #!/bin/bash
-
 set -e
 
+cd "$(dirname ${BASH_SOURCE[0]})"
+source config.sh
+
 # enter images directory
-pushd /build/jdk9u/build/linux-arm-normal-client-release/images
+cd "$IMAGEDIR"
 
 # clean destinations
 rm -rf ./jre-ev3
@@ -12,7 +14,7 @@ rm -rf ./jshell-support
 rm     ./jdk-ev3
 
 # build ev3 runtime image
-/opt/jdkcross/jdk-9.0.1/bin/jlink \
+"$SCRIPTDIR/jdk-9.0.1/bin/jlink" \
    --module-path ./jmods/ \
    --endian little \
    --compress 0 \
@@ -23,8 +25,8 @@ rm     ./jdk-ev3
    --output ./jre-ev3
 
 # build microjdk
-/opt/jdkcross/jdk-9.0.1/bin/jlink \
-   --module-path /opt/jdkcross/jdk-9.0.1/jmods \
+"$SCRIPTDIR/jdk-9.0.1/bin/jlink" \
+   --module-path "$SCRIPTDIR/jdk-9.0.1/jmods" \
    --compress 2 \
    --strip-debug \
    --no-header-files \
@@ -39,14 +41,14 @@ 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
+"$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
+cp ./jshellhack.jar ./jdk-pc/bin
+cp "$SCRIPTDIR/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
+zip -9r "$BUILDDIR/jdk-ev3.zip" jdk-ev3
+zip -9r "$BUILDDIR/jre-ev3.zip" jre-ev3
+zip -9r "$BUILDDIR/jdk-pc.zip"  jdk-pc
 
 popd