Merge pull request #326 from CocoaPods/multi_xcframeworks_fix

update integration specs
CocoaPods · Aug 25, 2021 · 0f94813 · 0f94813
2 parents 67797e0 + 779d05f
commit 0f94813
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 90 deletions.
diff --git a/...c_library_xcframework/after/Pods/Target Support Files/BananaLib/BananaLib-xcframeworks.sh b/...c_library_xcframework/after/Pods/Target Support Files/BananaLib/BananaLib-xcframeworks.sh
@@ -20,8 +20,8 @@ copy_dir()
   local destination="$2"
 
   # Use filter instead of exclude so missing patterns don't throw errors.
-  echo "rsync --delete -av "${RSYNC_PROTECT_TMP_FILES[@]}" --links --filter \"- CVS/\" --filter \"- .svn/\" --filter \"- .git/\" --filter \"- .hg/\" \"${source}\" \"${destination}\""
-  rsync --delete -av "${RSYNC_PROTECT_TMP_FILES[@]}" --links --filter "- CVS/" --filter "- .svn/" --filter "- .git/" --filter "- .hg/" "${source}" "${destination}"
+  echo "rsync --delete -av "${RSYNC_PROTECT_TMP_FILES[@]}" --links --filter \"- CVS/\" --filter \"- .svn/\" --filter \"- .git/\" --filter \"- .hg/\" \"${source}*\" \"${destination}\""
+  rsync --delete -av "${RSYNC_PROTECT_TMP_FILES[@]}" --links --filter "- CVS/" --filter "- .svn/" --filter "- .git/" --filter "- .hg/" "${source}"/* "${destination}"
 }
 
 SELECT_SLICE_RETVAL=""
@@ -80,33 +80,6 @@ select_slice() {
   done
 }
 
-install_library() {
-  local source="$1"
-  local name="$2"
-  local destination="${PODS_XCFRAMEWORKS_BUILD_DIR}/${name}"
-
-  # Libraries can contain headers, module maps, and a binary, so we'll copy everything in the folder over
-
-  local source="$binary"
-  echo "rsync --delete -av "${RSYNC_PROTECT_TMP_FILES[@]}" --links --filter \"- CVS/\" --filter \"- .svn/\" --filter \"- .git/\" --filter \"- .hg/\" \"${source}/*\" \"${destination}\""
-  rsync --delete -av "${RSYNC_PROTECT_TMP_FILES[@]}" --links --filter "- CVS/" --filter "- .svn/" --filter "- .git/" --filter "- .hg/" "${source}/*" "${destination}"
-}
-
-# Copies a framework to derived data for use in later build phases
-install_framework()
-{
-  local source="$1"
-  local name="$2"
-  local destination="${PODS_XCFRAMEWORKS_BUILD_DIR}/${name}"
-
-  if [ ! -d "$destination" ]; then
-    mkdir -p "$destination"
-  fi
-
-  copy_dir "$source" "$destination"
-  echo "Copied $source to $destination"
-}
-
 install_xcframework() {
   local basepath="$1"
   local name="$2"
@@ -129,7 +102,6 @@ install_xcframework() {
   fi
 
   copy_dir "$source/" "$destination"
-
   echo "Copied $source to $destination"
 }
 

diff --git a/...ed_static_xcframework/after/Pods/Target Support Files/BananaLib/BananaLib-xcframeworks.sh b/...ed_static_xcframework/after/Pods/Target Support Files/BananaLib/BananaLib-xcframeworks.sh
@@ -20,8 +20,8 @@ copy_dir()
   local destination="$2"
 
   # Use filter instead of exclude so missing patterns don't throw errors.
-  echo "rsync --delete -av "${RSYNC_PROTECT_TMP_FILES[@]}" --links --filter \"- CVS/\" --filter \"- .svn/\" --filter \"- .git/\" --filter \"- .hg/\" \"${source}\" \"${destination}\""
-  rsync --delete -av "${RSYNC_PROTECT_TMP_FILES[@]}" --links --filter "- CVS/" --filter "- .svn/" --filter "- .git/" --filter "- .hg/" "${source}" "${destination}"
+  echo "rsync --delete -av "${RSYNC_PROTECT_TMP_FILES[@]}" --links --filter \"- CVS/\" --filter \"- .svn/\" --filter \"- .git/\" --filter \"- .hg/\" \"${source}*\" \"${destination}\""
+  rsync --delete -av "${RSYNC_PROTECT_TMP_FILES[@]}" --links --filter "- CVS/" --filter "- .svn/" --filter "- .git/" --filter "- .hg/" "${source}"/* "${destination}"
 }
 
 SELECT_SLICE_RETVAL=""
@@ -80,33 +80,6 @@ select_slice() {
   done
 }
 
-install_library() {
-  local source="$1"
-  local name="$2"
-  local destination="${PODS_XCFRAMEWORKS_BUILD_DIR}/${name}"
-
-  # Libraries can contain headers, module maps, and a binary, so we'll copy everything in the folder over
-
-  local source="$binary"
-  echo "rsync --delete -av "${RSYNC_PROTECT_TMP_FILES[@]}" --links --filter \"- CVS/\" --filter \"- .svn/\" --filter \"- .git/\" --filter \"- .hg/\" \"${source}/*\" \"${destination}\""
-  rsync --delete -av "${RSYNC_PROTECT_TMP_FILES[@]}" --links --filter "- CVS/" --filter "- .svn/" --filter "- .git/" --filter "- .hg/" "${source}/*" "${destination}"
-}
-
-# Copies a framework to derived data for use in later build phases
-install_framework()
-{
-  local source="$1"
-  local name="$2"
-  local destination="${PODS_XCFRAMEWORKS_BUILD_DIR}/${name}"
-
-  if [ ! -d "$destination" ]; then
-    mkdir -p "$destination"
-  fi
-
-  copy_dir "$source" "$destination"
-  echo "Copied $source to $destination"
-}
-
 install_xcframework() {
   local basepath="$1"
   local name="$2"
@@ -129,7 +102,6 @@ install_xcframework() {
   fi
 
   copy_dir "$source/" "$destination"
-
   echo "Copied $source to $destination"
 }
 

diff --git a/..._vendored_xcframework/after/Pods/Target Support Files/BananaLib/BananaLib-xcframeworks.sh b/..._vendored_xcframework/after/Pods/Target Support Files/BananaLib/BananaLib-xcframeworks.sh
@@ -20,8 +20,8 @@ copy_dir()
   local destination="$2"
 
   # Use filter instead of exclude so missing patterns don't throw errors.
-  echo "rsync --delete -av "${RSYNC_PROTECT_TMP_FILES[@]}" --links --filter \"- CVS/\" --filter \"- .svn/\" --filter \"- .git/\" --filter \"- .hg/\" \"${source}\" \"${destination}\""
-  rsync --delete -av "${RSYNC_PROTECT_TMP_FILES[@]}" --links --filter "- CVS/" --filter "- .svn/" --filter "- .git/" --filter "- .hg/" "${source}" "${destination}"
+  echo "rsync --delete -av "${RSYNC_PROTECT_TMP_FILES[@]}" --links --filter \"- CVS/\" --filter \"- .svn/\" --filter \"- .git/\" --filter \"- .hg/\" \"${source}*\" \"${destination}\""
+  rsync --delete -av "${RSYNC_PROTECT_TMP_FILES[@]}" --links --filter "- CVS/" --filter "- .svn/" --filter "- .git/" --filter "- .hg/" "${source}"/* "${destination}"
 }
 
 SELECT_SLICE_RETVAL=""
@@ -80,33 +80,6 @@ select_slice() {
   done
 }
 
-install_library() {
-  local source="$1"
-  local name="$2"
-  local destination="${PODS_XCFRAMEWORKS_BUILD_DIR}/${name}"
-
-  # Libraries can contain headers, module maps, and a binary, so we'll copy everything in the folder over
-
-  local source="$binary"
-  echo "rsync --delete -av "${RSYNC_PROTECT_TMP_FILES[@]}" --links --filter \"- CVS/\" --filter \"- .svn/\" --filter \"- .git/\" --filter \"- .hg/\" \"${source}/*\" \"${destination}\""
-  rsync --delete -av "${RSYNC_PROTECT_TMP_FILES[@]}" --links --filter "- CVS/" --filter "- .svn/" --filter "- .git/" --filter "- .hg/" "${source}/*" "${destination}"
-}
-
-# Copies a framework to derived data for use in later build phases
-install_framework()
-{
-  local source="$1"
-  local name="$2"
-  local destination="${PODS_XCFRAMEWORKS_BUILD_DIR}/${name}"
-
-  if [ ! -d "$destination" ]; then
-    mkdir -p "$destination"
-  fi
-
-  copy_dir "$source" "$destination"
-  echo "Copied $source to $destination"
-}
-
 install_xcframework() {
   local basepath="$1"
   local name="$2"
@@ -129,7 +102,6 @@ install_xcframework() {
   fi
 
   copy_dir "$source/" "$destination"
-
   echo "Copied $source to $destination"
 }