Rename Java 17 home variable to JAVA17_HOME

Author: shai-almog

BUILDING.md

@@ -24,7 +24,7 @@ export JAVA_HOME=$PWD/jdk-8.0.28+6
 # JDK 17 (Linux x64; adjust `_x64_linux_` for your platform)
 curl -L -o temurin17.tar.gz https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.16%2B8/OpenJDK17U-jdk_x64_linux_hotspot_17.0.16_8.tar.gz
 tar xf temurin17.tar.gz
-export JAVA_HOME_17=$PWD/jdk-17.0.16+8
+export JAVA17_HOME=$PWD/jdk-17.0.16+8
 
 export PATH="$JAVA_HOME/bin:$PATH"
 ```
@@ -54,7 +54,7 @@ Note that it's important that `$CN1_BINARIES` points at the locally cloned [cn1-
 
 ## Building the Android port
 
-The Android port uses JDK 8 as well. However, it needs a `JAVA_HOME_17` environment variable that points at JDK 17.
+The Android port uses JDK 8 as well. However, it needs a `JAVA17_HOME` environment variable that points at JDK 17.
 
 ```bash
 ./scripts/build-android-port.sh -DskipTests

scripts/build-android-app.sh

@@ -25,7 +25,7 @@ if [ -f "$ENV_FILE" ]; then
   sed 's/^/[build-android-app] ENV: /' "$ENV_FILE"
   # shellcheck disable=SC1090
   source "$ENV_FILE"
-  ba_log "Loaded environment: JAVA_HOME=${JAVA_HOME:-<unset>} JAVA_HOME_17=${JAVA_HOME_17:-<unset>} MAVEN_HOME=${MAVEN_HOME:-<unset>}"
+  ba_log "Loaded environment: JAVA_HOME=${JAVA_HOME:-<unset>} JAVA17_HOME=${JAVA17_HOME:-<unset>} MAVEN_HOME=${MAVEN_HOME:-<unset>}"
 else
   ba_log "Workspace tools not found. Run scripts/setup-workspace.sh before this script." >&2
   exit 1
@@ -44,17 +44,17 @@ if [ -z "${JAVA_HOME:-}" ] || [ ! -x "$JAVA_HOME/bin/java" ]; then
   ba_log "JAVA_HOME is not set correctly. Please run scripts/setup-workspace.sh first." >&2
   exit 1
 fi
-if [ -z "${JAVA_HOME_17:-}" ] || [ ! -x "$JAVA_HOME_17/bin/java" ]; then
-  ba_log "JAVA_HOME_17 validation failed. Current value: ${JAVA_HOME_17:-<unset>}" >&2
-  if [ -n "${JAVA_HOME_17:-}" ]; then
-    ba_log "Contents of JAVA_HOME_17 directory"
-    if [ -d "$JAVA_HOME_17" ]; then
-      ls -l "$JAVA_HOME_17" | while IFS= read -r line; do ba_log "$line"; done
+if [ -z "${JAVA17_HOME:-}" ] || [ ! -x "$JAVA17_HOME/bin/java" ]; then
+  ba_log "JAVA17_HOME validation failed. Current value: ${JAVA17_HOME:-<unset>}" >&2
+  if [ -n "${JAVA17_HOME:-}" ]; then
+    ba_log "Contents of JAVA17_HOME directory"
+    if [ -d "$JAVA17_HOME" ]; then
+      ls -l "$JAVA17_HOME" | while IFS= read -r line; do ba_log "$line"; done
     else
-      ba_log "JAVA_HOME_17 directory does not exist"
+      ba_log "JAVA17_HOME directory does not exist"
     fi
   fi
-  ba_log "JAVA_HOME_17 is not set correctly. Please run scripts/setup-workspace.sh first." >&2
+  ba_log "JAVA17_HOME is not set correctly. Please run scripts/setup-workspace.sh first." >&2
   exit 1
 fi
 if [ -z "${MAVEN_HOME:-}" ] || [ ! -x "$MAVEN_HOME/bin/mvn" ]; then
@@ -72,7 +72,7 @@ if [ -z "${MAVEN_HOME:-}" ] || [ ! -x "$MAVEN_HOME/bin/mvn" ]; then
 fi
 
 ba_log "Using JAVA_HOME at $JAVA_HOME"
-ba_log "Using JAVA_HOME_17 at $JAVA_HOME_17"
+ba_log "Using JAVA17_HOME at $JAVA17_HOME"
 ba_log "Using Maven installation at $MAVEN_HOME"
 
 export PATH="$JAVA_HOME/bin:$MAVEN_HOME/bin:$PATH"
@@ -421,7 +421,7 @@ fi
 ba_log "Invoking Gradle build in $GRADLE_PROJECT_DIR"
 chmod +x "$GRADLE_PROJECT_DIR/gradlew"
 ORIGINAL_JAVA_HOME="$JAVA_HOME"
