Some more info in build.sh and location fix for deb package creation

Author: RealCLanger

lib/build.sh

@@ -16,7 +16,6 @@ if [[ $UNAME == CYGWIN* ]]; then
   WORKSPACE=$(cygpath -u "${WORKSPACE}")
 fi
 
-
 GTEST_DIR="${WORKSPACE}/gtest"
 export GTEST_DIR
 
@@ -62,28 +61,30 @@ fi
 
 eval _CONFIGURE_OPTS=($(python3 ../SapMachine-Infrastructure/lib/get_configure_opts.py $_GIT_TAG $_BUILD_NUMBER $_RELEASE))
 
+set -x
 bash ./configure \
 --with-boot-jdk=$BOOT_JDK \
 "${_CONFIGURE_OPTS[@]}" \
 $_DEVKIT_OPTION \
 $_CONFIGURE_OS_OPTIONS \
 --with-freetype=bundled \
 $EXTRA_CONFIGURE_OPTIONS
+{ set +x; } 2>/dev/null
 
 # Try to build with legacy-bundles in one step.
 # In case there is an error, we give it another try without legacy bundles and try to create the legacy bundle manually afterwards.
 # This is needed to support building older source versions that didn't have the legacy-bundles target.
 # Drawback: If there is a real build error, we'll restart the build and run into it again.
 
 legacy_bundles_available=1
-make JOBS=12 product-bundles legacy-bundles test-image || legacy_bundles_available=0
+(set -x && make JOBS=12 product-bundles legacy-bundles test-image || legacy_bundles_available=0)
 
 if [ $legacy_bundles_available -ne 1 ]; then
-  make JOBS=12 product-bundles test-image
+  (set -x && make JOBS=12 product-bundles test-image)
   if [[ $UNAME == Darwin ]]; then
-    make JOBS=12 mac-legacy-jre-bundle || true
+    (set -x && make JOBS=12 mac-legacy-jre-bundle || true)
   else
-    make JOBS=12 legacy-jre-image || true
+    (set -x && make JOBS=12 legacy-jre-image || true)
   fi
 fi
 

lib/make_deb.py

@@ -91,10 +91,11 @@ def main(argv=None):
     utils.remove_if_exists(work_dir)
     mkdir(work_dir)
 
-    jdk_archive = join(work_dir, jdk_url.rsplit('/', 1)[-1])
-
     if args.download:
+        jdk_archive = join(work_dir, jdk_url.rsplit('/', 1)[-1])
         utils.download_artifact(jdk_url, jdk_archive)
+    else:
+        jdk_archive = join(cwd, jdk_url.rsplit('/', 1)[-1])
 
     jdk_dir = join(work_dir, jdk_name)
     mkdir(jdk_dir)