Corrent source files

adoptium · Sep 25, 2024 · 05093c5 · 05093c5
1 parent a097af1
commit 05093c5
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 19 deletions.
diff --git a/tooling/reproducible/macos_repro_build_compare.sh b/tooling/reproducible/macos_repro_build_compare.sh
@@ -20,6 +20,7 @@
 # 3. This script requires that the correct versions of the sdk are installed and in the loaction defined in the MAC_SDK_LOCATION below.
 
 set -e
+source "$(dirname "$0")"/repro_compare.sh
 
 # Check All 3 Params Are Supplied
 if [ "$#" -lt 3 ]; then
@@ -476,21 +477,21 @@ Compare_JDK() {
 
   # Check The Comparison Scripts Are Present And Copy To The Working Directory
 
-  if [ -f ./repro_common.sh ]; then
-    cp ./repro_common.sh $WORK_DIR/compare/repro_common.sh
-  else
-    wget -O "$WORK_DIR/compare/repro_common.sh" "https://raw.githubusercontent.com/adoptium/temurin-build/master/tooling/reproducible/repro_common.sh"
-  fi
-  if [ -f ./repro_compare.sh ]; then
-    cp ./repro_compare.sh $WORK_DIR/compare/repro_compare.sh
-  else
-    wget -O "$WORK_DIR/compare/repro_compare.sh" "https://raw.githubusercontent.com/adoptium/temurin-build/master/tooling/reproducible/repro_compare.sh"
-  fi
-  if [ -f ./repro_process.sh ]; then
-    cp ./repro_process.sh $WORK_DIR/compare/repro_process.sh
-  else
-    wget -O "$WORK_DIR/compare/repro_process.sh" "https://raw.githubusercontent.com/adoptium/temurin-build/master/tooling/reproducible/repro_process.sh"
-  fi
+  # if [ -f ./repro_common.sh ]; then
+  #   cp ./repro_common.sh $WORK_DIR/compare/repro_common.sh
+  # else
+  #   wget -O "$WORK_DIR/compare/repro_common.sh" "https://raw.githubusercontent.com/adoptium/temurin-build/master/tooling/reproducible/repro_common.sh"
+  # fi
+  # if [ -f ./repro_compare.sh ]; then
+  #   cp ./repro_compare.sh $WORK_DIR/compare/repro_compare.sh
+  # else
+  #   wget -O "$WORK_DIR/compare/repro_compare.sh" "https://raw.githubusercontent.com/adoptium/temurin-build/master/tooling/reproducible/repro_compare.sh"
+  # fi
+  # if [ -f ./repro_process.sh ]; then
+  #   cp ./repro_process.sh $WORK_DIR/compare/repro_process.sh
+  # else
+  #   wget -O "$WORK_DIR/compare/repro_process.sh" "https://raw.githubusercontent.com/adoptium/temurin-build/master/tooling/reproducible/repro_process.sh"
+  # fi
 
   # Set Permissions
   chmod +x "$WORK_DIR/compare/"*sh

diff --git a/tooling/reproducible/repro_common.sh b/tooling/reproducible/repro_common.sh
@@ -89,7 +89,6 @@ function removeSystemModulesHashBuilderParams() {
   moduleHashesFunction="// Method jdk/internal/module/ModuleHashes\$Builder.hashForModule:(Ljava/lang/String;[B)Ljdk/internal/module/ModuleHashes\$Builder;"
   moduleString="// String "
   virtualFunction="invokevirtual"
-
   systemModules="SystemModules\$0.class SystemModules\$all.class SystemModules\$default.class"
   for systemModule in $systemModules
     do

diff --git a/tooling/reproducible/repro_compare.sh b/tooling/reproducible/repro_compare.sh
@@ -13,7 +13,7 @@
 # ********************************************************************************
 
 # shellcheck disable=SC1091
-source repro_common.sh
+source "$(dirname "$0")"/repro_common.sh
 
 BLD_TYPE1="$1"
 JDK_DIR1="$2"
@@ -32,7 +32,7 @@ do
 
   echo "Pre-processing ${JDK_DIR}"
   rc=0
-  source ./repro_process.sh "${JDK_DIR}" "${OS}" || rc=$?
+  source "$(dirname "$0")"/repro_process.sh "${JDK_DIR}" "${OS}" || rc=$?
   if [ $rc != 0 ]; then
     echo "Pre-process of ${JDK_DIR} ${OS} failed"
     exit 1

diff --git a/tooling/reproducible/repro_process.sh b/tooling/reproducible/repro_process.sh
@@ -13,7 +13,7 @@
 # ********************************************************************************
 
 # shellcheck disable=SC1091
-source repro_common.sh
+source "$(dirname "$0")"/repro_common.sh
 
 JDK_DIR="$1"
 OS="$2"