From f2a05e453f9576f7f9ffeb32dc82fbeabf4a6ca4 Mon Sep 17 00:00:00 2001 From: Amber Dixon Date: Thu, 1 Oct 2020 22:48:43 -0700 Subject: [PATCH 1/9] include all framework search paths for all configurations for targets --- rules/xcodeproj.bzl | 28 +- tests/ios/app/BUILD.bazel | 10 + tests/ios/app/FW2/FW.h | 4 + tests/ios/app/FW2/FW.m | 5 + tests/ios/xcodeproj/BUILD.bazel | 25 + .../bazelinstallers/_indexstore.sh | 42 ++ .../bazelinstallers/_swiftmodule.sh | 19 + .../bazelinstallers/indexstores.sh | 31 + .../bazelinstallers/install.sh | 77 ++ .../bazelinstallers/installer | 77 ++ .../bazelinstallers/lldb-settings.sh | 36 + .../bazelinstallers/swiftmodules.sh | 24 + .../project.pbxproj | 705 ++++++++++++++++++ .../contents.xcworkspacedata | 7 + .../xcshareddata/IDEWorkspaceChecks.plist | 8 + .../xcshareddata/WorkspaceSettings.xcsettings | 10 + .../xcshareddata/xcschemes/App.xcscheme | 90 +++ .../bazelinstallers/_indexstore.sh | 42 ++ .../bazelinstallers/_swiftmodule.sh | 19 + .../bazelinstallers/indexstores.sh | 31 + .../bazelinstallers/install.sh | 77 ++ .../bazelinstallers/installer | 77 ++ .../bazelinstallers/lldb-settings.sh | 36 + .../bazelinstallers/swiftmodules.sh | 24 + .../project.pbxproj | 513 +++++++++++++ .../contents.xcworkspacedata | 7 + .../xcshareddata/IDEWorkspaceChecks.plist | 8 + .../xcshareddata/WorkspaceSettings.xcsettings | 10 + .../xcshareddata/xcschemes/App.xcscheme | 90 +++ 29 files changed, 2120 insertions(+), 12 deletions(-) create mode 100644 tests/ios/app/FW2/FW.h create mode 100644 tests/ios/app/FW2/FW.m create mode 100755 tests/ios/xcodeproj/Test-MultipleConfigs-Project-WithTransitiveFlag.xcodeproj/bazelinstallers/_indexstore.sh create mode 100755 tests/ios/xcodeproj/Test-MultipleConfigs-Project-WithTransitiveFlag.xcodeproj/bazelinstallers/_swiftmodule.sh create mode 100755 tests/ios/xcodeproj/Test-MultipleConfigs-Project-WithTransitiveFlag.xcodeproj/bazelinstallers/indexstores.sh create mode 100755 tests/ios/xcodeproj/Test-MultipleConfigs-Project-WithTransitiveFlag.xcodeproj/bazelinstallers/install.sh create mode 100755 tests/ios/xcodeproj/Test-MultipleConfigs-Project-WithTransitiveFlag.xcodeproj/bazelinstallers/installer create mode 100755 tests/ios/xcodeproj/Test-MultipleConfigs-Project-WithTransitiveFlag.xcodeproj/bazelinstallers/lldb-settings.sh create mode 100755 tests/ios/xcodeproj/Test-MultipleConfigs-Project-WithTransitiveFlag.xcodeproj/bazelinstallers/swiftmodules.sh create mode 100755 tests/ios/xcodeproj/Test-MultipleConfigs-Project-WithTransitiveFlag.xcodeproj/project.pbxproj create mode 100755 tests/ios/xcodeproj/Test-MultipleConfigs-Project-WithTransitiveFlag.xcodeproj/project.xcworkspace/contents.xcworkspacedata create mode 100644 tests/ios/xcodeproj/Test-MultipleConfigs-Project-WithTransitiveFlag.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist create mode 100644 tests/ios/xcodeproj/Test-MultipleConfigs-Project-WithTransitiveFlag.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings create mode 100755 tests/ios/xcodeproj/Test-MultipleConfigs-Project-WithTransitiveFlag.xcodeproj/xcshareddata/xcschemes/App.xcscheme create mode 100755 tests/ios/xcodeproj/Test-MultipleConfigs-Project.xcodeproj/bazelinstallers/_indexstore.sh create mode 100755 tests/ios/xcodeproj/Test-MultipleConfigs-Project.xcodeproj/bazelinstallers/_swiftmodule.sh create mode 100755 tests/ios/xcodeproj/Test-MultipleConfigs-Project.xcodeproj/bazelinstallers/indexstores.sh create mode 100755 tests/ios/xcodeproj/Test-MultipleConfigs-Project.xcodeproj/bazelinstallers/install.sh create mode 100755 tests/ios/xcodeproj/Test-MultipleConfigs-Project.xcodeproj/bazelinstallers/installer create mode 100755 tests/ios/xcodeproj/Test-MultipleConfigs-Project.xcodeproj/bazelinstallers/lldb-settings.sh create mode 100755 tests/ios/xcodeproj/Test-MultipleConfigs-Project.xcodeproj/bazelinstallers/swiftmodules.sh create mode 100755 tests/ios/xcodeproj/Test-MultipleConfigs-Project.xcodeproj/project.pbxproj create mode 100755 tests/ios/xcodeproj/Test-MultipleConfigs-Project.xcodeproj/project.xcworkspace/contents.xcworkspacedata create mode 100644 tests/ios/xcodeproj/Test-MultipleConfigs-Project.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist create mode 100644 tests/ios/xcodeproj/Test-MultipleConfigs-Project.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings create mode 100755 tests/ios/xcodeproj/Test-MultipleConfigs-Project.xcodeproj/xcshareddata/xcschemes/App.xcscheme diff --git a/rules/xcodeproj.bzl b/rules/xcodeproj.bzl index 16dd1458c..be1be00a1 100644 --- a/rules/xcodeproj.bzl +++ b/rules/xcodeproj.bzl @@ -115,6 +115,7 @@ def _xcodeproj_aspect_impl(target, ctx): if test_host_target: test_host_appname = test_host_target[_TargetInfo].direct_targets[0].name + framework_includes = depset([], transitive = _get_attr_values_for_name(deps, _SrcsInfo, "framework_includes")) info = struct( name = bundle_info.bundle_name, bundle_id = bundle_info.bundle_id, @@ -124,7 +125,7 @@ def _xcodeproj_aspect_impl(target, ctx): srcs = depset([], transitive = _get_attr_values_for_name(deps, _SrcsInfo, "srcs")), non_arc_srcs = depset([], transitive = _get_attr_values_for_name(deps, _SrcsInfo, "non_arc_srcs")), asset_srcs = depset([], transitive = _get_attr_values_for_name(deps, _SrcsInfo, "asset_srcs")), - framework_includes = depset([], transitive = _get_attr_values_for_name(deps, _SrcsInfo, "framework_includes")), + framework_includes = framework_includes, cc_defines = depset([], transitive = _get_attr_values_for_name(deps, _SrcsInfo, "cc_defines")), swift_defines = depset([], transitive = _get_attr_values_for_name(deps, _SrcsInfo, "swift_defines")), build_files = depset(_srcs_info_build_files(ctx), transitive = _get_attr_values_for_name(deps, _SrcsInfo, "build_files")), @@ -397,7 +398,7 @@ env -u RUBYOPT -u RUBY_HOME -u GEM_HOME $BAZEL_BUILD_EXEC {bazel_build_target_na $BAZEL_INSTALLER """ -def _populate_xcodeproj_targets_and_schemes(ctx, targets, src_dot_dots): +def _populate_xcodeproj_targets_and_schemes(ctx, targets, src_dot_dots, all_transitive_targets): """Helper method to generate dicts for targets and schemes inside Xcode context Args: @@ -441,18 +442,20 @@ def _populate_xcodeproj_targets_and_schemes(ctx, targets, src_dot_dots): "CLANG_ENABLE_OBJC_ARC": "YES", } - # Just like framework, we need to have absolute path to the hmap files - # so that Objc files can correctly import headers - target_settings["HEADER_SEARCH_PATHS"] = _joined_header_search_paths( - target_info.hmap_paths.to_list(), - ) + all_hmaps = [] + for at in all_transitive_targets: + if at.name == target_name: + all_hmaps.extend(at.hmap_paths.to_list()) + target_settings["HEADER_SEARCH_PATHS"] = _joined_header_search_paths(all_hmaps) # Ensure Xcode will resolve references to the XCTest framework. framework_search_paths = ["$(PLATFORM_DIR)/Developer/Library/Frameworks"] - for fi in target_info.framework_includes.to_list(): - if fi[0] != "/": - fi = "$BAZEL_WORKSPACE_ROOT/%s" % fi - framework_search_paths.append("\"%s\"" % fi) + for at in all_transitive_targets: + if at.name == target_name: + for fi in at.framework_includes.to_list(): + if fi[0] != "/": + fi = "$BAZEL_WORKSPACE_ROOT/%s" % fi + framework_search_paths.append("\"%s\"" % fi) target_settings["FRAMEWORK_SEARCH_PATHS"] = " ".join(framework_search_paths) macros = ["\"%s\"" % d for d in target_info.cc_defines.to_list()] @@ -539,6 +542,7 @@ def _populate_xcodeproj_targets_and_schemes(ctx, targets, src_dot_dots): return (xcodeproj_targets_by_name, xcodeproj_schemes_by_name) def _xcodeproj_impl(ctx): + xcodegen_jsonfile = ctx.actions.declare_file( "%s-xcodegen.json" % ctx.attr.name, ) @@ -599,7 +603,7 @@ def _xcodeproj_impl(ctx): for t in _get_attr_values_for_name(ctx.attr.deps, _TargetInfo, "direct_targets"): targets.extend(t) - (xcodeproj_targets_by_name, xcodeproj_schemes_by_name) = _populate_xcodeproj_targets_and_schemes(ctx, targets, src_dot_dots) + (xcodeproj_targets_by_name, xcodeproj_schemes_by_name) = _populate_xcodeproj_targets_and_schemes(ctx, targets, src_dot_dots, all_transitive_targets) project_file_groups = [ {"path": paths.join(src_dot_dots, f.short_path), "optional": True} diff --git a/tests/ios/app/BUILD.bazel b/tests/ios/app/BUILD.bazel index e352630f0..cecd16608 100644 --- a/tests/ios/app/BUILD.bazel +++ b/tests/ios/app/BUILD.bazel @@ -6,6 +6,14 @@ apple_framework( name = "FW", srcs = glob(["FW/*"]), private_headers = glob(["FW/*_Private.*"]), + visibility = ["//visibility:public"], +) + +apple_framework( + name = "FW2", + srcs = glob(["FW2/*"]), + deps = [":FW"], + visibility = ["//visibility:public"], ) apple_framework( @@ -25,8 +33,10 @@ ios_application( deps = [ ":Empty", ":FW", + ":FW2", ":OnlySources", ], + visibility = ["//visibility:public"], ) ios_application( diff --git a/tests/ios/app/FW2/FW.h b/tests/ios/app/FW2/FW.h new file mode 100644 index 000000000..dd2446d48 --- /dev/null +++ b/tests/ios/app/FW2/FW.h @@ -0,0 +1,4 @@ +@import Foundation; + +@interface FW: NSObject +@end diff --git a/tests/ios/app/FW2/FW.m b/tests/ios/app/FW2/FW.m new file mode 100644 index 000000000..c451787e1 --- /dev/null +++ b/tests/ios/app/FW2/FW.m @@ -0,0 +1,5 @@ +#import + +@implementation FW + +@end diff --git a/tests/ios/xcodeproj/BUILD.bazel b/tests/ios/xcodeproj/BUILD.bazel index 3591683f2..da18842c0 100644 --- a/tests/ios/xcodeproj/BUILD.bazel +++ b/tests/ios/xcodeproj/BUILD.bazel @@ -28,6 +28,31 @@ xcodeproj( ], ) +xcodeproj( + name = "Test-MultipleConfigs-Project", + bazel_path = "bazelisk", + generate_schemes_for_product_types = ["application"], + include_transitive_targets = False, + deps = [ + "//tests/ios/app:FW", + "//tests/ios/app:FW2", + "//tests/ios/app:App", + ], +) + +xcodeproj( + name = "Test-MultipleConfigs-Project-WithTransitiveFlag", + bazel_path = "bazelisk", + generate_schemes_for_product_types = ["application"], + include_transitive_targets = True, + deps = [ + "//tests/ios/app:FW", + "//tests/ios/app:FW2", + "//tests/ios/app:App", + ], +) + + # Test that the test_host is included when using "include_transitive_targets = True" xcodeproj( name = "Test-With-Host-App", diff --git a/tests/ios/xcodeproj/Test-MultipleConfigs-Project-WithTransitiveFlag.xcodeproj/bazelinstallers/_indexstore.sh b/tests/ios/xcodeproj/Test-MultipleConfigs-Project-WithTransitiveFlag.xcodeproj/bazelinstallers/_indexstore.sh new file mode 100755 index 000000000..36fe20ad3 --- /dev/null +++ b/tests/ios/xcodeproj/Test-MultipleConfigs-Project-WithTransitiveFlag.xcodeproj/bazelinstallers/_indexstore.sh @@ -0,0 +1,42 @@ +#!/bin/bash + +set -euo pipefail + +# Import Bazel built indexstores into Xcode. See https://github.com/lyft/index-import +# +# This makes use of a number of Xcode's provided environment variables. These +# file remappings are not specific to this project, the apply to all projects +# built with Bazel and rules_swift. + +# Example: /private/var/tmp/_bazel_//execroot/ +readonly bazel_root="^/private/var/tmp/_bazel_.+?/.+?/execroot/[^/]+" +readonly bazel_bin="^(?:$bazel_root/)?bazel-out/.+?/bin" + +# Object file paths are fundamental to how Xcode loads from the indexstore. If +# the `OutputFile` does not match what Xcode looks for, then those parts of the +# indexstore will not be found and used. +readonly bazel_swift_object="$bazel_bin/.*/(.+?)(?:_swift)?_objs/.*/(.+?)[.]swift[.]o$" +readonly bazel_objc_object="$bazel_bin/.*/_objs/(?:arc/|non_arc/)?(.+?)-(?:objc|cpp)/(.+?)[.]o$" +readonly xcode_object="$CONFIGURATION_TEMP_DIR/\$1.build/Objects-normal/$ARCHS/\$2.o" + +# Bazel built `.swiftmodule` files are copied to `DerivedData`. Since modules +# are referenced by indexstores, their paths are remapped. +readonly bazel_module="$bazel_bin/.*/(.+?)[.]swiftmodule$" +readonly xcode_module="$BUILT_PRODUCTS_DIR/\$1.swiftmodule/$ARCHS.swiftmodule" + +# External dependencies are available via the `bazel-` symlink. +# This remapping, in combination with `xcode-index-preferences.json`, enables +# index features for external dependencies, such as jump-to-definition. +readonly bazel_external="$bazel_root/external" +readonly xcode_external="$BAZEL_WORKSPACE_ROOT/bazel-$(basename "$SRCROOT")/external" + + +$BAZEL_INSTALLERS_DIR/index-import \ + -remap "$bazel_module=$xcode_module" \ + -remap "$bazel_swift_object=$xcode_object" \ + -remap "$bazel_objc_object=$xcode_object" \ + -remap "$bazel_external=$xcode_external" \ + -remap "$bazel_root=$BAZEL_WORKSPACE_ROOT" \ + -remap "^([^//])=$BAZEL_WORKSPACE_ROOT/\$1" \ + "$@" \ + "$BUILD_DIR"/../../Index/DataStore diff --git a/tests/ios/xcodeproj/Test-MultipleConfigs-Project-WithTransitiveFlag.xcodeproj/bazelinstallers/_swiftmodule.sh b/tests/ios/xcodeproj/Test-MultipleConfigs-Project-WithTransitiveFlag.xcodeproj/bazelinstallers/_swiftmodule.sh new file mode 100755 index 000000000..c974cfb3e --- /dev/null +++ b/tests/ios/xcodeproj/Test-MultipleConfigs-Project-WithTransitiveFlag.xcodeproj/bazelinstallers/_swiftmodule.sh @@ -0,0 +1,19 @@ +#!/bin/bash + +set -euo pipefail + +for module in "$@"; do + doc="${module%.swiftmodule}.swiftdoc" + module_name=$(basename "$module") + module_bundle="$BUILT_PRODUCTS_DIR/$module_name" + mkdir -p "$module_bundle" + + cp "$module" "$module_bundle/$NATIVE_ARCH_ACTUAL.swiftmodule" + cp "$doc" "$module_bundle/$NATIVE_ARCH_ACTUAL.swiftdoc" + + ios_module_name="$NATIVE_ARCH_ACTUAL-$LLVM_TARGET_TRIPLE_VENDOR-$SWIFT_PLATFORM_TARGET_PREFIX$LLVM_TARGET_TRIPLE_SUFFIX" + cp "$module" "$module_bundle/$ios_module_name.swiftmodule" + cp "$doc" "$module_bundle/$ios_module_name.swiftdoc" + + chmod -R +w "$module_bundle" +done diff --git a/tests/ios/xcodeproj/Test-MultipleConfigs-Project-WithTransitiveFlag.xcodeproj/bazelinstallers/indexstores.sh b/tests/ios/xcodeproj/Test-MultipleConfigs-Project-WithTransitiveFlag.xcodeproj/bazelinstallers/indexstores.sh new file mode 100755 index 000000000..7f174d878 --- /dev/null +++ b/tests/ios/xcodeproj/Test-MultipleConfigs-Project-WithTransitiveFlag.xcodeproj/bazelinstallers/indexstores.sh @@ -0,0 +1,31 @@ +#!/bin/bash + +set -euo pipefail + +# See `_indexstore.sh` for full details. + +echo "Start remapping index files at `date`" + +FOUND_INDEXSTORES=`pcregrep -o1 'command_line: "(.*\.indexstore)' $BAZEL_BUILD_EVENT_TEXT_FILENAME | uniq` + +declare -a EXISTING_INDEXSTORES=() +for i in $FOUND_INDEXSTORES +do + if [ -d $i ] + then + EXISTING_INDEXSTORES+=($i) + fi +done + +echo "Found ${#EXISTING_INDEXSTORES[@]} existing indexstores" + +if [ ${#EXISTING_INDEXSTORES[@]} -ne 0 ] +then + "$BAZEL_INSTALLERS_DIR/_indexstore.sh" ${EXISTING_INDEXSTORES[*]} +else + echo "No indexstores found" +fi + +echo "Finish remapping index files at `date`" + +ls -ltR $BUILD_DIR/../../Index/DataStore/ > $BAZEL_DIAGNOSTICS_DIR/indexstores-contents-$DATE_SUFFIX.log diff --git a/tests/ios/xcodeproj/Test-MultipleConfigs-Project-WithTransitiveFlag.xcodeproj/bazelinstallers/install.sh b/tests/ios/xcodeproj/Test-MultipleConfigs-Project-WithTransitiveFlag.xcodeproj/bazelinstallers/install.sh new file mode 100755 index 000000000..830b7d3eb --- /dev/null +++ b/tests/ios/xcodeproj/Test-MultipleConfigs-Project-WithTransitiveFlag.xcodeproj/bazelinstallers/install.sh @@ -0,0 +1,77 @@ +#!/bin/bash + +# Install the runnable products so that Xcode can run it. This includes `.app`s, +# `.xctest`s, and also command line binaries. + +set -eux + +# Delete all logfiles that are older than 7 days +find "${BAZEL_DIAGNOSTICS_DIR}" -type f -atime +7d -delete + +case "${PRODUCT_TYPE}" in + com.apple.product-type.framework) + input_options=("bazel-bin/$BAZEL_BIN_SUBDIR/${TARGET_NAME}/${FULL_PRODUCT_NAME}") + ;; + com.apple.product-type.framework.static) + # For static library, as the output is not under bazel-bin, we have to get it based on build event + # Example of such entry inside build event: + # important_output { + # name: ".../SomeFramework.framework/SomeFramework" + # uri: "file:///private/var/tmp/.../.../SomeFramework.framework/SomeFramework" + # path_prefix:... + # ... + # } + # We only care about the entry ending with TARGET_NAME" so that we can get the path to its directory + QUERY=`grep -A 2 important_output "$BAZEL_BUILD_EVENT_TEXT_FILENAME" | grep -w uri | grep ${TARGET_NAME}\" | sed "s/uri: \"file:\/\///"` + if [[ -z $QUERY ]]; then + echo "Unable to locate resource for framework of ${TARGET_NAME}" + exit 1 + fi + input_options=($(dirname "${QUERY}")) + ;; + com.apple.product-type.bundle.unit-test) + input_options=("bazel-bin/$BAZEL_BIN_SUBDIR/${FULL_PRODUCT_NAME}" "bazel-bin/$BAZEL_BIN_SUBDIR/$TARGET_NAME.__internal__.__test_bundle_archive-root/$TARGET_NAME${WRAPPER_SUFFIX:-}") + ;; + com.apple.product-type.application) + input_options=("bazel-bin/$BAZEL_BIN_SUBDIR/${FULL_PRODUCT_NAME}" "bazel-bin/$BAZEL_BIN_SUBDIR/${TARGET_NAME}_archive-root/Payload/$TARGET_NAME${WRAPPER_SUFFIX:-}") + ;; + *) + echo "Error: Installing ${TARGET_NAME} of type ${PRODUCT_TYPE} is unsupported" >&2 + exit 1 + ;; +esac +output="$TARGET_BUILD_DIR/$FULL_PRODUCT_NAME" + +mkdir -p "$(dirname "$output")" + +for input in "${input_options[@]}"; do + if [[ -z $input ]] || [ $input = "." ] || [ $input = "/" ]; then + # rsync can be a dangerous operation when it tries to copy entire root dir into the $output + echo "Error: illegal input \"${input}\" for installing ${TARGET_NAME} of type ${PRODUCT_TYPE}" >&2 + exit 1 + fi + if [[ -d $input ]]; then + # Copy bundle contents, into the destination bundle. + # This avoids self-nesting, like: Foo.app/Foo.app + input+="/" + else + continue + fi + + rsync \ + --recursive --chmod=u+w --delete \ + "$input" "$output" > "$BAZEL_DIAGNOSTICS_DIR"/rsync-stdout-"$DATE_SUFFIX".log 2> "$BAZEL_DIAGNOSTICS_DIR"/rsync-stderr-"$DATE_SUFFIX".log + break +done + +if [[ ! -d $output ]]; then + echo "error: failed to find $FULL_PRODUCT_NAME in expected locations: ${input_options[*]}" + exit 1 +fi + +"$BAZEL_INSTALLERS_DIR"/lldb-settings.sh > "$BAZEL_DIAGNOSTICS_DIR"/lldb-stdout-"$DATE_SUFFIX".log 2> "$BAZEL_DIAGNOSTICS_DIR"/lldb-stderr-"$DATE_SUFFIX".log + +# Part of the build intermediary output will be swiftmodule files +# which XCode will use for indexing. Let's keep those. +"$BAZEL_INSTALLERS_DIR"/swiftmodules.sh > "$BAZEL_DIAGNOSTICS_DIR"/swiftmodules-stdout-"$DATE_SUFFIX".log 2> "$BAZEL_DIAGNOSTICS_DIR"/swiftmodules-stderr-"$DATE_SUFFIX".log & +"$BAZEL_INSTALLERS_DIR"/indexstores.sh > "$BAZEL_DIAGNOSTICS_DIR"/indexstores-stdout-"$DATE_SUFFIX".log 2> "$BAZEL_DIAGNOSTICS_DIR"/indexstores-stderr-"$DATE_SUFFIX".log & diff --git a/tests/ios/xcodeproj/Test-MultipleConfigs-Project-WithTransitiveFlag.xcodeproj/bazelinstallers/installer b/tests/ios/xcodeproj/Test-MultipleConfigs-Project-WithTransitiveFlag.xcodeproj/bazelinstallers/installer new file mode 100755 index 000000000..830b7d3eb --- /dev/null +++ b/tests/ios/xcodeproj/Test-MultipleConfigs-Project-WithTransitiveFlag.xcodeproj/bazelinstallers/installer @@ -0,0 +1,77 @@ +#!/bin/bash + +# Install the runnable products so that Xcode can run it. This includes `.app`s, +# `.xctest`s, and also command line binaries. + +set -eux + +# Delete all logfiles that are older than 7 days +find "${BAZEL_DIAGNOSTICS_DIR}" -type f -atime +7d -delete + +case "${PRODUCT_TYPE}" in + com.apple.product-type.framework) + input_options=("bazel-bin/$BAZEL_BIN_SUBDIR/${TARGET_NAME}/${FULL_PRODUCT_NAME}") + ;; + com.apple.product-type.framework.static) + # For static library, as the output is not under bazel-bin, we have to get it based on build event + # Example of such entry inside build event: + # important_output { + # name: ".../SomeFramework.framework/SomeFramework" + # uri: "file:///private/var/tmp/.../.../SomeFramework.framework/SomeFramework" + # path_prefix:... + # ... + # } + # We only care about the entry ending with TARGET_NAME" so that we can get the path to its directory + QUERY=`grep -A 2 important_output "$BAZEL_BUILD_EVENT_TEXT_FILENAME" | grep -w uri | grep ${TARGET_NAME}\" | sed "s/uri: \"file:\/\///"` + if [[ -z $QUERY ]]; then + echo "Unable to locate resource for framework of ${TARGET_NAME}" + exit 1 + fi + input_options=($(dirname "${QUERY}")) + ;; + com.apple.product-type.bundle.unit-test) + input_options=("bazel-bin/$BAZEL_BIN_SUBDIR/${FULL_PRODUCT_NAME}" "bazel-bin/$BAZEL_BIN_SUBDIR/$TARGET_NAME.__internal__.__test_bundle_archive-root/$TARGET_NAME${WRAPPER_SUFFIX:-}") + ;; + com.apple.product-type.application) + input_options=("bazel-bin/$BAZEL_BIN_SUBDIR/${FULL_PRODUCT_NAME}" "bazel-bin/$BAZEL_BIN_SUBDIR/${TARGET_NAME}_archive-root/Payload/$TARGET_NAME${WRAPPER_SUFFIX:-}") + ;; + *) + echo "Error: Installing ${TARGET_NAME} of type ${PRODUCT_TYPE} is unsupported" >&2 + exit 1 + ;; +esac +output="$TARGET_BUILD_DIR/$FULL_PRODUCT_NAME" + +mkdir -p "$(dirname "$output")" + +for input in "${input_options[@]}"; do + if [[ -z $input ]] || [ $input = "." ] || [ $input = "/" ]; then + # rsync can be a dangerous operation when it tries to copy entire root dir into the $output + echo "Error: illegal input \"${input}\" for installing ${TARGET_NAME} of type ${PRODUCT_TYPE}" >&2 + exit 1 + fi + if [[ -d $input ]]; then + # Copy bundle contents, into the destination bundle. + # This avoids self-nesting, like: Foo.app/Foo.app + input+="/" + else + continue + fi + + rsync \ + --recursive --chmod=u+w --delete \ + "$input" "$output" > "$BAZEL_DIAGNOSTICS_DIR"/rsync-stdout-"$DATE_SUFFIX".log 2> "$BAZEL_DIAGNOSTICS_DIR"/rsync-stderr-"$DATE_SUFFIX".log + break +done + +if [[ ! -d $output ]]; then + echo "error: failed to find $FULL_PRODUCT_NAME in expected locations: ${input_options[*]}" + exit 1 +fi + +"$BAZEL_INSTALLERS_DIR"/lldb-settings.sh > "$BAZEL_DIAGNOSTICS_DIR"/lldb-stdout-"$DATE_SUFFIX".log 2> "$BAZEL_DIAGNOSTICS_DIR"/lldb-stderr-"$DATE_SUFFIX".log + +# Part of the build intermediary output will be swiftmodule files +# which XCode will use for indexing. Let's keep those. +"$BAZEL_INSTALLERS_DIR"/swiftmodules.sh > "$BAZEL_DIAGNOSTICS_DIR"/swiftmodules-stdout-"$DATE_SUFFIX".log 2> "$BAZEL_DIAGNOSTICS_DIR"/swiftmodules-stderr-"$DATE_SUFFIX".log & +"$BAZEL_INSTALLERS_DIR"/indexstores.sh > "$BAZEL_DIAGNOSTICS_DIR"/indexstores-stdout-"$DATE_SUFFIX".log 2> "$BAZEL_DIAGNOSTICS_DIR"/indexstores-stderr-"$DATE_SUFFIX".log & diff --git a/tests/ios/xcodeproj/Test-MultipleConfigs-Project-WithTransitiveFlag.xcodeproj/bazelinstallers/lldb-settings.sh b/tests/ios/xcodeproj/Test-MultipleConfigs-Project-WithTransitiveFlag.xcodeproj/bazelinstallers/lldb-settings.sh new file mode 100755 index 000000000..bc280dfab --- /dev/null +++ b/tests/ios/xcodeproj/Test-MultipleConfigs-Project-WithTransitiveFlag.xcodeproj/bazelinstallers/lldb-settings.sh @@ -0,0 +1,36 @@ +#!/bin/bash + +set -euo pipefail + + +# Bazel uses `-debug-prefix-map` to strip the bazel build directory from the +# paths embedded in debug info. This means the debug info contains _project +# relative_ paths instead of Bazel absolute paths. +# +# However, Xcode sets breakpoints via _project absolute_ paths, which are not +# the paths in the debug info. This lldb setting ensures that _project relative_ +# paths are remapped to _project absolute_ paths. +# +# NOTE: In order to use this, add this line to `~/.lldbinit`: +# +# command source ~/.lldbinit-source-map +cat <<-END > ~/.lldbinit-source-map +settings set target.source-map ./ "$BAZEL_WORKSPACE_ROOT/" +settings set target.sdk-path $SDKROOT +settings set target.swift-framework-search-paths $FRAMEWORK_SEARCH_PATHS +END + +if [[ -n ${BAZEL_LLDB_SWIFT_EXTRA_CLANG_FLAGS:-} ]] +then + cat <<-END >> ~/.lldbinit-source-map +settings set -- target.swift-extra-clang-flags $BAZEL_LLDB_SWIFT_EXTRA_CLANG_FLAGS +END +fi + +BAZEL_EXTERNAL_DIRNAME="$BAZEL_WORKSPACE_ROOT/bazel-$(basename "$BAZEL_WORKSPACE_ROOT")/external" +if [ -d "$BAZEL_EXTERNAL_DIRNAME" ] +then + cat <<-END >> ~/.lldbinit-source-map +settings append target.source-map ./external/ "$BAZEL_EXTERNAL_DIRNAME" +END +fi diff --git a/tests/ios/xcodeproj/Test-MultipleConfigs-Project-WithTransitiveFlag.xcodeproj/bazelinstallers/swiftmodules.sh b/tests/ios/xcodeproj/Test-MultipleConfigs-Project-WithTransitiveFlag.xcodeproj/bazelinstallers/swiftmodules.sh new file mode 100755 index 000000000..92e5c4483 --- /dev/null +++ b/tests/ios/xcodeproj/Test-MultipleConfigs-Project-WithTransitiveFlag.xcodeproj/bazelinstallers/swiftmodules.sh @@ -0,0 +1,24 @@ +#!/bin/bash + +set -euo pipefail + +# Copy Bazel build `.swiftmodule` files to `DerivedData`. This is used by Xcode +# and its indexing. +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/tests/ios/xcodeproj/Test-MultipleConfigs-Project-WithTransitiveFlag.xcodeproj/project.pbxproj b/tests/ios/xcodeproj/Test-MultipleConfigs-Project-WithTransitiveFlag.xcodeproj/project.pbxproj new file mode 100755 index 000000000..9924cb7ed --- /dev/null +++ b/tests/ios/xcodeproj/Test-MultipleConfigs-Project-WithTransitiveFlag.xcodeproj/project.pbxproj @@ -0,0 +1,705 @@ +// !$*UTF8*$! +{ + archiveVersion = 1; + classes = { + }; + objectVersion = 51; + objects = { + +/* Begin PBXBuildFile section */ + 102BD1F0256A0C412AFC03E4 /* FW.m in Sources */ = {isa = PBXBuildFile; fileRef = 04D8C347E5F20AB550C507AE /* FW.m */; }; + 3DF73FAD53D0A91C9EFE99C4 /* OnlySources.m in Sources */ = {isa = PBXBuildFile; fileRef = 4A3A80773667B3313649167E /* OnlySources.m */; }; + 4DE0BDAA19658FF59165F380 /* FW_Private.h in Headers */ = {isa = PBXBuildFile; fileRef = 948A9DA2AB9E07E95A7A1F12 /* FW_Private.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 760C0061CEA9636469AC6674 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = C2E414444C372DCF13A567DB /* main.m */; }; + D750AE4E7C2A09F749D7E8E3 /* FW.m in Sources */ = {isa = PBXBuildFile; fileRef = 2DB245884E4114A9968C9EE7 /* FW.m */; }; +/* End PBXBuildFile section */ + +/* Begin PBXFileReference section */ + 04D8C347E5F20AB550C507AE /* FW.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = FW.m; sourceTree = ""; }; + 04E88991827262C51A711BEC /* common.pch */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = common.pch; sourceTree = ""; }; + 07774DB019275D39308A1548 /* FW2.framework */ = {isa = PBXFileReference; includeInIndex = 0; lastKnownFileType = wrapper.framework; path = FW2.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 1463668723465C798E673230 /* FW.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = FW.h; sourceTree = ""; }; + 2DB245884E4114A9968C9EE7 /* FW.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = FW.m; sourceTree = ""; }; + 39477307F8DF86D918747B9F /* BUILD.bazel */ = {isa = PBXFileReference; path = BUILD.bazel; sourceTree = ""; }; + 4A3A80773667B3313649167E /* OnlySources.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = OnlySources.m; sourceTree = ""; }; + 5A5DD8D99887CD20B0A3D7A1 /* App.app */ = {isa = PBXFileReference; includeInIndex = 0; lastKnownFileType = wrapper.application; path = App.app; sourceTree = BUILT_PRODUCTS_DIR; }; + 6EDE37267EB0CACA47C4C406 /* Empty.framework */ = {isa = PBXFileReference; includeInIndex = 0; lastKnownFileType = wrapper.framework; path = Empty.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 948A9DA2AB9E07E95A7A1F12 /* FW_Private.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = FW_Private.h; sourceTree = ""; }; + A75BF5BF59112DC3CF68ACB0 /* FW.framework */ = {isa = PBXFileReference; includeInIndex = 0; lastKnownFileType = wrapper.framework; path = FW.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + C2E414444C372DCF13A567DB /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = ""; }; + D4B2D23966A6F3D38D9278D6 /* FW.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = FW.h; sourceTree = ""; }; + FDFA25BC92149ED0819B1D1C /* OnlySources.framework */ = {isa = PBXFileReference; includeInIndex = 0; lastKnownFileType = wrapper.framework; path = OnlySources.framework; sourceTree = BUILT_PRODUCTS_DIR; }; +/* End PBXFileReference section */ + +/* Begin PBXGroup section */ + 2D2D895AE338EB9595893FEC /* Products */ = { + isa = PBXGroup; + children = ( + 5A5DD8D99887CD20B0A3D7A1 /* App.app */, + 6EDE37267EB0CACA47C4C406 /* Empty.framework */, + A75BF5BF59112DC3CF68ACB0 /* FW.framework */, + 07774DB019275D39308A1548 /* FW2.framework */, + FDFA25BC92149ED0819B1D1C /* OnlySources.framework */, + ); + name = Products; + sourceTree = ""; + }; + 2DF7D0D0E95B3893248C7261 /* rules */ = { + isa = PBXGroup; + children = ( + FB729A68E8C9E0AA5EC5B3CF /* library */, + ); + path = rules; + sourceTree = ""; + }; + 37056929C3E5B1D45B7ADB22 = { + isa = PBXGroup; + children = ( + FF6E776994AA685DB884266A /* build_bazel_rules_ios */, + 2D2D895AE338EB9595893FEC /* Products */, + ); + sourceTree = ""; + }; + 45BEFF852D6FC48F9F0FAE63 /* tests */ = { + isa = PBXGroup; + children = ( + D2F628667BF1DE168029F9B1 /* ios */, + ); + path = tests; + sourceTree = ""; + }; + A7D52DE6FB3C195998617569 /* OnlySources */ = { + isa = PBXGroup; + children = ( + 4A3A80773667B3313649167E /* OnlySources.m */, + ); + path = OnlySources; + sourceTree = ""; + }; + BFC4E81AACCD33E2DE624F04 /* App */ = { + isa = PBXGroup; + children = ( + C2E414444C372DCF13A567DB /* main.m */, + ); + path = App; + sourceTree = ""; + }; + D2F628667BF1DE168029F9B1 /* ios */ = { + isa = PBXGroup; + children = ( + D4A18C8707D64A0B844CA10A /* app */, + ); + path = ios; + sourceTree = ""; + }; + D4A18C8707D64A0B844CA10A /* app */ = { + isa = PBXGroup; + children = ( + BFC4E81AACCD33E2DE624F04 /* App */, + 39477307F8DF86D918747B9F /* BUILD.bazel */, + F1148781187BE083F44488DF /* FW */, + FCAD8185F6E9497488EC0EA8 /* FW2 */, + A7D52DE6FB3C195998617569 /* OnlySources */, + ); + path = app; + sourceTree = ""; + }; + F1148781187BE083F44488DF /* FW */ = { + isa = PBXGroup; + children = ( + 948A9DA2AB9E07E95A7A1F12 /* FW_Private.h */, + 1463668723465C798E673230 /* FW.h */, + 04D8C347E5F20AB550C507AE /* FW.m */, + ); + path = FW; + sourceTree = ""; + }; + FB729A68E8C9E0AA5EC5B3CF /* library */ = { + isa = PBXGroup; + children = ( + 04E88991827262C51A711BEC /* common.pch */, + ); + path = library; + sourceTree = ""; + }; + FCAD8185F6E9497488EC0EA8 /* FW2 */ = { + isa = PBXGroup; + children = ( + D4B2D23966A6F3D38D9278D6 /* FW.h */, + 2DB245884E4114A9968C9EE7 /* FW.m */, + ); + path = FW2; + sourceTree = ""; + }; + FF6E776994AA685DB884266A /* build_bazel_rules_ios */ = { + isa = PBXGroup; + children = ( + 2DF7D0D0E95B3893248C7261 /* rules */, + 45BEFF852D6FC48F9F0FAE63 /* tests */, + ); + name = build_bazel_rules_ios; + path = ../../..; + sourceTree = ""; + }; +/* End PBXGroup section */ + +/* Begin PBXHeadersBuildPhase section */ + FF1BC9CBA54D22D77739A87A /* Headers */ = { + isa = PBXHeadersBuildPhase; + buildActionMask = 2147483647; + files = ( + 4DE0BDAA19658FF59165F380 /* FW_Private.h in Headers */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXHeadersBuildPhase section */ + +/* Begin PBXNativeTarget section */ + 19CFCE12EE4A1C14C5132B34 /* App */ = { + isa = PBXNativeTarget; + buildConfigurationList = 71570EA8E216FD7C9313C564 /* Build configuration list for PBXNativeTarget "App" */; + buildPhases = ( + 9E89E4246CE90C8A39F72559 /* Build with bazel */, + 0E79EB51AAB01D083BEAA39D /* Sources */, + ); + buildRules = ( + ); + dependencies = ( + ); + name = App; + productName = App; + productReference = 5A5DD8D99887CD20B0A3D7A1 /* App.app */; + productType = "com.apple.product-type.application"; + }; + 4C6498C464AEEF9633C48C60 /* OnlySources */ = { + isa = PBXNativeTarget; + buildConfigurationList = E5F95071646F4E22E9B8AA72 /* Build configuration list for PBXNativeTarget "OnlySources" */; + buildPhases = ( + 7F715EC825110328503776DD /* Build with bazel */, + E26AA9EAB86831CBA247CE7A /* Sources */, + ); + buildRules = ( + ); + dependencies = ( + ); + name = OnlySources; + productName = OnlySources; + productReference = FDFA25BC92149ED0819B1D1C /* OnlySources.framework */; + productType = "com.apple.product-type.framework.static"; + }; + C9669E8D3E558DA5D6636AEF /* Empty */ = { + isa = PBXNativeTarget; + buildConfigurationList = A8457733EC58BE42D11419E4 /* Build configuration list for PBXNativeTarget "Empty" */; + buildPhases = ( + 1C54E9B814B347833D3EDFB7 /* Build with bazel */, + 5D1EBADCFB431E5A69890D1B /* Sources */, + ); + buildRules = ( + ); + dependencies = ( + ); + name = Empty; + productName = Empty; + productReference = 6EDE37267EB0CACA47C4C406 /* Empty.framework */; + productType = "com.apple.product-type.framework.static"; + }; + E2830301AB976A38E63AF1EE /* FW */ = { + isa = PBXNativeTarget; + buildConfigurationList = 225C9557C0DFB668662FE03A /* Build configuration list for PBXNativeTarget "FW" */; + buildPhases = ( + 2810B51CEA30355A80B0CFA5 /* Build with bazel */, + FF1BC9CBA54D22D77739A87A /* Headers */, + 434676F72A64548514D25CE6 /* Sources */, + ); + buildRules = ( + ); + dependencies = ( + ); + name = FW; + productName = FW; + productReference = A75BF5BF59112DC3CF68ACB0 /* FW.framework */; + productType = "com.apple.product-type.framework.static"; + }; + F69743083419364855A71D16 /* FW2 */ = { + isa = PBXNativeTarget; + buildConfigurationList = 22A228CF6C3A4A587D43ABAB /* Build configuration list for PBXNativeTarget "FW2" */; + buildPhases = ( + A03879998C89411146782C6B /* Build with bazel */, + B64EE1BDEE56C3ED339C9C42 /* Sources */, + ); + buildRules = ( + ); + dependencies = ( + ); + name = FW2; + productName = FW2; + productReference = 07774DB019275D39308A1548 /* FW2.framework */; + productType = "com.apple.product-type.framework.static"; + }; +/* End PBXNativeTarget section */ + +/* Begin PBXProject section */ + 1F5BC3835C61A6EFE62F69DA /* Project object */ = { + isa = PBXProject; + attributes = { + LastUpgradeCheck = 1020; + TargetAttributes = { + }; + }; + buildConfigurationList = 3581A136657805C705D66861 /* Build configuration list for PBXProject "Test-MultipleConfigs-Project-WithTransitiveFlag" */; + compatibilityVersion = "Xcode 10.0"; + developmentRegion = en; + hasScannedForEncodings = 0; + knownRegions = ( + en, + ); + mainGroup = 37056929C3E5B1D45B7ADB22; + projectDirPath = ""; + projectRoot = ""; + targets = ( + 19CFCE12EE4A1C14C5132B34 /* App */, + C9669E8D3E558DA5D6636AEF /* Empty */, + E2830301AB976A38E63AF1EE /* FW */, + F69743083419364855A71D16 /* FW2 */, + 4C6498C464AEEF9633C48C60 /* OnlySources */, + ); + }; +/* End PBXProject section */ + +/* Begin PBXShellScriptBuildPhase section */ + 1C54E9B814B347833D3EDFB7 /* Build with bazel */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + ); + inputPaths = ( + ); + name = "Build with bazel"; + outputFileListPaths = ( + ); + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "\nset -euxo pipefail\ncd $BAZEL_WORKSPACE_ROOT\n\nexport BAZEL_DIAGNOSTICS_DIR=\"$BUILD_DIR/../../bazel-xcode-diagnostics/\"\nmkdir -p $BAZEL_DIAGNOSTICS_DIR\nexport DATE_SUFFIX=\"$(date +%Y%m%d.%H%M%S%L)\"\nexport BAZEL_BUILD_EVENT_TEXT_FILENAME=\"$BAZEL_DIAGNOSTICS_DIR/build-event-$DATE_SUFFIX.txt\"\nexport BAZEL_BUILD_EXECUTION_LOG_FILENAME=\"$BAZEL_DIAGNOSTICS_DIR/build-execution-log-$DATE_SUFFIX.log\"\nenv -u RUBYOPT -u RUBY_HOME -u GEM_HOME $BAZEL_BUILD_EXEC tests/ios/app:Empty\n$BAZEL_INSTALLER\n"; + }; + 2810B51CEA30355A80B0CFA5 /* Build with bazel */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + ); + inputPaths = ( + ); + name = "Build with bazel"; + outputFileListPaths = ( + ); + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "\nset -euxo pipefail\ncd $BAZEL_WORKSPACE_ROOT\n\nexport BAZEL_DIAGNOSTICS_DIR=\"$BUILD_DIR/../../bazel-xcode-diagnostics/\"\nmkdir -p $BAZEL_DIAGNOSTICS_DIR\nexport DATE_SUFFIX=\"$(date +%Y%m%d.%H%M%S%L)\"\nexport BAZEL_BUILD_EVENT_TEXT_FILENAME=\"$BAZEL_DIAGNOSTICS_DIR/build-event-$DATE_SUFFIX.txt\"\nexport BAZEL_BUILD_EXECUTION_LOG_FILENAME=\"$BAZEL_DIAGNOSTICS_DIR/build-execution-log-$DATE_SUFFIX.log\"\nenv -u RUBYOPT -u RUBY_HOME -u GEM_HOME $BAZEL_BUILD_EXEC tests/ios/app:FW\n$BAZEL_INSTALLER\n"; + }; + 7F715EC825110328503776DD /* Build with bazel */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + ); + inputPaths = ( + ); + name = "Build with bazel"; + outputFileListPaths = ( + ); + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "\nset -euxo pipefail\ncd $BAZEL_WORKSPACE_ROOT\n\nexport BAZEL_DIAGNOSTICS_DIR=\"$BUILD_DIR/../../bazel-xcode-diagnostics/\"\nmkdir -p $BAZEL_DIAGNOSTICS_DIR\nexport DATE_SUFFIX=\"$(date +%Y%m%d.%H%M%S%L)\"\nexport BAZEL_BUILD_EVENT_TEXT_FILENAME=\"$BAZEL_DIAGNOSTICS_DIR/build-event-$DATE_SUFFIX.txt\"\nexport BAZEL_BUILD_EXECUTION_LOG_FILENAME=\"$BAZEL_DIAGNOSTICS_DIR/build-execution-log-$DATE_SUFFIX.log\"\nenv -u RUBYOPT -u RUBY_HOME -u GEM_HOME $BAZEL_BUILD_EXEC tests/ios/app:OnlySources\n$BAZEL_INSTALLER\n"; + }; + 9E89E4246CE90C8A39F72559 /* Build with bazel */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + ); + inputPaths = ( + ); + name = "Build with bazel"; + outputFileListPaths = ( + ); + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "\nset -euxo pipefail\ncd $BAZEL_WORKSPACE_ROOT\n\nexport BAZEL_DIAGNOSTICS_DIR=\"$BUILD_DIR/../../bazel-xcode-diagnostics/\"\nmkdir -p $BAZEL_DIAGNOSTICS_DIR\nexport DATE_SUFFIX=\"$(date +%Y%m%d.%H%M%S%L)\"\nexport BAZEL_BUILD_EVENT_TEXT_FILENAME=\"$BAZEL_DIAGNOSTICS_DIR/build-event-$DATE_SUFFIX.txt\"\nexport BAZEL_BUILD_EXECUTION_LOG_FILENAME=\"$BAZEL_DIAGNOSTICS_DIR/build-execution-log-$DATE_SUFFIX.log\"\nenv -u RUBYOPT -u RUBY_HOME -u GEM_HOME $BAZEL_BUILD_EXEC tests/ios/app:App\n$BAZEL_INSTALLER\n"; + }; + A03879998C89411146782C6B /* Build with bazel */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + ); + inputPaths = ( + ); + name = "Build with bazel"; + outputFileListPaths = ( + ); + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "\nset -euxo pipefail\ncd $BAZEL_WORKSPACE_ROOT\n\nexport BAZEL_DIAGNOSTICS_DIR=\"$BUILD_DIR/../../bazel-xcode-diagnostics/\"\nmkdir -p $BAZEL_DIAGNOSTICS_DIR\nexport DATE_SUFFIX=\"$(date +%Y%m%d.%H%M%S%L)\"\nexport BAZEL_BUILD_EVENT_TEXT_FILENAME=\"$BAZEL_DIAGNOSTICS_DIR/build-event-$DATE_SUFFIX.txt\"\nexport BAZEL_BUILD_EXECUTION_LOG_FILENAME=\"$BAZEL_DIAGNOSTICS_DIR/build-execution-log-$DATE_SUFFIX.log\"\nenv -u RUBYOPT -u RUBY_HOME -u GEM_HOME $BAZEL_BUILD_EXEC tests/ios/app:FW2\n$BAZEL_INSTALLER\n"; + }; +/* End PBXShellScriptBuildPhase section */ + +/* Begin PBXSourcesBuildPhase section */ + 0E79EB51AAB01D083BEAA39D /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 760C0061CEA9636469AC6674 /* main.m in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 434676F72A64548514D25CE6 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 102BD1F0256A0C412AFC03E4 /* FW.m in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 5D1EBADCFB431E5A69890D1B /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; + B64EE1BDEE56C3ED339C9C42 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + D750AE4E7C2A09F749D7E8E3 /* FW.m in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + E26AA9EAB86831CBA247CE7A /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 3DF73FAD53D0A91C9EFE99C4 /* OnlySources.m in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXSourcesBuildPhase section */ + +/* Begin XCBuildConfiguration section */ + 37A5F6CBFC0A4E491B7FB91F /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + BAZEL_BIN_SUBDIR = /tests/ios/app; + BAZEL_LLDB_SWIFT_EXTRA_CLANG_FLAGS = ""; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_macos-darwin_x86_64-dbg-ST-2b46341d9197/bin/tests/ios/app/FW\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-0010df40fd2e/bin/tests/ios/app/FW\""; + GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; + HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_macos-darwin_x86_64-dbg-ST-2b46341d9197/bin/tests/ios/app/FW2_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_macos-darwin_x86_64-dbg-ST-2b46341d9197/bin/tests/ios/app/FW2_private_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_macos-darwin_x86_64-dbg-ST-2b46341d9197/bin/tests/ios/app/FW2_private_angled_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-0010df40fd2e/bin/tests/ios/app/FW2_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-0010df40fd2e/bin/tests/ios/app/FW2_private_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-0010df40fd2e/bin/tests/ios/app/FW2_private_angled_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; + IPHONEOS_DEPLOYMENT_TARGET = 13.6; + MACH_O_TYPE = "$(inherited)"; + PRODUCT_NAME = FW2; + SWIFT_ACTIVE_COMPILATION_CONDITIONS = "\"$(inherited)\""; + VALID_ARCHS = "arm64 arm64e"; + }; + name = Release; + }; + 60862F748C30E08FA29BF259 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + BAZEL_BIN_SUBDIR = /tests/ios/app; + BAZEL_LLDB_SWIFT_EXTRA_CLANG_FLAGS = ""; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks"; + GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; + HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-0010df40fd2e/bin/tests/ios/app/OnlySources_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-0010df40fd2e/bin/tests/ios/app/OnlySources_private_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-0010df40fd2e/bin/tests/ios/app/OnlySources_private_angled_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; + IPHONEOS_DEPLOYMENT_TARGET = 13.6; + MACH_O_TYPE = "$(inherited)"; + PRODUCT_NAME = OnlySources; + SWIFT_ACTIVE_COMPILATION_CONDITIONS = "\"$(inherited)\""; + VALID_ARCHS = "arm64 arm64e"; + }; + name = Release; + }; + 620EC53C6575012D0923B0DF /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + BAZEL_BIN_SUBDIR = /tests/ios/app; + BAZEL_LLDB_SWIFT_EXTRA_CLANG_FLAGS = ""; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks"; + GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; + HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-0010df40fd2e/bin/tests/ios/app/Empty_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-0010df40fd2e/bin/tests/ios/app/Empty_private_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-0010df40fd2e/bin/tests/ios/app/Empty_private_angled_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; + IPHONEOS_DEPLOYMENT_TARGET = 13.6; + MACH_O_TYPE = "$(inherited)"; + PRODUCT_NAME = Empty; + SWIFT_ACTIVE_COMPILATION_CONDITIONS = "\"$(inherited)\""; + VALID_ARCHS = "arm64 arm64e"; + }; + name = Debug; + }; + 6CBCB2258FE67296AD1EE1A6 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + BAZEL_BIN_SUBDIR = /tests/ios/app; + BAZEL_LLDB_SWIFT_EXTRA_CLANG_FLAGS = ""; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks"; + GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; + HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-0010df40fd2e/bin/tests/ios/app/Empty_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-0010df40fd2e/bin/tests/ios/app/Empty_private_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-0010df40fd2e/bin/tests/ios/app/Empty_private_angled_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; + IPHONEOS_DEPLOYMENT_TARGET = 13.6; + MACH_O_TYPE = "$(inherited)"; + PRODUCT_NAME = Empty; + SWIFT_ACTIVE_COMPILATION_CONDITIONS = "\"$(inherited)\""; + VALID_ARCHS = "arm64 arm64e"; + }; + name = Release; + }; + 7FBFC0CCB1CA07630DE91A02 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + BAZEL_BIN_SUBDIR = /tests/ios/app; + BAZEL_LLDB_SWIFT_EXTRA_CLANG_FLAGS = ""; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks"; + GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; + HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_macos-darwin_x86_64-dbg-ST-2b46341d9197/bin/tests/ios/app/FW_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_macos-darwin_x86_64-dbg-ST-2b46341d9197/bin/tests/ios/app/FW_private_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_macos-darwin_x86_64-dbg-ST-2b46341d9197/bin/tests/ios/app/FW_private_angled_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-0010df40fd2e/bin/tests/ios/app/FW_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-0010df40fd2e/bin/tests/ios/app/FW_private_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-0010df40fd2e/bin/tests/ios/app/FW_private_angled_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; + IPHONEOS_DEPLOYMENT_TARGET = 13.6; + MACH_O_TYPE = "$(inherited)"; + PRODUCT_NAME = FW; + SWIFT_ACTIVE_COMPILATION_CONDITIONS = "\"$(inherited)\""; + VALID_ARCHS = "arm64 arm64e"; + }; + name = Release; + }; + 834C9586992F65F7F404DAA6 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + BAZEL_BUILD_EXEC = "$BAZEL_STUBS_DIR/build-wrapper"; + BAZEL_EXECUTION_LOG_ENABLED = 0; + BAZEL_INSTALLER = $BAZEL_INSTALLERS_DIR/installer; + BAZEL_INSTALLERS_DIR = $PROJECT_FILE_PATH/bazelinstallers; + BAZEL_OUTPUT_PROCESSOR = "$BAZEL_STUBS_DIR/output-processor.rb"; + BAZEL_PATH = bazelisk; + BAZEL_RULES_IOS_OPTIONS = "--@build_bazel_rules_ios//rules:local_debug_options_enabled"; + BAZEL_STUBS_DIR = $PROJECT_FILE_PATH/bazelstubs; + BAZEL_WORKSPACE_ROOT = $SRCROOT/../../..; + CC = "$BAZEL_STUBS_DIR/clang-stub"; + CLANG_ANALYZER_EXEC = $CC; + CODE_SIGNING_ALLOWED = 0; + CXX = $CC; + DEBUG_INFORMATION_FORMAT = dwarf; + DONT_RUN_SWIFT_STDLIB_TOOL = 1; + GCC_PREPROCESSOR_DEFINITIONS = DEBUG; + LD = "$BAZEL_STUBS_DIR/ld-stub"; + LIBTOOL = /usr/bin/true; + SDKROOT = iphoneos; + SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; + SWIFT_EXEC = "$BAZEL_STUBS_DIR/swiftc-stub"; + SWIFT_OBJC_INTERFACE_HEADER_NAME = ""; + SWIFT_VERSION = 5; + }; + name = Debug; + }; + 9017BA7510346F64213CFF88 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + BAZEL_BIN_SUBDIR = /tests/ios/app; + BAZEL_LLDB_SWIFT_EXTRA_CLANG_FLAGS = ""; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks"; + GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; + HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-0010df40fd2e/bin/tests/ios/app/OnlySources_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-0010df40fd2e/bin/tests/ios/app/OnlySources_private_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-0010df40fd2e/bin/tests/ios/app/OnlySources_private_angled_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; + IPHONEOS_DEPLOYMENT_TARGET = 13.6; + MACH_O_TYPE = "$(inherited)"; + PRODUCT_NAME = OnlySources; + SWIFT_ACTIVE_COMPILATION_CONDITIONS = "\"$(inherited)\""; + VALID_ARCHS = "arm64 arm64e"; + }; + name = Debug; + }; + A3BB3C20BEA25FF427DFEC8F /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + BAZEL_BIN_SUBDIR = /tests/ios/app; + BAZEL_LLDB_SWIFT_EXTRA_CLANG_FLAGS = ""; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-0010df40fd2e/bin/tests/ios/app/FW\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-0010df40fd2e/bin/tests/ios/app/FW2\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-0010df40fd2e/bin/tests/ios/app/OnlySources\""; + GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; + HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT\""; + INFOPLIST_FILE = "$BAZEL_STUBS_DIR/Info-stub.plist"; + IPHONEOS_DEPLOYMENT_TARGET = 10.0; + MACH_O_TYPE = "$(inherited)"; + PRODUCT_BUNDLE_IDENTIFIER = com.example.app; + PRODUCT_NAME = App; + SWIFT_ACTIVE_COMPILATION_CONDITIONS = "\"$(inherited)\""; + VALID_ARCHS = "arm64 arm64e"; + }; + name = Debug; + }; + A402FAF8670F04802D276D4B /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + BAZEL_BIN_SUBDIR = /tests/ios/app; + BAZEL_LLDB_SWIFT_EXTRA_CLANG_FLAGS = ""; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_macos-darwin_x86_64-dbg-ST-2b46341d9197/bin/tests/ios/app/FW\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-0010df40fd2e/bin/tests/ios/app/FW\""; + GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; + HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_macos-darwin_x86_64-dbg-ST-2b46341d9197/bin/tests/ios/app/FW2_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_macos-darwin_x86_64-dbg-ST-2b46341d9197/bin/tests/ios/app/FW2_private_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_macos-darwin_x86_64-dbg-ST-2b46341d9197/bin/tests/ios/app/FW2_private_angled_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-0010df40fd2e/bin/tests/ios/app/FW2_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-0010df40fd2e/bin/tests/ios/app/FW2_private_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-0010df40fd2e/bin/tests/ios/app/FW2_private_angled_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; + IPHONEOS_DEPLOYMENT_TARGET = 13.6; + MACH_O_TYPE = "$(inherited)"; + PRODUCT_NAME = FW2; + SWIFT_ACTIVE_COMPILATION_CONDITIONS = "\"$(inherited)\""; + VALID_ARCHS = "arm64 arm64e"; + }; + name = Debug; + }; + ACC2FC19CFEF61CF9C633256 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + BAZEL_BIN_SUBDIR = /tests/ios/app; + BAZEL_LLDB_SWIFT_EXTRA_CLANG_FLAGS = ""; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-0010df40fd2e/bin/tests/ios/app/FW\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-0010df40fd2e/bin/tests/ios/app/FW2\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-0010df40fd2e/bin/tests/ios/app/OnlySources\""; + GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; + HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT\""; + INFOPLIST_FILE = "$BAZEL_STUBS_DIR/Info-stub.plist"; + IPHONEOS_DEPLOYMENT_TARGET = 10.0; + MACH_O_TYPE = "$(inherited)"; + PRODUCT_BUNDLE_IDENTIFIER = com.example.app; + PRODUCT_NAME = App; + SWIFT_ACTIVE_COMPILATION_CONDITIONS = "\"$(inherited)\""; + VALID_ARCHS = "arm64 arm64e"; + }; + name = Release; + }; + B904885E18945DFC03C9C2D1 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + BAZEL_BIN_SUBDIR = /tests/ios/app; + BAZEL_LLDB_SWIFT_EXTRA_CLANG_FLAGS = ""; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks"; + GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; + HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_macos-darwin_x86_64-dbg-ST-2b46341d9197/bin/tests/ios/app/FW_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_macos-darwin_x86_64-dbg-ST-2b46341d9197/bin/tests/ios/app/FW_private_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_macos-darwin_x86_64-dbg-ST-2b46341d9197/bin/tests/ios/app/FW_private_angled_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-0010df40fd2e/bin/tests/ios/app/FW_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-0010df40fd2e/bin/tests/ios/app/FW_private_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-0010df40fd2e/bin/tests/ios/app/FW_private_angled_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; + IPHONEOS_DEPLOYMENT_TARGET = 13.6; + MACH_O_TYPE = "$(inherited)"; + PRODUCT_NAME = FW; + SWIFT_ACTIVE_COMPILATION_CONDITIONS = "\"$(inherited)\""; + VALID_ARCHS = "arm64 arm64e"; + }; + name = Debug; + }; + F53D97A61B79705C8B3C230E /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + BAZEL_BUILD_EXEC = "$BAZEL_STUBS_DIR/build-wrapper"; + BAZEL_EXECUTION_LOG_ENABLED = 0; + BAZEL_INSTALLER = $BAZEL_INSTALLERS_DIR/installer; + BAZEL_INSTALLERS_DIR = $PROJECT_FILE_PATH/bazelinstallers; + BAZEL_OUTPUT_PROCESSOR = "$BAZEL_STUBS_DIR/output-processor.rb"; + BAZEL_PATH = bazelisk; + BAZEL_RULES_IOS_OPTIONS = "--@build_bazel_rules_ios//rules:local_debug_options_enabled"; + BAZEL_STUBS_DIR = $PROJECT_FILE_PATH/bazelstubs; + BAZEL_WORKSPACE_ROOT = $SRCROOT/../../..; + CC = "$BAZEL_STUBS_DIR/clang-stub"; + CLANG_ANALYZER_EXEC = $CC; + CODE_SIGNING_ALLOWED = 0; + CXX = $CC; + DEBUG_INFORMATION_FORMAT = dwarf; + DONT_RUN_SWIFT_STDLIB_TOOL = 1; + LD = "$BAZEL_STUBS_DIR/ld-stub"; + LIBTOOL = /usr/bin/true; + SDKROOT = iphoneos; + SWIFT_EXEC = "$BAZEL_STUBS_DIR/swiftc-stub"; + SWIFT_OBJC_INTERFACE_HEADER_NAME = ""; + SWIFT_VERSION = 5; + }; + name = Release; + }; +/* End XCBuildConfiguration section */ + +/* Begin XCConfigurationList section */ + 225C9557C0DFB668662FE03A /* Build configuration list for PBXNativeTarget "FW" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + B904885E18945DFC03C9C2D1 /* Debug */, + 7FBFC0CCB1CA07630DE91A02 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Debug; + }; + 22A228CF6C3A4A587D43ABAB /* Build configuration list for PBXNativeTarget "FW2" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + A402FAF8670F04802D276D4B /* Debug */, + 37A5F6CBFC0A4E491B7FB91F /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Debug; + }; + 3581A136657805C705D66861 /* Build configuration list for PBXProject "Test-MultipleConfigs-Project-WithTransitiveFlag" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 834C9586992F65F7F404DAA6 /* Debug */, + F53D97A61B79705C8B3C230E /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Debug; + }; + 71570EA8E216FD7C9313C564 /* Build configuration list for PBXNativeTarget "App" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + A3BB3C20BEA25FF427DFEC8F /* Debug */, + ACC2FC19CFEF61CF9C633256 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Debug; + }; + A8457733EC58BE42D11419E4 /* Build configuration list for PBXNativeTarget "Empty" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 620EC53C6575012D0923B0DF /* Debug */, + 6CBCB2258FE67296AD1EE1A6 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Debug; + }; + E5F95071646F4E22E9B8AA72 /* Build configuration list for PBXNativeTarget "OnlySources" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 9017BA7510346F64213CFF88 /* Debug */, + 60862F748C30E08FA29BF259 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Debug; + }; +/* End XCConfigurationList section */ + }; + rootObject = 1F5BC3835C61A6EFE62F69DA /* Project object */; +} diff --git a/tests/ios/xcodeproj/Test-MultipleConfigs-Project-WithTransitiveFlag.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/tests/ios/xcodeproj/Test-MultipleConfigs-Project-WithTransitiveFlag.xcodeproj/project.xcworkspace/contents.xcworkspacedata new file mode 100755 index 000000000..59501b7ab --- /dev/null +++ b/tests/ios/xcodeproj/Test-MultipleConfigs-Project-WithTransitiveFlag.xcodeproj/project.xcworkspace/contents.xcworkspacedata @@ -0,0 +1,7 @@ + + + + + diff --git a/tests/ios/xcodeproj/Test-MultipleConfigs-Project-WithTransitiveFlag.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/tests/ios/xcodeproj/Test-MultipleConfigs-Project-WithTransitiveFlag.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist new file mode 100644 index 000000000..18d981003 --- /dev/null +++ b/tests/ios/xcodeproj/Test-MultipleConfigs-Project-WithTransitiveFlag.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist @@ -0,0 +1,8 @@ + + + + + IDEDidComputeMac32BitWarning + + + diff --git a/tests/ios/xcodeproj/Test-MultipleConfigs-Project-WithTransitiveFlag.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings b/tests/ios/xcodeproj/Test-MultipleConfigs-Project-WithTransitiveFlag.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings new file mode 100644 index 000000000..a3f43a8b3 --- /dev/null +++ b/tests/ios/xcodeproj/Test-MultipleConfigs-Project-WithTransitiveFlag.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings @@ -0,0 +1,10 @@ + + + + + BuildSystemType + Original + IDEWorkspaceSharedSettings_AutocreateContextsIfNeeded + + + diff --git a/tests/ios/xcodeproj/Test-MultipleConfigs-Project-WithTransitiveFlag.xcodeproj/xcshareddata/xcschemes/App.xcscheme b/tests/ios/xcodeproj/Test-MultipleConfigs-Project-WithTransitiveFlag.xcodeproj/xcshareddata/xcschemes/App.xcscheme new file mode 100755 index 000000000..d9a692d74 --- /dev/null +++ b/tests/ios/xcodeproj/Test-MultipleConfigs-Project-WithTransitiveFlag.xcodeproj/xcshareddata/xcschemes/App.xcscheme @@ -0,0 +1,90 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/ios/xcodeproj/Test-MultipleConfigs-Project.xcodeproj/bazelinstallers/_indexstore.sh b/tests/ios/xcodeproj/Test-MultipleConfigs-Project.xcodeproj/bazelinstallers/_indexstore.sh new file mode 100755 index 000000000..36fe20ad3 --- /dev/null +++ b/tests/ios/xcodeproj/Test-MultipleConfigs-Project.xcodeproj/bazelinstallers/_indexstore.sh @@ -0,0 +1,42 @@ +#!/bin/bash + +set -euo pipefail + +# Import Bazel built indexstores into Xcode. See https://github.com/lyft/index-import +# +# This makes use of a number of Xcode's provided environment variables. These +# file remappings are not specific to this project, the apply to all projects +# built with Bazel and rules_swift. + +# Example: /private/var/tmp/_bazel_//execroot/ +readonly bazel_root="^/private/var/tmp/_bazel_.+?/.+?/execroot/[^/]+" +readonly bazel_bin="^(?:$bazel_root/)?bazel-out/.+?/bin" + +# Object file paths are fundamental to how Xcode loads from the indexstore. If +# the `OutputFile` does not match what Xcode looks for, then those parts of the +# indexstore will not be found and used. +readonly bazel_swift_object="$bazel_bin/.*/(.+?)(?:_swift)?_objs/.*/(.+?)[.]swift[.]o$" +readonly bazel_objc_object="$bazel_bin/.*/_objs/(?:arc/|non_arc/)?(.+?)-(?:objc|cpp)/(.+?)[.]o$" +readonly xcode_object="$CONFIGURATION_TEMP_DIR/\$1.build/Objects-normal/$ARCHS/\$2.o" + +# Bazel built `.swiftmodule` files are copied to `DerivedData`. Since modules +# are referenced by indexstores, their paths are remapped. +readonly bazel_module="$bazel_bin/.*/(.+?)[.]swiftmodule$" +readonly xcode_module="$BUILT_PRODUCTS_DIR/\$1.swiftmodule/$ARCHS.swiftmodule" + +# External dependencies are available via the `bazel-` symlink. +# This remapping, in combination with `xcode-index-preferences.json`, enables +# index features for external dependencies, such as jump-to-definition. +readonly bazel_external="$bazel_root/external" +readonly xcode_external="$BAZEL_WORKSPACE_ROOT/bazel-$(basename "$SRCROOT")/external" + + +$BAZEL_INSTALLERS_DIR/index-import \ + -remap "$bazel_module=$xcode_module" \ + -remap "$bazel_swift_object=$xcode_object" \ + -remap "$bazel_objc_object=$xcode_object" \ + -remap "$bazel_external=$xcode_external" \ + -remap "$bazel_root=$BAZEL_WORKSPACE_ROOT" \ + -remap "^([^//])=$BAZEL_WORKSPACE_ROOT/\$1" \ + "$@" \ + "$BUILD_DIR"/../../Index/DataStore diff --git a/tests/ios/xcodeproj/Test-MultipleConfigs-Project.xcodeproj/bazelinstallers/_swiftmodule.sh b/tests/ios/xcodeproj/Test-MultipleConfigs-Project.xcodeproj/bazelinstallers/_swiftmodule.sh new file mode 100755 index 000000000..c974cfb3e --- /dev/null +++ b/tests/ios/xcodeproj/Test-MultipleConfigs-Project.xcodeproj/bazelinstallers/_swiftmodule.sh @@ -0,0 +1,19 @@ +#!/bin/bash + +set -euo pipefail + +for module in "$@"; do + doc="${module%.swiftmodule}.swiftdoc" + module_name=$(basename "$module") + module_bundle="$BUILT_PRODUCTS_DIR/$module_name" + mkdir -p "$module_bundle" + + cp "$module" "$module_bundle/$NATIVE_ARCH_ACTUAL.swiftmodule" + cp "$doc" "$module_bundle/$NATIVE_ARCH_ACTUAL.swiftdoc" + + ios_module_name="$NATIVE_ARCH_ACTUAL-$LLVM_TARGET_TRIPLE_VENDOR-$SWIFT_PLATFORM_TARGET_PREFIX$LLVM_TARGET_TRIPLE_SUFFIX" + cp "$module" "$module_bundle/$ios_module_name.swiftmodule" + cp "$doc" "$module_bundle/$ios_module_name.swiftdoc" + + chmod -R +w "$module_bundle" +done diff --git a/tests/ios/xcodeproj/Test-MultipleConfigs-Project.xcodeproj/bazelinstallers/indexstores.sh b/tests/ios/xcodeproj/Test-MultipleConfigs-Project.xcodeproj/bazelinstallers/indexstores.sh new file mode 100755 index 000000000..7f174d878 --- /dev/null +++ b/tests/ios/xcodeproj/Test-MultipleConfigs-Project.xcodeproj/bazelinstallers/indexstores.sh @@ -0,0 +1,31 @@ +#!/bin/bash + +set -euo pipefail + +# See `_indexstore.sh` for full details. + +echo "Start remapping index files at `date`" + +FOUND_INDEXSTORES=`pcregrep -o1 'command_line: "(.*\.indexstore)' $BAZEL_BUILD_EVENT_TEXT_FILENAME | uniq` + +declare -a EXISTING_INDEXSTORES=() +for i in $FOUND_INDEXSTORES +do + if [ -d $i ] + then + EXISTING_INDEXSTORES+=($i) + fi +done + +echo "Found ${#EXISTING_INDEXSTORES[@]} existing indexstores" + +if [ ${#EXISTING_INDEXSTORES[@]} -ne 0 ] +then + "$BAZEL_INSTALLERS_DIR/_indexstore.sh" ${EXISTING_INDEXSTORES[*]} +else + echo "No indexstores found" +fi + +echo "Finish remapping index files at `date`" + +ls -ltR $BUILD_DIR/../../Index/DataStore/ > $BAZEL_DIAGNOSTICS_DIR/indexstores-contents-$DATE_SUFFIX.log diff --git a/tests/ios/xcodeproj/Test-MultipleConfigs-Project.xcodeproj/bazelinstallers/install.sh b/tests/ios/xcodeproj/Test-MultipleConfigs-Project.xcodeproj/bazelinstallers/install.sh new file mode 100755 index 000000000..830b7d3eb --- /dev/null +++ b/tests/ios/xcodeproj/Test-MultipleConfigs-Project.xcodeproj/bazelinstallers/install.sh @@ -0,0 +1,77 @@ +#!/bin/bash + +# Install the runnable products so that Xcode can run it. This includes `.app`s, +# `.xctest`s, and also command line binaries. + +set -eux + +# Delete all logfiles that are older than 7 days +find "${BAZEL_DIAGNOSTICS_DIR}" -type f -atime +7d -delete + +case "${PRODUCT_TYPE}" in + com.apple.product-type.framework) + input_options=("bazel-bin/$BAZEL_BIN_SUBDIR/${TARGET_NAME}/${FULL_PRODUCT_NAME}") + ;; + com.apple.product-type.framework.static) + # For static library, as the output is not under bazel-bin, we have to get it based on build event + # Example of such entry inside build event: + # important_output { + # name: ".../SomeFramework.framework/SomeFramework" + # uri: "file:///private/var/tmp/.../.../SomeFramework.framework/SomeFramework" + # path_prefix:... + # ... + # } + # We only care about the entry ending with TARGET_NAME" so that we can get the path to its directory + QUERY=`grep -A 2 important_output "$BAZEL_BUILD_EVENT_TEXT_FILENAME" | grep -w uri | grep ${TARGET_NAME}\" | sed "s/uri: \"file:\/\///"` + if [[ -z $QUERY ]]; then + echo "Unable to locate resource for framework of ${TARGET_NAME}" + exit 1 + fi + input_options=($(dirname "${QUERY}")) + ;; + com.apple.product-type.bundle.unit-test) + input_options=("bazel-bin/$BAZEL_BIN_SUBDIR/${FULL_PRODUCT_NAME}" "bazel-bin/$BAZEL_BIN_SUBDIR/$TARGET_NAME.__internal__.__test_bundle_archive-root/$TARGET_NAME${WRAPPER_SUFFIX:-}") + ;; + com.apple.product-type.application) + input_options=("bazel-bin/$BAZEL_BIN_SUBDIR/${FULL_PRODUCT_NAME}" "bazel-bin/$BAZEL_BIN_SUBDIR/${TARGET_NAME}_archive-root/Payload/$TARGET_NAME${WRAPPER_SUFFIX:-}") + ;; + *) + echo "Error: Installing ${TARGET_NAME} of type ${PRODUCT_TYPE} is unsupported" >&2 + exit 1 + ;; +esac +output="$TARGET_BUILD_DIR/$FULL_PRODUCT_NAME" + +mkdir -p "$(dirname "$output")" + +for input in "${input_options[@]}"; do + if [[ -z $input ]] || [ $input = "." ] || [ $input = "/" ]; then + # rsync can be a dangerous operation when it tries to copy entire root dir into the $output + echo "Error: illegal input \"${input}\" for installing ${TARGET_NAME} of type ${PRODUCT_TYPE}" >&2 + exit 1 + fi + if [[ -d $input ]]; then + # Copy bundle contents, into the destination bundle. + # This avoids self-nesting, like: Foo.app/Foo.app + input+="/" + else + continue + fi + + rsync \ + --recursive --chmod=u+w --delete \ + "$input" "$output" > "$BAZEL_DIAGNOSTICS_DIR"/rsync-stdout-"$DATE_SUFFIX".log 2> "$BAZEL_DIAGNOSTICS_DIR"/rsync-stderr-"$DATE_SUFFIX".log + break +done + +if [[ ! -d $output ]]; then + echo "error: failed to find $FULL_PRODUCT_NAME in expected locations: ${input_options[*]}" + exit 1 +fi + +"$BAZEL_INSTALLERS_DIR"/lldb-settings.sh > "$BAZEL_DIAGNOSTICS_DIR"/lldb-stdout-"$DATE_SUFFIX".log 2> "$BAZEL_DIAGNOSTICS_DIR"/lldb-stderr-"$DATE_SUFFIX".log + +# Part of the build intermediary output will be swiftmodule files +# which XCode will use for indexing. Let's keep those. +"$BAZEL_INSTALLERS_DIR"/swiftmodules.sh > "$BAZEL_DIAGNOSTICS_DIR"/swiftmodules-stdout-"$DATE_SUFFIX".log 2> "$BAZEL_DIAGNOSTICS_DIR"/swiftmodules-stderr-"$DATE_SUFFIX".log & +"$BAZEL_INSTALLERS_DIR"/indexstores.sh > "$BAZEL_DIAGNOSTICS_DIR"/indexstores-stdout-"$DATE_SUFFIX".log 2> "$BAZEL_DIAGNOSTICS_DIR"/indexstores-stderr-"$DATE_SUFFIX".log & diff --git a/tests/ios/xcodeproj/Test-MultipleConfigs-Project.xcodeproj/bazelinstallers/installer b/tests/ios/xcodeproj/Test-MultipleConfigs-Project.xcodeproj/bazelinstallers/installer new file mode 100755 index 000000000..830b7d3eb --- /dev/null +++ b/tests/ios/xcodeproj/Test-MultipleConfigs-Project.xcodeproj/bazelinstallers/installer @@ -0,0 +1,77 @@ +#!/bin/bash + +# Install the runnable products so that Xcode can run it. This includes `.app`s, +# `.xctest`s, and also command line binaries. + +set -eux + +# Delete all logfiles that are older than 7 days +find "${BAZEL_DIAGNOSTICS_DIR}" -type f -atime +7d -delete + +case "${PRODUCT_TYPE}" in + com.apple.product-type.framework) + input_options=("bazel-bin/$BAZEL_BIN_SUBDIR/${TARGET_NAME}/${FULL_PRODUCT_NAME}") + ;; + com.apple.product-type.framework.static) + # For static library, as the output is not under bazel-bin, we have to get it based on build event + # Example of such entry inside build event: + # important_output { + # name: ".../SomeFramework.framework/SomeFramework" + # uri: "file:///private/var/tmp/.../.../SomeFramework.framework/SomeFramework" + # path_prefix:... + # ... + # } + # We only care about the entry ending with TARGET_NAME" so that we can get the path to its directory + QUERY=`grep -A 2 important_output "$BAZEL_BUILD_EVENT_TEXT_FILENAME" | grep -w uri | grep ${TARGET_NAME}\" | sed "s/uri: \"file:\/\///"` + if [[ -z $QUERY ]]; then + echo "Unable to locate resource for framework of ${TARGET_NAME}" + exit 1 + fi + input_options=($(dirname "${QUERY}")) + ;; + com.apple.product-type.bundle.unit-test) + input_options=("bazel-bin/$BAZEL_BIN_SUBDIR/${FULL_PRODUCT_NAME}" "bazel-bin/$BAZEL_BIN_SUBDIR/$TARGET_NAME.__internal__.__test_bundle_archive-root/$TARGET_NAME${WRAPPER_SUFFIX:-}") + ;; + com.apple.product-type.application) + input_options=("bazel-bin/$BAZEL_BIN_SUBDIR/${FULL_PRODUCT_NAME}" "bazel-bin/$BAZEL_BIN_SUBDIR/${TARGET_NAME}_archive-root/Payload/$TARGET_NAME${WRAPPER_SUFFIX:-}") + ;; + *) + echo "Error: Installing ${TARGET_NAME} of type ${PRODUCT_TYPE} is unsupported" >&2 + exit 1 + ;; +esac +output="$TARGET_BUILD_DIR/$FULL_PRODUCT_NAME" + +mkdir -p "$(dirname "$output")" + +for input in "${input_options[@]}"; do + if [[ -z $input ]] || [ $input = "." ] || [ $input = "/" ]; then + # rsync can be a dangerous operation when it tries to copy entire root dir into the $output + echo "Error: illegal input \"${input}\" for installing ${TARGET_NAME} of type ${PRODUCT_TYPE}" >&2 + exit 1 + fi + if [[ -d $input ]]; then + # Copy bundle contents, into the destination bundle. + # This avoids self-nesting, like: Foo.app/Foo.app + input+="/" + else + continue + fi + + rsync \ + --recursive --chmod=u+w --delete \ + "$input" "$output" > "$BAZEL_DIAGNOSTICS_DIR"/rsync-stdout-"$DATE_SUFFIX".log 2> "$BAZEL_DIAGNOSTICS_DIR"/rsync-stderr-"$DATE_SUFFIX".log + break +done + +if [[ ! -d $output ]]; then + echo "error: failed to find $FULL_PRODUCT_NAME in expected locations: ${input_options[*]}" + exit 1 +fi + +"$BAZEL_INSTALLERS_DIR"/lldb-settings.sh > "$BAZEL_DIAGNOSTICS_DIR"/lldb-stdout-"$DATE_SUFFIX".log 2> "$BAZEL_DIAGNOSTICS_DIR"/lldb-stderr-"$DATE_SUFFIX".log + +# Part of the build intermediary output will be swiftmodule files +# which XCode will use for indexing. Let's keep those. +"$BAZEL_INSTALLERS_DIR"/swiftmodules.sh > "$BAZEL_DIAGNOSTICS_DIR"/swiftmodules-stdout-"$DATE_SUFFIX".log 2> "$BAZEL_DIAGNOSTICS_DIR"/swiftmodules-stderr-"$DATE_SUFFIX".log & +"$BAZEL_INSTALLERS_DIR"/indexstores.sh > "$BAZEL_DIAGNOSTICS_DIR"/indexstores-stdout-"$DATE_SUFFIX".log 2> "$BAZEL_DIAGNOSTICS_DIR"/indexstores-stderr-"$DATE_SUFFIX".log & diff --git a/tests/ios/xcodeproj/Test-MultipleConfigs-Project.xcodeproj/bazelinstallers/lldb-settings.sh b/tests/ios/xcodeproj/Test-MultipleConfigs-Project.xcodeproj/bazelinstallers/lldb-settings.sh new file mode 100755 index 000000000..bc280dfab --- /dev/null +++ b/tests/ios/xcodeproj/Test-MultipleConfigs-Project.xcodeproj/bazelinstallers/lldb-settings.sh @@ -0,0 +1,36 @@ +#!/bin/bash + +set -euo pipefail + + +# Bazel uses `-debug-prefix-map` to strip the bazel build directory from the +# paths embedded in debug info. This means the debug info contains _project +# relative_ paths instead of Bazel absolute paths. +# +# However, Xcode sets breakpoints via _project absolute_ paths, which are not +# the paths in the debug info. This lldb setting ensures that _project relative_ +# paths are remapped to _project absolute_ paths. +# +# NOTE: In order to use this, add this line to `~/.lldbinit`: +# +# command source ~/.lldbinit-source-map +cat <<-END > ~/.lldbinit-source-map +settings set target.source-map ./ "$BAZEL_WORKSPACE_ROOT/" +settings set target.sdk-path $SDKROOT +settings set target.swift-framework-search-paths $FRAMEWORK_SEARCH_PATHS +END + +if [[ -n ${BAZEL_LLDB_SWIFT_EXTRA_CLANG_FLAGS:-} ]] +then + cat <<-END >> ~/.lldbinit-source-map +settings set -- target.swift-extra-clang-flags $BAZEL_LLDB_SWIFT_EXTRA_CLANG_FLAGS +END +fi + +BAZEL_EXTERNAL_DIRNAME="$BAZEL_WORKSPACE_ROOT/bazel-$(basename "$BAZEL_WORKSPACE_ROOT")/external" +if [ -d "$BAZEL_EXTERNAL_DIRNAME" ] +then + cat <<-END >> ~/.lldbinit-source-map +settings append target.source-map ./external/ "$BAZEL_EXTERNAL_DIRNAME" +END +fi diff --git a/tests/ios/xcodeproj/Test-MultipleConfigs-Project.xcodeproj/bazelinstallers/swiftmodules.sh b/tests/ios/xcodeproj/Test-MultipleConfigs-Project.xcodeproj/bazelinstallers/swiftmodules.sh new file mode 100755 index 000000000..92e5c4483 --- /dev/null +++ b/tests/ios/xcodeproj/Test-MultipleConfigs-Project.xcodeproj/bazelinstallers/swiftmodules.sh @@ -0,0 +1,24 @@ +#!/bin/bash + +set -euo pipefail + +# Copy Bazel build `.swiftmodule` files to `DerivedData`. This is used by Xcode +# and its indexing. +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/tests/ios/xcodeproj/Test-MultipleConfigs-Project.xcodeproj/project.pbxproj b/tests/ios/xcodeproj/Test-MultipleConfigs-Project.xcodeproj/project.pbxproj new file mode 100755 index 000000000..2a2248e34 --- /dev/null +++ b/tests/ios/xcodeproj/Test-MultipleConfigs-Project.xcodeproj/project.pbxproj @@ -0,0 +1,513 @@ +// !$*UTF8*$! +{ + archiveVersion = 1; + classes = { + }; + objectVersion = 51; + objects = { + +/* Begin PBXBuildFile section */ + 2159F2133D2BBDE7A2192A4F /* FW_Private.h in Headers */ = {isa = PBXBuildFile; fileRef = F90DA395E305A8FA92AF3E0A /* FW_Private.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 5EA4B898494E9206EEF3E72A /* FW.m in Sources */ = {isa = PBXBuildFile; fileRef = 7028BD13D6686B040AB5A030 /* FW.m */; }; + 77B2851412A65B323DB0B7EF /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = FD90F7779C3D54F17BEC3EEA /* main.m */; }; + 82E549C4AAB2B4D5A9E02A9D /* FW.m in Sources */ = {isa = PBXBuildFile; fileRef = 177820436C75B787C7628EAD /* FW.m */; }; +/* End PBXBuildFile section */ + +/* Begin PBXFileReference section */ + 177820436C75B787C7628EAD /* FW.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = FW.m; sourceTree = ""; }; + 42D83EE9C52F58A91F9FD2A0 /* common.pch */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = common.pch; sourceTree = ""; }; + 542BDACECDA884DD561CAABB /* FW.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = FW.h; sourceTree = ""; }; + 6E10AF3580A0BD84B1DCECA6 /* FW.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = FW.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 7028BD13D6686B040AB5A030 /* FW.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = FW.m; sourceTree = ""; }; + 9136DB330408F391F19DF200 /* FW2.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = FW2.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 9FB51A491DF26DF53E3A5C8A /* FW.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = FW.h; sourceTree = ""; }; + B0113FEF453C7D130B7396ED /* BUILD.bazel */ = {isa = PBXFileReference; path = BUILD.bazel; sourceTree = ""; }; + E6AAF2A08BBF9E1B20C9A4F2 /* App.app */ = {isa = PBXFileReference; includeInIndex = 0; lastKnownFileType = wrapper.application; path = App.app; sourceTree = BUILT_PRODUCTS_DIR; }; + F90DA395E305A8FA92AF3E0A /* FW_Private.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = FW_Private.h; sourceTree = ""; }; + FD90F7779C3D54F17BEC3EEA /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = ""; }; +/* End PBXFileReference section */ + +/* Begin PBXGroup section */ + 187F618567D4A569BC6DA3CF /* build_bazel_rules_ios */ = { + isa = PBXGroup; + children = ( + 7A4A4B64D72C3297B112337A /* rules */, + F85D6FD9172FB44E6B9CA175 /* tests */, + ); + name = build_bazel_rules_ios; + path = ../../..; + sourceTree = ""; + }; + 23D24DB2B85A87820174D2C5 = { + isa = PBXGroup; + children = ( + 187F618567D4A569BC6DA3CF /* build_bazel_rules_ios */, + 8A5EC0D49E51C276C0CE1CC0 /* Products */, + ); + sourceTree = ""; + }; + 4822497B86765D811AC0DAEE /* FW */ = { + isa = PBXGroup; + children = ( + F90DA395E305A8FA92AF3E0A /* FW_Private.h */, + 542BDACECDA884DD561CAABB /* FW.h */, + 177820436C75B787C7628EAD /* FW.m */, + ); + path = FW; + sourceTree = ""; + }; + 62A114A7EC6F9CDFA7BE542C /* App */ = { + isa = PBXGroup; + children = ( + FD90F7779C3D54F17BEC3EEA /* main.m */, + ); + path = App; + sourceTree = ""; + }; + 70B5E61C73915CCD796EB616 /* FW2 */ = { + isa = PBXGroup; + children = ( + 9FB51A491DF26DF53E3A5C8A /* FW.h */, + 7028BD13D6686B040AB5A030 /* FW.m */, + ); + path = FW2; + sourceTree = ""; + }; + 75E5DEFD1115B577A2E2C572 /* ios */ = { + isa = PBXGroup; + children = ( + E1DF6AE6EA47CBAB2E11C0E4 /* app */, + ); + path = ios; + sourceTree = ""; + }; + 7A4A4B64D72C3297B112337A /* rules */ = { + isa = PBXGroup; + children = ( + 874ED8C9666A47A767B145E1 /* library */, + ); + path = rules; + sourceTree = ""; + }; + 874ED8C9666A47A767B145E1 /* library */ = { + isa = PBXGroup; + children = ( + 42D83EE9C52F58A91F9FD2A0 /* common.pch */, + ); + path = library; + sourceTree = ""; + }; + 8A5EC0D49E51C276C0CE1CC0 /* Products */ = { + isa = PBXGroup; + children = ( + E6AAF2A08BBF9E1B20C9A4F2 /* App.app */, + 6E10AF3580A0BD84B1DCECA6 /* FW.framework */, + 9136DB330408F391F19DF200 /* FW2.framework */, + ); + name = Products; + sourceTree = ""; + }; + E1DF6AE6EA47CBAB2E11C0E4 /* app */ = { + isa = PBXGroup; + children = ( + 62A114A7EC6F9CDFA7BE542C /* App */, + B0113FEF453C7D130B7396ED /* BUILD.bazel */, + 4822497B86765D811AC0DAEE /* FW */, + 70B5E61C73915CCD796EB616 /* FW2 */, + ); + path = app; + sourceTree = ""; + }; + F85D6FD9172FB44E6B9CA175 /* tests */ = { + isa = PBXGroup; + children = ( + 75E5DEFD1115B577A2E2C572 /* ios */, + ); + path = tests; + sourceTree = ""; + }; +/* End PBXGroup section */ + +/* Begin PBXHeadersBuildPhase section */ + 8F8BD666BEDEDE9D7093EF7B /* Headers */ = { + isa = PBXHeadersBuildPhase; + buildActionMask = 2147483647; + files = ( + 2159F2133D2BBDE7A2192A4F /* FW_Private.h in Headers */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXHeadersBuildPhase section */ + +/* Begin PBXNativeTarget section */ + 0B72F55EDEA4383A4DD03A0C /* FW */ = { + isa = PBXNativeTarget; + buildConfigurationList = 4413A83646FC47DEECAC1B58 /* Build configuration list for PBXNativeTarget "FW" */; + buildPhases = ( + 2FC233EF8D7108B00E5A9112 /* Build with bazel */, + 8F8BD666BEDEDE9D7093EF7B /* Headers */, + A8448394415996088A858536 /* Sources */, + ); + buildRules = ( + ); + dependencies = ( + ); + name = FW; + productName = FW; + productReference = 6E10AF3580A0BD84B1DCECA6 /* FW.framework */; + productType = "com.apple.product-type.framework.static"; + }; + 146DB7287A0C49D7ABD9555C /* FW2 */ = { + isa = PBXNativeTarget; + buildConfigurationList = 357699BEC3E85E52B9803FB4 /* Build configuration list for PBXNativeTarget "FW2" */; + buildPhases = ( + 9E31330D27B20E5F456059B3 /* Build with bazel */, + 200C72A4A9E7946782BC7746 /* Sources */, + ); + buildRules = ( + ); + dependencies = ( + ); + name = FW2; + productName = FW2; + productReference = 9136DB330408F391F19DF200 /* FW2.framework */; + productType = "com.apple.product-type.framework.static"; + }; + 37F42DB481CB416C0BC69DD1 /* App */ = { + isa = PBXNativeTarget; + buildConfigurationList = 839023D0991E4172568B155B /* Build configuration list for PBXNativeTarget "App" */; + buildPhases = ( + FFC42D0FC93D63FF4D743AEF /* Build with bazel */, + CFA507F941A605865221F575 /* Sources */, + ); + buildRules = ( + ); + dependencies = ( + ); + name = App; + productName = App; + productReference = E6AAF2A08BBF9E1B20C9A4F2 /* App.app */; + productType = "com.apple.product-type.application"; + }; +/* End PBXNativeTarget section */ + +/* Begin PBXProject section */ + B8F68D4A5DF58E5FDF706458 /* Project object */ = { + isa = PBXProject; + attributes = { + LastUpgradeCheck = 1020; + TargetAttributes = { + }; + }; + buildConfigurationList = EC0766B02FF768721E1D341B /* Build configuration list for PBXProject "Test-MultipleConfigs-Project" */; + compatibilityVersion = "Xcode 10.0"; + developmentRegion = en; + hasScannedForEncodings = 0; + knownRegions = ( + en, + ); + mainGroup = 23D24DB2B85A87820174D2C5; + projectDirPath = ""; + projectRoot = ""; + targets = ( + 37F42DB481CB416C0BC69DD1 /* App */, + 0B72F55EDEA4383A4DD03A0C /* FW */, + 146DB7287A0C49D7ABD9555C /* FW2 */, + ); + }; +/* End PBXProject section */ + +/* Begin PBXShellScriptBuildPhase section */ + 2FC233EF8D7108B00E5A9112 /* Build with bazel */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + ); + inputPaths = ( + ); + name = "Build with bazel"; + outputFileListPaths = ( + ); + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "\nset -euxo pipefail\ncd $BAZEL_WORKSPACE_ROOT\n\nexport BAZEL_DIAGNOSTICS_DIR=\"$BUILD_DIR/../../bazel-xcode-diagnostics/\"\nmkdir -p $BAZEL_DIAGNOSTICS_DIR\nexport DATE_SUFFIX=\"$(date +%Y%m%d.%H%M%S%L)\"\nexport BAZEL_BUILD_EVENT_TEXT_FILENAME=\"$BAZEL_DIAGNOSTICS_DIR/build-event-$DATE_SUFFIX.txt\"\nexport BAZEL_BUILD_EXECUTION_LOG_FILENAME=\"$BAZEL_DIAGNOSTICS_DIR/build-execution-log-$DATE_SUFFIX.log\"\nenv -u RUBYOPT -u RUBY_HOME -u GEM_HOME $BAZEL_BUILD_EXEC tests/ios/app:FW\n$BAZEL_INSTALLER\n"; + }; + 9E31330D27B20E5F456059B3 /* Build with bazel */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + ); + inputPaths = ( + ); + name = "Build with bazel"; + outputFileListPaths = ( + ); + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "\nset -euxo pipefail\ncd $BAZEL_WORKSPACE_ROOT\n\nexport BAZEL_DIAGNOSTICS_DIR=\"$BUILD_DIR/../../bazel-xcode-diagnostics/\"\nmkdir -p $BAZEL_DIAGNOSTICS_DIR\nexport DATE_SUFFIX=\"$(date +%Y%m%d.%H%M%S%L)\"\nexport BAZEL_BUILD_EVENT_TEXT_FILENAME=\"$BAZEL_DIAGNOSTICS_DIR/build-event-$DATE_SUFFIX.txt\"\nexport BAZEL_BUILD_EXECUTION_LOG_FILENAME=\"$BAZEL_DIAGNOSTICS_DIR/build-execution-log-$DATE_SUFFIX.log\"\nenv -u RUBYOPT -u RUBY_HOME -u GEM_HOME $BAZEL_BUILD_EXEC tests/ios/app:FW2\n$BAZEL_INSTALLER\n"; + }; + FFC42D0FC93D63FF4D743AEF /* Build with bazel */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + ); + inputPaths = ( + ); + name = "Build with bazel"; + outputFileListPaths = ( + ); + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "\nset -euxo pipefail\ncd $BAZEL_WORKSPACE_ROOT\n\nexport BAZEL_DIAGNOSTICS_DIR=\"$BUILD_DIR/../../bazel-xcode-diagnostics/\"\nmkdir -p $BAZEL_DIAGNOSTICS_DIR\nexport DATE_SUFFIX=\"$(date +%Y%m%d.%H%M%S%L)\"\nexport BAZEL_BUILD_EVENT_TEXT_FILENAME=\"$BAZEL_DIAGNOSTICS_DIR/build-event-$DATE_SUFFIX.txt\"\nexport BAZEL_BUILD_EXECUTION_LOG_FILENAME=\"$BAZEL_DIAGNOSTICS_DIR/build-execution-log-$DATE_SUFFIX.log\"\nenv -u RUBYOPT -u RUBY_HOME -u GEM_HOME $BAZEL_BUILD_EXEC tests/ios/app:App\n$BAZEL_INSTALLER\n"; + }; +/* End PBXShellScriptBuildPhase section */ + +/* Begin PBXSourcesBuildPhase section */ + 200C72A4A9E7946782BC7746 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 5EA4B898494E9206EEF3E72A /* FW.m in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + A8448394415996088A858536 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 82E549C4AAB2B4D5A9E02A9D /* FW.m in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + CFA507F941A605865221F575 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 77B2851412A65B323DB0B7EF /* main.m in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXSourcesBuildPhase section */ + +/* Begin XCBuildConfiguration section */ + 06AFEEBD5DF4C607E0124A84 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + BAZEL_BIN_SUBDIR = /tests/ios/app; + BAZEL_LLDB_SWIFT_EXTRA_CLANG_FLAGS = ""; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-0010df40fd2e/bin/tests/ios/app/FW\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-0010df40fd2e/bin/tests/ios/app/FW2\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-0010df40fd2e/bin/tests/ios/app/OnlySources\""; + GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; + HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT\""; + INFOPLIST_FILE = "$BAZEL_STUBS_DIR/Info-stub.plist"; + IPHONEOS_DEPLOYMENT_TARGET = 10.0; + MACH_O_TYPE = "$(inherited)"; + PRODUCT_BUNDLE_IDENTIFIER = com.example.app; + PRODUCT_NAME = App; + SWIFT_ACTIVE_COMPILATION_CONDITIONS = "\"$(inherited)\""; + VALID_ARCHS = "arm64 arm64e"; + }; + name = Debug; + }; + 0C5C26920994F0B52B74D3B8 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + BAZEL_BIN_SUBDIR = /tests/ios/app; + BAZEL_LLDB_SWIFT_EXTRA_CLANG_FLAGS = ""; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-0010df40fd2e/bin/tests/ios/app/FW\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-0010df40fd2e/bin/tests/ios/app/FW2\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-0010df40fd2e/bin/tests/ios/app/OnlySources\""; + GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; + HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT\""; + INFOPLIST_FILE = "$BAZEL_STUBS_DIR/Info-stub.plist"; + IPHONEOS_DEPLOYMENT_TARGET = 10.0; + MACH_O_TYPE = "$(inherited)"; + PRODUCT_BUNDLE_IDENTIFIER = com.example.app; + PRODUCT_NAME = App; + SWIFT_ACTIVE_COMPILATION_CONDITIONS = "\"$(inherited)\""; + VALID_ARCHS = "arm64 arm64e"; + }; + name = Release; + }; + 221830DDC933DEC8FE0EA0F0 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + BAZEL_BUILD_EXEC = "$BAZEL_STUBS_DIR/build-wrapper"; + BAZEL_EXECUTION_LOG_ENABLED = 0; + BAZEL_INSTALLER = $BAZEL_INSTALLERS_DIR/installer; + BAZEL_INSTALLERS_DIR = $PROJECT_FILE_PATH/bazelinstallers; + BAZEL_OUTPUT_PROCESSOR = "$BAZEL_STUBS_DIR/output-processor.rb"; + BAZEL_PATH = bazelisk; + BAZEL_RULES_IOS_OPTIONS = "--@build_bazel_rules_ios//rules:local_debug_options_enabled"; + BAZEL_STUBS_DIR = $PROJECT_FILE_PATH/bazelstubs; + BAZEL_WORKSPACE_ROOT = $SRCROOT/../../..; + CC = "$BAZEL_STUBS_DIR/clang-stub"; + CLANG_ANALYZER_EXEC = $CC; + CODE_SIGNING_ALLOWED = 0; + CXX = $CC; + DEBUG_INFORMATION_FORMAT = dwarf; + DONT_RUN_SWIFT_STDLIB_TOOL = 1; + GCC_PREPROCESSOR_DEFINITIONS = DEBUG; + LD = "$BAZEL_STUBS_DIR/ld-stub"; + LIBTOOL = /usr/bin/true; + SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; + SWIFT_EXEC = "$BAZEL_STUBS_DIR/swiftc-stub"; + SWIFT_OBJC_INTERFACE_HEADER_NAME = ""; + SWIFT_VERSION = 5; + }; + name = Debug; + }; + 4E7D60973FAF0C06D4E2E3FD /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + BAZEL_BIN_SUBDIR = /tests/ios/app; + BAZEL_LLDB_SWIFT_EXTRA_CLANG_FLAGS = ""; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks"; + GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; + HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_macos-darwin_x86_64-dbg-ST-2b46341d9197/bin/tests/ios/app/FW_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_macos-darwin_x86_64-dbg-ST-2b46341d9197/bin/tests/ios/app/FW_private_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_macos-darwin_x86_64-dbg-ST-2b46341d9197/bin/tests/ios/app/FW_private_angled_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-0010df40fd2e/bin/tests/ios/app/FW_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-0010df40fd2e/bin/tests/ios/app/FW_private_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-0010df40fd2e/bin/tests/ios/app/FW_private_angled_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; + MACH_O_TYPE = "$(inherited)"; + MACOSX_DEPLOYMENT_TARGET = 10.15; + PRODUCT_NAME = FW; + SWIFT_ACTIVE_COMPILATION_CONDITIONS = "\"$(inherited)\""; + VALID_ARCHS = "i386 x86_64"; + }; + name = Release; + }; + 5B4B01971638CD778D69AA72 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + BAZEL_BUILD_EXEC = "$BAZEL_STUBS_DIR/build-wrapper"; + BAZEL_EXECUTION_LOG_ENABLED = 0; + BAZEL_INSTALLER = $BAZEL_INSTALLERS_DIR/installer; + BAZEL_INSTALLERS_DIR = $PROJECT_FILE_PATH/bazelinstallers; + BAZEL_OUTPUT_PROCESSOR = "$BAZEL_STUBS_DIR/output-processor.rb"; + BAZEL_PATH = bazelisk; + BAZEL_RULES_IOS_OPTIONS = "--@build_bazel_rules_ios//rules:local_debug_options_enabled"; + BAZEL_STUBS_DIR = $PROJECT_FILE_PATH/bazelstubs; + BAZEL_WORKSPACE_ROOT = $SRCROOT/../../..; + CC = "$BAZEL_STUBS_DIR/clang-stub"; + CLANG_ANALYZER_EXEC = $CC; + CODE_SIGNING_ALLOWED = 0; + CXX = $CC; + DEBUG_INFORMATION_FORMAT = dwarf; + DONT_RUN_SWIFT_STDLIB_TOOL = 1; + LD = "$BAZEL_STUBS_DIR/ld-stub"; + LIBTOOL = /usr/bin/true; + SWIFT_EXEC = "$BAZEL_STUBS_DIR/swiftc-stub"; + SWIFT_OBJC_INTERFACE_HEADER_NAME = ""; + SWIFT_VERSION = 5; + }; + name = Release; + }; + B25EB476917A1EBAB5869617 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + BAZEL_BIN_SUBDIR = /tests/ios/app; + BAZEL_LLDB_SWIFT_EXTRA_CLANG_FLAGS = ""; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks"; + GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; + HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_macos-darwin_x86_64-dbg-ST-2b46341d9197/bin/tests/ios/app/FW_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_macos-darwin_x86_64-dbg-ST-2b46341d9197/bin/tests/ios/app/FW_private_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_macos-darwin_x86_64-dbg-ST-2b46341d9197/bin/tests/ios/app/FW_private_angled_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-0010df40fd2e/bin/tests/ios/app/FW_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-0010df40fd2e/bin/tests/ios/app/FW_private_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-0010df40fd2e/bin/tests/ios/app/FW_private_angled_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; + MACH_O_TYPE = "$(inherited)"; + MACOSX_DEPLOYMENT_TARGET = 10.15; + PRODUCT_NAME = FW; + SWIFT_ACTIVE_COMPILATION_CONDITIONS = "\"$(inherited)\""; + VALID_ARCHS = "i386 x86_64"; + }; + name = Debug; + }; + DB3DA510CFD931A1B8B5CC22 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + BAZEL_BIN_SUBDIR = /tests/ios/app; + BAZEL_LLDB_SWIFT_EXTRA_CLANG_FLAGS = ""; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_macos-darwin_x86_64-dbg-ST-2b46341d9197/bin/tests/ios/app/FW\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-0010df40fd2e/bin/tests/ios/app/FW\""; + GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; + HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_macos-darwin_x86_64-dbg-ST-2b46341d9197/bin/tests/ios/app/FW2_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_macos-darwin_x86_64-dbg-ST-2b46341d9197/bin/tests/ios/app/FW2_private_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_macos-darwin_x86_64-dbg-ST-2b46341d9197/bin/tests/ios/app/FW2_private_angled_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-0010df40fd2e/bin/tests/ios/app/FW2_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-0010df40fd2e/bin/tests/ios/app/FW2_private_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-0010df40fd2e/bin/tests/ios/app/FW2_private_angled_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; + MACH_O_TYPE = "$(inherited)"; + MACOSX_DEPLOYMENT_TARGET = 10.15; + PRODUCT_NAME = FW2; + SWIFT_ACTIVE_COMPILATION_CONDITIONS = "\"$(inherited)\""; + VALID_ARCHS = "i386 x86_64"; + }; + name = Debug; + }; + DEE5622C12D90BD28B247F4C /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + BAZEL_BIN_SUBDIR = /tests/ios/app; + BAZEL_LLDB_SWIFT_EXTRA_CLANG_FLAGS = ""; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_macos-darwin_x86_64-dbg-ST-2b46341d9197/bin/tests/ios/app/FW\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-0010df40fd2e/bin/tests/ios/app/FW\""; + GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; + HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_macos-darwin_x86_64-dbg-ST-2b46341d9197/bin/tests/ios/app/FW2_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_macos-darwin_x86_64-dbg-ST-2b46341d9197/bin/tests/ios/app/FW2_private_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_macos-darwin_x86_64-dbg-ST-2b46341d9197/bin/tests/ios/app/FW2_private_angled_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-0010df40fd2e/bin/tests/ios/app/FW2_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-0010df40fd2e/bin/tests/ios/app/FW2_private_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-0010df40fd2e/bin/tests/ios/app/FW2_private_angled_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; + MACH_O_TYPE = "$(inherited)"; + MACOSX_DEPLOYMENT_TARGET = 10.15; + PRODUCT_NAME = FW2; + SWIFT_ACTIVE_COMPILATION_CONDITIONS = "\"$(inherited)\""; + VALID_ARCHS = "i386 x86_64"; + }; + name = Release; + }; +/* End XCBuildConfiguration section */ + +/* Begin XCConfigurationList section */ + 357699BEC3E85E52B9803FB4 /* Build configuration list for PBXNativeTarget "FW2" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + DB3DA510CFD931A1B8B5CC22 /* Debug */, + DEE5622C12D90BD28B247F4C /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Debug; + }; + 4413A83646FC47DEECAC1B58 /* Build configuration list for PBXNativeTarget "FW" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + B25EB476917A1EBAB5869617 /* Debug */, + 4E7D60973FAF0C06D4E2E3FD /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Debug; + }; + 839023D0991E4172568B155B /* Build configuration list for PBXNativeTarget "App" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 06AFEEBD5DF4C607E0124A84 /* Debug */, + 0C5C26920994F0B52B74D3B8 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Debug; + }; + EC0766B02FF768721E1D341B /* Build configuration list for PBXProject "Test-MultipleConfigs-Project" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 221830DDC933DEC8FE0EA0F0 /* Debug */, + 5B4B01971638CD778D69AA72 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Debug; + }; +/* End XCConfigurationList section */ + }; + rootObject = B8F68D4A5DF58E5FDF706458 /* Project object */; +} diff --git a/tests/ios/xcodeproj/Test-MultipleConfigs-Project.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/tests/ios/xcodeproj/Test-MultipleConfigs-Project.xcodeproj/project.xcworkspace/contents.xcworkspacedata new file mode 100755 index 000000000..b78b3bf19 --- /dev/null +++ b/tests/ios/xcodeproj/Test-MultipleConfigs-Project.xcodeproj/project.xcworkspace/contents.xcworkspacedata @@ -0,0 +1,7 @@ + + + + + diff --git a/tests/ios/xcodeproj/Test-MultipleConfigs-Project.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/tests/ios/xcodeproj/Test-MultipleConfigs-Project.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist new file mode 100644 index 000000000..18d981003 --- /dev/null +++ b/tests/ios/xcodeproj/Test-MultipleConfigs-Project.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist @@ -0,0 +1,8 @@ + + + + + IDEDidComputeMac32BitWarning + + + diff --git a/tests/ios/xcodeproj/Test-MultipleConfigs-Project.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings b/tests/ios/xcodeproj/Test-MultipleConfigs-Project.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings new file mode 100644 index 000000000..a3f43a8b3 --- /dev/null +++ b/tests/ios/xcodeproj/Test-MultipleConfigs-Project.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings @@ -0,0 +1,10 @@ + + + + + BuildSystemType + Original + IDEWorkspaceSharedSettings_AutocreateContextsIfNeeded + + + diff --git a/tests/ios/xcodeproj/Test-MultipleConfigs-Project.xcodeproj/xcshareddata/xcschemes/App.xcscheme b/tests/ios/xcodeproj/Test-MultipleConfigs-Project.xcodeproj/xcshareddata/xcschemes/App.xcscheme new file mode 100755 index 000000000..b0df5f1da --- /dev/null +++ b/tests/ios/xcodeproj/Test-MultipleConfigs-Project.xcodeproj/xcshareddata/xcschemes/App.xcscheme @@ -0,0 +1,90 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From bce67d258e0243d2b4372da2c2c3efb63ea2f6f1 Mon Sep 17 00:00:00 2001 From: Amber Dixon Date: Fri, 2 Oct 2020 11:53:22 -0700 Subject: [PATCH 2/9] Fix to point to correct symbol name --- tests/ios/app/FW2/FW.m | 5 ----- tests/ios/app/FW2/{FW.h => FW2.h} | 2 +- tests/ios/app/FW2/FW2.m | 5 +++++ 3 files changed, 6 insertions(+), 6 deletions(-) delete mode 100644 tests/ios/app/FW2/FW.m rename tests/ios/app/FW2/{FW.h => FW2.h} (50%) create mode 100644 tests/ios/app/FW2/FW2.m diff --git a/tests/ios/app/FW2/FW.m b/tests/ios/app/FW2/FW.m deleted file mode 100644 index c451787e1..000000000 --- a/tests/ios/app/FW2/FW.m +++ /dev/null @@ -1,5 +0,0 @@ -#import - -@implementation FW - -@end diff --git a/tests/ios/app/FW2/FW.h b/tests/ios/app/FW2/FW2.h similarity index 50% rename from tests/ios/app/FW2/FW.h rename to tests/ios/app/FW2/FW2.h index dd2446d48..a052afb57 100644 --- a/tests/ios/app/FW2/FW.h +++ b/tests/ios/app/FW2/FW2.h @@ -1,4 +1,4 @@ @import Foundation; -@interface FW: NSObject +@interface FW2: NSObject @end diff --git a/tests/ios/app/FW2/FW2.m b/tests/ios/app/FW2/FW2.m new file mode 100644 index 000000000..82f98a040 --- /dev/null +++ b/tests/ios/app/FW2/FW2.m @@ -0,0 +1,5 @@ +#import + +@implementation FW2 + +@end From 7eadd51ec4a817d857d0af91d17064cae13f911d Mon Sep 17 00:00:00 2001 From: Amber Dixon Date: Fri, 2 Oct 2020 15:30:15 -0700 Subject: [PATCH 3/9] Address build failures and PR feedback --- rules/xcodeproj.bzl | 44 +++++++++++------- tests/ios/app/BUILD.bazel | 4 +- tests/ios/xcodeproj/BUILD.bazel | 5 +- .../project.pbxproj | 12 ++--- .../project.pbxproj | 8 ++-- .../bazelinstallers/lldb-settings.sh | 5 ++ .../project.pbxproj | 46 +++++++++---------- .../bazelinstallers/lldb-settings.sh | 5 ++ .../project.pbxproj | 24 +++++----- .../TestWithHostApp.xcodeproj/project.pbxproj | 4 +- .../project.pbxproj | 4 +- .../project.pbxproj | 4 +- .../project.pbxproj | 12 ++--- 13 files changed, 97 insertions(+), 80 deletions(-) diff --git a/rules/xcodeproj.bzl b/rules/xcodeproj.bzl index be1be00a1..3b1964d2b 100644 --- a/rules/xcodeproj.bzl +++ b/rules/xcodeproj.bzl @@ -252,7 +252,22 @@ def _exclude_swift_incompatible_define(define): return token return None -def _joined_header_search_paths(hmap_paths): +def _fw_search_paths_for_target(target_name, all_transitive_targets): + # Ensure Xcode will resolve references to the XCTest framework. + framework_search_paths = ["$(PLATFORM_DIR)/Developer/Library/Frameworks"] + + # all_transitive_targets includes all the targets built with their different configurations. + # Some configurations are only applied when the target is reached transitively + # (e.g. via an app or test that applies and propagates new build settings). + for at in all_transitive_targets: + if at.name == target_name: + for fi in at.framework_includes.to_list(): + if fi[0] != "/": + fi = "$BAZEL_WORKSPACE_ROOT/%s" % fi + framework_search_paths.append("\"%s\"" % fi) + return " ".join(framework_search_paths) + +def _header_search_paths_for_target(target_name, all_transitive_targets): """Helper method transforming valid hmap paths into full absolute paths and concat together Args: @@ -262,7 +277,15 @@ def _joined_header_search_paths(hmap_paths): One string joined by absolute hmap paths, each path is quoted and separated by a space """ header_search_paths = [] - for hmap in hmap_paths: + all_hmaps = [] + + # all_transitive_targets includes all the targets built with their different configurations. + # Some configurations are only applied when the target is reached transitively + # (e.g. via an app or test that applies and propagates new build settings). + for at in all_transitive_targets: + if at.name == target_name: + all_hmaps.extend(at.hmap_paths.to_list()) + for hmap in all_hmaps: if len(hmap) == 0: continue if hmap != "." and hmap[0] != "/": @@ -442,21 +465,9 @@ def _populate_xcodeproj_targets_and_schemes(ctx, targets, src_dot_dots, all_tran "CLANG_ENABLE_OBJC_ARC": "YES", } - all_hmaps = [] - for at in all_transitive_targets: - if at.name == target_name: - all_hmaps.extend(at.hmap_paths.to_list()) - target_settings["HEADER_SEARCH_PATHS"] = _joined_header_search_paths(all_hmaps) + target_settings["HEADER_SEARCH_PATHS"] = _header_search_paths_for_target(target_name, all_transitive_targets) - # Ensure Xcode will resolve references to the XCTest framework. - framework_search_paths = ["$(PLATFORM_DIR)/Developer/Library/Frameworks"] - for at in all_transitive_targets: - if at.name == target_name: - for fi in at.framework_includes.to_list(): - if fi[0] != "/": - fi = "$BAZEL_WORKSPACE_ROOT/%s" % fi - framework_search_paths.append("\"%s\"" % fi) - target_settings["FRAMEWORK_SEARCH_PATHS"] = " ".join(framework_search_paths) + target_settings["FRAMEWORK_SEARCH_PATHS"] = _fw_search_paths_for_target(target_name, all_transitive_targets) macros = ["\"%s\"" % d for d in target_info.cc_defines.to_list()] macros.append("$(inherited)") @@ -542,7 +553,6 @@ def _populate_xcodeproj_targets_and_schemes(ctx, targets, src_dot_dots, all_tran return (xcodeproj_targets_by_name, xcodeproj_schemes_by_name) def _xcodeproj_impl(ctx): - xcodegen_jsonfile = ctx.actions.declare_file( "%s-xcodegen.json" % ctx.attr.name, ) diff --git a/tests/ios/app/BUILD.bazel b/tests/ios/app/BUILD.bazel index cecd16608..419376cc2 100644 --- a/tests/ios/app/BUILD.bazel +++ b/tests/ios/app/BUILD.bazel @@ -12,8 +12,8 @@ apple_framework( apple_framework( name = "FW2", srcs = glob(["FW2/*"]), - deps = [":FW"], visibility = ["//visibility:public"], + deps = [":FW"], ) apple_framework( @@ -30,13 +30,13 @@ ios_application( srcs = ["App/main.m"], bundle_id = "com.example.app", minimum_os_version = "10.0", + visibility = ["//visibility:public"], deps = [ ":Empty", ":FW", ":FW2", ":OnlySources", ], - visibility = ["//visibility:public"], ) ios_application( diff --git a/tests/ios/xcodeproj/BUILD.bazel b/tests/ios/xcodeproj/BUILD.bazel index da18842c0..2bdae011f 100644 --- a/tests/ios/xcodeproj/BUILD.bazel +++ b/tests/ios/xcodeproj/BUILD.bazel @@ -34,9 +34,9 @@ xcodeproj( generate_schemes_for_product_types = ["application"], include_transitive_targets = False, deps = [ + "//tests/ios/app:App", "//tests/ios/app:FW", "//tests/ios/app:FW2", - "//tests/ios/app:App", ], ) @@ -46,13 +46,12 @@ xcodeproj( generate_schemes_for_product_types = ["application"], include_transitive_targets = True, deps = [ + "//tests/ios/app:App", "//tests/ios/app:FW", "//tests/ios/app:FW2", - "//tests/ios/app:App", ], ) - # Test that the test_host is included when using "include_transitive_targets = True" xcodeproj( name = "Test-With-Host-App", diff --git a/tests/ios/xcodeproj/Single-Static-Framework-Project.xcodeproj/project.pbxproj b/tests/ios/xcodeproj/Single-Static-Framework-Project.xcodeproj/project.pbxproj index 78330bb70..163e79a33 100755 --- a/tests/ios/xcodeproj/Single-Static-Framework-Project.xcodeproj/project.pbxproj +++ b/tests/ios/xcodeproj/Single-Static-Framework-Project.xcodeproj/project.pbxproj @@ -282,7 +282,7 @@ CLANG_ENABLE_OBJC_ARC = YES; FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks"; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; - HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-f75cadb68314/bin/tests/ios/frameworks/objc/ObjcFramework_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-f75cadb68314/bin/tests/ios/frameworks/objc/ObjcFramework_private_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-f75cadb68314/bin/tests/ios/frameworks/objc/ObjcFramework_private_angled_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; + HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-e85ff352ea2d/bin/tests/ios/frameworks/objc/ObjcFramework_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-e85ff352ea2d/bin/tests/ios/frameworks/objc/ObjcFramework_private_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-e85ff352ea2d/bin/tests/ios/frameworks/objc/ObjcFramework_private_angled_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-f75cadb68314/bin/tests/ios/frameworks/objc/ObjcFramework_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-f75cadb68314/bin/tests/ios/frameworks/objc/ObjcFramework_private_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-f75cadb68314/bin/tests/ios/frameworks/objc/ObjcFramework_private_angled_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; IPHONEOS_DEPLOYMENT_TARGET = 10.0; MACH_O_TYPE = "$(inherited)"; PRODUCT_NAME = ObjcFramework; @@ -347,7 +347,7 @@ CLANG_ENABLE_OBJC_ARC = YES; FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks"; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; - HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-f75cadb68314/bin/tests/ios/frameworks/objc/ObjcFramework_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-f75cadb68314/bin/tests/ios/frameworks/objc/ObjcFramework_private_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-f75cadb68314/bin/tests/ios/frameworks/objc/ObjcFramework_private_angled_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; + HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-e85ff352ea2d/bin/tests/ios/frameworks/objc/ObjcFramework_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-e85ff352ea2d/bin/tests/ios/frameworks/objc/ObjcFramework_private_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-e85ff352ea2d/bin/tests/ios/frameworks/objc/ObjcFramework_private_angled_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-f75cadb68314/bin/tests/ios/frameworks/objc/ObjcFramework_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-f75cadb68314/bin/tests/ios/frameworks/objc/ObjcFramework_private_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-f75cadb68314/bin/tests/ios/frameworks/objc/ObjcFramework_private_angled_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; IPHONEOS_DEPLOYMENT_TARGET = 10.0; MACH_O_TYPE = "$(inherited)"; PRODUCT_NAME = ObjcFramework; @@ -390,9 +390,9 @@ BAZEL_LLDB_SWIFT_EXTRA_CLANG_FLAGS = ""; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; - FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-f75cadb68314/bin/tests/ios/frameworks/objc/ObjcFramework\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-0010df40fd2e/bin/tests/ios/frameworks/objc/ObjcFrameworkTestLib\""; + FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-f75cadb68314/bin/tests/ios/frameworks/objc/ObjcFramework\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-0010df40fd2e/bin/tests/ios/frameworks/objc/ObjcFrameworkTestLib\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-f75cadb68314/bin/tests/ios/frameworks/objc/ObjcFramework\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-0010df40fd2e/bin/tests/ios/frameworks/objc/ObjcFrameworkTestLib\""; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; - HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT\""; + HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-1ebda4c9d464/bin/tests/ios/frameworks/objc/ObjcFrameworkTests_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-1ebda4c9d464/bin/tests/ios/frameworks/objc/ObjcFrameworkTests_private_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-1ebda4c9d464/bin/tests/ios/frameworks/objc/ObjcFrameworkTests_private_angled_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; IPHONEOS_DEPLOYMENT_TARGET = 10.0; MACH_O_TYPE = "$(inherited)"; PRODUCT_NAME = ObjcFrameworkTests; @@ -409,9 +409,9 @@ BAZEL_LLDB_SWIFT_EXTRA_CLANG_FLAGS = ""; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; - FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-f75cadb68314/bin/tests/ios/frameworks/objc/ObjcFramework\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-0010df40fd2e/bin/tests/ios/frameworks/objc/ObjcFrameworkTestLib\""; + FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-f75cadb68314/bin/tests/ios/frameworks/objc/ObjcFramework\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-0010df40fd2e/bin/tests/ios/frameworks/objc/ObjcFrameworkTestLib\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-f75cadb68314/bin/tests/ios/frameworks/objc/ObjcFramework\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-0010df40fd2e/bin/tests/ios/frameworks/objc/ObjcFrameworkTestLib\""; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; - HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT\""; + HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-1ebda4c9d464/bin/tests/ios/frameworks/objc/ObjcFrameworkTests_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-1ebda4c9d464/bin/tests/ios/frameworks/objc/ObjcFrameworkTests_private_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-1ebda4c9d464/bin/tests/ios/frameworks/objc/ObjcFrameworkTests_private_angled_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; IPHONEOS_DEPLOYMENT_TARGET = 10.0; MACH_O_TYPE = "$(inherited)"; PRODUCT_NAME = ObjcFrameworkTests; diff --git a/tests/ios/xcodeproj/Test-Imports-App-Project.xcodeproj/project.pbxproj b/tests/ios/xcodeproj/Test-Imports-App-Project.xcodeproj/project.pbxproj index 1f3c6f666..5c18ef755 100755 --- a/tests/ios/xcodeproj/Test-Imports-App-Project.xcodeproj/project.pbxproj +++ b/tests/ios/xcodeproj/Test-Imports-App-Project.xcodeproj/project.pbxproj @@ -343,9 +343,9 @@ BAZEL_LLDB_SWIFT_EXTRA_CLANG_FLAGS = ""; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; - FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-e11e4ada49a5/bin/tests/ios/unit-test/test-imports-app/TestImports-App_framework_unlinked\""; + FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-e11e4ada49a5/bin/tests/ios/unit-test/test-imports-app/TestImports-App_framework_unlinked\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-e11e4ada49a5/bin/tests/ios/unit-test/test-imports-app/TestImports-App_framework_unlinked\""; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; - HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT\""; + HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min12.0-applebin_ios-ios_x86_64-dbg-ST-1ebda4c9d464/bin/tests/ios/unit-test/test-imports-app/TestImports-Unit-Tests_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min12.0-applebin_ios-ios_x86_64-dbg-ST-1ebda4c9d464/bin/tests/ios/unit-test/test-imports-app/TestImports-Unit-Tests_private_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min12.0-applebin_ios-ios_x86_64-dbg-ST-1ebda4c9d464/bin/tests/ios/unit-test/test-imports-app/TestImports-Unit-Tests_private_angled_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min12.0-applebin_ios-ios_x86_64-dbg-ST-1ebda4c9d464/bin/tests/ios/unit-test/test-imports-app/TestImports-Unit-Tests_swift_doublequote_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min12.0-applebin_ios-ios_x86_64-dbg-ST-1ebda4c9d464/bin/tests/ios/unit-test/test-imports-app/TestImports-Unit-Tests_swift_angle_bracket_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; IPHONEOS_DEPLOYMENT_TARGET = 12.0; MACH_O_TYPE = "$(inherited)"; PRODUCT_NAME = "TestImports-Unit-Tests"; @@ -403,9 +403,9 @@ BAZEL_LLDB_SWIFT_EXTRA_CLANG_FLAGS = ""; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; - FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-e11e4ada49a5/bin/tests/ios/unit-test/test-imports-app/TestImports-App_framework_unlinked\""; + FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-e11e4ada49a5/bin/tests/ios/unit-test/test-imports-app/TestImports-App_framework_unlinked\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-e11e4ada49a5/bin/tests/ios/unit-test/test-imports-app/TestImports-App_framework_unlinked\""; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; - HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT\""; + HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min12.0-applebin_ios-ios_x86_64-dbg-ST-1ebda4c9d464/bin/tests/ios/unit-test/test-imports-app/TestImports-Unit-Tests_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min12.0-applebin_ios-ios_x86_64-dbg-ST-1ebda4c9d464/bin/tests/ios/unit-test/test-imports-app/TestImports-Unit-Tests_private_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min12.0-applebin_ios-ios_x86_64-dbg-ST-1ebda4c9d464/bin/tests/ios/unit-test/test-imports-app/TestImports-Unit-Tests_private_angled_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min12.0-applebin_ios-ios_x86_64-dbg-ST-1ebda4c9d464/bin/tests/ios/unit-test/test-imports-app/TestImports-Unit-Tests_swift_doublequote_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min12.0-applebin_ios-ios_x86_64-dbg-ST-1ebda4c9d464/bin/tests/ios/unit-test/test-imports-app/TestImports-Unit-Tests_swift_angle_bracket_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; IPHONEOS_DEPLOYMENT_TARGET = 12.0; MACH_O_TYPE = "$(inherited)"; PRODUCT_NAME = "TestImports-Unit-Tests"; diff --git a/tests/ios/xcodeproj/Test-MultipleConfigs-Project-WithTransitiveFlag.xcodeproj/bazelinstallers/lldb-settings.sh b/tests/ios/xcodeproj/Test-MultipleConfigs-Project-WithTransitiveFlag.xcodeproj/bazelinstallers/lldb-settings.sh index bc280dfab..11e4c7452 100755 --- a/tests/ios/xcodeproj/Test-MultipleConfigs-Project-WithTransitiveFlag.xcodeproj/bazelinstallers/lldb-settings.sh +++ b/tests/ios/xcodeproj/Test-MultipleConfigs-Project-WithTransitiveFlag.xcodeproj/bazelinstallers/lldb-settings.sh @@ -11,10 +11,15 @@ set -euo pipefail # the paths in the debug info. This lldb setting ensures that _project relative_ # paths are remapped to _project absolute_ paths. # +# The platform settings one points the current working directory (cwd) to workspace root. +# This is needed for features relying on lldb remote debugging, such as `oso_prefix_is_pwd`. +# # NOTE: In order to use this, add this line to `~/.lldbinit`: # # command source ~/.lldbinit-source-map cat <<-END > ~/.lldbinit-source-map +platform settings -w "$BAZEL_WORKSPACE_ROOT/" + settings set target.source-map ./ "$BAZEL_WORKSPACE_ROOT/" settings set target.sdk-path $SDKROOT settings set target.swift-framework-search-paths $FRAMEWORK_SEARCH_PATHS diff --git a/tests/ios/xcodeproj/Test-MultipleConfigs-Project-WithTransitiveFlag.xcodeproj/project.pbxproj b/tests/ios/xcodeproj/Test-MultipleConfigs-Project-WithTransitiveFlag.xcodeproj/project.pbxproj index 9924cb7ed..fe187e5d5 100755 --- a/tests/ios/xcodeproj/Test-MultipleConfigs-Project-WithTransitiveFlag.xcodeproj/project.pbxproj +++ b/tests/ios/xcodeproj/Test-MultipleConfigs-Project-WithTransitiveFlag.xcodeproj/project.pbxproj @@ -8,26 +8,26 @@ /* Begin PBXBuildFile section */ 102BD1F0256A0C412AFC03E4 /* FW.m in Sources */ = {isa = PBXBuildFile; fileRef = 04D8C347E5F20AB550C507AE /* FW.m */; }; + 237DC29D3EDB640C22E12C77 /* FW2.m in Sources */ = {isa = PBXBuildFile; fileRef = 9F5243CDA891CA94629FC430 /* FW2.m */; }; 3DF73FAD53D0A91C9EFE99C4 /* OnlySources.m in Sources */ = {isa = PBXBuildFile; fileRef = 4A3A80773667B3313649167E /* OnlySources.m */; }; 4DE0BDAA19658FF59165F380 /* FW_Private.h in Headers */ = {isa = PBXBuildFile; fileRef = 948A9DA2AB9E07E95A7A1F12 /* FW_Private.h */; settings = {ATTRIBUTES = (Public, ); }; }; 760C0061CEA9636469AC6674 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = C2E414444C372DCF13A567DB /* main.m */; }; - D750AE4E7C2A09F749D7E8E3 /* FW.m in Sources */ = {isa = PBXBuildFile; fileRef = 2DB245884E4114A9968C9EE7 /* FW.m */; }; /* End PBXBuildFile section */ /* Begin PBXFileReference section */ 04D8C347E5F20AB550C507AE /* FW.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = FW.m; sourceTree = ""; }; 04E88991827262C51A711BEC /* common.pch */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = common.pch; sourceTree = ""; }; - 07774DB019275D39308A1548 /* FW2.framework */ = {isa = PBXFileReference; includeInIndex = 0; lastKnownFileType = wrapper.framework; path = FW2.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 07774DB019275D39308A1548 /* FW2.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = FW2.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 1463668723465C798E673230 /* FW.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = FW.h; sourceTree = ""; }; - 2DB245884E4114A9968C9EE7 /* FW.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = FW.m; sourceTree = ""; }; + 206990066655BFAE5C81A4EA /* FW2.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = FW2.h; sourceTree = ""; }; 39477307F8DF86D918747B9F /* BUILD.bazel */ = {isa = PBXFileReference; path = BUILD.bazel; sourceTree = ""; }; 4A3A80773667B3313649167E /* OnlySources.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = OnlySources.m; sourceTree = ""; }; 5A5DD8D99887CD20B0A3D7A1 /* App.app */ = {isa = PBXFileReference; includeInIndex = 0; lastKnownFileType = wrapper.application; path = App.app; sourceTree = BUILT_PRODUCTS_DIR; }; 6EDE37267EB0CACA47C4C406 /* Empty.framework */ = {isa = PBXFileReference; includeInIndex = 0; lastKnownFileType = wrapper.framework; path = Empty.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 948A9DA2AB9E07E95A7A1F12 /* FW_Private.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = FW_Private.h; sourceTree = ""; }; - A75BF5BF59112DC3CF68ACB0 /* FW.framework */ = {isa = PBXFileReference; includeInIndex = 0; lastKnownFileType = wrapper.framework; path = FW.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 9F5243CDA891CA94629FC430 /* FW2.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = FW2.m; sourceTree = ""; }; + A75BF5BF59112DC3CF68ACB0 /* FW.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = FW.framework; sourceTree = BUILT_PRODUCTS_DIR; }; C2E414444C372DCF13A567DB /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = ""; }; - D4B2D23966A6F3D38D9278D6 /* FW.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = FW.h; sourceTree = ""; }; FDFA25BC92149ED0819B1D1C /* OnlySources.framework */ = {isa = PBXFileReference; includeInIndex = 0; lastKnownFileType = wrapper.framework; path = OnlySources.framework; sourceTree = BUILT_PRODUCTS_DIR; }; /* End PBXFileReference section */ @@ -125,8 +125,8 @@ FCAD8185F6E9497488EC0EA8 /* FW2 */ = { isa = PBXGroup; children = ( - D4B2D23966A6F3D38D9278D6 /* FW.h */, - 2DB245884E4114A9968C9EE7 /* FW.m */, + 206990066655BFAE5C81A4EA /* FW2.h */, + 9F5243CDA891CA94629FC430 /* FW2.m */, ); path = FW2; sourceTree = ""; @@ -387,7 +387,7 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - D750AE4E7C2A09F749D7E8E3 /* FW.m in Sources */, + 237DC29D3EDB640C22E12C77 /* FW2.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -409,14 +409,14 @@ BAZEL_LLDB_SWIFT_EXTRA_CLANG_FLAGS = ""; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; - FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_macos-darwin_x86_64-dbg-ST-2b46341d9197/bin/tests/ios/app/FW\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-0010df40fd2e/bin/tests/ios/app/FW\""; + FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-0010df40fd2e/bin/tests/ios/app/FW\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_macos-darwin_x86_64-dbg-ST-2b46341d9197/bin/tests/ios/app/FW\""; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; - HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_macos-darwin_x86_64-dbg-ST-2b46341d9197/bin/tests/ios/app/FW2_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_macos-darwin_x86_64-dbg-ST-2b46341d9197/bin/tests/ios/app/FW2_private_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_macos-darwin_x86_64-dbg-ST-2b46341d9197/bin/tests/ios/app/FW2_private_angled_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-0010df40fd2e/bin/tests/ios/app/FW2_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-0010df40fd2e/bin/tests/ios/app/FW2_private_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-0010df40fd2e/bin/tests/ios/app/FW2_private_angled_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; - IPHONEOS_DEPLOYMENT_TARGET = 13.6; + HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-0010df40fd2e/bin/tests/ios/app/FW2_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-0010df40fd2e/bin/tests/ios/app/FW2_private_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-0010df40fd2e/bin/tests/ios/app/FW2_private_angled_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_macos-darwin_x86_64-dbg-ST-2b46341d9197/bin/tests/ios/app/FW2_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_macos-darwin_x86_64-dbg-ST-2b46341d9197/bin/tests/ios/app/FW2_private_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_macos-darwin_x86_64-dbg-ST-2b46341d9197/bin/tests/ios/app/FW2_private_angled_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; MACH_O_TYPE = "$(inherited)"; + MACOSX_DEPLOYMENT_TARGET = 10.15; PRODUCT_NAME = FW2; SWIFT_ACTIVE_COMPILATION_CONDITIONS = "\"$(inherited)\""; - VALID_ARCHS = "arm64 arm64e"; + VALID_ARCHS = "i386 x86_64"; }; name = Release; }; @@ -483,12 +483,12 @@ CLANG_ENABLE_OBJC_ARC = YES; FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks"; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; - HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_macos-darwin_x86_64-dbg-ST-2b46341d9197/bin/tests/ios/app/FW_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_macos-darwin_x86_64-dbg-ST-2b46341d9197/bin/tests/ios/app/FW_private_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_macos-darwin_x86_64-dbg-ST-2b46341d9197/bin/tests/ios/app/FW_private_angled_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-0010df40fd2e/bin/tests/ios/app/FW_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-0010df40fd2e/bin/tests/ios/app/FW_private_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-0010df40fd2e/bin/tests/ios/app/FW_private_angled_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; - IPHONEOS_DEPLOYMENT_TARGET = 13.6; + HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-0010df40fd2e/bin/tests/ios/app/FW_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-0010df40fd2e/bin/tests/ios/app/FW_private_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-0010df40fd2e/bin/tests/ios/app/FW_private_angled_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_macos-darwin_x86_64-dbg-ST-2b46341d9197/bin/tests/ios/app/FW_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_macos-darwin_x86_64-dbg-ST-2b46341d9197/bin/tests/ios/app/FW_private_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_macos-darwin_x86_64-dbg-ST-2b46341d9197/bin/tests/ios/app/FW_private_angled_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; MACH_O_TYPE = "$(inherited)"; + MACOSX_DEPLOYMENT_TARGET = 10.15; PRODUCT_NAME = FW; SWIFT_ACTIVE_COMPILATION_CONDITIONS = "\"$(inherited)\""; - VALID_ARCHS = "arm64 arm64e"; + VALID_ARCHS = "i386 x86_64"; }; name = Release; }; @@ -513,7 +513,6 @@ GCC_PREPROCESSOR_DEFINITIONS = DEBUG; LD = "$BAZEL_STUBS_DIR/ld-stub"; LIBTOOL = /usr/bin/true; - SDKROOT = iphoneos; SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; SWIFT_EXEC = "$BAZEL_STUBS_DIR/swiftc-stub"; SWIFT_OBJC_INTERFACE_HEADER_NAME = ""; @@ -566,14 +565,14 @@ BAZEL_LLDB_SWIFT_EXTRA_CLANG_FLAGS = ""; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; - FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_macos-darwin_x86_64-dbg-ST-2b46341d9197/bin/tests/ios/app/FW\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-0010df40fd2e/bin/tests/ios/app/FW\""; + FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-0010df40fd2e/bin/tests/ios/app/FW\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_macos-darwin_x86_64-dbg-ST-2b46341d9197/bin/tests/ios/app/FW\""; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; - HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_macos-darwin_x86_64-dbg-ST-2b46341d9197/bin/tests/ios/app/FW2_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_macos-darwin_x86_64-dbg-ST-2b46341d9197/bin/tests/ios/app/FW2_private_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_macos-darwin_x86_64-dbg-ST-2b46341d9197/bin/tests/ios/app/FW2_private_angled_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-0010df40fd2e/bin/tests/ios/app/FW2_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-0010df40fd2e/bin/tests/ios/app/FW2_private_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-0010df40fd2e/bin/tests/ios/app/FW2_private_angled_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; - IPHONEOS_DEPLOYMENT_TARGET = 13.6; + HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-0010df40fd2e/bin/tests/ios/app/FW2_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-0010df40fd2e/bin/tests/ios/app/FW2_private_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-0010df40fd2e/bin/tests/ios/app/FW2_private_angled_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_macos-darwin_x86_64-dbg-ST-2b46341d9197/bin/tests/ios/app/FW2_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_macos-darwin_x86_64-dbg-ST-2b46341d9197/bin/tests/ios/app/FW2_private_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_macos-darwin_x86_64-dbg-ST-2b46341d9197/bin/tests/ios/app/FW2_private_angled_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; MACH_O_TYPE = "$(inherited)"; + MACOSX_DEPLOYMENT_TARGET = 10.15; PRODUCT_NAME = FW2; SWIFT_ACTIVE_COMPILATION_CONDITIONS = "\"$(inherited)\""; - VALID_ARCHS = "arm64 arm64e"; + VALID_ARCHS = "i386 x86_64"; }; name = Debug; }; @@ -606,12 +605,12 @@ CLANG_ENABLE_OBJC_ARC = YES; FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks"; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; - HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_macos-darwin_x86_64-dbg-ST-2b46341d9197/bin/tests/ios/app/FW_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_macos-darwin_x86_64-dbg-ST-2b46341d9197/bin/tests/ios/app/FW_private_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_macos-darwin_x86_64-dbg-ST-2b46341d9197/bin/tests/ios/app/FW_private_angled_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-0010df40fd2e/bin/tests/ios/app/FW_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-0010df40fd2e/bin/tests/ios/app/FW_private_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-0010df40fd2e/bin/tests/ios/app/FW_private_angled_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; - IPHONEOS_DEPLOYMENT_TARGET = 13.6; + HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-0010df40fd2e/bin/tests/ios/app/FW_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-0010df40fd2e/bin/tests/ios/app/FW_private_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-0010df40fd2e/bin/tests/ios/app/FW_private_angled_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_macos-darwin_x86_64-dbg-ST-2b46341d9197/bin/tests/ios/app/FW_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_macos-darwin_x86_64-dbg-ST-2b46341d9197/bin/tests/ios/app/FW_private_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_macos-darwin_x86_64-dbg-ST-2b46341d9197/bin/tests/ios/app/FW_private_angled_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; MACH_O_TYPE = "$(inherited)"; + MACOSX_DEPLOYMENT_TARGET = 10.15; PRODUCT_NAME = FW; SWIFT_ACTIVE_COMPILATION_CONDITIONS = "\"$(inherited)\""; - VALID_ARCHS = "arm64 arm64e"; + VALID_ARCHS = "i386 x86_64"; }; name = Debug; }; @@ -635,7 +634,6 @@ DONT_RUN_SWIFT_STDLIB_TOOL = 1; LD = "$BAZEL_STUBS_DIR/ld-stub"; LIBTOOL = /usr/bin/true; - SDKROOT = iphoneos; SWIFT_EXEC = "$BAZEL_STUBS_DIR/swiftc-stub"; SWIFT_OBJC_INTERFACE_HEADER_NAME = ""; SWIFT_VERSION = 5; diff --git a/tests/ios/xcodeproj/Test-MultipleConfigs-Project.xcodeproj/bazelinstallers/lldb-settings.sh b/tests/ios/xcodeproj/Test-MultipleConfigs-Project.xcodeproj/bazelinstallers/lldb-settings.sh index bc280dfab..11e4c7452 100755 --- a/tests/ios/xcodeproj/Test-MultipleConfigs-Project.xcodeproj/bazelinstallers/lldb-settings.sh +++ b/tests/ios/xcodeproj/Test-MultipleConfigs-Project.xcodeproj/bazelinstallers/lldb-settings.sh @@ -11,10 +11,15 @@ set -euo pipefail # the paths in the debug info. This lldb setting ensures that _project relative_ # paths are remapped to _project absolute_ paths. # +# The platform settings one points the current working directory (cwd) to workspace root. +# This is needed for features relying on lldb remote debugging, such as `oso_prefix_is_pwd`. +# # NOTE: In order to use this, add this line to `~/.lldbinit`: # # command source ~/.lldbinit-source-map cat <<-END > ~/.lldbinit-source-map +platform settings -w "$BAZEL_WORKSPACE_ROOT/" + settings set target.source-map ./ "$BAZEL_WORKSPACE_ROOT/" settings set target.sdk-path $SDKROOT settings set target.swift-framework-search-paths $FRAMEWORK_SEARCH_PATHS diff --git a/tests/ios/xcodeproj/Test-MultipleConfigs-Project.xcodeproj/project.pbxproj b/tests/ios/xcodeproj/Test-MultipleConfigs-Project.xcodeproj/project.pbxproj index 2a2248e34..b81cde0c4 100755 --- a/tests/ios/xcodeproj/Test-MultipleConfigs-Project.xcodeproj/project.pbxproj +++ b/tests/ios/xcodeproj/Test-MultipleConfigs-Project.xcodeproj/project.pbxproj @@ -7,8 +7,8 @@ objects = { /* Begin PBXBuildFile section */ + 08A59F58EBC44D475F40283C /* FW2.m in Sources */ = {isa = PBXBuildFile; fileRef = F9038CC7ADC97180ECAFF45C /* FW2.m */; }; 2159F2133D2BBDE7A2192A4F /* FW_Private.h in Headers */ = {isa = PBXBuildFile; fileRef = F90DA395E305A8FA92AF3E0A /* FW_Private.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 5EA4B898494E9206EEF3E72A /* FW.m in Sources */ = {isa = PBXBuildFile; fileRef = 7028BD13D6686B040AB5A030 /* FW.m */; }; 77B2851412A65B323DB0B7EF /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = FD90F7779C3D54F17BEC3EEA /* main.m */; }; 82E549C4AAB2B4D5A9E02A9D /* FW.m in Sources */ = {isa = PBXBuildFile; fileRef = 177820436C75B787C7628EAD /* FW.m */; }; /* End PBXBuildFile section */ @@ -18,11 +18,11 @@ 42D83EE9C52F58A91F9FD2A0 /* common.pch */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = common.pch; sourceTree = ""; }; 542BDACECDA884DD561CAABB /* FW.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = FW.h; sourceTree = ""; }; 6E10AF3580A0BD84B1DCECA6 /* FW.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = FW.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - 7028BD13D6686B040AB5A030 /* FW.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = FW.m; sourceTree = ""; }; 9136DB330408F391F19DF200 /* FW2.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = FW2.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - 9FB51A491DF26DF53E3A5C8A /* FW.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = FW.h; sourceTree = ""; }; B0113FEF453C7D130B7396ED /* BUILD.bazel */ = {isa = PBXFileReference; path = BUILD.bazel; sourceTree = ""; }; E6AAF2A08BBF9E1B20C9A4F2 /* App.app */ = {isa = PBXFileReference; includeInIndex = 0; lastKnownFileType = wrapper.application; path = App.app; sourceTree = BUILT_PRODUCTS_DIR; }; + E758830598D97274903D2AD9 /* FW2.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = FW2.h; sourceTree = ""; }; + F9038CC7ADC97180ECAFF45C /* FW2.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = FW2.m; sourceTree = ""; }; F90DA395E305A8FA92AF3E0A /* FW_Private.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = FW_Private.h; sourceTree = ""; }; FD90F7779C3D54F17BEC3EEA /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = ""; }; /* End PBXFileReference section */ @@ -67,8 +67,8 @@ 70B5E61C73915CCD796EB616 /* FW2 */ = { isa = PBXGroup; children = ( - 9FB51A491DF26DF53E3A5C8A /* FW.h */, - 7028BD13D6686B040AB5A030 /* FW.m */, + E758830598D97274903D2AD9 /* FW2.h */, + F9038CC7ADC97180ECAFF45C /* FW2.m */, ); path = FW2; sourceTree = ""; @@ -279,7 +279,7 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 5EA4B898494E9206EEF3E72A /* FW.m in Sources */, + 08A59F58EBC44D475F40283C /* FW2.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -379,7 +379,7 @@ CLANG_ENABLE_OBJC_ARC = YES; FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks"; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; - HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_macos-darwin_x86_64-dbg-ST-2b46341d9197/bin/tests/ios/app/FW_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_macos-darwin_x86_64-dbg-ST-2b46341d9197/bin/tests/ios/app/FW_private_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_macos-darwin_x86_64-dbg-ST-2b46341d9197/bin/tests/ios/app/FW_private_angled_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-0010df40fd2e/bin/tests/ios/app/FW_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-0010df40fd2e/bin/tests/ios/app/FW_private_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-0010df40fd2e/bin/tests/ios/app/FW_private_angled_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; + HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-0010df40fd2e/bin/tests/ios/app/FW_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-0010df40fd2e/bin/tests/ios/app/FW_private_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-0010df40fd2e/bin/tests/ios/app/FW_private_angled_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_macos-darwin_x86_64-dbg-ST-2b46341d9197/bin/tests/ios/app/FW_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_macos-darwin_x86_64-dbg-ST-2b46341d9197/bin/tests/ios/app/FW_private_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_macos-darwin_x86_64-dbg-ST-2b46341d9197/bin/tests/ios/app/FW_private_angled_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; MACH_O_TYPE = "$(inherited)"; MACOSX_DEPLOYMENT_TARGET = 10.15; PRODUCT_NAME = FW; @@ -423,7 +423,7 @@ CLANG_ENABLE_OBJC_ARC = YES; FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks"; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; - HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_macos-darwin_x86_64-dbg-ST-2b46341d9197/bin/tests/ios/app/FW_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_macos-darwin_x86_64-dbg-ST-2b46341d9197/bin/tests/ios/app/FW_private_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_macos-darwin_x86_64-dbg-ST-2b46341d9197/bin/tests/ios/app/FW_private_angled_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-0010df40fd2e/bin/tests/ios/app/FW_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-0010df40fd2e/bin/tests/ios/app/FW_private_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-0010df40fd2e/bin/tests/ios/app/FW_private_angled_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; + HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-0010df40fd2e/bin/tests/ios/app/FW_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-0010df40fd2e/bin/tests/ios/app/FW_private_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-0010df40fd2e/bin/tests/ios/app/FW_private_angled_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_macos-darwin_x86_64-dbg-ST-2b46341d9197/bin/tests/ios/app/FW_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_macos-darwin_x86_64-dbg-ST-2b46341d9197/bin/tests/ios/app/FW_private_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_macos-darwin_x86_64-dbg-ST-2b46341d9197/bin/tests/ios/app/FW_private_angled_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; MACH_O_TYPE = "$(inherited)"; MACOSX_DEPLOYMENT_TARGET = 10.15; PRODUCT_NAME = FW; @@ -439,9 +439,9 @@ BAZEL_LLDB_SWIFT_EXTRA_CLANG_FLAGS = ""; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; - FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_macos-darwin_x86_64-dbg-ST-2b46341d9197/bin/tests/ios/app/FW\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-0010df40fd2e/bin/tests/ios/app/FW\""; + FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-0010df40fd2e/bin/tests/ios/app/FW\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_macos-darwin_x86_64-dbg-ST-2b46341d9197/bin/tests/ios/app/FW\""; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; - HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_macos-darwin_x86_64-dbg-ST-2b46341d9197/bin/tests/ios/app/FW2_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_macos-darwin_x86_64-dbg-ST-2b46341d9197/bin/tests/ios/app/FW2_private_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_macos-darwin_x86_64-dbg-ST-2b46341d9197/bin/tests/ios/app/FW2_private_angled_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-0010df40fd2e/bin/tests/ios/app/FW2_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-0010df40fd2e/bin/tests/ios/app/FW2_private_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-0010df40fd2e/bin/tests/ios/app/FW2_private_angled_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; + HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-0010df40fd2e/bin/tests/ios/app/FW2_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-0010df40fd2e/bin/tests/ios/app/FW2_private_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-0010df40fd2e/bin/tests/ios/app/FW2_private_angled_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_macos-darwin_x86_64-dbg-ST-2b46341d9197/bin/tests/ios/app/FW2_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_macos-darwin_x86_64-dbg-ST-2b46341d9197/bin/tests/ios/app/FW2_private_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_macos-darwin_x86_64-dbg-ST-2b46341d9197/bin/tests/ios/app/FW2_private_angled_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; MACH_O_TYPE = "$(inherited)"; MACOSX_DEPLOYMENT_TARGET = 10.15; PRODUCT_NAME = FW2; @@ -457,9 +457,9 @@ BAZEL_LLDB_SWIFT_EXTRA_CLANG_FLAGS = ""; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; - FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_macos-darwin_x86_64-dbg-ST-2b46341d9197/bin/tests/ios/app/FW\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-0010df40fd2e/bin/tests/ios/app/FW\""; + FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-0010df40fd2e/bin/tests/ios/app/FW\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_macos-darwin_x86_64-dbg-ST-2b46341d9197/bin/tests/ios/app/FW\""; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; - HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_macos-darwin_x86_64-dbg-ST-2b46341d9197/bin/tests/ios/app/FW2_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_macos-darwin_x86_64-dbg-ST-2b46341d9197/bin/tests/ios/app/FW2_private_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_macos-darwin_x86_64-dbg-ST-2b46341d9197/bin/tests/ios/app/FW2_private_angled_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-0010df40fd2e/bin/tests/ios/app/FW2_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-0010df40fd2e/bin/tests/ios/app/FW2_private_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-0010df40fd2e/bin/tests/ios/app/FW2_private_angled_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; + HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-0010df40fd2e/bin/tests/ios/app/FW2_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-0010df40fd2e/bin/tests/ios/app/FW2_private_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-0010df40fd2e/bin/tests/ios/app/FW2_private_angled_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_macos-darwin_x86_64-dbg-ST-2b46341d9197/bin/tests/ios/app/FW2_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_macos-darwin_x86_64-dbg-ST-2b46341d9197/bin/tests/ios/app/FW2_private_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_macos-darwin_x86_64-dbg-ST-2b46341d9197/bin/tests/ios/app/FW2_private_angled_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; MACH_O_TYPE = "$(inherited)"; MACOSX_DEPLOYMENT_TARGET = 10.15; PRODUCT_NAME = FW2; diff --git a/tests/ios/xcodeproj/TestWithHostApp.xcodeproj/project.pbxproj b/tests/ios/xcodeproj/TestWithHostApp.xcodeproj/project.pbxproj index bcaa49fd5..0dc477eae 100755 --- a/tests/ios/xcodeproj/TestWithHostApp.xcodeproj/project.pbxproj +++ b/tests/ios/xcodeproj/TestWithHostApp.xcodeproj/project.pbxproj @@ -355,7 +355,7 @@ CLANG_ENABLE_OBJC_ARC = YES; FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks"; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; - HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT\""; + HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min12.0-applebin_ios-ios_x86_64-dbg-ST-1ebda4c9d464/bin/tests/ios/unit-test/ExplicitHosted_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min12.0-applebin_ios-ios_x86_64-dbg-ST-1ebda4c9d464/bin/tests/ios/unit-test/ExplicitHosted_private_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min12.0-applebin_ios-ios_x86_64-dbg-ST-1ebda4c9d464/bin/tests/ios/unit-test/ExplicitHosted_private_angled_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min12.0-applebin_ios-ios_x86_64-dbg-ST-1ebda4c9d464/bin/tests/ios/unit-test/ExplicitHosted_swift_doublequote_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min12.0-applebin_ios-ios_x86_64-dbg-ST-1ebda4c9d464/bin/tests/ios/unit-test/ExplicitHosted_swift_angle_bracket_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; IPHONEOS_DEPLOYMENT_TARGET = 12.0; MACH_O_TYPE = "$(inherited)"; PRODUCT_NAME = ExplicitHosted; @@ -375,7 +375,7 @@ CLANG_ENABLE_OBJC_ARC = YES; FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks"; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; - HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT\""; + HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min12.0-applebin_ios-ios_x86_64-dbg-ST-1ebda4c9d464/bin/tests/ios/unit-test/ExplicitHosted_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min12.0-applebin_ios-ios_x86_64-dbg-ST-1ebda4c9d464/bin/tests/ios/unit-test/ExplicitHosted_private_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min12.0-applebin_ios-ios_x86_64-dbg-ST-1ebda4c9d464/bin/tests/ios/unit-test/ExplicitHosted_private_angled_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min12.0-applebin_ios-ios_x86_64-dbg-ST-1ebda4c9d464/bin/tests/ios/unit-test/ExplicitHosted_swift_doublequote_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min12.0-applebin_ios-ios_x86_64-dbg-ST-1ebda4c9d464/bin/tests/ios/unit-test/ExplicitHosted_swift_angle_bracket_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; IPHONEOS_DEPLOYMENT_TARGET = 12.0; MACH_O_TYPE = "$(inherited)"; PRODUCT_NAME = ExplicitHosted; diff --git a/tests/macos/xcodeproj/Single-Application-Project-AllTargets.xcodeproj/project.pbxproj b/tests/macos/xcodeproj/Single-Application-Project-AllTargets.xcodeproj/project.pbxproj index f7f2b52cf..e4f200c22 100755 --- a/tests/macos/xcodeproj/Single-Application-Project-AllTargets.xcodeproj/project.pbxproj +++ b/tests/macos/xcodeproj/Single-Application-Project-AllTargets.xcodeproj/project.pbxproj @@ -288,7 +288,7 @@ CLANG_ENABLE_OBJC_ARC = YES; FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks"; GCC_PREPROCESSOR_DEFINITIONS = "\"REQUIRED_DEFINED_FLAG=1\" \"FLAG_WITH_VALUE_ZERO=0\" $(inherited)"; - HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT\""; + HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min11.0-applebin_ios-ios_x86_64-dbg-ST-1ebda4c9d464/bin/tests/macos/xcodeproj/Single-Application-UnitTests_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min11.0-applebin_ios-ios_x86_64-dbg-ST-1ebda4c9d464/bin/tests/macos/xcodeproj/Single-Application-UnitTests_private_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min11.0-applebin_ios-ios_x86_64-dbg-ST-1ebda4c9d464/bin/tests/macos/xcodeproj/Single-Application-UnitTests_private_angled_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min11.0-applebin_ios-ios_x86_64-dbg-ST-1ebda4c9d464/bin/tests/macos/xcodeproj/Single-Application-UnitTests_swift_doublequote_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min11.0-applebin_ios-ios_x86_64-dbg-ST-1ebda4c9d464/bin/tests/macos/xcodeproj/Single-Application-UnitTests_swift_angle_bracket_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; IPHONEOS_DEPLOYMENT_TARGET = 11.0; MACH_O_TYPE = "$(inherited)"; PRODUCT_NAME = "Single-Application-UnitTests"; @@ -441,7 +441,7 @@ CLANG_ENABLE_OBJC_ARC = YES; FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks"; GCC_PREPROCESSOR_DEFINITIONS = "\"REQUIRED_DEFINED_FLAG=1\" \"FLAG_WITH_VALUE_ZERO=0\" $(inherited)"; - HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT\""; + HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min11.0-applebin_ios-ios_x86_64-dbg-ST-1ebda4c9d464/bin/tests/macos/xcodeproj/Single-Application-UnitTests_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min11.0-applebin_ios-ios_x86_64-dbg-ST-1ebda4c9d464/bin/tests/macos/xcodeproj/Single-Application-UnitTests_private_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min11.0-applebin_ios-ios_x86_64-dbg-ST-1ebda4c9d464/bin/tests/macos/xcodeproj/Single-Application-UnitTests_private_angled_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min11.0-applebin_ios-ios_x86_64-dbg-ST-1ebda4c9d464/bin/tests/macos/xcodeproj/Single-Application-UnitTests_swift_doublequote_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min11.0-applebin_ios-ios_x86_64-dbg-ST-1ebda4c9d464/bin/tests/macos/xcodeproj/Single-Application-UnitTests_swift_angle_bracket_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; IPHONEOS_DEPLOYMENT_TARGET = 11.0; MACH_O_TYPE = "$(inherited)"; PRODUCT_NAME = "Single-Application-UnitTests"; diff --git a/tests/macos/xcodeproj/Single-Application-Project-DirectTargetsOnly.xcodeproj/project.pbxproj b/tests/macos/xcodeproj/Single-Application-Project-DirectTargetsOnly.xcodeproj/project.pbxproj index 15f906ea0..0a629e48e 100755 --- a/tests/macos/xcodeproj/Single-Application-Project-DirectTargetsOnly.xcodeproj/project.pbxproj +++ b/tests/macos/xcodeproj/Single-Application-Project-DirectTargetsOnly.xcodeproj/project.pbxproj @@ -307,7 +307,7 @@ CLANG_ENABLE_OBJC_ARC = YES; FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks"; GCC_PREPROCESSOR_DEFINITIONS = "\"REQUIRED_DEFINED_FLAG=1\" \"FLAG_WITH_VALUE_ZERO=0\" $(inherited)"; - HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT\""; + HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min11.0-applebin_ios-ios_x86_64-dbg-ST-1ebda4c9d464/bin/tests/macos/xcodeproj/Single-Application-UnitTests_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min11.0-applebin_ios-ios_x86_64-dbg-ST-1ebda4c9d464/bin/tests/macos/xcodeproj/Single-Application-UnitTests_private_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min11.0-applebin_ios-ios_x86_64-dbg-ST-1ebda4c9d464/bin/tests/macos/xcodeproj/Single-Application-UnitTests_private_angled_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min11.0-applebin_ios-ios_x86_64-dbg-ST-1ebda4c9d464/bin/tests/macos/xcodeproj/Single-Application-UnitTests_swift_doublequote_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min11.0-applebin_ios-ios_x86_64-dbg-ST-1ebda4c9d464/bin/tests/macos/xcodeproj/Single-Application-UnitTests_swift_angle_bracket_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; IPHONEOS_DEPLOYMENT_TARGET = 11.0; MACH_O_TYPE = "$(inherited)"; PRODUCT_NAME = "Single-Application-UnitTests"; @@ -441,7 +441,7 @@ CLANG_ENABLE_OBJC_ARC = YES; FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks"; GCC_PREPROCESSOR_DEFINITIONS = "\"REQUIRED_DEFINED_FLAG=1\" \"FLAG_WITH_VALUE_ZERO=0\" $(inherited)"; - HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT\""; + HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min11.0-applebin_ios-ios_x86_64-dbg-ST-1ebda4c9d464/bin/tests/macos/xcodeproj/Single-Application-UnitTests_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min11.0-applebin_ios-ios_x86_64-dbg-ST-1ebda4c9d464/bin/tests/macos/xcodeproj/Single-Application-UnitTests_private_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min11.0-applebin_ios-ios_x86_64-dbg-ST-1ebda4c9d464/bin/tests/macos/xcodeproj/Single-Application-UnitTests_private_angled_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min11.0-applebin_ios-ios_x86_64-dbg-ST-1ebda4c9d464/bin/tests/macos/xcodeproj/Single-Application-UnitTests_swift_doublequote_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min11.0-applebin_ios-ios_x86_64-dbg-ST-1ebda4c9d464/bin/tests/macos/xcodeproj/Single-Application-UnitTests_swift_angle_bracket_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; IPHONEOS_DEPLOYMENT_TARGET = 11.0; MACH_O_TYPE = "$(inherited)"; PRODUCT_NAME = "Single-Application-UnitTests"; diff --git a/tests/macos/xcodeproj/Test-Target-With-Test-Host-Project.xcodeproj/project.pbxproj b/tests/macos/xcodeproj/Test-Target-With-Test-Host-Project.xcodeproj/project.pbxproj index 2f12b6660..c90e13c21 100755 --- a/tests/macos/xcodeproj/Test-Target-With-Test-Host-Project.xcodeproj/project.pbxproj +++ b/tests/macos/xcodeproj/Test-Target-With-Test-Host-Project.xcodeproj/project.pbxproj @@ -416,9 +416,9 @@ BAZEL_LLDB_SWIFT_EXTRA_CLANG_FLAGS = ""; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; - FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-e11e4ada49a5/bin/tests/ios/unit-test/test-imports-app/TestImports-App_framework_unlinked\""; + FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-e11e4ada49a5/bin/tests/ios/unit-test/test-imports-app/TestImports-App_framework_unlinked\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-e11e4ada49a5/bin/tests/ios/unit-test/test-imports-app/TestImports-App_framework_unlinked\""; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; - HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT\""; + HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min12.0-applebin_ios-ios_x86_64-dbg-ST-1ebda4c9d464/bin/tests/ios/unit-test/test-imports-app/TestImports-Unit-Tests_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min12.0-applebin_ios-ios_x86_64-dbg-ST-1ebda4c9d464/bin/tests/ios/unit-test/test-imports-app/TestImports-Unit-Tests_private_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min12.0-applebin_ios-ios_x86_64-dbg-ST-1ebda4c9d464/bin/tests/ios/unit-test/test-imports-app/TestImports-Unit-Tests_private_angled_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min12.0-applebin_ios-ios_x86_64-dbg-ST-1ebda4c9d464/bin/tests/ios/unit-test/test-imports-app/TestImports-Unit-Tests_swift_doublequote_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min12.0-applebin_ios-ios_x86_64-dbg-ST-1ebda4c9d464/bin/tests/ios/unit-test/test-imports-app/TestImports-Unit-Tests_swift_angle_bracket_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; IPHONEOS_DEPLOYMENT_TARGET = 12.0; MACH_O_TYPE = "$(inherited)"; PRODUCT_NAME = "TestImports-Unit-Tests"; @@ -456,9 +456,9 @@ BAZEL_LLDB_SWIFT_EXTRA_CLANG_FLAGS = ""; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; - FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-e11e4ada49a5/bin/tests/ios/unit-test/test-imports-app/TestImports-App_framework_unlinked\""; + FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-e11e4ada49a5/bin/tests/ios/unit-test/test-imports-app/TestImports-App_framework_unlinked\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-e11e4ada49a5/bin/tests/ios/unit-test/test-imports-app/TestImports-App_framework_unlinked\""; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; - HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT\""; + HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min12.0-applebin_ios-ios_x86_64-dbg-ST-1ebda4c9d464/bin/tests/ios/unit-test/test-imports-app/TestImports-Unit-Tests_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min12.0-applebin_ios-ios_x86_64-dbg-ST-1ebda4c9d464/bin/tests/ios/unit-test/test-imports-app/TestImports-Unit-Tests_private_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min12.0-applebin_ios-ios_x86_64-dbg-ST-1ebda4c9d464/bin/tests/ios/unit-test/test-imports-app/TestImports-Unit-Tests_private_angled_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min12.0-applebin_ios-ios_x86_64-dbg-ST-1ebda4c9d464/bin/tests/ios/unit-test/test-imports-app/TestImports-Unit-Tests_swift_doublequote_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min12.0-applebin_ios-ios_x86_64-dbg-ST-1ebda4c9d464/bin/tests/ios/unit-test/test-imports-app/TestImports-Unit-Tests_swift_angle_bracket_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; IPHONEOS_DEPLOYMENT_TARGET = 12.0; MACH_O_TYPE = "$(inherited)"; PRODUCT_NAME = "TestImports-Unit-Tests"; @@ -478,7 +478,7 @@ CLANG_ENABLE_OBJC_ARC = YES; FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks"; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; - HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT\""; + HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-1ebda4c9d464/bin/tests/ios/unit-test/DefaultHosted_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-1ebda4c9d464/bin/tests/ios/unit-test/DefaultHosted_private_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-1ebda4c9d464/bin/tests/ios/unit-test/DefaultHosted_private_angled_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-1ebda4c9d464/bin/tests/ios/unit-test/DefaultHosted_swift_doublequote_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-1ebda4c9d464/bin/tests/ios/unit-test/DefaultHosted_swift_angle_bracket_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; IPHONEOS_DEPLOYMENT_TARGET = 10.0; MACH_O_TYPE = "$(inherited)"; PRODUCT_NAME = DefaultHosted; @@ -614,7 +614,7 @@ CLANG_ENABLE_OBJC_ARC = YES; FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks"; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; - HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT\""; + HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-1ebda4c9d464/bin/tests/ios/unit-test/DefaultHosted_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-1ebda4c9d464/bin/tests/ios/unit-test/DefaultHosted_private_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-1ebda4c9d464/bin/tests/ios/unit-test/DefaultHosted_private_angled_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-1ebda4c9d464/bin/tests/ios/unit-test/DefaultHosted_swift_doublequote_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-1ebda4c9d464/bin/tests/ios/unit-test/DefaultHosted_swift_angle_bracket_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; IPHONEOS_DEPLOYMENT_TARGET = 10.0; MACH_O_TYPE = "$(inherited)"; PRODUCT_NAME = DefaultHosted; From 51acff742ff6bda10ffe166f19bb783852233207 Mon Sep 17 00:00:00 2001 From: Amber Dixon Date: Mon, 5 Oct 2020 12:10:46 -0700 Subject: [PATCH 4/9] fix build errors --- tests/ios/app/BUILD.bazel | 16 ++++++++ .../project.pbxproj | 38 ++++++++++--------- .../project.pbxproj | 38 ++++++++++--------- 3 files changed, 56 insertions(+), 36 deletions(-) diff --git a/tests/ios/app/BUILD.bazel b/tests/ios/app/BUILD.bazel index 419376cc2..29b8cb113 100644 --- a/tests/ios/app/BUILD.bazel +++ b/tests/ios/app/BUILD.bazel @@ -7,6 +7,7 @@ apple_framework( srcs = glob(["FW/*"]), private_headers = glob(["FW/*_Private.*"]), visibility = ["//visibility:public"], + platforms = {"ios": "10.0"}, ) apple_framework( @@ -14,6 +15,7 @@ apple_framework( srcs = glob(["FW2/*"]), visibility = ["//visibility:public"], deps = [":FW"], + platforms = {"ios": "10.0"}, ) apple_framework( @@ -39,6 +41,20 @@ ios_application( ], ) +ios_application( + name = "AppWithEmptyDep", + srcs = ["App/main.m"], + bundle_id = "com.example.app", + minimum_os_version = "10.0", + visibility = ["//visibility:public"], + deps = [ + ":Empty", + ":FW", + ":FW2", + ":OnlySources", + ], +) + ios_application( name = "AppWithResources", srcs = ["App/main.m"], diff --git a/tests/ios/xcodeproj/Test-MultipleConfigs-Project-WithTransitiveFlag.xcodeproj/project.pbxproj b/tests/ios/xcodeproj/Test-MultipleConfigs-Project-WithTransitiveFlag.xcodeproj/project.pbxproj index fe187e5d5..7e98ad3e6 100755 --- a/tests/ios/xcodeproj/Test-MultipleConfigs-Project-WithTransitiveFlag.xcodeproj/project.pbxproj +++ b/tests/ios/xcodeproj/Test-MultipleConfigs-Project-WithTransitiveFlag.xcodeproj/project.pbxproj @@ -17,7 +17,7 @@ /* Begin PBXFileReference section */ 04D8C347E5F20AB550C507AE /* FW.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = FW.m; sourceTree = ""; }; 04E88991827262C51A711BEC /* common.pch */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = common.pch; sourceTree = ""; }; - 07774DB019275D39308A1548 /* FW2.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = FW2.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 07774DB019275D39308A1548 /* FW2.framework */ = {isa = PBXFileReference; includeInIndex = 0; lastKnownFileType = wrapper.framework; path = FW2.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 1463668723465C798E673230 /* FW.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = FW.h; sourceTree = ""; }; 206990066655BFAE5C81A4EA /* FW2.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = FW2.h; sourceTree = ""; }; 39477307F8DF86D918747B9F /* BUILD.bazel */ = {isa = PBXFileReference; path = BUILD.bazel; sourceTree = ""; }; @@ -26,7 +26,7 @@ 6EDE37267EB0CACA47C4C406 /* Empty.framework */ = {isa = PBXFileReference; includeInIndex = 0; lastKnownFileType = wrapper.framework; path = Empty.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 948A9DA2AB9E07E95A7A1F12 /* FW_Private.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = FW_Private.h; sourceTree = ""; }; 9F5243CDA891CA94629FC430 /* FW2.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = FW2.m; sourceTree = ""; }; - A75BF5BF59112DC3CF68ACB0 /* FW.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = FW.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + A75BF5BF59112DC3CF68ACB0 /* FW.framework */ = {isa = PBXFileReference; includeInIndex = 0; lastKnownFileType = wrapper.framework; path = FW.framework; sourceTree = BUILT_PRODUCTS_DIR; }; C2E414444C372DCF13A567DB /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = ""; }; FDFA25BC92149ED0819B1D1C /* OnlySources.framework */ = {isa = PBXFileReference; includeInIndex = 0; lastKnownFileType = wrapper.framework; path = OnlySources.framework; sourceTree = BUILT_PRODUCTS_DIR; }; /* End PBXFileReference section */ @@ -409,14 +409,14 @@ BAZEL_LLDB_SWIFT_EXTRA_CLANG_FLAGS = ""; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; - FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-0010df40fd2e/bin/tests/ios/app/FW\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_macos-darwin_x86_64-dbg-ST-2b46341d9197/bin/tests/ios/app/FW\""; + FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-e11e4ada49a5/bin/tests/ios/app/FW\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-e85ff352ea2d/bin/tests/ios/app/FW\""; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; - HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-0010df40fd2e/bin/tests/ios/app/FW2_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-0010df40fd2e/bin/tests/ios/app/FW2_private_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-0010df40fd2e/bin/tests/ios/app/FW2_private_angled_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_macos-darwin_x86_64-dbg-ST-2b46341d9197/bin/tests/ios/app/FW2_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_macos-darwin_x86_64-dbg-ST-2b46341d9197/bin/tests/ios/app/FW2_private_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_macos-darwin_x86_64-dbg-ST-2b46341d9197/bin/tests/ios/app/FW2_private_angled_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; + HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-e11e4ada49a5/bin/tests/ios/app/FW2_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-e11e4ada49a5/bin/tests/ios/app/FW2_private_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-e11e4ada49a5/bin/tests/ios/app/FW2_private_angled_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-e85ff352ea2d/bin/tests/ios/app/FW2_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-e85ff352ea2d/bin/tests/ios/app/FW2_private_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-e85ff352ea2d/bin/tests/ios/app/FW2_private_angled_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; + IPHONEOS_DEPLOYMENT_TARGET = 10.0; MACH_O_TYPE = "$(inherited)"; - MACOSX_DEPLOYMENT_TARGET = 10.15; PRODUCT_NAME = FW2; SWIFT_ACTIVE_COMPILATION_CONDITIONS = "\"$(inherited)\""; - VALID_ARCHS = "i386 x86_64"; + VALID_ARCHS = "arm64 arm64e"; }; name = Release; }; @@ -483,12 +483,12 @@ CLANG_ENABLE_OBJC_ARC = YES; FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks"; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; - HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-0010df40fd2e/bin/tests/ios/app/FW_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-0010df40fd2e/bin/tests/ios/app/FW_private_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-0010df40fd2e/bin/tests/ios/app/FW_private_angled_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_macos-darwin_x86_64-dbg-ST-2b46341d9197/bin/tests/ios/app/FW_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_macos-darwin_x86_64-dbg-ST-2b46341d9197/bin/tests/ios/app/FW_private_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_macos-darwin_x86_64-dbg-ST-2b46341d9197/bin/tests/ios/app/FW_private_angled_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; + HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-e11e4ada49a5/bin/tests/ios/app/FW_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-e11e4ada49a5/bin/tests/ios/app/FW_private_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-e11e4ada49a5/bin/tests/ios/app/FW_private_angled_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-e85ff352ea2d/bin/tests/ios/app/FW_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-e85ff352ea2d/bin/tests/ios/app/FW_private_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-e85ff352ea2d/bin/tests/ios/app/FW_private_angled_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; + IPHONEOS_DEPLOYMENT_TARGET = 10.0; MACH_O_TYPE = "$(inherited)"; - MACOSX_DEPLOYMENT_TARGET = 10.15; PRODUCT_NAME = FW; SWIFT_ACTIVE_COMPILATION_CONDITIONS = "\"$(inherited)\""; - VALID_ARCHS = "i386 x86_64"; + VALID_ARCHS = "arm64 arm64e"; }; name = Release; }; @@ -513,6 +513,7 @@ GCC_PREPROCESSOR_DEFINITIONS = DEBUG; LD = "$BAZEL_STUBS_DIR/ld-stub"; LIBTOOL = /usr/bin/true; + SDKROOT = iphoneos; SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; SWIFT_EXEC = "$BAZEL_STUBS_DIR/swiftc-stub"; SWIFT_OBJC_INTERFACE_HEADER_NAME = ""; @@ -545,7 +546,7 @@ BAZEL_LLDB_SWIFT_EXTRA_CLANG_FLAGS = ""; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; - FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-0010df40fd2e/bin/tests/ios/app/FW\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-0010df40fd2e/bin/tests/ios/app/FW2\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-0010df40fd2e/bin/tests/ios/app/OnlySources\""; + FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-e11e4ada49a5/bin/tests/ios/app/FW\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-e11e4ada49a5/bin/tests/ios/app/FW2\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-0010df40fd2e/bin/tests/ios/app/OnlySources\""; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT\""; INFOPLIST_FILE = "$BAZEL_STUBS_DIR/Info-stub.plist"; @@ -565,14 +566,14 @@ BAZEL_LLDB_SWIFT_EXTRA_CLANG_FLAGS = ""; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; - FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-0010df40fd2e/bin/tests/ios/app/FW\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_macos-darwin_x86_64-dbg-ST-2b46341d9197/bin/tests/ios/app/FW\""; + FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-e11e4ada49a5/bin/tests/ios/app/FW\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-e85ff352ea2d/bin/tests/ios/app/FW\""; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; - HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-0010df40fd2e/bin/tests/ios/app/FW2_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-0010df40fd2e/bin/tests/ios/app/FW2_private_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-0010df40fd2e/bin/tests/ios/app/FW2_private_angled_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_macos-darwin_x86_64-dbg-ST-2b46341d9197/bin/tests/ios/app/FW2_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_macos-darwin_x86_64-dbg-ST-2b46341d9197/bin/tests/ios/app/FW2_private_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_macos-darwin_x86_64-dbg-ST-2b46341d9197/bin/tests/ios/app/FW2_private_angled_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; + HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-e11e4ada49a5/bin/tests/ios/app/FW2_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-e11e4ada49a5/bin/tests/ios/app/FW2_private_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-e11e4ada49a5/bin/tests/ios/app/FW2_private_angled_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-e85ff352ea2d/bin/tests/ios/app/FW2_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-e85ff352ea2d/bin/tests/ios/app/FW2_private_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-e85ff352ea2d/bin/tests/ios/app/FW2_private_angled_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; + IPHONEOS_DEPLOYMENT_TARGET = 10.0; MACH_O_TYPE = "$(inherited)"; - MACOSX_DEPLOYMENT_TARGET = 10.15; PRODUCT_NAME = FW2; SWIFT_ACTIVE_COMPILATION_CONDITIONS = "\"$(inherited)\""; - VALID_ARCHS = "i386 x86_64"; + VALID_ARCHS = "arm64 arm64e"; }; name = Debug; }; @@ -583,7 +584,7 @@ BAZEL_LLDB_SWIFT_EXTRA_CLANG_FLAGS = ""; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; - FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-0010df40fd2e/bin/tests/ios/app/FW\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-0010df40fd2e/bin/tests/ios/app/FW2\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-0010df40fd2e/bin/tests/ios/app/OnlySources\""; + FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-e11e4ada49a5/bin/tests/ios/app/FW\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-e11e4ada49a5/bin/tests/ios/app/FW2\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-0010df40fd2e/bin/tests/ios/app/OnlySources\""; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT\""; INFOPLIST_FILE = "$BAZEL_STUBS_DIR/Info-stub.plist"; @@ -605,12 +606,12 @@ CLANG_ENABLE_OBJC_ARC = YES; FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks"; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; - HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-0010df40fd2e/bin/tests/ios/app/FW_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-0010df40fd2e/bin/tests/ios/app/FW_private_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-0010df40fd2e/bin/tests/ios/app/FW_private_angled_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_macos-darwin_x86_64-dbg-ST-2b46341d9197/bin/tests/ios/app/FW_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_macos-darwin_x86_64-dbg-ST-2b46341d9197/bin/tests/ios/app/FW_private_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_macos-darwin_x86_64-dbg-ST-2b46341d9197/bin/tests/ios/app/FW_private_angled_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; + HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-e11e4ada49a5/bin/tests/ios/app/FW_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-e11e4ada49a5/bin/tests/ios/app/FW_private_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-e11e4ada49a5/bin/tests/ios/app/FW_private_angled_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-e85ff352ea2d/bin/tests/ios/app/FW_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-e85ff352ea2d/bin/tests/ios/app/FW_private_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-e85ff352ea2d/bin/tests/ios/app/FW_private_angled_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; + IPHONEOS_DEPLOYMENT_TARGET = 10.0; MACH_O_TYPE = "$(inherited)"; - MACOSX_DEPLOYMENT_TARGET = 10.15; PRODUCT_NAME = FW; SWIFT_ACTIVE_COMPILATION_CONDITIONS = "\"$(inherited)\""; - VALID_ARCHS = "i386 x86_64"; + VALID_ARCHS = "arm64 arm64e"; }; name = Debug; }; @@ -634,6 +635,7 @@ DONT_RUN_SWIFT_STDLIB_TOOL = 1; LD = "$BAZEL_STUBS_DIR/ld-stub"; LIBTOOL = /usr/bin/true; + SDKROOT = iphoneos; SWIFT_EXEC = "$BAZEL_STUBS_DIR/swiftc-stub"; SWIFT_OBJC_INTERFACE_HEADER_NAME = ""; SWIFT_VERSION = 5; diff --git a/tests/ios/xcodeproj/Test-MultipleConfigs-Project.xcodeproj/project.pbxproj b/tests/ios/xcodeproj/Test-MultipleConfigs-Project.xcodeproj/project.pbxproj index b81cde0c4..681838a75 100755 --- a/tests/ios/xcodeproj/Test-MultipleConfigs-Project.xcodeproj/project.pbxproj +++ b/tests/ios/xcodeproj/Test-MultipleConfigs-Project.xcodeproj/project.pbxproj @@ -17,8 +17,8 @@ 177820436C75B787C7628EAD /* FW.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = FW.m; sourceTree = ""; }; 42D83EE9C52F58A91F9FD2A0 /* common.pch */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = common.pch; sourceTree = ""; }; 542BDACECDA884DD561CAABB /* FW.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = FW.h; sourceTree = ""; }; - 6E10AF3580A0BD84B1DCECA6 /* FW.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = FW.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - 9136DB330408F391F19DF200 /* FW2.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = FW2.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 6E10AF3580A0BD84B1DCECA6 /* FW.framework */ = {isa = PBXFileReference; includeInIndex = 0; lastKnownFileType = wrapper.framework; path = FW.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 9136DB330408F391F19DF200 /* FW2.framework */ = {isa = PBXFileReference; includeInIndex = 0; lastKnownFileType = wrapper.framework; path = FW2.framework; sourceTree = BUILT_PRODUCTS_DIR; }; B0113FEF453C7D130B7396ED /* BUILD.bazel */ = {isa = PBXFileReference; path = BUILD.bazel; sourceTree = ""; }; E6AAF2A08BBF9E1B20C9A4F2 /* App.app */ = {isa = PBXFileReference; includeInIndex = 0; lastKnownFileType = wrapper.application; path = App.app; sourceTree = BUILT_PRODUCTS_DIR; }; E758830598D97274903D2AD9 /* FW2.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = FW2.h; sourceTree = ""; }; @@ -309,7 +309,7 @@ BAZEL_LLDB_SWIFT_EXTRA_CLANG_FLAGS = ""; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; - FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-0010df40fd2e/bin/tests/ios/app/FW\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-0010df40fd2e/bin/tests/ios/app/FW2\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-0010df40fd2e/bin/tests/ios/app/OnlySources\""; + FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-e11e4ada49a5/bin/tests/ios/app/FW\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-e11e4ada49a5/bin/tests/ios/app/FW2\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-0010df40fd2e/bin/tests/ios/app/OnlySources\""; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT\""; INFOPLIST_FILE = "$BAZEL_STUBS_DIR/Info-stub.plist"; @@ -329,7 +329,7 @@ BAZEL_LLDB_SWIFT_EXTRA_CLANG_FLAGS = ""; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; - FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-0010df40fd2e/bin/tests/ios/app/FW\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-0010df40fd2e/bin/tests/ios/app/FW2\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-0010df40fd2e/bin/tests/ios/app/OnlySources\""; + FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-e11e4ada49a5/bin/tests/ios/app/FW\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-e11e4ada49a5/bin/tests/ios/app/FW2\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-0010df40fd2e/bin/tests/ios/app/OnlySources\""; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT\""; INFOPLIST_FILE = "$BAZEL_STUBS_DIR/Info-stub.plist"; @@ -363,6 +363,7 @@ GCC_PREPROCESSOR_DEFINITIONS = DEBUG; LD = "$BAZEL_STUBS_DIR/ld-stub"; LIBTOOL = /usr/bin/true; + SDKROOT = iphoneos; SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; SWIFT_EXEC = "$BAZEL_STUBS_DIR/swiftc-stub"; SWIFT_OBJC_INTERFACE_HEADER_NAME = ""; @@ -379,12 +380,12 @@ CLANG_ENABLE_OBJC_ARC = YES; FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks"; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; - HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-0010df40fd2e/bin/tests/ios/app/FW_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-0010df40fd2e/bin/tests/ios/app/FW_private_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-0010df40fd2e/bin/tests/ios/app/FW_private_angled_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_macos-darwin_x86_64-dbg-ST-2b46341d9197/bin/tests/ios/app/FW_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_macos-darwin_x86_64-dbg-ST-2b46341d9197/bin/tests/ios/app/FW_private_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_macos-darwin_x86_64-dbg-ST-2b46341d9197/bin/tests/ios/app/FW_private_angled_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; + HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-e11e4ada49a5/bin/tests/ios/app/FW_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-e11e4ada49a5/bin/tests/ios/app/FW_private_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-e11e4ada49a5/bin/tests/ios/app/FW_private_angled_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-e85ff352ea2d/bin/tests/ios/app/FW_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-e85ff352ea2d/bin/tests/ios/app/FW_private_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-e85ff352ea2d/bin/tests/ios/app/FW_private_angled_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; + IPHONEOS_DEPLOYMENT_TARGET = 10.0; MACH_O_TYPE = "$(inherited)"; - MACOSX_DEPLOYMENT_TARGET = 10.15; PRODUCT_NAME = FW; SWIFT_ACTIVE_COMPILATION_CONDITIONS = "\"$(inherited)\""; - VALID_ARCHS = "i386 x86_64"; + VALID_ARCHS = "arm64 arm64e"; }; name = Release; }; @@ -408,6 +409,7 @@ DONT_RUN_SWIFT_STDLIB_TOOL = 1; LD = "$BAZEL_STUBS_DIR/ld-stub"; LIBTOOL = /usr/bin/true; + SDKROOT = iphoneos; SWIFT_EXEC = "$BAZEL_STUBS_DIR/swiftc-stub"; SWIFT_OBJC_INTERFACE_HEADER_NAME = ""; SWIFT_VERSION = 5; @@ -423,12 +425,12 @@ CLANG_ENABLE_OBJC_ARC = YES; FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks"; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; - HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-0010df40fd2e/bin/tests/ios/app/FW_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-0010df40fd2e/bin/tests/ios/app/FW_private_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-0010df40fd2e/bin/tests/ios/app/FW_private_angled_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_macos-darwin_x86_64-dbg-ST-2b46341d9197/bin/tests/ios/app/FW_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_macos-darwin_x86_64-dbg-ST-2b46341d9197/bin/tests/ios/app/FW_private_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_macos-darwin_x86_64-dbg-ST-2b46341d9197/bin/tests/ios/app/FW_private_angled_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; + HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-e11e4ada49a5/bin/tests/ios/app/FW_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-e11e4ada49a5/bin/tests/ios/app/FW_private_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-e11e4ada49a5/bin/tests/ios/app/FW_private_angled_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-e85ff352ea2d/bin/tests/ios/app/FW_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-e85ff352ea2d/bin/tests/ios/app/FW_private_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-e85ff352ea2d/bin/tests/ios/app/FW_private_angled_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; + IPHONEOS_DEPLOYMENT_TARGET = 10.0; MACH_O_TYPE = "$(inherited)"; - MACOSX_DEPLOYMENT_TARGET = 10.15; PRODUCT_NAME = FW; SWIFT_ACTIVE_COMPILATION_CONDITIONS = "\"$(inherited)\""; - VALID_ARCHS = "i386 x86_64"; + VALID_ARCHS = "arm64 arm64e"; }; name = Debug; }; @@ -439,14 +441,14 @@ BAZEL_LLDB_SWIFT_EXTRA_CLANG_FLAGS = ""; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; - FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-0010df40fd2e/bin/tests/ios/app/FW\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_macos-darwin_x86_64-dbg-ST-2b46341d9197/bin/tests/ios/app/FW\""; + FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-e11e4ada49a5/bin/tests/ios/app/FW\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-e85ff352ea2d/bin/tests/ios/app/FW\""; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; - HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-0010df40fd2e/bin/tests/ios/app/FW2_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-0010df40fd2e/bin/tests/ios/app/FW2_private_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-0010df40fd2e/bin/tests/ios/app/FW2_private_angled_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_macos-darwin_x86_64-dbg-ST-2b46341d9197/bin/tests/ios/app/FW2_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_macos-darwin_x86_64-dbg-ST-2b46341d9197/bin/tests/ios/app/FW2_private_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_macos-darwin_x86_64-dbg-ST-2b46341d9197/bin/tests/ios/app/FW2_private_angled_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; + HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-e11e4ada49a5/bin/tests/ios/app/FW2_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-e11e4ada49a5/bin/tests/ios/app/FW2_private_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-e11e4ada49a5/bin/tests/ios/app/FW2_private_angled_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-e85ff352ea2d/bin/tests/ios/app/FW2_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-e85ff352ea2d/bin/tests/ios/app/FW2_private_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-e85ff352ea2d/bin/tests/ios/app/FW2_private_angled_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; + IPHONEOS_DEPLOYMENT_TARGET = 10.0; MACH_O_TYPE = "$(inherited)"; - MACOSX_DEPLOYMENT_TARGET = 10.15; PRODUCT_NAME = FW2; SWIFT_ACTIVE_COMPILATION_CONDITIONS = "\"$(inherited)\""; - VALID_ARCHS = "i386 x86_64"; + VALID_ARCHS = "arm64 arm64e"; }; name = Debug; }; @@ -457,14 +459,14 @@ BAZEL_LLDB_SWIFT_EXTRA_CLANG_FLAGS = ""; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; - FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-0010df40fd2e/bin/tests/ios/app/FW\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_macos-darwin_x86_64-dbg-ST-2b46341d9197/bin/tests/ios/app/FW\""; + FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-e11e4ada49a5/bin/tests/ios/app/FW\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-e85ff352ea2d/bin/tests/ios/app/FW\""; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; - HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-0010df40fd2e/bin/tests/ios/app/FW2_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-0010df40fd2e/bin/tests/ios/app/FW2_private_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-0010df40fd2e/bin/tests/ios/app/FW2_private_angled_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_macos-darwin_x86_64-dbg-ST-2b46341d9197/bin/tests/ios/app/FW2_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_macos-darwin_x86_64-dbg-ST-2b46341d9197/bin/tests/ios/app/FW2_private_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_macos-darwin_x86_64-dbg-ST-2b46341d9197/bin/tests/ios/app/FW2_private_angled_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; + HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-e11e4ada49a5/bin/tests/ios/app/FW2_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-e11e4ada49a5/bin/tests/ios/app/FW2_private_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-e11e4ada49a5/bin/tests/ios/app/FW2_private_angled_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-e85ff352ea2d/bin/tests/ios/app/FW2_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-e85ff352ea2d/bin/tests/ios/app/FW2_private_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-e85ff352ea2d/bin/tests/ios/app/FW2_private_angled_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; + IPHONEOS_DEPLOYMENT_TARGET = 10.0; MACH_O_TYPE = "$(inherited)"; - MACOSX_DEPLOYMENT_TARGET = 10.15; PRODUCT_NAME = FW2; SWIFT_ACTIVE_COMPILATION_CONDITIONS = "\"$(inherited)\""; - VALID_ARCHS = "i386 x86_64"; + VALID_ARCHS = "arm64 arm64e"; }; name = Release; }; From e86a97c6c1de4196b9f9175c026f1f8263de2cb6 Mon Sep 17 00:00:00 2001 From: Amber Dixon Date: Mon, 5 Oct 2020 13:16:48 -0700 Subject: [PATCH 5/9] Address more build issues --- tests/ios/app/BUILD.bazel | 5 +- .../project.pbxproj | 89 ------------------- 2 files changed, 2 insertions(+), 92 deletions(-) diff --git a/tests/ios/app/BUILD.bazel b/tests/ios/app/BUILD.bazel index 29b8cb113..c7b412938 100644 --- a/tests/ios/app/BUILD.bazel +++ b/tests/ios/app/BUILD.bazel @@ -5,17 +5,17 @@ load("//rules:test.bzl", "ios_unit_test") apple_framework( name = "FW", srcs = glob(["FW/*"]), + platforms = {"ios": "10.0"}, private_headers = glob(["FW/*_Private.*"]), visibility = ["//visibility:public"], - platforms = {"ios": "10.0"}, ) apple_framework( name = "FW2", srcs = glob(["FW2/*"]), + platforms = {"ios": "10.0"}, visibility = ["//visibility:public"], deps = [":FW"], - platforms = {"ios": "10.0"}, ) apple_framework( @@ -34,7 +34,6 @@ ios_application( minimum_os_version = "10.0", visibility = ["//visibility:public"], deps = [ - ":Empty", ":FW", ":FW2", ":OnlySources", diff --git a/tests/ios/xcodeproj/Test-MultipleConfigs-Project-WithTransitiveFlag.xcodeproj/project.pbxproj b/tests/ios/xcodeproj/Test-MultipleConfigs-Project-WithTransitiveFlag.xcodeproj/project.pbxproj index 7e98ad3e6..4e8a15526 100755 --- a/tests/ios/xcodeproj/Test-MultipleConfigs-Project-WithTransitiveFlag.xcodeproj/project.pbxproj +++ b/tests/ios/xcodeproj/Test-MultipleConfigs-Project-WithTransitiveFlag.xcodeproj/project.pbxproj @@ -23,7 +23,6 @@ 39477307F8DF86D918747B9F /* BUILD.bazel */ = {isa = PBXFileReference; path = BUILD.bazel; sourceTree = ""; }; 4A3A80773667B3313649167E /* OnlySources.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = OnlySources.m; sourceTree = ""; }; 5A5DD8D99887CD20B0A3D7A1 /* App.app */ = {isa = PBXFileReference; includeInIndex = 0; lastKnownFileType = wrapper.application; path = App.app; sourceTree = BUILT_PRODUCTS_DIR; }; - 6EDE37267EB0CACA47C4C406 /* Empty.framework */ = {isa = PBXFileReference; includeInIndex = 0; lastKnownFileType = wrapper.framework; path = Empty.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 948A9DA2AB9E07E95A7A1F12 /* FW_Private.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = FW_Private.h; sourceTree = ""; }; 9F5243CDA891CA94629FC430 /* FW2.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = FW2.m; sourceTree = ""; }; A75BF5BF59112DC3CF68ACB0 /* FW.framework */ = {isa = PBXFileReference; includeInIndex = 0; lastKnownFileType = wrapper.framework; path = FW.framework; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -36,7 +35,6 @@ isa = PBXGroup; children = ( 5A5DD8D99887CD20B0A3D7A1 /* App.app */, - 6EDE37267EB0CACA47C4C406 /* Empty.framework */, A75BF5BF59112DC3CF68ACB0 /* FW.framework */, 07774DB019275D39308A1548 /* FW2.framework */, FDFA25BC92149ED0819B1D1C /* OnlySources.framework */, @@ -187,22 +185,6 @@ productReference = FDFA25BC92149ED0819B1D1C /* OnlySources.framework */; productType = "com.apple.product-type.framework.static"; }; - C9669E8D3E558DA5D6636AEF /* Empty */ = { - isa = PBXNativeTarget; - buildConfigurationList = A8457733EC58BE42D11419E4 /* Build configuration list for PBXNativeTarget "Empty" */; - buildPhases = ( - 1C54E9B814B347833D3EDFB7 /* Build with bazel */, - 5D1EBADCFB431E5A69890D1B /* Sources */, - ); - buildRules = ( - ); - dependencies = ( - ); - name = Empty; - productName = Empty; - productReference = 6EDE37267EB0CACA47C4C406 /* Empty.framework */; - productType = "com.apple.product-type.framework.static"; - }; E2830301AB976A38E63AF1EE /* FW */ = { isa = PBXNativeTarget; buildConfigurationList = 225C9557C0DFB668662FE03A /* Build configuration list for PBXNativeTarget "FW" */; @@ -258,7 +240,6 @@ projectRoot = ""; targets = ( 19CFCE12EE4A1C14C5132B34 /* App */, - C9669E8D3E558DA5D6636AEF /* Empty */, E2830301AB976A38E63AF1EE /* FW */, F69743083419364855A71D16 /* FW2 */, 4C6498C464AEEF9633C48C60 /* OnlySources */, @@ -267,24 +248,6 @@ /* End PBXProject section */ /* Begin PBXShellScriptBuildPhase section */ - 1C54E9B814B347833D3EDFB7 /* Build with bazel */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputFileListPaths = ( - ); - inputPaths = ( - ); - name = "Build with bazel"; - outputFileListPaths = ( - ); - outputPaths = ( - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "\nset -euxo pipefail\ncd $BAZEL_WORKSPACE_ROOT\n\nexport BAZEL_DIAGNOSTICS_DIR=\"$BUILD_DIR/../../bazel-xcode-diagnostics/\"\nmkdir -p $BAZEL_DIAGNOSTICS_DIR\nexport DATE_SUFFIX=\"$(date +%Y%m%d.%H%M%S%L)\"\nexport BAZEL_BUILD_EVENT_TEXT_FILENAME=\"$BAZEL_DIAGNOSTICS_DIR/build-event-$DATE_SUFFIX.txt\"\nexport BAZEL_BUILD_EXECUTION_LOG_FILENAME=\"$BAZEL_DIAGNOSTICS_DIR/build-execution-log-$DATE_SUFFIX.log\"\nenv -u RUBYOPT -u RUBY_HOME -u GEM_HOME $BAZEL_BUILD_EXEC tests/ios/app:Empty\n$BAZEL_INSTALLER\n"; - }; 2810B51CEA30355A80B0CFA5 /* Build with bazel */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; @@ -376,13 +339,6 @@ ); runOnlyForDeploymentPostprocessing = 0; }; - 5D1EBADCFB431E5A69890D1B /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; B64EE1BDEE56C3ED339C9C42 /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; @@ -438,42 +394,6 @@ }; name = Release; }; - 620EC53C6575012D0923B0DF /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - BAZEL_BIN_SUBDIR = /tests/ios/app; - BAZEL_LLDB_SWIFT_EXTRA_CLANG_FLAGS = ""; - CLANG_ENABLE_MODULES = YES; - CLANG_ENABLE_OBJC_ARC = YES; - FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks"; - GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; - HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-0010df40fd2e/bin/tests/ios/app/Empty_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-0010df40fd2e/bin/tests/ios/app/Empty_private_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-0010df40fd2e/bin/tests/ios/app/Empty_private_angled_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; - IPHONEOS_DEPLOYMENT_TARGET = 13.6; - MACH_O_TYPE = "$(inherited)"; - PRODUCT_NAME = Empty; - SWIFT_ACTIVE_COMPILATION_CONDITIONS = "\"$(inherited)\""; - VALID_ARCHS = "arm64 arm64e"; - }; - name = Debug; - }; - 6CBCB2258FE67296AD1EE1A6 /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - BAZEL_BIN_SUBDIR = /tests/ios/app; - BAZEL_LLDB_SWIFT_EXTRA_CLANG_FLAGS = ""; - CLANG_ENABLE_MODULES = YES; - CLANG_ENABLE_OBJC_ARC = YES; - FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks"; - GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; - HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-0010df40fd2e/bin/tests/ios/app/Empty_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-0010df40fd2e/bin/tests/ios/app/Empty_private_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-0010df40fd2e/bin/tests/ios/app/Empty_private_angled_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; - IPHONEOS_DEPLOYMENT_TARGET = 13.6; - MACH_O_TYPE = "$(inherited)"; - PRODUCT_NAME = Empty; - SWIFT_ACTIVE_COMPILATION_CONDITIONS = "\"$(inherited)\""; - VALID_ARCHS = "arm64 arm64e"; - }; - name = Release; - }; 7FBFC0CCB1CA07630DE91A02 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { @@ -681,15 +601,6 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Debug; }; - A8457733EC58BE42D11419E4 /* Build configuration list for PBXNativeTarget "Empty" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 620EC53C6575012D0923B0DF /* Debug */, - 6CBCB2258FE67296AD1EE1A6 /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Debug; - }; E5F95071646F4E22E9B8AA72 /* Build configuration list for PBXNativeTarget "OnlySources" */ = { isa = XCConfigurationList; buildConfigurations = ( From d2d2c3d737a138b03739059d72a97d271ff172d6 Mon Sep 17 00:00:00 2001 From: Amber Dixon Date: Mon, 5 Oct 2020 13:38:09 -0700 Subject: [PATCH 6/9] rename method name --- rules/xcodeproj.bzl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rules/xcodeproj.bzl b/rules/xcodeproj.bzl index 3b1964d2b..2b2887025 100644 --- a/rules/xcodeproj.bzl +++ b/rules/xcodeproj.bzl @@ -252,7 +252,7 @@ def _exclude_swift_incompatible_define(define): return token return None -def _fw_search_paths_for_target(target_name, all_transitive_targets): +def _framework_search_paths_for_target(target_name, all_transitive_targets): # Ensure Xcode will resolve references to the XCTest framework. framework_search_paths = ["$(PLATFORM_DIR)/Developer/Library/Frameworks"] @@ -467,7 +467,7 @@ def _populate_xcodeproj_targets_and_schemes(ctx, targets, src_dot_dots, all_tran target_settings["HEADER_SEARCH_PATHS"] = _header_search_paths_for_target(target_name, all_transitive_targets) - target_settings["FRAMEWORK_SEARCH_PATHS"] = _fw_search_paths_for_target(target_name, all_transitive_targets) + target_settings["FRAMEWORK_SEARCH_PATHS"] = _framework_search_paths_for_target(target_name, all_transitive_targets) macros = ["\"%s\"" % d for d in target_info.cc_defines.to_list()] macros.append("$(inherited)") From 3cee054620df5d271335934f0e875508a87fac68 Mon Sep 17 00:00:00 2001 From: Amber Dixon Date: Wed, 7 Oct 2020 17:09:14 -0700 Subject: [PATCH 7/9] Filter out headermaps that do not take any inputs --- rules/hmap.bzl | 17 +++++++++++++---- .../project.pbxproj | 12 ++++++------ .../project.pbxproj | 4 ++-- .../project.pbxproj | 8 ++++---- .../project.pbxproj | 4 ++-- .../TestWithHostApp.xcodeproj/project.pbxproj | 4 ++-- .../project.pbxproj | 4 ++-- .../project.pbxproj | 4 ++-- .../project.pbxproj | 8 ++++---- 9 files changed, 37 insertions(+), 28 deletions(-) diff --git a/rules/hmap.bzl b/rules/hmap.bzl index c698aee5f..689586be3 100644 --- a/rules/hmap.bzl +++ b/rules/hmap.bzl @@ -74,14 +74,23 @@ def _make_headermap_impl(ctx): ) cc_info_provider = CcInfo(compilation_context = objc_provider.compilation_context) - return [ - HeaderMapInfo( - files = depset([ctx.outputs.headermap]), - ), + contains_headers = False + for h in hdrs_lists: + if len(h) > 0: + contains_headers = True + + providers = [ objc_provider, cc_info_provider, ] + if contains_headers: + providers.append(HeaderMapInfo( + files = depset([ctx.outputs.headermap]), + )) + + return providers + # Derive a headermap from transitive headermaps # hdrs: a file group containing headers for this rule # namespace: the Apple style namespace these header should be under diff --git a/tests/ios/xcodeproj/Single-Static-Framework-Project.xcodeproj/project.pbxproj b/tests/ios/xcodeproj/Single-Static-Framework-Project.xcodeproj/project.pbxproj index 163e79a33..34bb185af 100755 --- a/tests/ios/xcodeproj/Single-Static-Framework-Project.xcodeproj/project.pbxproj +++ b/tests/ios/xcodeproj/Single-Static-Framework-Project.xcodeproj/project.pbxproj @@ -282,7 +282,7 @@ CLANG_ENABLE_OBJC_ARC = YES; FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks"; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; - HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-e85ff352ea2d/bin/tests/ios/frameworks/objc/ObjcFramework_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-e85ff352ea2d/bin/tests/ios/frameworks/objc/ObjcFramework_private_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-e85ff352ea2d/bin/tests/ios/frameworks/objc/ObjcFramework_private_angled_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-f75cadb68314/bin/tests/ios/frameworks/objc/ObjcFramework_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-f75cadb68314/bin/tests/ios/frameworks/objc/ObjcFramework_private_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-f75cadb68314/bin/tests/ios/frameworks/objc/ObjcFramework_private_angled_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; + HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-e85ff352ea2d/bin/tests/ios/frameworks/objc/ObjcFramework_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-e85ff352ea2d/bin/tests/ios/frameworks/objc/ObjcFramework_private_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-f75cadb68314/bin/tests/ios/frameworks/objc/ObjcFramework_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-f75cadb68314/bin/tests/ios/frameworks/objc/ObjcFramework_private_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; IPHONEOS_DEPLOYMENT_TARGET = 10.0; MACH_O_TYPE = "$(inherited)"; PRODUCT_NAME = ObjcFramework; @@ -329,7 +329,7 @@ CLANG_ENABLE_OBJC_ARC = YES; FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-f75cadb68314/bin/tests/ios/frameworks/objc/ObjcFramework\""; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; - HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-0010df40fd2e/bin/tests/ios/frameworks/objc/ObjcFrameworkTestLib_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-0010df40fd2e/bin/tests/ios/frameworks/objc/ObjcFrameworkTestLib_private_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-0010df40fd2e/bin/tests/ios/frameworks/objc/ObjcFrameworkTestLib_private_angled_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; + HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-0010df40fd2e/bin/tests/ios/frameworks/objc/ObjcFrameworkTestLib_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-0010df40fd2e/bin/tests/ios/frameworks/objc/ObjcFrameworkTestLib_private_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; IPHONEOS_DEPLOYMENT_TARGET = 13.6; MACH_O_TYPE = "$(inherited)"; PRODUCT_NAME = ObjcFrameworkTestLib; @@ -347,7 +347,7 @@ CLANG_ENABLE_OBJC_ARC = YES; FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks"; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; - HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-e85ff352ea2d/bin/tests/ios/frameworks/objc/ObjcFramework_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-e85ff352ea2d/bin/tests/ios/frameworks/objc/ObjcFramework_private_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-e85ff352ea2d/bin/tests/ios/frameworks/objc/ObjcFramework_private_angled_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-f75cadb68314/bin/tests/ios/frameworks/objc/ObjcFramework_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-f75cadb68314/bin/tests/ios/frameworks/objc/ObjcFramework_private_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-f75cadb68314/bin/tests/ios/frameworks/objc/ObjcFramework_private_angled_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; + HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-e85ff352ea2d/bin/tests/ios/frameworks/objc/ObjcFramework_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-e85ff352ea2d/bin/tests/ios/frameworks/objc/ObjcFramework_private_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-f75cadb68314/bin/tests/ios/frameworks/objc/ObjcFramework_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-f75cadb68314/bin/tests/ios/frameworks/objc/ObjcFramework_private_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; IPHONEOS_DEPLOYMENT_TARGET = 10.0; MACH_O_TYPE = "$(inherited)"; PRODUCT_NAME = ObjcFramework; @@ -392,7 +392,7 @@ CLANG_ENABLE_OBJC_ARC = YES; FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-f75cadb68314/bin/tests/ios/frameworks/objc/ObjcFramework\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-0010df40fd2e/bin/tests/ios/frameworks/objc/ObjcFrameworkTestLib\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-f75cadb68314/bin/tests/ios/frameworks/objc/ObjcFramework\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-0010df40fd2e/bin/tests/ios/frameworks/objc/ObjcFrameworkTestLib\""; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; - HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-1ebda4c9d464/bin/tests/ios/frameworks/objc/ObjcFrameworkTests_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-1ebda4c9d464/bin/tests/ios/frameworks/objc/ObjcFrameworkTests_private_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-1ebda4c9d464/bin/tests/ios/frameworks/objc/ObjcFrameworkTests_private_angled_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; + HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT\""; IPHONEOS_DEPLOYMENT_TARGET = 10.0; MACH_O_TYPE = "$(inherited)"; PRODUCT_NAME = ObjcFrameworkTests; @@ -411,7 +411,7 @@ CLANG_ENABLE_OBJC_ARC = YES; FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-f75cadb68314/bin/tests/ios/frameworks/objc/ObjcFramework\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-0010df40fd2e/bin/tests/ios/frameworks/objc/ObjcFrameworkTestLib\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-f75cadb68314/bin/tests/ios/frameworks/objc/ObjcFramework\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-0010df40fd2e/bin/tests/ios/frameworks/objc/ObjcFrameworkTestLib\""; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; - HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-1ebda4c9d464/bin/tests/ios/frameworks/objc/ObjcFrameworkTests_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-1ebda4c9d464/bin/tests/ios/frameworks/objc/ObjcFrameworkTests_private_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-1ebda4c9d464/bin/tests/ios/frameworks/objc/ObjcFrameworkTests_private_angled_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; + HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT\""; IPHONEOS_DEPLOYMENT_TARGET = 10.0; MACH_O_TYPE = "$(inherited)"; PRODUCT_NAME = ObjcFrameworkTests; @@ -430,7 +430,7 @@ CLANG_ENABLE_OBJC_ARC = YES; FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-f75cadb68314/bin/tests/ios/frameworks/objc/ObjcFramework\""; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; - HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-0010df40fd2e/bin/tests/ios/frameworks/objc/ObjcFrameworkTestLib_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-0010df40fd2e/bin/tests/ios/frameworks/objc/ObjcFrameworkTestLib_private_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-0010df40fd2e/bin/tests/ios/frameworks/objc/ObjcFrameworkTestLib_private_angled_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; + HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-0010df40fd2e/bin/tests/ios/frameworks/objc/ObjcFrameworkTestLib_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-0010df40fd2e/bin/tests/ios/frameworks/objc/ObjcFrameworkTestLib_private_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; IPHONEOS_DEPLOYMENT_TARGET = 13.6; MACH_O_TYPE = "$(inherited)"; PRODUCT_NAME = ObjcFrameworkTestLib; diff --git a/tests/ios/xcodeproj/Test-Imports-App-Project.xcodeproj/project.pbxproj b/tests/ios/xcodeproj/Test-Imports-App-Project.xcodeproj/project.pbxproj index 5c18ef755..9986cfbfa 100755 --- a/tests/ios/xcodeproj/Test-Imports-App-Project.xcodeproj/project.pbxproj +++ b/tests/ios/xcodeproj/Test-Imports-App-Project.xcodeproj/project.pbxproj @@ -345,7 +345,7 @@ CLANG_ENABLE_OBJC_ARC = YES; FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-e11e4ada49a5/bin/tests/ios/unit-test/test-imports-app/TestImports-App_framework_unlinked\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-e11e4ada49a5/bin/tests/ios/unit-test/test-imports-app/TestImports-App_framework_unlinked\""; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; - HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min12.0-applebin_ios-ios_x86_64-dbg-ST-1ebda4c9d464/bin/tests/ios/unit-test/test-imports-app/TestImports-Unit-Tests_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min12.0-applebin_ios-ios_x86_64-dbg-ST-1ebda4c9d464/bin/tests/ios/unit-test/test-imports-app/TestImports-Unit-Tests_private_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min12.0-applebin_ios-ios_x86_64-dbg-ST-1ebda4c9d464/bin/tests/ios/unit-test/test-imports-app/TestImports-Unit-Tests_private_angled_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min12.0-applebin_ios-ios_x86_64-dbg-ST-1ebda4c9d464/bin/tests/ios/unit-test/test-imports-app/TestImports-Unit-Tests_swift_doublequote_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min12.0-applebin_ios-ios_x86_64-dbg-ST-1ebda4c9d464/bin/tests/ios/unit-test/test-imports-app/TestImports-Unit-Tests_swift_angle_bracket_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; + HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min12.0-applebin_ios-ios_x86_64-dbg/bin/tests/ios/unit-test/test-imports-app/TestImports-Unit-Tests_swift_doublequote_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min12.0-applebin_ios-ios_x86_64-dbg/bin/tests/ios/unit-test/test-imports-app/TestImports-Unit-Tests_swift_angle_bracket_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; IPHONEOS_DEPLOYMENT_TARGET = 12.0; MACH_O_TYPE = "$(inherited)"; PRODUCT_NAME = "TestImports-Unit-Tests"; @@ -405,7 +405,7 @@ CLANG_ENABLE_OBJC_ARC = YES; FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-e11e4ada49a5/bin/tests/ios/unit-test/test-imports-app/TestImports-App_framework_unlinked\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-e11e4ada49a5/bin/tests/ios/unit-test/test-imports-app/TestImports-App_framework_unlinked\""; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; - HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min12.0-applebin_ios-ios_x86_64-dbg-ST-1ebda4c9d464/bin/tests/ios/unit-test/test-imports-app/TestImports-Unit-Tests_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min12.0-applebin_ios-ios_x86_64-dbg-ST-1ebda4c9d464/bin/tests/ios/unit-test/test-imports-app/TestImports-Unit-Tests_private_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min12.0-applebin_ios-ios_x86_64-dbg-ST-1ebda4c9d464/bin/tests/ios/unit-test/test-imports-app/TestImports-Unit-Tests_private_angled_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min12.0-applebin_ios-ios_x86_64-dbg-ST-1ebda4c9d464/bin/tests/ios/unit-test/test-imports-app/TestImports-Unit-Tests_swift_doublequote_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min12.0-applebin_ios-ios_x86_64-dbg-ST-1ebda4c9d464/bin/tests/ios/unit-test/test-imports-app/TestImports-Unit-Tests_swift_angle_bracket_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; + HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min12.0-applebin_ios-ios_x86_64-dbg/bin/tests/ios/unit-test/test-imports-app/TestImports-Unit-Tests_swift_doublequote_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min12.0-applebin_ios-ios_x86_64-dbg/bin/tests/ios/unit-test/test-imports-app/TestImports-Unit-Tests_swift_angle_bracket_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; IPHONEOS_DEPLOYMENT_TARGET = 12.0; MACH_O_TYPE = "$(inherited)"; PRODUCT_NAME = "TestImports-Unit-Tests"; diff --git a/tests/ios/xcodeproj/Test-MultipleConfigs-Project-WithTransitiveFlag.xcodeproj/project.pbxproj b/tests/ios/xcodeproj/Test-MultipleConfigs-Project-WithTransitiveFlag.xcodeproj/project.pbxproj index 4e8a15526..4ad896437 100755 --- a/tests/ios/xcodeproj/Test-MultipleConfigs-Project-WithTransitiveFlag.xcodeproj/project.pbxproj +++ b/tests/ios/xcodeproj/Test-MultipleConfigs-Project-WithTransitiveFlag.xcodeproj/project.pbxproj @@ -367,7 +367,7 @@ CLANG_ENABLE_OBJC_ARC = YES; FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-e11e4ada49a5/bin/tests/ios/app/FW\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-e85ff352ea2d/bin/tests/ios/app/FW\""; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; - HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-e11e4ada49a5/bin/tests/ios/app/FW2_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-e11e4ada49a5/bin/tests/ios/app/FW2_private_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-e11e4ada49a5/bin/tests/ios/app/FW2_private_angled_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-e85ff352ea2d/bin/tests/ios/app/FW2_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-e85ff352ea2d/bin/tests/ios/app/FW2_private_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-e85ff352ea2d/bin/tests/ios/app/FW2_private_angled_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; + HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-e11e4ada49a5/bin/tests/ios/app/FW2_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-e11e4ada49a5/bin/tests/ios/app/FW2_private_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-e85ff352ea2d/bin/tests/ios/app/FW2_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-e85ff352ea2d/bin/tests/ios/app/FW2_private_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; IPHONEOS_DEPLOYMENT_TARGET = 10.0; MACH_O_TYPE = "$(inherited)"; PRODUCT_NAME = FW2; @@ -385,7 +385,7 @@ CLANG_ENABLE_OBJC_ARC = YES; FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks"; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; - HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-0010df40fd2e/bin/tests/ios/app/OnlySources_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-0010df40fd2e/bin/tests/ios/app/OnlySources_private_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-0010df40fd2e/bin/tests/ios/app/OnlySources_private_angled_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; + HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-0010df40fd2e/bin/tests/ios/app/OnlySources_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-0010df40fd2e/bin/tests/ios/app/OnlySources_private_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; IPHONEOS_DEPLOYMENT_TARGET = 13.6; MACH_O_TYPE = "$(inherited)"; PRODUCT_NAME = OnlySources; @@ -450,7 +450,7 @@ CLANG_ENABLE_OBJC_ARC = YES; FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks"; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; - HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-0010df40fd2e/bin/tests/ios/app/OnlySources_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-0010df40fd2e/bin/tests/ios/app/OnlySources_private_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-0010df40fd2e/bin/tests/ios/app/OnlySources_private_angled_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; + HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-0010df40fd2e/bin/tests/ios/app/OnlySources_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-0010df40fd2e/bin/tests/ios/app/OnlySources_private_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; IPHONEOS_DEPLOYMENT_TARGET = 13.6; MACH_O_TYPE = "$(inherited)"; PRODUCT_NAME = OnlySources; @@ -488,7 +488,7 @@ CLANG_ENABLE_OBJC_ARC = YES; FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-e11e4ada49a5/bin/tests/ios/app/FW\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-e85ff352ea2d/bin/tests/ios/app/FW\""; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; - HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-e11e4ada49a5/bin/tests/ios/app/FW2_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-e11e4ada49a5/bin/tests/ios/app/FW2_private_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-e11e4ada49a5/bin/tests/ios/app/FW2_private_angled_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-e85ff352ea2d/bin/tests/ios/app/FW2_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-e85ff352ea2d/bin/tests/ios/app/FW2_private_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-e85ff352ea2d/bin/tests/ios/app/FW2_private_angled_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; + HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-e11e4ada49a5/bin/tests/ios/app/FW2_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-e11e4ada49a5/bin/tests/ios/app/FW2_private_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-e85ff352ea2d/bin/tests/ios/app/FW2_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-e85ff352ea2d/bin/tests/ios/app/FW2_private_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; IPHONEOS_DEPLOYMENT_TARGET = 10.0; MACH_O_TYPE = "$(inherited)"; PRODUCT_NAME = FW2; diff --git a/tests/ios/xcodeproj/Test-MultipleConfigs-Project.xcodeproj/project.pbxproj b/tests/ios/xcodeproj/Test-MultipleConfigs-Project.xcodeproj/project.pbxproj index 681838a75..528b3ef88 100755 --- a/tests/ios/xcodeproj/Test-MultipleConfigs-Project.xcodeproj/project.pbxproj +++ b/tests/ios/xcodeproj/Test-MultipleConfigs-Project.xcodeproj/project.pbxproj @@ -443,7 +443,7 @@ CLANG_ENABLE_OBJC_ARC = YES; FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-e11e4ada49a5/bin/tests/ios/app/FW\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-e85ff352ea2d/bin/tests/ios/app/FW\""; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; - HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-e11e4ada49a5/bin/tests/ios/app/FW2_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-e11e4ada49a5/bin/tests/ios/app/FW2_private_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-e11e4ada49a5/bin/tests/ios/app/FW2_private_angled_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-e85ff352ea2d/bin/tests/ios/app/FW2_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-e85ff352ea2d/bin/tests/ios/app/FW2_private_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-e85ff352ea2d/bin/tests/ios/app/FW2_private_angled_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; + HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-e11e4ada49a5/bin/tests/ios/app/FW2_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-e11e4ada49a5/bin/tests/ios/app/FW2_private_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-e85ff352ea2d/bin/tests/ios/app/FW2_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-e85ff352ea2d/bin/tests/ios/app/FW2_private_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; IPHONEOS_DEPLOYMENT_TARGET = 10.0; MACH_O_TYPE = "$(inherited)"; PRODUCT_NAME = FW2; @@ -461,7 +461,7 @@ CLANG_ENABLE_OBJC_ARC = YES; FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-e11e4ada49a5/bin/tests/ios/app/FW\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-e85ff352ea2d/bin/tests/ios/app/FW\""; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; - HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-e11e4ada49a5/bin/tests/ios/app/FW2_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-e11e4ada49a5/bin/tests/ios/app/FW2_private_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-e11e4ada49a5/bin/tests/ios/app/FW2_private_angled_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-e85ff352ea2d/bin/tests/ios/app/FW2_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-e85ff352ea2d/bin/tests/ios/app/FW2_private_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-e85ff352ea2d/bin/tests/ios/app/FW2_private_angled_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; + HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-e11e4ada49a5/bin/tests/ios/app/FW2_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-e11e4ada49a5/bin/tests/ios/app/FW2_private_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-e85ff352ea2d/bin/tests/ios/app/FW2_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-e85ff352ea2d/bin/tests/ios/app/FW2_private_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; IPHONEOS_DEPLOYMENT_TARGET = 10.0; MACH_O_TYPE = "$(inherited)"; PRODUCT_NAME = FW2; diff --git a/tests/ios/xcodeproj/TestWithHostApp.xcodeproj/project.pbxproj b/tests/ios/xcodeproj/TestWithHostApp.xcodeproj/project.pbxproj index 0dc477eae..23ee92ef1 100755 --- a/tests/ios/xcodeproj/TestWithHostApp.xcodeproj/project.pbxproj +++ b/tests/ios/xcodeproj/TestWithHostApp.xcodeproj/project.pbxproj @@ -355,7 +355,7 @@ CLANG_ENABLE_OBJC_ARC = YES; FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks"; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; - HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min12.0-applebin_ios-ios_x86_64-dbg-ST-1ebda4c9d464/bin/tests/ios/unit-test/ExplicitHosted_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min12.0-applebin_ios-ios_x86_64-dbg-ST-1ebda4c9d464/bin/tests/ios/unit-test/ExplicitHosted_private_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min12.0-applebin_ios-ios_x86_64-dbg-ST-1ebda4c9d464/bin/tests/ios/unit-test/ExplicitHosted_private_angled_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min12.0-applebin_ios-ios_x86_64-dbg-ST-1ebda4c9d464/bin/tests/ios/unit-test/ExplicitHosted_swift_doublequote_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min12.0-applebin_ios-ios_x86_64-dbg-ST-1ebda4c9d464/bin/tests/ios/unit-test/ExplicitHosted_swift_angle_bracket_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; + HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min12.0-applebin_ios-ios_x86_64-dbg/bin/tests/ios/unit-test/ExplicitHosted_swift_doublequote_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min12.0-applebin_ios-ios_x86_64-dbg/bin/tests/ios/unit-test/ExplicitHosted_swift_angle_bracket_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; IPHONEOS_DEPLOYMENT_TARGET = 12.0; MACH_O_TYPE = "$(inherited)"; PRODUCT_NAME = ExplicitHosted; @@ -375,7 +375,7 @@ CLANG_ENABLE_OBJC_ARC = YES; FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks"; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; - HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min12.0-applebin_ios-ios_x86_64-dbg-ST-1ebda4c9d464/bin/tests/ios/unit-test/ExplicitHosted_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min12.0-applebin_ios-ios_x86_64-dbg-ST-1ebda4c9d464/bin/tests/ios/unit-test/ExplicitHosted_private_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min12.0-applebin_ios-ios_x86_64-dbg-ST-1ebda4c9d464/bin/tests/ios/unit-test/ExplicitHosted_private_angled_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min12.0-applebin_ios-ios_x86_64-dbg-ST-1ebda4c9d464/bin/tests/ios/unit-test/ExplicitHosted_swift_doublequote_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min12.0-applebin_ios-ios_x86_64-dbg-ST-1ebda4c9d464/bin/tests/ios/unit-test/ExplicitHosted_swift_angle_bracket_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; + HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min12.0-applebin_ios-ios_x86_64-dbg/bin/tests/ios/unit-test/ExplicitHosted_swift_doublequote_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min12.0-applebin_ios-ios_x86_64-dbg/bin/tests/ios/unit-test/ExplicitHosted_swift_angle_bracket_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; IPHONEOS_DEPLOYMENT_TARGET = 12.0; MACH_O_TYPE = "$(inherited)"; PRODUCT_NAME = ExplicitHosted; diff --git a/tests/macos/xcodeproj/Single-Application-Project-AllTargets.xcodeproj/project.pbxproj b/tests/macos/xcodeproj/Single-Application-Project-AllTargets.xcodeproj/project.pbxproj index e4f200c22..5d93e60f2 100755 --- a/tests/macos/xcodeproj/Single-Application-Project-AllTargets.xcodeproj/project.pbxproj +++ b/tests/macos/xcodeproj/Single-Application-Project-AllTargets.xcodeproj/project.pbxproj @@ -288,7 +288,7 @@ CLANG_ENABLE_OBJC_ARC = YES; FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks"; GCC_PREPROCESSOR_DEFINITIONS = "\"REQUIRED_DEFINED_FLAG=1\" \"FLAG_WITH_VALUE_ZERO=0\" $(inherited)"; - HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min11.0-applebin_ios-ios_x86_64-dbg-ST-1ebda4c9d464/bin/tests/macos/xcodeproj/Single-Application-UnitTests_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min11.0-applebin_ios-ios_x86_64-dbg-ST-1ebda4c9d464/bin/tests/macos/xcodeproj/Single-Application-UnitTests_private_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min11.0-applebin_ios-ios_x86_64-dbg-ST-1ebda4c9d464/bin/tests/macos/xcodeproj/Single-Application-UnitTests_private_angled_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min11.0-applebin_ios-ios_x86_64-dbg-ST-1ebda4c9d464/bin/tests/macos/xcodeproj/Single-Application-UnitTests_swift_doublequote_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min11.0-applebin_ios-ios_x86_64-dbg-ST-1ebda4c9d464/bin/tests/macos/xcodeproj/Single-Application-UnitTests_swift_angle_bracket_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; + HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min11.0-applebin_ios-ios_x86_64-dbg/bin/tests/macos/xcodeproj/Single-Application-UnitTests_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min11.0-applebin_ios-ios_x86_64-dbg/bin/tests/macos/xcodeproj/Single-Application-UnitTests_private_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min11.0-applebin_ios-ios_x86_64-dbg/bin/tests/macos/xcodeproj/Single-Application-UnitTests_swift_doublequote_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min11.0-applebin_ios-ios_x86_64-dbg/bin/tests/macos/xcodeproj/Single-Application-UnitTests_swift_angle_bracket_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; IPHONEOS_DEPLOYMENT_TARGET = 11.0; MACH_O_TYPE = "$(inherited)"; PRODUCT_NAME = "Single-Application-UnitTests"; @@ -441,7 +441,7 @@ CLANG_ENABLE_OBJC_ARC = YES; FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks"; GCC_PREPROCESSOR_DEFINITIONS = "\"REQUIRED_DEFINED_FLAG=1\" \"FLAG_WITH_VALUE_ZERO=0\" $(inherited)"; - HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min11.0-applebin_ios-ios_x86_64-dbg-ST-1ebda4c9d464/bin/tests/macos/xcodeproj/Single-Application-UnitTests_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min11.0-applebin_ios-ios_x86_64-dbg-ST-1ebda4c9d464/bin/tests/macos/xcodeproj/Single-Application-UnitTests_private_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min11.0-applebin_ios-ios_x86_64-dbg-ST-1ebda4c9d464/bin/tests/macos/xcodeproj/Single-Application-UnitTests_private_angled_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min11.0-applebin_ios-ios_x86_64-dbg-ST-1ebda4c9d464/bin/tests/macos/xcodeproj/Single-Application-UnitTests_swift_doublequote_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min11.0-applebin_ios-ios_x86_64-dbg-ST-1ebda4c9d464/bin/tests/macos/xcodeproj/Single-Application-UnitTests_swift_angle_bracket_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; + HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min11.0-applebin_ios-ios_x86_64-dbg/bin/tests/macos/xcodeproj/Single-Application-UnitTests_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min11.0-applebin_ios-ios_x86_64-dbg/bin/tests/macos/xcodeproj/Single-Application-UnitTests_private_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min11.0-applebin_ios-ios_x86_64-dbg/bin/tests/macos/xcodeproj/Single-Application-UnitTests_swift_doublequote_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min11.0-applebin_ios-ios_x86_64-dbg/bin/tests/macos/xcodeproj/Single-Application-UnitTests_swift_angle_bracket_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; IPHONEOS_DEPLOYMENT_TARGET = 11.0; MACH_O_TYPE = "$(inherited)"; PRODUCT_NAME = "Single-Application-UnitTests"; diff --git a/tests/macos/xcodeproj/Single-Application-Project-DirectTargetsOnly.xcodeproj/project.pbxproj b/tests/macos/xcodeproj/Single-Application-Project-DirectTargetsOnly.xcodeproj/project.pbxproj index 0a629e48e..f06579530 100755 --- a/tests/macos/xcodeproj/Single-Application-Project-DirectTargetsOnly.xcodeproj/project.pbxproj +++ b/tests/macos/xcodeproj/Single-Application-Project-DirectTargetsOnly.xcodeproj/project.pbxproj @@ -307,7 +307,7 @@ CLANG_ENABLE_OBJC_ARC = YES; FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks"; GCC_PREPROCESSOR_DEFINITIONS = "\"REQUIRED_DEFINED_FLAG=1\" \"FLAG_WITH_VALUE_ZERO=0\" $(inherited)"; - HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min11.0-applebin_ios-ios_x86_64-dbg-ST-1ebda4c9d464/bin/tests/macos/xcodeproj/Single-Application-UnitTests_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min11.0-applebin_ios-ios_x86_64-dbg-ST-1ebda4c9d464/bin/tests/macos/xcodeproj/Single-Application-UnitTests_private_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min11.0-applebin_ios-ios_x86_64-dbg-ST-1ebda4c9d464/bin/tests/macos/xcodeproj/Single-Application-UnitTests_private_angled_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min11.0-applebin_ios-ios_x86_64-dbg-ST-1ebda4c9d464/bin/tests/macos/xcodeproj/Single-Application-UnitTests_swift_doublequote_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min11.0-applebin_ios-ios_x86_64-dbg-ST-1ebda4c9d464/bin/tests/macos/xcodeproj/Single-Application-UnitTests_swift_angle_bracket_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; + HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min11.0-applebin_ios-ios_x86_64-dbg/bin/tests/macos/xcodeproj/Single-Application-UnitTests_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min11.0-applebin_ios-ios_x86_64-dbg/bin/tests/macos/xcodeproj/Single-Application-UnitTests_private_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min11.0-applebin_ios-ios_x86_64-dbg/bin/tests/macos/xcodeproj/Single-Application-UnitTests_swift_doublequote_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min11.0-applebin_ios-ios_x86_64-dbg/bin/tests/macos/xcodeproj/Single-Application-UnitTests_swift_angle_bracket_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; IPHONEOS_DEPLOYMENT_TARGET = 11.0; MACH_O_TYPE = "$(inherited)"; PRODUCT_NAME = "Single-Application-UnitTests"; @@ -441,7 +441,7 @@ CLANG_ENABLE_OBJC_ARC = YES; FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks"; GCC_PREPROCESSOR_DEFINITIONS = "\"REQUIRED_DEFINED_FLAG=1\" \"FLAG_WITH_VALUE_ZERO=0\" $(inherited)"; - HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min11.0-applebin_ios-ios_x86_64-dbg-ST-1ebda4c9d464/bin/tests/macos/xcodeproj/Single-Application-UnitTests_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min11.0-applebin_ios-ios_x86_64-dbg-ST-1ebda4c9d464/bin/tests/macos/xcodeproj/Single-Application-UnitTests_private_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min11.0-applebin_ios-ios_x86_64-dbg-ST-1ebda4c9d464/bin/tests/macos/xcodeproj/Single-Application-UnitTests_private_angled_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min11.0-applebin_ios-ios_x86_64-dbg-ST-1ebda4c9d464/bin/tests/macos/xcodeproj/Single-Application-UnitTests_swift_doublequote_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min11.0-applebin_ios-ios_x86_64-dbg-ST-1ebda4c9d464/bin/tests/macos/xcodeproj/Single-Application-UnitTests_swift_angle_bracket_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; + HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min11.0-applebin_ios-ios_x86_64-dbg/bin/tests/macos/xcodeproj/Single-Application-UnitTests_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min11.0-applebin_ios-ios_x86_64-dbg/bin/tests/macos/xcodeproj/Single-Application-UnitTests_private_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min11.0-applebin_ios-ios_x86_64-dbg/bin/tests/macos/xcodeproj/Single-Application-UnitTests_swift_doublequote_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min11.0-applebin_ios-ios_x86_64-dbg/bin/tests/macos/xcodeproj/Single-Application-UnitTests_swift_angle_bracket_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; IPHONEOS_DEPLOYMENT_TARGET = 11.0; MACH_O_TYPE = "$(inherited)"; PRODUCT_NAME = "Single-Application-UnitTests"; diff --git a/tests/macos/xcodeproj/Test-Target-With-Test-Host-Project.xcodeproj/project.pbxproj b/tests/macos/xcodeproj/Test-Target-With-Test-Host-Project.xcodeproj/project.pbxproj index c90e13c21..656dbad1b 100755 --- a/tests/macos/xcodeproj/Test-Target-With-Test-Host-Project.xcodeproj/project.pbxproj +++ b/tests/macos/xcodeproj/Test-Target-With-Test-Host-Project.xcodeproj/project.pbxproj @@ -418,7 +418,7 @@ CLANG_ENABLE_OBJC_ARC = YES; FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-e11e4ada49a5/bin/tests/ios/unit-test/test-imports-app/TestImports-App_framework_unlinked\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-e11e4ada49a5/bin/tests/ios/unit-test/test-imports-app/TestImports-App_framework_unlinked\""; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; - HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min12.0-applebin_ios-ios_x86_64-dbg-ST-1ebda4c9d464/bin/tests/ios/unit-test/test-imports-app/TestImports-Unit-Tests_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min12.0-applebin_ios-ios_x86_64-dbg-ST-1ebda4c9d464/bin/tests/ios/unit-test/test-imports-app/TestImports-Unit-Tests_private_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min12.0-applebin_ios-ios_x86_64-dbg-ST-1ebda4c9d464/bin/tests/ios/unit-test/test-imports-app/TestImports-Unit-Tests_private_angled_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min12.0-applebin_ios-ios_x86_64-dbg-ST-1ebda4c9d464/bin/tests/ios/unit-test/test-imports-app/TestImports-Unit-Tests_swift_doublequote_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min12.0-applebin_ios-ios_x86_64-dbg-ST-1ebda4c9d464/bin/tests/ios/unit-test/test-imports-app/TestImports-Unit-Tests_swift_angle_bracket_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; + HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min12.0-applebin_ios-ios_x86_64-dbg/bin/tests/ios/unit-test/test-imports-app/TestImports-Unit-Tests_swift_doublequote_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min12.0-applebin_ios-ios_x86_64-dbg/bin/tests/ios/unit-test/test-imports-app/TestImports-Unit-Tests_swift_angle_bracket_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; IPHONEOS_DEPLOYMENT_TARGET = 12.0; MACH_O_TYPE = "$(inherited)"; PRODUCT_NAME = "TestImports-Unit-Tests"; @@ -458,7 +458,7 @@ CLANG_ENABLE_OBJC_ARC = YES; FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-e11e4ada49a5/bin/tests/ios/unit-test/test-imports-app/TestImports-App_framework_unlinked\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-e11e4ada49a5/bin/tests/ios/unit-test/test-imports-app/TestImports-App_framework_unlinked\""; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; - HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min12.0-applebin_ios-ios_x86_64-dbg-ST-1ebda4c9d464/bin/tests/ios/unit-test/test-imports-app/TestImports-Unit-Tests_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min12.0-applebin_ios-ios_x86_64-dbg-ST-1ebda4c9d464/bin/tests/ios/unit-test/test-imports-app/TestImports-Unit-Tests_private_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min12.0-applebin_ios-ios_x86_64-dbg-ST-1ebda4c9d464/bin/tests/ios/unit-test/test-imports-app/TestImports-Unit-Tests_private_angled_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min12.0-applebin_ios-ios_x86_64-dbg-ST-1ebda4c9d464/bin/tests/ios/unit-test/test-imports-app/TestImports-Unit-Tests_swift_doublequote_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min12.0-applebin_ios-ios_x86_64-dbg-ST-1ebda4c9d464/bin/tests/ios/unit-test/test-imports-app/TestImports-Unit-Tests_swift_angle_bracket_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; + HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min12.0-applebin_ios-ios_x86_64-dbg/bin/tests/ios/unit-test/test-imports-app/TestImports-Unit-Tests_swift_doublequote_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min12.0-applebin_ios-ios_x86_64-dbg/bin/tests/ios/unit-test/test-imports-app/TestImports-Unit-Tests_swift_angle_bracket_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; IPHONEOS_DEPLOYMENT_TARGET = 12.0; MACH_O_TYPE = "$(inherited)"; PRODUCT_NAME = "TestImports-Unit-Tests"; @@ -478,7 +478,7 @@ CLANG_ENABLE_OBJC_ARC = YES; FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks"; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; - HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-1ebda4c9d464/bin/tests/ios/unit-test/DefaultHosted_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-1ebda4c9d464/bin/tests/ios/unit-test/DefaultHosted_private_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-1ebda4c9d464/bin/tests/ios/unit-test/DefaultHosted_private_angled_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-1ebda4c9d464/bin/tests/ios/unit-test/DefaultHosted_swift_doublequote_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-1ebda4c9d464/bin/tests/ios/unit-test/DefaultHosted_swift_angle_bracket_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; + HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg/bin/tests/ios/unit-test/DefaultHosted_swift_doublequote_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg/bin/tests/ios/unit-test/DefaultHosted_swift_angle_bracket_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; IPHONEOS_DEPLOYMENT_TARGET = 10.0; MACH_O_TYPE = "$(inherited)"; PRODUCT_NAME = DefaultHosted; @@ -614,7 +614,7 @@ CLANG_ENABLE_OBJC_ARC = YES; FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks"; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; - HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-1ebda4c9d464/bin/tests/ios/unit-test/DefaultHosted_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-1ebda4c9d464/bin/tests/ios/unit-test/DefaultHosted_private_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-1ebda4c9d464/bin/tests/ios/unit-test/DefaultHosted_private_angled_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-1ebda4c9d464/bin/tests/ios/unit-test/DefaultHosted_swift_doublequote_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-1ebda4c9d464/bin/tests/ios/unit-test/DefaultHosted_swift_angle_bracket_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; + HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg/bin/tests/ios/unit-test/DefaultHosted_swift_doublequote_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg/bin/tests/ios/unit-test/DefaultHosted_swift_angle_bracket_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; IPHONEOS_DEPLOYMENT_TARGET = 10.0; MACH_O_TYPE = "$(inherited)"; PRODUCT_NAME = DefaultHosted; From c9a7d4f5dadcf5e86e44a7b5ea936897a69c2f54 Mon Sep 17 00:00:00 2001 From: Amber Dixon Date: Wed, 7 Oct 2020 17:15:14 -0700 Subject: [PATCH 8/9] buildifier fixes --- rules/hmap.bzl | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/rules/hmap.bzl b/rules/hmap.bzl index 689586be3..e673e289d 100644 --- a/rules/hmap.bzl +++ b/rules/hmap.bzl @@ -76,8 +76,8 @@ def _make_headermap_impl(ctx): contains_headers = False for h in hdrs_lists: - if len(h) > 0: - contains_headers = True + if len(h) > 0: + contains_headers = True providers = [ objc_provider, @@ -85,9 +85,9 @@ def _make_headermap_impl(ctx): ] if contains_headers: - providers.append(HeaderMapInfo( - files = depset([ctx.outputs.headermap]), - )) + providers.append(HeaderMapInfo( + files = depset([ctx.outputs.headermap]), + )) return providers From a08ec579989f9367c7ca573000aef2154ad3ee8c Mon Sep 17 00:00:00 2001 From: Amber Dixon Date: Wed, 7 Oct 2020 18:43:32 -0700 Subject: [PATCH 9/9] change the way we iterate over headers --- rules/hmap.bzl | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/rules/hmap.bzl b/rules/hmap.bzl index e673e289d..ea6c97533 100644 --- a/rules/hmap.bzl +++ b/rules/hmap.bzl @@ -74,17 +74,13 @@ def _make_headermap_impl(ctx): ) cc_info_provider = CcInfo(compilation_context = objc_provider.compilation_context) - contains_headers = False - for h in hdrs_lists: - if len(h) > 0: - contains_headers = True - providers = [ objc_provider, cc_info_provider, ] - if contains_headers: + hdrs_lists = [l for l in hdrs_lists if l] + if len(hdrs_lists) > 0: providers.append(HeaderMapInfo( files = depset([ctx.outputs.headermap]), ))