From 9f7aaec985fd30ee1b09c2084a19fbbbe03f61b3 Mon Sep 17 00:00:00 2001 From: Amber Dixon Date: Tue, 6 Oct 2020 14:46:55 -0700 Subject: [PATCH 1/5] Do not apply force_swift_local_debug_options transition. When bazel sees this transition is present, it adds a transition directory name fragment, even if the build settings are identical to having the local_debug_options_enabled flag specified on command line. --- .github/workflows/tests.yml | 4 ++-- rules/transition_support.bzl | 15 --------------- rules/xcodeproj.bzl | 1 - tests/ios/xcodeproj/BUILD.bazel | 8 ++++---- tests/macos/xcodeproj/BUILD.bazel | 4 ++-- 5 files changed, 8 insertions(+), 24 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 61fad3980..0107d4ebc 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -49,7 +49,7 @@ jobs: set -euo pipefail rm -rf tests/macos/xcodeproj/*.xcodeproj bazelisk clean - bazelisk query 'kind(xcodeproj, tests/macos/xcodeproj/...)' | xargs -n 1 bazelisk run + bazelisk query 'kind(xcodeproj, tests/macos/xcodeproj/...)' | xargs -n 1 bazelisk run --//rules:local_debug_options_enabled bazelisk query 'attr(executable, 1, kind(genrule, tests/macos/xcodeproj/...))' | xargs -n 1 bazelisk run git diff --exit-code tests/macos/xcodeproj - name: Run Xcode builds @@ -68,7 +68,7 @@ jobs: set -euo pipefail rm -rf tests/ios/xcodeproj/*.xcodeproj bazelisk clean - bazelisk query 'kind(xcodeproj, tests/ios/xcodeproj/...)' | xargs -n 1 bazelisk run + bazelisk query 'kind(xcodeproj, tests/ios/xcodeproj/...)' | xargs -n 1 bazelisk run --//rules:local_debug_options_enabled bazelisk query 'attr(executable, 1, kind(genrule, tests/ios/xcodeproj/...))' | xargs -n 1 bazelisk run git diff --exit-code tests/ios/xcodeproj - name: Run pre build checks diff --git a/rules/transition_support.bzl b/rules/transition_support.bzl index fb5c1bde5..1d7f847da 100644 --- a/rules/transition_support.bzl +++ b/rules/transition_support.bzl @@ -118,22 +118,7 @@ _apple_rule_transition = transition( ], ) -def _force_swift_local_debug_options_transition_impl(settings, attr): - _ignore = (settings, attr) - return [ - {"@build_bazel_rules_ios//rules:local_debug_options_enabled": True}, - ] - -_force_swift_local_debug_options_transition = transition( - implementation = _force_swift_local_debug_options_transition_impl, - inputs = [], - outputs = [ - "@build_bazel_rules_ios//rules:local_debug_options_enabled", - ], -) - transition_support = struct( apple_rule_transition = _apple_rule_transition, current_apple_platform = _current_apple_platform, - force_swift_local_debug_options_transition = _force_swift_local_debug_options_transition, ) diff --git a/rules/xcodeproj.bzl b/rules/xcodeproj.bzl index c744f7815..78a005f18 100644 --- a/rules/xcodeproj.bzl +++ b/rules/xcodeproj.bzl @@ -678,7 +678,6 @@ Generates a Xcode project file (.xcodeproj) with a reasonable set of defaults Tags for configuration: xcodeproj-ignore-as-target: Add this to a rule declaration so that this rule will not generates a scheme for this target """, - cfg = transition_support.force_swift_local_debug_options_transition, attrs = { "deps": attr.label_list(mandatory = True, allow_empty = False, providers = [], aspects = [_xcodeproj_aspect]), "include_transitive_targets": attr.bool(default = False, mandatory = False), diff --git a/tests/ios/xcodeproj/BUILD.bazel b/tests/ios/xcodeproj/BUILD.bazel index 6f23a65b6..1b90b1319 100644 --- a/tests/ios/xcodeproj/BUILD.bazel +++ b/tests/ios/xcodeproj/BUILD.bazel @@ -54,8 +54,8 @@ cat <<'EOS' > $@ #!/bin/sh set -euxo pipefail rm -fr {package_name}/{target_name}.xcodeproj -bazelisk run {package_name}:{target_name} -bazelisk run {package_name}:{target_name} +bazelisk run {package_name}:{target_name} --//rules:local_debug_options_enabled +bazelisk run {package_name}:{target_name} --//rules:local_debug_options_enabled EOS """.format( package_name = package_name(), @@ -74,8 +74,8 @@ cat <<'EOS' > $@ #!/bin/sh set -euxo pipefail rm -fr {package_name}/{target_name}.xcodeproj -bazelisk run {package_name}:{target_name} -bazelisk run {package_name}:{target_name} +bazelisk run {package_name}:{target_name} --//rules:local_debug_options_enabled +bazelisk run {package_name}:{target_name} --//rules:local_debug_options_enabled EOS """.format( package_name = package_name(), diff --git a/tests/macos/xcodeproj/BUILD.bazel b/tests/macos/xcodeproj/BUILD.bazel index 89a2e4370..c00921ba7 100644 --- a/tests/macos/xcodeproj/BUILD.bazel +++ b/tests/macos/xcodeproj/BUILD.bazel @@ -104,8 +104,8 @@ cat <<'EOS' > $@ #!/bin/sh set -euxo pipefail rm -fr {package_name}/{target_name}.xcodeproj -bazelisk run {package_name}:{target_name} -bazelisk run {package_name}:{target_name} +bazelisk run {package_name}:{target_name} --//rules:local_debug_options_enabled +bazelisk run {package_name}:{target_name} --//rules:local_debug_options_enabled EOS """.format( package_name = package_name(), From b2ec2131cec612f1df09aae9577e0131e6841eb3 Mon Sep 17 00:00:00 2001 From: Amber Dixon Date: Tue, 6 Oct 2020 14:52:42 -0700 Subject: [PATCH 2/5] Add documentation --- README.md | 4 +++- rules/xcodeproj.bzl | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 09df607b4..4f6fb7dbe 100644 --- a/README.md +++ b/README.md @@ -93,5 +93,7 @@ ios_application( See the [tests](https://github.com/bazel-ios/rules_ios/tree/master/tests) directory for sample applications. -## Special note about debugging +## Special notes about debugging xcode projects +Note that when generating xcodeprojects, it is necessary to supply the `--//rules:local_debug_options_enabled` so that debugging of swift files will work. + Debugging does not work in sandbox mode, due to issue #108. The workaround for now is to disable sandboxing in the .bazelrc file. diff --git a/rules/xcodeproj.bzl b/rules/xcodeproj.bzl index 78a005f18..5ca704512 100644 --- a/rules/xcodeproj.bzl +++ b/rules/xcodeproj.bzl @@ -674,7 +674,7 @@ def _xcodeproj_impl(ctx): xcodeproj = rule( implementation = _xcodeproj_impl, doc = """\ -Generates a Xcode project file (.xcodeproj) with a reasonable set of defaults +Generates a Xcode project file (.xcodeproj) with a reasonable set of defaults. Specify the --//rules:local_debug_options_enabled when generating the project to ensure debugging of swiftmodules works. Tags for configuration: xcodeproj-ignore-as-target: Add this to a rule declaration so that this rule will not generates a scheme for this target """, From 2ffd9ae665f5fed6e25da68b0d4e65d20aa49c4d Mon Sep 17 00:00:00 2001 From: amberdixon Date: Wed, 7 Oct 2020 10:13:34 -0700 Subject: [PATCH 3/5] Update README.md Co-authored-by: Samuel Giddins --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 4f6fb7dbe..cebeb9286 100644 --- a/README.md +++ b/README.md @@ -94,6 +94,6 @@ See the [tests](https://github.com/bazel-ios/rules_ios/tree/master/tests) directory for sample applications. ## Special notes about debugging xcode projects -Note that when generating xcodeprojects, it is necessary to supply the `--//rules:local_debug_options_enabled` so that debugging of swift files will work. +Note that when generating Xcode projects, it is necessary to supply the `--//rules:local_debug_options_enabled` so that debugging of swift files will work. Debugging does not work in sandbox mode, due to issue #108. The workaround for now is to disable sandboxing in the .bazelrc file. From 3dd5a4ea0e2d6251a6003aff63414f13cd31ce39 Mon Sep 17 00:00:00 2001 From: Amber Dixon Date: Wed, 7 Oct 2020 10:17:54 -0700 Subject: [PATCH 4/5] Address PR feedback and build fixes --- README.md | 2 +- rules/xcodeproj.bzl | 7 +------ .../project.pbxproj | 16 ++++++++-------- .../project.pbxproj | 10 ++++++---- .../project.pbxproj | 10 ++++++---- 5 files changed, 22 insertions(+), 23 deletions(-) diff --git a/README.md b/README.md index cebeb9286..b10f3008c 100644 --- a/README.md +++ b/README.md @@ -94,6 +94,6 @@ See the [tests](https://github.com/bazel-ios/rules_ios/tree/master/tests) directory for sample applications. ## Special notes about debugging xcode projects -Note that when generating Xcode projects, it is necessary to supply the `--//rules:local_debug_options_enabled` so that debugging of swift files will work. +Note that when generating Xcode projects, it is necessary to supply the `--@build_bazel_rules_ios//rules:local_debug_options_enabled` so that debugging of swift files will work. Debugging does not work in sandbox mode, due to issue #108. The workaround for now is to disable sandboxing in the .bazelrc file. diff --git a/rules/xcodeproj.bzl b/rules/xcodeproj.bzl index 5ca704512..16dd1458c 100644 --- a/rules/xcodeproj.bzl +++ b/rules/xcodeproj.bzl @@ -2,7 +2,6 @@ load("@build_bazel_rules_apple//apple:providers.bzl", "AppleBundleInfo") load("@build_bazel_rules_swift//swift:swift.bzl", "SwiftInfo") load("@bazel_skylib//lib:paths.bzl", "paths") load("//rules:hmap.bzl", "HeaderMapInfo") -load("//rules:transition_support.bzl", "transition_support") def _get_attr_values_for_name(deps, provider, field): return [ @@ -674,7 +673,7 @@ def _xcodeproj_impl(ctx): xcodeproj = rule( implementation = _xcodeproj_impl, doc = """\ -Generates a Xcode project file (.xcodeproj) with a reasonable set of defaults. Specify the --//rules:local_debug_options_enabled when generating the project to ensure debugging of swiftmodules works. +Generates a Xcode project file (.xcodeproj) with a reasonable set of defaults. Specify the --@build_bazel_rules_ios//rules:local_debug_options_enabled when generating the project to ensure debugging of swiftmodules works. Tags for configuration: xcodeproj-ignore-as-target: Add this to a rule declaration so that this rule will not generates a scheme for this target """, @@ -704,10 +703,6 @@ https://www.rubydoc.info/github/CocoaPods/Xcodeproj/Xcodeproj/Constants "installer": attr.label(executable = True, default = Label("//tools/xcodeproj_shims:installer"), cfg = "host"), "build_wrapper": attr.label(executable = True, default = Label("//tools/xcodeproj_shims:build-wrapper"), cfg = "host"), "additional_files": attr.label_list(allow_files = True, allow_empty = True, default = [], mandatory = False), - "_allowlist_function_transition": attr.label( - default = "@bazel_tools//tools/allowlists/function_transition_allowlist", - doc = "Needed to allow this rule to have an incoming edge configuration transition.", - ), }, executable = True, ) 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..e7ff49b7c 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-f8009c2cc851/bin/tests/ios/frameworks/objc/ObjcFramework_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-f8009c2cc851/bin/tests/ios/frameworks/objc/ObjcFramework_private_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-f8009c2cc851/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; @@ -327,9 +327,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\""; + FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-f8009c2cc851/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-cd61d2c85cfc/bin/tests/ios/frameworks/objc/ObjcFrameworkTestLib_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-cd61d2c85cfc/bin/tests/ios/frameworks/objc/ObjcFrameworkTestLib_private_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-cd61d2c85cfc/bin/tests/ios/frameworks/objc/ObjcFrameworkTestLib_private_angled_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-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-f8009c2cc851/bin/tests/ios/frameworks/objc/ObjcFramework_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-f8009c2cc851/bin/tests/ios/frameworks/objc/ObjcFramework_private_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-f8009c2cc851/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,7 +390,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-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-f8009c2cc851/bin/tests/ios/frameworks/objc/ObjcFramework\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-cd61d2c85cfc/bin/tests/ios/frameworks/objc/ObjcFrameworkTestLib\""; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT\""; IPHONEOS_DEPLOYMENT_TARGET = 10.0; @@ -409,7 +409,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-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-f8009c2cc851/bin/tests/ios/frameworks/objc/ObjcFramework\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-cd61d2c85cfc/bin/tests/ios/frameworks/objc/ObjcFrameworkTestLib\""; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT\""; IPHONEOS_DEPLOYMENT_TARGET = 10.0; @@ -428,9 +428,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\""; + FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-f8009c2cc851/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-cd61d2c85cfc/bin/tests/ios/frameworks/objc/ObjcFrameworkTestLib_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-cd61d2c85cfc/bin/tests/ios/frameworks/objc/ObjcFrameworkTestLib_private_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-cd61d2c85cfc/bin/tests/ios/frameworks/objc/ObjcFrameworkTestLib_private_angled_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 1f3c6f666..8c52d380e 100755 --- a/tests/ios/xcodeproj/Test-Imports-App-Project.xcodeproj/project.pbxproj +++ b/tests/ios/xcodeproj/Test-Imports-App-Project.xcodeproj/project.pbxproj @@ -33,6 +33,7 @@ 4EA47E87D37B93163DC37DFE /* Header2.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = Header2.h; sourceTree = ""; }; 4ED99215913B1CD2AA84B255 /* empty.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = empty.swift; sourceTree = ""; }; 632CFB9DFB491CE5041EE814 /* TestStickers.xcstickers */ = {isa = PBXFileReference; lastKnownFileType = folder.stickers; path = TestStickers.xcstickers; sourceTree = ""; }; + 70E27FA8E54946025994BBF5 /* BUILD.bazel */ = {isa = PBXFileReference; path = BUILD.bazel; sourceTree = ""; }; B3D32E19E3BA9A9FCC8FCBCF /* common.pch */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = common.pch; sourceTree = ""; }; B4CD841B3F2A7DEE174D9413 /* Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = Header.h; sourceTree = ""; }; B776E1DCA016E54FFA3DD126 /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = ""; }; @@ -107,6 +108,7 @@ 52753EA7175AA78967732213 /* rules */ = { isa = PBXGroup; children = ( + 70E27FA8E54946025994BBF5 /* BUILD.bazel */, 69BCA59A4DB8984153B811AA /* library */, ); path = rules; @@ -343,7 +345,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-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-87b21033b2ac/bin/tests/ios/unit-test/test-imports-app/TestImports-App_framework_unlinked\""; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT\""; IPHONEOS_DEPLOYMENT_TARGET = 12.0; @@ -363,7 +365,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-e11e4ada49a5/bin/tests/ios/unit-test/test-imports-app/SomeFramework\""; + FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-87b21033b2ac/bin/tests/ios/unit-test/test-imports-app/SomeFramework\""; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT\""; INFOPLIST_FILE = "$BAZEL_STUBS_DIR/Info-stub.plist"; @@ -383,7 +385,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-e11e4ada49a5/bin/tests/ios/unit-test/test-imports-app/SomeFramework\""; + FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-87b21033b2ac/bin/tests/ios/unit-test/test-imports-app/SomeFramework\""; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT\""; INFOPLIST_FILE = "$BAZEL_STUBS_DIR/Info-stub.plist"; @@ -403,7 +405,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-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-87b21033b2ac/bin/tests/ios/unit-test/test-imports-app/TestImports-App_framework_unlinked\""; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT\""; IPHONEOS_DEPLOYMENT_TARGET = 12.0; 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..0ac512dfe 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 @@ -60,6 +60,7 @@ D08289E7727590A63B67489C /* Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = Header.h; sourceTree = ""; }; D229E599DDBCC713FF997122 /* TestStickers.xcstickers */ = {isa = PBXFileReference; lastKnownFileType = folder.stickers; path = TestStickers.xcstickers; sourceTree = ""; }; EC2BF9F658BA7B0FF93BA215 /* test.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = test.m; sourceTree = ""; }; + EC8393155FFBA7A9EC632BB9 /* BUILD.bazel */ = {isa = PBXFileReference; path = BUILD.bazel; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXGroup section */ @@ -146,6 +147,7 @@ B0B40062B117F993E7D160D6 /* rules */ = { isa = PBXGroup; children = ( + EC8393155FFBA7A9EC632BB9 /* BUILD.bazel */, E58B9C8B7E68050BE38EEF27 /* library */, 086FBDD761E762B1598CC05E /* test_host_app */, ); @@ -416,7 +418,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-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-87b21033b2ac/bin/tests/ios/unit-test/test-imports-app/TestImports-App_framework_unlinked\""; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT\""; IPHONEOS_DEPLOYMENT_TARGET = 12.0; @@ -436,7 +438,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-e11e4ada49a5/bin/tests/ios/unit-test/test-imports-app/SomeFramework\""; + FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-87b21033b2ac/bin/tests/ios/unit-test/test-imports-app/SomeFramework\""; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT\""; INFOPLIST_FILE = "$BAZEL_STUBS_DIR/Info-stub.plist"; @@ -456,7 +458,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-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-87b21033b2ac/bin/tests/ios/unit-test/test-imports-app/TestImports-App_framework_unlinked\""; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT\""; IPHONEOS_DEPLOYMENT_TARGET = 12.0; @@ -496,7 +498,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-e11e4ada49a5/bin/tests/ios/unit-test/test-imports-app/SomeFramework\""; + FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-87b21033b2ac/bin/tests/ios/unit-test/test-imports-app/SomeFramework\""; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT\""; INFOPLIST_FILE = "$BAZEL_STUBS_DIR/Info-stub.plist"; From ced10b88cab737ded67792433603662cb401ee9f Mon Sep 17 00:00:00 2001 From: Amber Dixon Date: Wed, 7 Oct 2020 14:33:06 -0700 Subject: [PATCH 5/5] Always refer to reponame in command line build setting --- .github/workflows/tests.yml | 4 ++-- tests/ios/xcodeproj/BUILD.bazel | 8 ++++---- .../project.pbxproj | 16 ++++++++-------- .../project.pbxproj | 10 ++++------ tests/macos/xcodeproj/BUILD.bazel | 4 ++-- .../project.pbxproj | 10 ++++------ 6 files changed, 24 insertions(+), 28 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 0107d4ebc..c830f8bd4 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -49,7 +49,7 @@ jobs: set -euo pipefail rm -rf tests/macos/xcodeproj/*.xcodeproj bazelisk clean - bazelisk query 'kind(xcodeproj, tests/macos/xcodeproj/...)' | xargs -n 1 bazelisk run --//rules:local_debug_options_enabled + bazelisk query 'kind(xcodeproj, tests/macos/xcodeproj/...)' | xargs -n 1 bazelisk run --@build_bazel_rules_ios//rules:local_debug_options_enabled bazelisk query 'attr(executable, 1, kind(genrule, tests/macos/xcodeproj/...))' | xargs -n 1 bazelisk run git diff --exit-code tests/macos/xcodeproj - name: Run Xcode builds @@ -68,7 +68,7 @@ jobs: set -euo pipefail rm -rf tests/ios/xcodeproj/*.xcodeproj bazelisk clean - bazelisk query 'kind(xcodeproj, tests/ios/xcodeproj/...)' | xargs -n 1 bazelisk run --//rules:local_debug_options_enabled + bazelisk query 'kind(xcodeproj, tests/ios/xcodeproj/...)' | xargs -n 1 bazelisk run --@build_bazel_rules_ios//rules:local_debug_options_enabled bazelisk query 'attr(executable, 1, kind(genrule, tests/ios/xcodeproj/...))' | xargs -n 1 bazelisk run git diff --exit-code tests/ios/xcodeproj - name: Run pre build checks diff --git a/tests/ios/xcodeproj/BUILD.bazel b/tests/ios/xcodeproj/BUILD.bazel index 1b90b1319..3591683f2 100644 --- a/tests/ios/xcodeproj/BUILD.bazel +++ b/tests/ios/xcodeproj/BUILD.bazel @@ -54,8 +54,8 @@ cat <<'EOS' > $@ #!/bin/sh set -euxo pipefail rm -fr {package_name}/{target_name}.xcodeproj -bazelisk run {package_name}:{target_name} --//rules:local_debug_options_enabled -bazelisk run {package_name}:{target_name} --//rules:local_debug_options_enabled +bazelisk run {package_name}:{target_name} --@build_bazel_rules_ios//rules:local_debug_options_enabled +bazelisk run {package_name}:{target_name} --@build_bazel_rules_ios//rules:local_debug_options_enabled EOS """.format( package_name = package_name(), @@ -74,8 +74,8 @@ cat <<'EOS' > $@ #!/bin/sh set -euxo pipefail rm -fr {package_name}/{target_name}.xcodeproj -bazelisk run {package_name}:{target_name} --//rules:local_debug_options_enabled -bazelisk run {package_name}:{target_name} --//rules:local_debug_options_enabled +bazelisk run {package_name}:{target_name} --@build_bazel_rules_ios//rules:local_debug_options_enabled +bazelisk run {package_name}:{target_name} --@build_bazel_rules_ios//rules:local_debug_options_enabled EOS """.format( package_name = package_name(), 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 e7ff49b7c..78330bb70 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-f8009c2cc851/bin/tests/ios/frameworks/objc/ObjcFramework_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-f8009c2cc851/bin/tests/ios/frameworks/objc/ObjcFramework_private_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-f8009c2cc851/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-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; @@ -327,9 +327,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-f8009c2cc851/bin/tests/ios/frameworks/objc/ObjcFramework\""; + 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-cd61d2c85cfc/bin/tests/ios/frameworks/objc/ObjcFrameworkTestLib_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-cd61d2c85cfc/bin/tests/ios/frameworks/objc/ObjcFrameworkTestLib_private_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-cd61d2c85cfc/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/bazel-out/applebin_ios-ios_x86_64-dbg-ST-0010df40fd2e/bin/tests/ios/frameworks/objc/ObjcFrameworkTestLib_private_angled_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-f8009c2cc851/bin/tests/ios/frameworks/objc/ObjcFramework_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-f8009c2cc851/bin/tests/ios/frameworks/objc/ObjcFramework_private_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-f8009c2cc851/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-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,7 +390,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-f8009c2cc851/bin/tests/ios/frameworks/objc/ObjcFramework\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-cd61d2c85cfc/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\""; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT\""; IPHONEOS_DEPLOYMENT_TARGET = 10.0; @@ -409,7 +409,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-f8009c2cc851/bin/tests/ios/frameworks/objc/ObjcFramework\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-cd61d2c85cfc/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\""; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT\""; IPHONEOS_DEPLOYMENT_TARGET = 10.0; @@ -428,9 +428,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-f8009c2cc851/bin/tests/ios/frameworks/objc/ObjcFramework\""; + 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-cd61d2c85cfc/bin/tests/ios/frameworks/objc/ObjcFrameworkTestLib_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-cd61d2c85cfc/bin/tests/ios/frameworks/objc/ObjcFrameworkTestLib_private_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/applebin_ios-ios_x86_64-dbg-ST-cd61d2c85cfc/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/bazel-out/applebin_ios-ios_x86_64-dbg-ST-0010df40fd2e/bin/tests/ios/frameworks/objc/ObjcFrameworkTestLib_private_angled_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 8c52d380e..1f3c6f666 100755 --- a/tests/ios/xcodeproj/Test-Imports-App-Project.xcodeproj/project.pbxproj +++ b/tests/ios/xcodeproj/Test-Imports-App-Project.xcodeproj/project.pbxproj @@ -33,7 +33,6 @@ 4EA47E87D37B93163DC37DFE /* Header2.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = Header2.h; sourceTree = ""; }; 4ED99215913B1CD2AA84B255 /* empty.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = empty.swift; sourceTree = ""; }; 632CFB9DFB491CE5041EE814 /* TestStickers.xcstickers */ = {isa = PBXFileReference; lastKnownFileType = folder.stickers; path = TestStickers.xcstickers; sourceTree = ""; }; - 70E27FA8E54946025994BBF5 /* BUILD.bazel */ = {isa = PBXFileReference; path = BUILD.bazel; sourceTree = ""; }; B3D32E19E3BA9A9FCC8FCBCF /* common.pch */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = common.pch; sourceTree = ""; }; B4CD841B3F2A7DEE174D9413 /* Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = Header.h; sourceTree = ""; }; B776E1DCA016E54FFA3DD126 /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = ""; }; @@ -108,7 +107,6 @@ 52753EA7175AA78967732213 /* rules */ = { isa = PBXGroup; children = ( - 70E27FA8E54946025994BBF5 /* BUILD.bazel */, 69BCA59A4DB8984153B811AA /* library */, ); path = rules; @@ -345,7 +343,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-87b21033b2ac/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\""; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT\""; IPHONEOS_DEPLOYMENT_TARGET = 12.0; @@ -365,7 +363,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-87b21033b2ac/bin/tests/ios/unit-test/test-imports-app/SomeFramework\""; + 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/SomeFramework\""; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT\""; INFOPLIST_FILE = "$BAZEL_STUBS_DIR/Info-stub.plist"; @@ -385,7 +383,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-87b21033b2ac/bin/tests/ios/unit-test/test-imports-app/SomeFramework\""; + 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/SomeFramework\""; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT\""; INFOPLIST_FILE = "$BAZEL_STUBS_DIR/Info-stub.plist"; @@ -405,7 +403,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-87b21033b2ac/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\""; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT\""; IPHONEOS_DEPLOYMENT_TARGET = 12.0; diff --git a/tests/macos/xcodeproj/BUILD.bazel b/tests/macos/xcodeproj/BUILD.bazel index c00921ba7..1a03aa08e 100644 --- a/tests/macos/xcodeproj/BUILD.bazel +++ b/tests/macos/xcodeproj/BUILD.bazel @@ -104,8 +104,8 @@ cat <<'EOS' > $@ #!/bin/sh set -euxo pipefail rm -fr {package_name}/{target_name}.xcodeproj -bazelisk run {package_name}:{target_name} --//rules:local_debug_options_enabled -bazelisk run {package_name}:{target_name} --//rules:local_debug_options_enabled +bazelisk run {package_name}:{target_name} --@build_bazel_rules_ios//rules:local_debug_options_enabled +bazelisk run {package_name}:{target_name} --@build_bazel_rules_ios//rules:local_debug_options_enabled EOS """.format( package_name = package_name(), 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 0ac512dfe..2f12b6660 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 @@ -60,7 +60,6 @@ D08289E7727590A63B67489C /* Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = Header.h; sourceTree = ""; }; D229E599DDBCC713FF997122 /* TestStickers.xcstickers */ = {isa = PBXFileReference; lastKnownFileType = folder.stickers; path = TestStickers.xcstickers; sourceTree = ""; }; EC2BF9F658BA7B0FF93BA215 /* test.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = test.m; sourceTree = ""; }; - EC8393155FFBA7A9EC632BB9 /* BUILD.bazel */ = {isa = PBXFileReference; path = BUILD.bazel; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXGroup section */ @@ -147,7 +146,6 @@ B0B40062B117F993E7D160D6 /* rules */ = { isa = PBXGroup; children = ( - EC8393155FFBA7A9EC632BB9 /* BUILD.bazel */, E58B9C8B7E68050BE38EEF27 /* library */, 086FBDD761E762B1598CC05E /* test_host_app */, ); @@ -418,7 +416,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-87b21033b2ac/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\""; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT\""; IPHONEOS_DEPLOYMENT_TARGET = 12.0; @@ -438,7 +436,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-87b21033b2ac/bin/tests/ios/unit-test/test-imports-app/SomeFramework\""; + 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/SomeFramework\""; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT\""; INFOPLIST_FILE = "$BAZEL_STUBS_DIR/Info-stub.plist"; @@ -458,7 +456,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-87b21033b2ac/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\""; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT\""; IPHONEOS_DEPLOYMENT_TARGET = 12.0; @@ -498,7 +496,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-87b21033b2ac/bin/tests/ios/unit-test/test-imports-app/SomeFramework\""; + 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/SomeFramework\""; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT\""; INFOPLIST_FILE = "$BAZEL_STUBS_DIR/Info-stub.plist";