Merge pull request #97 from bazel-ios/amber/fix-lldb-swiftmodules-scr…

…ipts Fix LLDB, swiftmodules xcode installers
bazel-ios · Aug 3, 2020 · 9b9f158 · 9b9f158
2 parents 47fec4a + d3c4c2a
commit 9b9f158
Show file tree

Hide file tree

Showing 10 changed files with 110 additions and 30 deletions.
diff --git a/.../ios/xcodeproj/Single-Static-Framework-Project.xcodeproj/bazelinstallers/lldb-settings.sh b/.../ios/xcodeproj/Single-Static-Framework-Project.xcodeproj/bazelinstallers/lldb-settings.sh
@@ -15,5 +15,8 @@ set -euo pipefail
 #
 #     command source ~/.lldbinit-source-map
 cat <<-END > ~/.lldbinit-source-map
-settings set target.source-map ./ "$BAZEL_WORKSPACE_ROOT/"
+settings set target.source-map ./external/ "$BAZEL_WORKSPACE_ROOT/bazel-$(basename "$BAZEL_WORKSPACE_ROOT")/external"
+settings append target.source-map ./ "$BAZEL_WORKSPACE_ROOT/"
+settings set target.sdk-path $SDKROOT
+settings set target.swift-framework-search-paths $FRAMEWORK_SEARCH_PATHS
 END
diff --git a/...s/ios/xcodeproj/Single-Static-Framework-Project.xcodeproj/bazelinstallers/swiftmodules.sh b/...s/ios/xcodeproj/Single-Static-Framework-Project.xcodeproj/bazelinstallers/swiftmodules.sh
@@ -4,8 +4,21 @@ set -euo pipefail
 
 # Copy Bazel build `.swiftmodule` files to `DerivedData`. This is used by Xcode
 # and its indexing.
