From 8c4e1ebd3898902ad6fd080bb6485d2e209641ac Mon Sep 17 00:00:00 2001 From: Andrew Leonard Date: Fri, 1 Nov 2024 14:23:00 +0000 Subject: [PATCH 01/17] Update windows_repro_build_compare.sh to allow for windows Redist dev kit Signed-off-by: Andrew Leonard --- tooling/reproducible/windows_repro_build_compare.sh | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/tooling/reproducible/windows_repro_build_compare.sh b/tooling/reproducible/windows_repro_build_compare.sh index 9796f17b2..e8b5b2400 100755 --- a/tooling/reproducible/windows_repro_build_compare.sh +++ b/tooling/reproducible/windows_repro_build_compare.sh @@ -684,10 +684,12 @@ Check_Architecture echo "---------------------------------------------" Check_VS_Versions echo "---------------------------------------------" -Get_SRC_UCRT_Version -echo "---------------------------------------------" -Check_UCRT_Location -echo "---------------------------------------------" +if [[ "${buildArgs}" != *"--use-adoptium-devkit"* ]]; then + Get_SRC_UCRT_Version + echo "---------------------------------------------" + Check_UCRT_Location + echo "---------------------------------------------" +fi echo "All Validation Checks Passed - Proceeding To Build" echo "---------------------------------------------" Check_And_Install_Ant From 6a0446bee679cc6cd76c580e58e6235a749a8e8b Mon Sep 17 00:00:00 2001 From: Andrew Leonard Date: Fri, 1 Nov 2024 15:06:56 +0000 Subject: [PATCH 02/17] Update windows_repro_build_compare.sh to allow for windows Redist dev kit Signed-off-by: Andrew Leonard --- sbin/build.sh | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/sbin/build.sh b/sbin/build.sh index a51c4947c..a0a10d52d 100755 --- a/sbin/build.sh +++ b/sbin/build.sh @@ -79,12 +79,18 @@ configureDevKitConfigureParameter() { if [[ "$OSTYPE" == "cygwin" ]] || [[ "$OSTYPE" == "msys" ]]; then # Windows DevKit, currently only Redist DLLs + # Default to build architecture unless target ARCHITECTURE variable is set + def target_arch="${BUILD_CONFIG[OS_ARCHITECTURE]}" + if [ -n ${var+x} ]; then + target_arch="${ARCHITECTURE}" + fi + echo "Target architecture for Windows devkit: ${target_arch}" + # This is TARGET Architecture for the Redist DLLs to use - # ARCHITECTURE is set to the "target" architecture by caller, or defaults to build architecture if not set local dll_arch - if [[ "${ARCHITECTURE}" == "x86-32" ]]; then + if [[ "${target_arch}" == "x86-32" ]]; then dll_arch="x86" - elif [[ "${ARCHITECTURE}" == "aarch64" ]]; then + elif [[ "${target_arch}" == "aarch64" ]]; then dll_arch="arm64" else dll_arch="x64" From 804f8a41721562108c0eef24341124aad8a5b920 Mon Sep 17 00:00:00 2001 From: Andrew Leonard Date: Fri, 1 Nov 2024 15:12:06 +0000 Subject: [PATCH 03/17] Update windows_repro_build_compare.sh to allow for windows Redist dev kit Signed-off-by: Andrew Leonard --- sbin/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sbin/build.sh b/sbin/build.sh index a0a10d52d..3b8751ecc 100755 --- a/sbin/build.sh +++ b/sbin/build.sh @@ -81,7 +81,7 @@ configureDevKitConfigureParameter() { # Default to build architecture unless target ARCHITECTURE variable is set def target_arch="${BUILD_CONFIG[OS_ARCHITECTURE]}" - if [ -n ${var+x} ]; then + if [ -n "${ARCHITECTURE+x}" ]; then target_arch="${ARCHITECTURE}" fi echo "Target architecture for Windows devkit: ${target_arch}" From 1e80404fba17013372cb7e1d55e3141401b18fd3 Mon Sep 17 00:00:00 2001 From: Andrew Leonard Date: Fri, 1 Nov 2024 15:21:32 +0000 Subject: [PATCH 04/17] Update windows_repro_build_compare.sh to allow for windows Redist dev kit Signed-off-by: Andrew Leonard --- sbin/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sbin/build.sh b/sbin/build.sh index 3b8751ecc..a700bf32d 100755 --- a/sbin/build.sh +++ b/sbin/build.sh @@ -81,7 +81,7 @@ configureDevKitConfigureParameter() { # Default to build architecture unless target ARCHITECTURE variable is set def target_arch="${BUILD_CONFIG[OS_ARCHITECTURE]}" - if [ -n "${ARCHITECTURE+x}" ]; then + if [ ! -z "${ARCHITECTURE+x}" ]; then target_arch="${ARCHITECTURE}" fi echo "Target architecture for Windows devkit: ${target_arch}" From 42b1da7e5bf65a64b5e9c680533d7bd900ede3a9 Mon Sep 17 00:00:00 2001 From: Andrew Leonard Date: Fri, 1 Nov 2024 15:35:09 +0000 Subject: [PATCH 05/17] Update windows_repro_build_compare.sh to allow for windows Redist dev kit Signed-off-by: Andrew Leonard --- sbin/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sbin/build.sh b/sbin/build.sh index a700bf32d..3b8751ecc 100755 --- a/sbin/build.sh +++ b/sbin/build.sh @@ -81,7 +81,7 @@ configureDevKitConfigureParameter() { # Default to build architecture unless target ARCHITECTURE variable is set def target_arch="${BUILD_CONFIG[OS_ARCHITECTURE]}" - if [ ! -z "${ARCHITECTURE+x}" ]; then + if [ -n "${ARCHITECTURE+x}" ]; then target_arch="${ARCHITECTURE}" fi echo "Target architecture for Windows devkit: ${target_arch}" From 118e506bfdc14d14d6a8fdc79bf16c5320b3d742 Mon Sep 17 00:00:00 2001 From: Andrew Leonard Date: Fri, 1 Nov 2024 15:46:01 +0000 Subject: [PATCH 06/17] Update windows_repro_build_compare.sh to allow for windows Redist dev kit Signed-off-by: Andrew Leonard --- sbin/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sbin/build.sh b/sbin/build.sh index 3b8751ecc..dc222109e 100755 --- a/sbin/build.sh +++ b/sbin/build.sh @@ -81,7 +81,7 @@ configureDevKitConfigureParameter() { # Default to build architecture unless target ARCHITECTURE variable is set def target_arch="${BUILD_CONFIG[OS_ARCHITECTURE]}" - if [ -n "${ARCHITECTURE+x}" ]; then + if [[ -n "${ARCHITECTURE}" ]]; then target_arch="${ARCHITECTURE}" fi echo "Target architecture for Windows devkit: ${target_arch}" From f32dd20d323be4085d2b1e38431bd31ffd5e6735 Mon Sep 17 00:00:00 2001 From: Andrew Leonard Date: Fri, 1 Nov 2024 15:57:58 +0000 Subject: [PATCH 07/17] Update windows_repro_build_compare.sh to allow for windows Redist dev kit Signed-off-by: Andrew Leonard --- sbin/build.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sbin/build.sh b/sbin/build.sh index dc222109e..06559bfb2 100755 --- a/sbin/build.sh +++ b/sbin/build.sh @@ -79,9 +79,10 @@ configureDevKitConfigureParameter() { if [[ "$OSTYPE" == "cygwin" ]] || [[ "$OSTYPE" == "msys" ]]; then # Windows DevKit, currently only Redist DLLs + # Default to build architecture unless target ARCHITECTURE variable is set def target_arch="${BUILD_CONFIG[OS_ARCHITECTURE]}" - if [[ -n "${ARCHITECTURE}" ]]; then + if [[ ! -z "${ARCHITECTURE+x}" ]]; then target_arch="${ARCHITECTURE}" fi echo "Target architecture for Windows devkit: ${target_arch}" From 42f52cee22d77d4dd81c3dbd78fad09048c81cdd Mon Sep 17 00:00:00 2001 From: Andrew Leonard Date: Fri, 1 Nov 2024 16:13:53 +0000 Subject: [PATCH 08/17] Update windows_repro_build_compare.sh to allow for windows Redist dev kit Signed-off-by: Andrew Leonard --- sbin/build.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/sbin/build.sh b/sbin/build.sh index 06559bfb2..f6e4b8565 100755 --- a/sbin/build.sh +++ b/sbin/build.sh @@ -79,6 +79,7 @@ configureDevKitConfigureParameter() { if [[ "$OSTYPE" == "cygwin" ]] || [[ "$OSTYPE" == "msys" ]]; then # Windows DevKit, currently only Redist DLLs + echo "HERE!" # Default to build architecture unless target ARCHITECTURE variable is set def target_arch="${BUILD_CONFIG[OS_ARCHITECTURE]}" From 7a1136894cad0a57af5b31c29faffc879904411a Mon Sep 17 00:00:00 2001 From: Andrew Leonard Date: Mon, 4 Nov 2024 09:02:29 +0000 Subject: [PATCH 09/17] Update windows_repro_build_compare.sh to allow for windows Redist dev kit Signed-off-by: Andrew Leonard --- tooling/reproducible/windows_repro_build_compare.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tooling/reproducible/windows_repro_build_compare.sh b/tooling/reproducible/windows_repro_build_compare.sh index e8b5b2400..9a1c53ba0 100755 --- a/tooling/reproducible/windows_repro_build_compare.sh +++ b/tooling/reproducible/windows_repro_build_compare.sh @@ -528,9 +528,9 @@ Clone_Build_Repo() { if [ ! -r "$WORK_DIR/temurin-build" ] ; then echo "Cloning Temurin Build Repository" echo "" - git clone -q https://github.com/adoptium/temurin-build "$WORK_DIR/temurin-build" || exit 1 - echo "Switching To Build SHA From SBOM : $buildSHA" - (cd "$WORK_DIR/temurin-build" && git checkout -q "$buildSHA") + git clone -q https://github.com/andrew-m-leonard/openjdk-build "$WORK_DIR/temurin-build" || exit 1 + echo "Switching To Build SHA From SBOM : win_repo" + (cd "$WORK_DIR/temurin-build" && git checkout -q "win_repo") echo "Completed" fi } From 851170074d5a39a0c2869774225a493e75e476bb Mon Sep 17 00:00:00 2001 From: Andrew Leonard Date: Mon, 4 Nov 2024 09:15:15 +0000 Subject: [PATCH 10/17] Update windows_repro_build_compare.sh to allow for windows Redist dev kit Signed-off-by: Andrew Leonard --- tooling/reproducible/windows_repro_build_compare.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tooling/reproducible/windows_repro_build_compare.sh b/tooling/reproducible/windows_repro_build_compare.sh index 9a1c53ba0..d4bf3f6ac 100755 --- a/tooling/reproducible/windows_repro_build_compare.sh +++ b/tooling/reproducible/windows_repro_build_compare.sh @@ -529,8 +529,8 @@ Clone_Build_Repo() { echo "Cloning Temurin Build Repository" echo "" git clone -q https://github.com/andrew-m-leonard/openjdk-build "$WORK_DIR/temurin-build" || exit 1 - echo "Switching To Build SHA From SBOM : win_repo" - (cd "$WORK_DIR/temurin-build" && git checkout -q "win_repo") + echo "Switching To Build SHA From SBOM : win_repro" + (cd "$WORK_DIR/temurin-build" && git checkout -q "win_repro") echo "Completed" fi } From 463634804a542ab2efbe3416162505ca7e6afb7f Mon Sep 17 00:00:00 2001 From: Andrew Leonard Date: Mon, 4 Nov 2024 09:25:51 +0000 Subject: [PATCH 11/17] Update windows_repro_build_compare.sh to allow for windows Redist dev kit Signed-off-by: Andrew Leonard --- sbin/build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sbin/build.sh b/sbin/build.sh index f6e4b8565..2b490631a 100755 --- a/sbin/build.sh +++ b/sbin/build.sh @@ -82,8 +82,8 @@ configureDevKitConfigureParameter() { echo "HERE!" # Default to build architecture unless target ARCHITECTURE variable is set - def target_arch="${BUILD_CONFIG[OS_ARCHITECTURE]}" - if [[ ! -z "${ARCHITECTURE+x}" ]]; then + local target_arch="${BUILD_CONFIG[OS_ARCHITECTURE]}" + if [[ -n "${ARCHITECTURE+x}" ]]; then target_arch="${ARCHITECTURE}" fi echo "Target architecture for Windows devkit: ${target_arch}" From fe36492b7923cd5ce7e1da436ec3f34df16d52b7 Mon Sep 17 00:00:00 2001 From: Andrew Leonard Date: Mon, 4 Nov 2024 14:43:04 +0000 Subject: [PATCH 12/17] Update windows_repro_build_compare.sh to allow for windows Redist dev kit Signed-off-by: Andrew Leonard --- tooling/reproducible/windows_repro_build_compare.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tooling/reproducible/windows_repro_build_compare.sh b/tooling/reproducible/windows_repro_build_compare.sh index d4bf3f6ac..1fd979044 100755 --- a/tooling/reproducible/windows_repro_build_compare.sh +++ b/tooling/reproducible/windows_repro_build_compare.sh @@ -528,9 +528,9 @@ Clone_Build_Repo() { if [ ! -r "$WORK_DIR/temurin-build" ] ; then echo "Cloning Temurin Build Repository" echo "" - git clone -q https://github.com/andrew-m-leonard/openjdk-build "$WORK_DIR/temurin-build" || exit 1 - echo "Switching To Build SHA From SBOM : win_repro" - (cd "$WORK_DIR/temurin-build" && git checkout -q "win_repro") + git clone -q https://github.com/adoptium/temurin-build "$WORK_DIR/temurin-build" || exit 1 + echo "Switching To Build SHA From SBOM : " + (cd "$WORK_DIR/temurin-build" && git checkout -q "$buildSHA") echo "Completed" fi } From 8f1c6bd5ee3ba9d4d2b532fa442effb39080bc64 Mon Sep 17 00:00:00 2001 From: Andrew Leonard Date: Mon, 4 Nov 2024 14:44:06 +0000 Subject: [PATCH 13/17] Update windows_repro_build_compare.sh to allow for windows Redist dev kit Signed-off-by: Andrew Leonard --- tooling/reproducible/windows_repro_build_compare.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tooling/reproducible/windows_repro_build_compare.sh b/tooling/reproducible/windows_repro_build_compare.sh index 1fd979044..e8b5b2400 100755 --- a/tooling/reproducible/windows_repro_build_compare.sh +++ b/tooling/reproducible/windows_repro_build_compare.sh @@ -529,7 +529,7 @@ Clone_Build_Repo() { echo "Cloning Temurin Build Repository" echo "" git clone -q https://github.com/adoptium/temurin-build "$WORK_DIR/temurin-build" || exit 1 - echo "Switching To Build SHA From SBOM : " + echo "Switching To Build SHA From SBOM : $buildSHA" (cd "$WORK_DIR/temurin-build" && git checkout -q "$buildSHA") echo "Completed" fi From f53cbb75fd30ddea6085bca34c8fad5b1da9dc29 Mon Sep 17 00:00:00 2001 From: Andrew Leonard Date: Mon, 4 Nov 2024 14:44:40 +0000 Subject: [PATCH 14/17] Update windows_repro_build_compare.sh to allow for windows Redist dev kit Signed-off-by: Andrew Leonard --- sbin/build.sh | 2 -- 1 file changed, 2 deletions(-) diff --git a/sbin/build.sh b/sbin/build.sh index 2b490631a..f07abb5cf 100755 --- a/sbin/build.sh +++ b/sbin/build.sh @@ -79,8 +79,6 @@ configureDevKitConfigureParameter() { if [[ "$OSTYPE" == "cygwin" ]] || [[ "$OSTYPE" == "msys" ]]; then # Windows DevKit, currently only Redist DLLs - echo "HERE!" - # Default to build architecture unless target ARCHITECTURE variable is set local target_arch="${BUILD_CONFIG[OS_ARCHITECTURE]}" if [[ -n "${ARCHITECTURE+x}" ]]; then From cfbfac7821b2e257904241ccb190d64ca5deffee Mon Sep 17 00:00:00 2001 From: Andrew Leonard Date: Tue, 5 Nov 2024 09:29:09 +0000 Subject: [PATCH 15/17] Update windows_repro_build_compare.sh to allow for windows Redist dev kit Signed-off-by: Andrew Leonard --- sbin/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sbin/build.sh b/sbin/build.sh index f07abb5cf..6149bae5e 100755 --- a/sbin/build.sh +++ b/sbin/build.sh @@ -81,7 +81,7 @@ configureDevKitConfigureParameter() { # Default to build architecture unless target ARCHITECTURE variable is set local target_arch="${BUILD_CONFIG[OS_ARCHITECTURE]}" - if [[ -n "${ARCHITECTURE+x}" ]]; then + if [ ${ARCHITECTURE+x} ] && [ -n "${ARCHITECTURE}" ]; then target_arch="${ARCHITECTURE}" fi echo "Target architecture for Windows devkit: ${target_arch}" From d5b0bc334df435fde4109d523bbcefd4ccfbaa0a Mon Sep 17 00:00:00 2001 From: Andrew Leonard Date: Tue, 5 Nov 2024 09:52:34 +0000 Subject: [PATCH 16/17] Update windows_repro_build_compare.sh to allow for windows Redist dev kit Signed-off-by: Andrew Leonard --- tooling/reproducible/windows_repro_build_compare.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tooling/reproducible/windows_repro_build_compare.sh b/tooling/reproducible/windows_repro_build_compare.sh index e8b5b2400..1d526a4e4 100755 --- a/tooling/reproducible/windows_repro_build_compare.sh +++ b/tooling/reproducible/windows_repro_build_compare.sh @@ -528,9 +528,9 @@ Clone_Build_Repo() { if [ ! -r "$WORK_DIR/temurin-build" ] ; then echo "Cloning Temurin Build Repository" echo "" - git clone -q https://github.com/adoptium/temurin-build "$WORK_DIR/temurin-build" || exit 1 + git clone -q https://github.com/andrew-m-leonard/openjdk-build "$WORK_DIR/temurin-build" || exit 1 echo "Switching To Build SHA From SBOM : $buildSHA" - (cd "$WORK_DIR/temurin-build" && git checkout -q "$buildSHA") + (cd "$WORK_DIR/temurin-build" && git checkout -q "win_repro") echo "Completed" fi } From b2445ceaa0f0f8df9b8f820f38c4c0d369e7c32b Mon Sep 17 00:00:00 2001 From: Andrew Leonard Date: Tue, 5 Nov 2024 10:01:58 +0000 Subject: [PATCH 17/17] Update windows_repro_build_compare.sh to allow for windows Redist dev kit Signed-off-by: Andrew Leonard --- tooling/reproducible/windows_repro_build_compare.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tooling/reproducible/windows_repro_build_compare.sh b/tooling/reproducible/windows_repro_build_compare.sh index 1d526a4e4..e8b5b2400 100755 --- a/tooling/reproducible/windows_repro_build_compare.sh +++ b/tooling/reproducible/windows_repro_build_compare.sh @@ -528,9 +528,9 @@ Clone_Build_Repo() { if [ ! -r "$WORK_DIR/temurin-build" ] ; then echo "Cloning Temurin Build Repository" echo "" - git clone -q https://github.com/andrew-m-leonard/openjdk-build "$WORK_DIR/temurin-build" || exit 1 + git clone -q https://github.com/adoptium/temurin-build "$WORK_DIR/temurin-build" || exit 1 echo "Switching To Build SHA From SBOM : $buildSHA" - (cd "$WORK_DIR/temurin-build" && git checkout -q "win_repro") + (cd "$WORK_DIR/temurin-build" && git checkout -q "$buildSHA") echo "Completed" fi }