From 27b2006a19cb0188b49a46cc05dfa7a188e19740 Mon Sep 17 00:00:00 2001 From: vraspar Date: Fri, 2 Aug 2024 01:30:17 -0700 Subject: [PATCH] remove changes for assemble pods and set symlinks for macabi --- tools/ci_build/github/apple/build_apple_framework.py | 2 +- tools/ci_build/github/apple/c/assemble_c_pod_package.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/ci_build/github/apple/build_apple_framework.py b/tools/ci_build/github/apple/build_apple_framework.py index b92baa3da6872..f4982ffa5d7e2 100644 --- a/tools/ci_build/github/apple/build_apple_framework.py +++ b/tools/ci_build/github/apple/build_apple_framework.py @@ -92,7 +92,7 @@ def _build_for_apple_sysroot( # macos requires different framework structure: # https://developer.apple.com/library/archive/documentation/MacOSX/Conceptual/BPFrameworks/Concepts/FrameworkAnatomy.html - if sysroot == "macosx": + if sysroot == "macosx" or sysroot == "macabi": # create headers and resources directory header_dir = os.path.join(framework_dir, "Versions", "A", "Headers") resource_dir = os.path.join(framework_dir, "Versions", "A", "Resources") diff --git a/tools/ci_build/github/apple/c/assemble_c_pod_package.py b/tools/ci_build/github/apple/c/assemble_c_pod_package.py index dc4e14872267b..ca4f01cf65bd9 100644 --- a/tools/ci_build/github/apple/c/assemble_c_pod_package.py +++ b/tools/ci_build/github/apple/c/assemble_c_pod_package.py @@ -66,8 +66,8 @@ def assemble_c_pod_package( print("Warning: staging directory already exists", file=sys.stderr) # copy the necessary files to the staging directory - shutil.copytree(framework_dir, staging_dir / framework_dir.name, dirs_exist_ok=True, symlinks=True) - shutil.copytree(public_headers_dir, staging_dir / public_headers_dir.name, dirs_exist_ok=True, symlinks=True) + shutil.copytree(framework_dir, staging_dir / framework_dir.name, dirs_exist_ok=True) + shutil.copytree(public_headers_dir, staging_dir / public_headers_dir.name, dirs_exist_ok=True) copy_repo_relative_to_dir(["LICENSE"], staging_dir) # generate the podspec file from the template