-find "$BAZEL_WORKSPACE_ROOT/bazel-out"/*/bin/ \
-    -name "*.swiftmodule" \
-     -not -path "*/_swift_module_cache/*" \
-     -print0 \
-    | xargs -0 "$BAZEL_INSTALLERS_DIR/_swiftmodule.sh"
+echo "Start copying swiftmodules at `date`"
+FOUND_SWIFTMODULES=`pcregrep -o1 'primary_output: "(.*\.swiftmodule)' $BAZEL_BUILD_EVENT_TEXT_FILENAME | uniq`
+declare -a EXISTING_SWIFTMODULES=()
+for i in $FOUND_SWIFTMODULES
+do
+  if [[ -f $i ]]
+  then
+    EXISTING_SWIFTMODULES+=($i)
+  fi
+done
+echo "Found ${#EXISTING_SWIFTMODULES[@]} existing SWIFTMODULES"
+if [ ${#EXISTING_SWIFTMODULES[@]} -ne 0 ]
+then
+  "$BAZEL_INSTALLERS_DIR/_swiftmodule.sh" ${EXISTING_SWIFTMODULES[*]}
+else
+  echo "No SWIFTMODULES found"
+fi
+echo "Finish copying swiftmodules at `date`"
diff --git a/...codeproj/Single-Application-Project-AllTargets.xcodeproj/bazelinstallers/lldb-settings.sh b/...codeproj/Single-Application-Project-AllTargets.xcodeproj/bazelinstallers/lldb-settings.sh
@@ -15,5 +15,8 @@ set -euo pipefail
 #
 #     command source ~/.lldbinit-source-map
 cat <<-END > ~/.lldbinit-source-map
-settings set target.source-map ./ "$BAZEL_WORKSPACE_ROOT/"
+settings set target.source-map ./external/ "$BAZEL_WORKSPACE_ROOT/bazel-$(basename "$BAZEL_WORKSPACE_ROOT")/external"
+settings append target.source-map ./ "$BAZEL_WORKSPACE_ROOT/"
+settings set target.sdk-path $SDKROOT
+settings set target.swift-framework-search-paths $FRAMEWORK_SEARCH_PATHS
 END
diff --git a/...xcodeproj/Single-Application-Project-AllTargets.xcodeproj/bazelinstallers/swiftmodules.sh b/...xcodeproj/Single-Application-Project-AllTargets.xcodeproj/bazelinstallers/swiftmodules.sh
@@ -4,8 +4,21 @@ set -euo pipefail
 
 # Copy Bazel build `.swiftmodule` files to `DerivedData`. This is used by Xcode
 # and its indexing.
-find "$BAZEL_WORKSPACE_ROOT/bazel-out"/*/bin/ \
-    -name "*.swiftmodule" \
-     -not -path "*/_swift_module_cache/*" \
-     -print0 \
-    | xargs -0 "$BAZEL_INSTALLERS_DIR/_swiftmodule.sh"
+echo "Start copying swiftmodules at `date`"
+FOUND_SWIFTMODULES=`pcregrep -o1 'primary_output: "(.*\.swiftmodule)' $BAZEL_BUILD_EVENT_TEXT_FILENAME | uniq`
+declare -a EXISTING_SWIFTMODULES=()
+for i in $FOUND_SWIFTMODULES
+do
+  if [[ -f $i ]]
+  then
+    EXISTING_SWIFTMODULES+=($i)
+  fi
+done
+echo "Found ${#EXISTING_SWIFTMODULES[@]} existing SWIFTMODULES"
+if [ ${#EXISTING_SWIFTMODULES[@]} -ne 0 ]
+then
+  "$BAZEL_INSTALLERS_DIR/_swiftmodule.sh" ${EXISTING_SWIFTMODULES[*]}
+else
+  echo "No SWIFTMODULES found"
+fi
+echo "Finish copying swiftmodules at `date`"
diff --git a/...j/Single-Application-Project-DirectTargetsOnly.xcodeproj/bazelinstallers/lldb-settings.sh b/...j/Single-Application-Project-DirectTargetsOnly.xcodeproj/bazelinstallers/lldb-settings.sh
@@ -15,5 +15,8 @@ set -euo pipefail
 #
 #     command source ~/.lldbinit-source-map
 cat <<-END > ~/.lldbinit-source-map
-settings set target.source-map ./ "$BAZEL_WORKSPACE_ROOT/"
+settings set target.source-map ./external/ "$BAZEL_WORKSPACE_ROOT/bazel-$(basename "$BAZEL_WORKSPACE_ROOT")/external"
+settings append target.source-map ./ "$BAZEL_WORKSPACE_ROOT/"
+settings set target.sdk-path $SDKROOT
+settings set target.swift-framework-search-paths $FRAMEWORK_SEARCH_PATHS
 END
diff --git a/...oj/Single-Application-Project-DirectTargetsOnly.xcodeproj/bazelinstallers/swiftmodules.sh b/...oj/Single-Application-Project-DirectTargetsOnly.xcodeproj/bazelinstallers/swiftmodules.sh
@@ -4,8 +4,21 @@ set -euo pipefail
 
 # Copy Bazel build `.swiftmodule` files to `DerivedData`. This is used by Xcode
 # and its indexing.
-find "$BAZEL_WORKSPACE_ROOT/bazel-out"/*/bin/ \
-    -name "*.swiftmodule" \
-     -not -path "*/_swift_module_cache/*" \
-     -print0 \
-    | xargs -0 "$BAZEL_INSTALLERS_DIR/_swiftmodule.sh"
+echo "Start copying swiftmodules at `date`"
+FOUND_SWIFTMODULES=`pcregrep -o1 'primary_output: "(.*\.swiftmodule)' $BAZEL_BUILD_EVENT_TEXT_FILENAME | uniq`
+declare -a EXISTING_SWIFTMODULES=()
+for i in $FOUND_SWIFTMODULES
+do
+  if [[ -f $i ]]
+  then
+    EXISTING_SWIFTMODULES+=($i)
+  fi
+done
+echo "Found ${#EXISTING_SWIFTMODULES[@]} existing SWIFTMODULES"
+if [ ${#EXISTING_SWIFTMODULES[@]} -ne 0 ]
+then
+  "$BAZEL_INSTALLERS_DIR/_swiftmodule.sh" ${EXISTING_SWIFTMODULES[*]}
+else
+  echo "No SWIFTMODULES found"
+fi
+echo "Finish copying swiftmodules at `date`"
diff --git a/...s/xcodeproj/Test-Target-With-Test-Host-Project.xcodeproj/bazelinstallers/lldb-settings.sh b/...s/xcodeproj/Test-Target-With-Test-Host-Project.xcodeproj/bazelinstallers/lldb-settings.sh
@@ -15,5 +15,8 @@ set -euo pipefail
 #
 #     command source ~/.lldbinit-source-map
 cat <<-END > ~/.lldbinit-source-map
-settings set target.source-map ./ "$BAZEL_WORKSPACE_ROOT/"
+settings set target.source-map ./external/ "$BAZEL_WORKSPACE_ROOT/bazel-$(basename "$BAZEL_WORKSPACE_ROOT")/external"
+settings append target.source-map ./ "$BAZEL_WORKSPACE_ROOT/"
+settings set target.sdk-path $SDKROOT
+settings set target.swift-framework-search-paths $FRAMEWORK_SEARCH_PATHS
 END
diff --git a/...os/xcodeproj/Test-Target-With-Test-Host-Project.xcodeproj/bazelinstallers/swiftmodules.sh b/...os/xcodeproj/Test-Target-With-Test-Host-Project.xcodeproj/bazelinstallers/swiftmodules.sh
@@ -4,8 +4,21 @@ set -euo pipefail
 
 # Copy Bazel build `.swiftmodule` files to `DerivedData`. This is used by Xcode
 # and its indexing.
-find "$BAZEL_WORKSPACE_ROOT/bazel-out"/*/bin/ \
-    -name "*.swiftmodule" \
-     -not -path "*/_swift_module_cache/*" \
-     -print0 \
-    | xargs -0 "$BAZEL_INSTALLERS_DIR/_swiftmodule.sh"
+echo "Start copying swiftmodules at `date`"
+FOUND_SWIFTMODULES=`pcregrep -o1 'primary_output: "(.*\.swiftmodule)' $BAZEL_BUILD_EVENT_TEXT_FILENAME | uniq`
+declare -a EXISTING_SWIFTMODULES=()
+for i in $FOUND_SWIFTMODULES
+do
+  if [[ -f $i ]]
+  then
+    EXISTING_SWIFTMODULES+=($i)
+  fi
+done
+echo "Found ${#EXISTING_SWIFTMODULES[@]} existing SWIFTMODULES"
+if [ ${#EXISTING_SWIFTMODULES[@]} -ne 0 ]
+then
+  "$BAZEL_INSTALLERS_DIR/_swiftmodule.sh" ${EXISTING_SWIFTMODULES[*]}
+else
+  echo "No SWIFTMODULES found"
+fi
+echo "Finish copying swiftmodules at `date`"
diff --git a/tools/xcodeproj_shims/installers/lldb-settings.sh b/tools/xcodeproj_shims/installers/lldb-settings.sh
@@ -15,5 +15,8 @@ set -euo pipefail
 #
 #     command source ~/.lldbinit-source-map
 cat <<-END > ~/.lldbinit-source-map
-settings set target.source-map ./ "$BAZEL_WORKSPACE_ROOT/"
+settings set target.source-map ./external/ "$BAZEL_WORKSPACE_ROOT/bazel-$(basename "$BAZEL_WORKSPACE_ROOT")/external"
+settings append target.source-map ./ "$BAZEL_WORKSPACE_ROOT/"
+settings set target.sdk-path $SDKROOT
+settings set target.swift-framework-search-paths $FRAMEWORK_SEARCH_PATHS
 END
diff --git a/tools/xcodeproj_shims/installers/swiftmodules.sh b/tools/xcodeproj_shims/installers/swiftmodules.sh
@@ -4,8 +4,21 @@ set -euo pipefail
 
 # Copy Bazel build `.swiftmodule` files to `DerivedData`. This is used by Xcode
 # and its indexing.
-find "$BAZEL_WORKSPACE_ROOT/bazel-out"/*/bin/ \
-    -name "*.swiftmodule" \
-     -not -path "*/_swift_module_cache/*" \
-     -print0 \
-    | xargs -0 "$BAZEL_INSTALLERS_DIR/_swiftmodule.sh"
+echo "Start copying swiftmodules at `date`"
+FOUND_SWIFTMODULES=`pcregrep -o1 'primary_output: "(.*\.swiftmodule)' $BAZEL_BUILD_EVENT_TEXT_FILENAME | uniq`
+declare -a EXISTING_SWIFTMODULES=()
+for i in $FOUND_SWIFTMODULES
+do
+  if [[ -f $i ]]
+  then
+    EXISTING_SWIFTMODULES+=($i)
+  fi
+done
+echo "Found ${#EXISTING_SWIFTMODULES[@]} existing SWIFTMODULES"
+if [ ${#EXISTING_SWIFTMODULES[@]} -ne 0 ]
+then
+  "$BAZEL_INSTALLERS_DIR/_swiftmodule.sh" ${EXISTING_SWIFTMODULES[*]}
+else
+  echo "No SWIFTMODULES found"
+fi
+echo "Finish copying swiftmodules at `date`"