From bc972eaf21b06e62b367c1ee427b338482233533 Mon Sep 17 00:00:00 2001 From: Brentley Jones Date: Tue, 1 Apr 2025 09:52:00 -0500 Subject: [PATCH 1/5] Debug Signed-off-by: Brentley Jones --- xcodeproj/internal/templates/runner.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/xcodeproj/internal/templates/runner.sh b/xcodeproj/internal/templates/runner.sh index 7241e1774..e60428b37 100644 --- a/xcodeproj/internal/templates/runner.sh +++ b/xcodeproj/internal/templates/runner.sh @@ -2,6 +2,8 @@ set -euo pipefail +set -x + # Functions # Echos the provided message to stderr and exits with an error (1) @@ -121,6 +123,9 @@ else "md5 or md5sum" fi +ls -la /var/tmp/rules_xcodeproj/generated_v2 +ls -la "/var/tmp/rules_xcodeproj/generated_v2/$output_base_hash" + # Create files for the generator target output_base_hash=$(echo "$output_base" | "$md5_command" | awk '{print $1}') readonly generator_package_directory="/var/tmp/rules_xcodeproj/generated_v2/$output_base_hash/%generator_package_name%" From 0fd67961b177213e6320501696e748bfe88cb665 Mon Sep 17 00:00:00 2001 From: Brentley Jones Date: Tue, 1 Apr 2025 09:52:57 -0500 Subject: [PATCH 2/5] Fix Signed-off-by: Brentley Jones --- xcodeproj/internal/templates/runner.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/xcodeproj/internal/templates/runner.sh b/xcodeproj/internal/templates/runner.sh index e60428b37..2adb85b83 100644 --- a/xcodeproj/internal/templates/runner.sh +++ b/xcodeproj/internal/templates/runner.sh @@ -123,11 +123,13 @@ else "md5 or md5sum" fi +# Create files for the generator target +output_base_hash=$(echo "$output_base" | "$md5_command" | awk '{print $1}') + + ls -la /var/tmp/rules_xcodeproj/generated_v2 ls -la "/var/tmp/rules_xcodeproj/generated_v2/$output_base_hash" -# Create files for the generator target -output_base_hash=$(echo "$output_base" | "$md5_command" | awk '{print $1}') readonly generator_package_directory="/var/tmp/rules_xcodeproj/generated_v2/$output_base_hash/%generator_package_name%" mkdir -p "$generator_package_directory" From 8ee7a9ef3cae4b64971b44a3a5c99f1f5dcc3a16 Mon Sep 17 00:00:00 2001 From: Brentley Jones Date: Tue, 1 Apr 2025 09:55:27 -0500 Subject: [PATCH 3/5] Fix Signed-off-by: Brentley Jones --- xcodeproj/internal/templates/runner.sh | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/xcodeproj/internal/templates/runner.sh b/xcodeproj/internal/templates/runner.sh index 2adb85b83..7421ce79e 100644 --- a/xcodeproj/internal/templates/runner.sh +++ b/xcodeproj/internal/templates/runner.sh @@ -125,11 +125,6 @@ fi # Create files for the generator target output_base_hash=$(echo "$output_base" | "$md5_command" | awk '{print $1}') - - -ls -la /var/tmp/rules_xcodeproj/generated_v2 -ls -la "/var/tmp/rules_xcodeproj/generated_v2/$output_base_hash" - readonly generator_package_directory="/var/tmp/rules_xcodeproj/generated_v2/$output_base_hash/%generator_package_name%" mkdir -p "$generator_package_directory" @@ -140,6 +135,10 @@ chmod u+w "$generator_package_directory/defs.bzl" cp "$schemes_json" "$generator_package_directory/custom_xcode_schemes.json" chmod u+w "$generator_package_directory/custom_xcode_schemes.json" +ls -la /var/tmp/rules_xcodeproj/generated_v2 +ls -la "/var/tmp/rules_xcodeproj/generated_v2/$output_base_hash" +ls -la "$generator_package_directory" + if [[ %is_fixture% -eq 1 ]]; then cat >> "$generator_package_directory/defs.bzl" < Date: Tue, 1 Apr 2025 09:59:53 -0500 Subject: [PATCH 4/5] Fix Signed-off-by: Brentley Jones --- xcodeproj/internal/templates/legacy_installer.sh | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/xcodeproj/internal/templates/legacy_installer.sh b/xcodeproj/internal/templates/legacy_installer.sh index e458acc43..fd2f96d0f 100644 --- a/xcodeproj/internal/templates/legacy_installer.sh +++ b/xcodeproj/internal/templates/legacy_installer.sh @@ -85,8 +85,17 @@ if [[ $for_fixture -eq 1 ]]; then readonly generator_package_name="${generator_package_name_prefix#*/*/*/}" readonly generator_name="${generator_package_name##*/}" + if command -v /sbin/md5 >/dev/null 2>&1; then + readonly md5_command="/sbin/md5" + elif command -v md5sum >/dev/null 2>&1; then + readonly md5_command="md5sum" + else + fail "ERROR: Unable to find a command to calculate MD5 hash; please install" \ + "md5 or md5sum" + fi + # Copy over generated generator - output_base_hash=$(/sbin/md5 -q -s "${execution_root%/*/*}") + output_base_hash=$(echo "${execution_root%/*/*}" | "$md5_command" | awk '{print $1}') readonly src_generator_package_directory="/var/tmp/rules_xcodeproj/generated_v2/$output_base_hash/generator/$generator_package_name" readonly dest_generator_package_directory="$project_dir/generated" readonly dest_generator_package="${dest_generator_package_directory:?}/$generator_name" From f8cb99e0e601a899e158d1215489244e3e191fe7 Mon Sep 17 00:00:00 2001 From: Brentley Jones Date: Tue, 1 Apr 2025 10:04:08 -0500 Subject: [PATCH 5/5] Revert debug Signed-off-by: Brentley Jones --- xcodeproj/internal/templates/runner.sh | 6 ------ 1 file changed, 6 deletions(-) diff --git a/xcodeproj/internal/templates/runner.sh b/xcodeproj/internal/templates/runner.sh index 7421ce79e..7241e1774 100644 --- a/xcodeproj/internal/templates/runner.sh +++ b/xcodeproj/internal/templates/runner.sh @@ -2,8 +2,6 @@ set -euo pipefail -set -x - # Functions # Echos the provided message to stderr and exits with an error (1) @@ -135,10 +133,6 @@ chmod u+w "$generator_package_directory/defs.bzl" cp "$schemes_json" "$generator_package_directory/custom_xcode_schemes.json" chmod u+w "$generator_package_directory/custom_xcode_schemes.json" -ls -la /var/tmp/rules_xcodeproj/generated_v2 -ls -la "/var/tmp/rules_xcodeproj/generated_v2/$output_base_hash" -ls -la "$generator_package_directory" - if [[ %is_fixture% -eq 1 ]]; then cat >> "$generator_package_directory/defs.bzl" <