Fix windows support

Signed-off-by: Stewart X Addison <[email protected]>
adoptium · Feb 24, 2021 · fb60dd2 · fb60dd2
1 parent 933180c
commit fb60dd2
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 13 deletions.
diff --git a/ansible/pbTestScripts/buildJDK.sh b/ansible/pbTestScripts/buildJDK.sh
@@ -131,8 +131,6 @@ if [[ "$(uname -m)" == "armv7l" && "$VARIANT" == "openj9" ]]; then
 	export VARIANT=hotspot
 fi
 
-export FILENAME="java.tar.gz"
-
 echo "buildJDK.sh DEBUG:
         TARGET_OS=${TARGET_OS:-}
         ARCHITECTURE=${ARCHITECTURE:-}

diff --git a/ansible/pbTestScripts/buildJDKWin.sh b/ansible/pbTestScripts/buildJDKWin.sh
@@ -114,17 +114,16 @@ setJDKVars
 processArgs $*
 cloneRepo
 
-export FILENAME="${JAVA_TO_BUILD}_${VARIANT}_${ARCHITECTURE}"
-echo "DEBUG:
-	TARGET_OS=$TARGET_OS
-	ARCHITECTURE=$ARCHITECTURE
-	JAVA_TO_BUILD=$JAVA_TO_BUILD
-	VARIANT=$VARIANT
-	JDK_BOOT_DIR=$JDK_BOOT_DIR
-	JAVA_HOME=$JAVA_HOME
-	WORKSPACE=$WORKSPACE
-	GIT_URL=$GIT_URL
-	FILENAME=$FILENAME"
+echo "buildJDKWin.sh DEBUG:
+	TARGET_OS=${TARGET_OS:-}
+	ARCHITECTURE=${ARCHITECTURE:-}
+	JAVA_TO_BUILD=${JAVA_TO_BUILD:-}
+	VARIANT=${VARIANT:-}
+	JDK_BOOT_DIR=${JDK_BOOT_DIR:-}
+	JAVA_HOME=${JAVA_HOME:-}
+	WORKSPACE=${WORKSPACE:-}
+	GIT_URL=${GIT_URL:-}
+	FILENAME=${FILENAME:-}"
 
 echo "Running $WORKSPACE/openjdk-build/build-farm/make-adopt-build-farm.sh"
 $WORKSPACE/openjdk-build/build-farm/make-adopt-build-farm.sh