Add new build arg option to specify an existing folder for openjdk bu…

…ild output

Signed-off-by: Andrew Leonard <[email protected]>

sbin/prepareWorkspace.sh

@@ -108,13 +108,6 @@ checkoutAndCloneOpenJDKGitRepo() {
 
   git clean -ffdx
 
-  # If a user supplied OpenJDK build root directory has been specified and it is not empty
-  # then fail with an error, we don't want to delete it in case user has specified a wrong directory
-  if [[ ! -z "${BUILD_CONFIG[USER_OPENJDK_BUILD_ROOT_DIRECTORY]}" ]] && [[ "$(ls -A ${BUILD_CONFIG[USER_OPENJDK_BUILD_ROOT_DIRECTORY]})" ]]; then
-    echo "ERROR: User supplied OpenJDK build root directory ${BUILD_CONFIG[USER_OPENJDK_BUILD_ROOT_DIRECTORY]} is not empty"
-    exit 1
-  fi
-
   updateOpenj9Sources
 
   createSourceTagFile
@@ -305,6 +298,17 @@ createWorkspace() {
   umask 022
   mkdir -p "${BUILD_CONFIG[WORKSPACE_DIR]}" || exit
   mkdir -p "${BUILD_CONFIG[WORKSPACE_DIR]}/${BUILD_CONFIG[WORKING_DIR]}" || exit
+
+  # If a user supplied OpenJDK build root directory has been specified and it is not empty
+  # then fail with an error, we don't want to delete it in case user has specified a wrong directory
+  # Ensure the directory is created if it doesn't exist
+  if [[ ! -z "${BUILD_CONFIG[USER_OPENJDK_BUILD_ROOT_DIRECTORY]}" ]]; then
+    if [[ -d "${BUILD_CONFIG[USER_OPENJDK_BUILD_ROOT_DIRECTORY]}" ]] && [[ "$(ls -A ${BUILD_CONFIG[USER_OPENJDK_BUILD_ROOT_DIRECTORY]})" ]]; then
+      echo "ERROR: Existing user supplied OpenJDK build root directory ${BUILD_CONFIG[USER_OPENJDK_BUILD_ROOT_DIRECTORY]} is not empty"
+      exit 1
+    fi
+    mkdir -p "${BUILD_CONFIG[USER_OPENJDK_BUILD_ROOT_DIRECTORY]}" || exit
+  fi
 }
 
 # ALSA first for sound