Inegrate rsync from BCR

Author: adincebic

MODULE.bazel

@@ -19,6 +19,7 @@ bazel_dep(
     repo_name = "build_bazel_rules_apple",
 )
 bazel_dep(name = "rules_python", version = "0.27.1")
+bazel_dep(name = "rsync", version = "3.4.1")
 
 internal = use_extension("//xcodeproj:extensions.bzl", "internal")
 use_repo(internal, "rules_xcodeproj_generated")

xcodeproj/internal/bazel_integration_files/BUILD

@@ -10,6 +10,7 @@ filegroup(
     name = "bazel_integration_files",
     srcs = _BASE_FILES + [
         ":renamed_swiftc_stub",
+        ":renamed_rsync",
         ":rsync_excludes",
     ] + glob(
         ["**/*"],
@@ -125,6 +126,26 @@ fi
     ],
 )
 
+genrule(
+    name = "renamed_rsync",
+    srcs = ["@rsync//:rsync"],
+    outs = ["rsync"],
+    # Make `rsync` have the right name
+    cmd = """\
+readonly output="$@"
+if [[ $$(stat -f '%d' "$<") == $$(stat -f '%d' "$${output%/*}") ]]; then
+  cp -c "$<" "$@"
+else
+  cp "$<" "$@"
+fi
+""",
+    message = "Renaming rsync",
+    tags = [
+        "manual",
+        "no-sandbox",
+    ],
+)
+
 # Release
 
 filegroup(

xcodeproj/internal/bazel_integration_files/copy_dsyms.sh

@@ -46,16 +46,13 @@ function patch_dsym() {
 EOF
 }
 
+readonly rsync="$BAZEL_INTEGRATION_DIR/rsync"
+
 if [[ -n "${BAZEL_OUTPUTS_DSYM:-}" ]]; then
   cd "${BAZEL_OUT%/*}"
 
-  # NOTE: use `which` to find the path to `rsync`.
-  # In macOS 15.4, the system `rsync` is using `openrsync` which contains some permission issues.
-  # This allows users to workaround the issue by overriding the system `rsync` with a working version.
-  # Remove this once we no longer support macOS versions with broken `rsync`.
   # shellcheck disable=SC2046
-  PATH="/opt/homebrew/bin:/usr/local/bin:$PATH" \
-    rsync \
+  "$rsync" \
     --copy-links \
     --recursive \
     --times \

xcodeproj/internal/bazel_integration_files/copy_outputs.sh

@@ -21,6 +21,8 @@ readonly test_frameworks=(
   "XCUnit.framework"
 )
 
+readonly rsync="$BAZEL_INTEGRATION_DIR/rsync"
+
 if [[ "$ACTION" != indexbuild ]]; then
   # Copy product
   if [[ -n ${BAZEL_OUTPUTS_PRODUCT:-} ]]; then
@@ -32,12 +34,7 @@ if [[ "$ACTION" != indexbuild ]]; then
       ln -sfh "$PWD/$BAZEL_OUTPUTS_PRODUCT_BASENAME" "$TARGET_BUILD_DIR/$PRODUCT_NAME"
     else
       # Product is a bundle
-      # NOTE: use `which` to find the path to `rsync`.
-      # In macOS 15.4, the system `rsync` is using `openrsync` which contains some permission issues.
-      # This allows users to workaround the issue by overriding the system `rsync` with a working version.
-      # Remove this once we no longer support macOS versions with broken `rsync`.
-      PATH="/opt/homebrew/bin:/usr/local/bin:$PATH" \
-        rsync \
+      "$rsync" \
         --copy-links \
         --recursive \
         --times \

xcodeproj/internal/templates/installer.sh

@@ -66,6 +66,7 @@ readonly src_project_pbxproj="$PWD/%project_pbxproj%"
 readonly src_xcschememanagement="$PWD/%xcschememanagement%"
 readonly src_xcschemes="$PWD/%xcschemes%/"
 readonly src_xcworkspacedata="$PWD/%contents_xcworkspacedata%"
+readonly src_rsync="$PWD/%rsync%"
 
 # Resolve the destination
 [[ -z "${dest:-}" ]] \
@@ -82,13 +83,7 @@ readonly dest_xcschemes="$dest/xcshareddata/xcschemes"
 
 mkdir -p "$dest_xcschemes"
 
-# NOTE: use `which` to find the path to `rsync`.
-# In macOS 15.4, the system `rsync` is using `openrsync` which contains some permission issues.
-# This allows users to workaround the issue by overriding the system `rsync` with a working version.
-# Remove this once we no longer support macOS versions with broken `rsync`.
-# shellcheck disable=SC2046
-PATH="/opt/homebrew/bin:/usr/local/bin:$PATH" \
-  rsync \
+"$src_rsync" \
   --archive \
   --perms \
   --chmod=u+w,F-x \
@@ -124,6 +119,7 @@ mkdir -p "$dest/rules_xcodeproj/bazel"
 rm -rf "$dest/rules_xcodeproj/bazel"/*
 $cp_cmd "${bazel_integration_files[@]}" "$dest/rules_xcodeproj/bazel"
 $cp_cmd "$xcodeproj_bazelrc" "$dest/rules_xcodeproj/bazel/xcodeproj.bazelrc"
+chmod u+rx "$dest/rules_xcodeproj/bazel/rsync"
 
 if [[ -s "${extra_flags_bazelrc:-}" ]]; then
   $cp_cmd "$extra_flags_bazelrc" "$dest/rules_xcodeproj/bazel/xcodeproj_extra_flags.bazelrc"
@@ -141,10 +137,10 @@ chmod u+w "$dest_generated_xcfilelist"
 
 # - Keep only scripts as runnable
 find "$dest/rules_xcodeproj/bazel" \
-  -type f \( -name "*.sh" -o -name "*.py" -o -name "ld" -o -name "libtool" \) \
+  -type f \( -name "*.sh" -o -name "*.py" -o -name "ld" -o -name "libtool" -o -name "rsync" \) \
   -print0 | xargs -0 chmod u+x
 find "$dest/rules_xcodeproj/bazel" \
-  -type f ! \( -name "swiftc" -o -name "ld" -o -name "libtool" -o -name "import_indexstores" -o -name "*.sh" -o -name "*.py" \) \
+  -type f ! \( -name "swiftc" -o -name "ld" -o -name "libtool" -o -name "import_indexstores" -o -name "rsync" -o -name "*.sh" -o -name "*.py" \) \
   -print0 | xargs -0 chmod -x
 
 # Copy over `project.xcworkspace/contents.xcworkspacedata` if needed

xcodeproj/internal/xcodeproj_rule.bzl

@@ -283,6 +283,14 @@ def _write_installer(
         template,
         xcschememanagement,
         xcschemes):
+    rsync_file = None
+    for f in bazel_integration_files:
+        if f.basename == "rsync":
+            rsync_file = f
+            break
+    if rsync_file == None:
+        fail("Failed to find rsync in bazel integration files")
+
     installer = actions.declare_file(
         "{}-installer.sh".format(name),
     )
@@ -303,6 +311,7 @@ def _write_installer(
             "%generated_xcfilelist%": generated_xcfilelist.short_path,
             "%output_path%": install_path,
             "%project_pbxproj%": project_pbxproj.short_path,
+            "%rsync%": rsync_file.short_path,
             "%xcschememanagement%": xcschememanagement.short_path,
             "%xcschemes%": xcschemes.short_path,
         },