-export JAVA_HOME="$JAVA_HOME_17"
+export JAVA_HOME="$JAVA17_HOME"
 (
   cd "$GRADLE_PROJECT_DIR"
   if command -v sdkmanager >/dev/null 2>&1; then

scripts/build-android-port.sh

@@ -63,7 +63,7 @@ validate_workspace() {
     missing=1
   fi
 
-  if ! check_java_home "JAVA_HOME_17" "${JAVA_HOME_17:-}" '17\.'; then
+  if ! check_java_home "JAVA17_HOME" "${JAVA17_HOME:-}" '17\.'; then
     missing=1
   fi
 
@@ -106,11 +106,11 @@ else
   log "Workspace environment validated"
 fi
 
-log "Loaded environment: JAVA_HOME=${JAVA_HOME:-<unset>} JAVA_HOME_17=${JAVA_HOME_17:-<unset>} MAVEN_HOME=${MAVEN_HOME:-<unset>}"
+log "Loaded environment: JAVA_HOME=${JAVA_HOME:-<unset>} JAVA17_HOME=${JAVA17_HOME:-<unset>} MAVEN_HOME=${MAVEN_HOME:-<unset>}"
 
 export PATH="$JAVA_HOME/bin:$MAVEN_HOME/bin:$PATH"
 "$JAVA_HOME/bin/java" -version
-"$JAVA_HOME_17/bin/java" -version
+"$JAVA17_HOME/bin/java" -version
 "$MAVEN_HOME/bin/mvn" -version
 
 run_maven() {

scripts/setup-workspace.sh

@@ -43,7 +43,7 @@ if [ -f "$ENV_FILE" ]; then
 fi
 
 JAVA_HOME="${JAVA_HOME:-}"
-JAVA_HOME_17="${JAVA_HOME_17:-}"
+JAVA17_HOME="${JAVA17_HOME:-}"
 MAVEN_HOME="${MAVEN_HOME:-}"
 
 log "Detecting host platform"
@@ -116,11 +116,11 @@ else
 fi
 
 log "Ensuring JDK 17 is available"
-if [ -z "${JAVA_HOME_17:-}" ] || [ ! -x "$JAVA_HOME_17/bin/java" ] || ! "$JAVA_HOME_17/bin/java" -version 2>&1 | grep -q '17\.0'; then
+if [ -z "${JAVA17_HOME:-}" ] || [ ! -x "$JAVA17_HOME/bin/java" ] || ! "$JAVA17_HOME/bin/java" -version 2>&1 | grep -q '17\.0'; then
   log "Provisioning JDK 17..."
-  install_jdk "$JDK17_URL" JAVA_HOME_17
+  install_jdk "$JDK17_URL" JAVA17_HOME
 else
-  log "Using existing JDK 17 at $JAVA_HOME_17"
+  log "Using existing JDK 17 at $JAVA17_HOME"
 fi
 
 log "Ensuring Maven is available"
@@ -159,7 +159,7 @@ fi
 log "Writing environment to $ENV_FILE"
 cat > "$ENV_FILE" <<ENV
 export JAVA_HOME="$JAVA_HOME"
-export JAVA_HOME_17="$JAVA_HOME_17"
+export JAVA17_HOME="$JAVA17_HOME"
 export MAVEN_HOME="$MAVEN_HOME"
 export PATH="\$JAVA_HOME/bin:\$MAVEN_HOME/bin:\$PATH"
 ENV
@@ -177,7 +177,7 @@ fi
 source "$ENV_FILE"
 
 log "JDK 8 version:"; "$JAVA_HOME/bin/java" -version
-log "JDK 17 version:"; "$JAVA_HOME_17/bin/java" -version
+log "JDK 17 version:"; "$JAVA17_HOME/bin/java" -version
 log "Maven version:"; "$MAVEN_HOME/bin/mvn" -version
 
 PATH="$JAVA_HOME/bin:$MAVEN_HOME/bin:$PATH"

tools/env.sh

@@ -1,4 +1,4 @@
 export JAVA_HOME="/var/folders/zk/c7v7vr9d4s98dkx18yc7by7c0000gn/T//codenameone-tools/jdk8u462-b08/Contents/Home"
-export JAVA_HOME_17="/var/folders/zk/c7v7vr9d4s98dkx18yc7by7c0000gn/T//codenameone-tools/jdk-17.0.16+8/Contents/Home"
+export JAVA17_HOME="/var/folders/zk/c7v7vr9d4s98dkx18yc7by7c0000gn/T//codenameone-tools/jdk-17.0.16+8/Contents/Home"
 export MAVEN_HOME="/var/folders/zk/c7v7vr9d4s98dkx18yc7by7c0000gn/T//codenameone-tools/apache-maven-3.9.6"
 export PATH="$JAVA_HOME/bin:$MAVEN_HOME/bin:$PATH"