diff --git a/examples/cc/test/fixtures/bwb.xcodeproj/project.pbxproj b/examples/cc/test/fixtures/bwb.xcodeproj/project.pbxproj index fdb99d7938..5c664f4535 100644 --- a/examples/cc/test/fixtures/bwb.xcodeproj/project.pbxproj +++ b/examples/cc/test/fixtures/bwb.xcodeproj/project.pbxproj @@ -23,60 +23,60 @@ /* Begin PBXBuildFile section */ 47A652C93D0ED0E4B3D9E7CF /* main.c in Sources */ = {isa = PBXBuildFile; fileRef = 48A78400BB5E1C20A3299A42 /* main.c */; }; - 80A6741D0B0D88FD1395524A /* lib.c in Sources */ = {isa = PBXBuildFile; fileRef = BF6AED364F6BEC4B651A5032 /* lib.c */; }; - 9639B0DDE138496A9E661EEE /* lib.c in Sources */ = {isa = PBXBuildFile; fileRef = A2B55BE680D0A09636C9B2B8 /* lib.c */; }; + 4D7D6BF252B1F2BB8BCCA2B2 /* lib.c in Sources */ = {isa = PBXBuildFile; fileRef = BF6AED364F6BEC4B651A5032 /* lib.c */; }; + B32F269ED12B4DFACBB2A17F /* lib.c in Sources */ = {isa = PBXBuildFile; fileRef = A2B55BE680D0A09636C9B2B8 /* lib.c */; }; D8961DA25CBC1AF0367FBA37 /* lib.c in Sources */ = {isa = PBXBuildFile; fileRef = 26866FEDF67CD3FA66FFAB17 /* lib.c */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ - 138D72E83A5A533D00999AB1 /* PBXContainerItemProxy */ = { + 222EDD9A43AD7060E37D98C1 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 0805833D09730531AD081697 /* Project object */; proxyType = 1; remoteGlobalIDString = 7E7D155EBCA520F35DEA3571; remoteInfo = BazelDependencies; }; - 1D339408DBF7C3E910376D67 /* PBXContainerItemProxy */ = { + 2D50AC8D57F94038C0E530C9 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 0805833D09730531AD081697 /* Project object */; proxyType = 1; - remoteGlobalIDString = E97BB4F5E7A1A5667030D4C5; - remoteInfo = "//lib2:lib_impl"; + remoteGlobalIDString = 0CEAA3455274D4DE9B4B82BF; + remoteInfo = "@examples_cc_external//:lib_impl"; }; - 222EDD9A43AD7060E37D98C1 /* PBXContainerItemProxy */ = { + 41A85DCF88F765027016DA3F /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 0805833D09730531AD081697 /* Project object */; proxyType = 1; remoteGlobalIDString = 7E7D155EBCA520F35DEA3571; remoteInfo = BazelDependencies; }; - 230C74027CF49296E318C22E /* PBXContainerItemProxy */ = { + 4EE0B41522461A6BD9642C81 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 0805833D09730531AD081697 /* Project object */; proxyType = 1; remoteGlobalIDString = 7E7D155EBCA520F35DEA3571; remoteInfo = BazelDependencies; }; - 2D50AC8D57F94038C0E530C9 /* PBXContainerItemProxy */ = { + 5FD413763AE8F987FC778F0D /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 0805833D09730531AD081697 /* Project object */; proxyType = 1; - remoteGlobalIDString = 0CEAA3455274D4DE9B4B82BF; - remoteInfo = "@examples_cc_external//:lib_impl"; + remoteGlobalIDString = 7E7D155EBCA520F35DEA3571; + remoteInfo = BazelDependencies; }; - 4747345E3F51DB581B6B4D58 /* PBXContainerItemProxy */ = { + 8AEF3D20012797DE8D00DC2A /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 0805833D09730531AD081697 /* Project object */; proxyType = 1; - remoteGlobalIDString = DA1CC6F7CBE8BEA35178CDF1; - remoteInfo = "//lib:lib_impl"; + remoteGlobalIDString = 5B96F6D9D67FE0B0221407C1; + remoteInfo = "@//lib2:lib_impl"; }; - 4EE0B41522461A6BD9642C81 /* PBXContainerItemProxy */ = { + 9557E02729B04E773AE3B59B /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 0805833D09730531AD081697 /* Project object */; proxyType = 1; - remoteGlobalIDString = 7E7D155EBCA520F35DEA3571; - remoteInfo = BazelDependencies; + remoteGlobalIDString = 4F1627B7F69F8B8097C47C79; + remoteInfo = "@//lib:lib_impl"; }; /* End PBXContainerItemProxy section */ @@ -252,42 +252,42 @@ ); dependencies = ( 7176C357250A109C7B9B42E1 /* PBXTargetDependency */, + 11D5EC37A0BCE6BF6015ECA8 /* PBXTargetDependency */, + 4F5306ADE88BA1E845CBB036 /* PBXTargetDependency */, 09E3E376134BB6CCC0CBAD31 /* PBXTargetDependency */, - 4D16E1442BB4054D34F691C4 /* PBXTargetDependency */, - 3A2CA71B65BCAEF5539BE49D /* PBXTargetDependency */, ); name = tool; productName = tool; productReference = 8EEF31F83F9AF990435CC135 /* tool */; productType = "com.apple.product-type.tool"; }; - DA1CC6F7CBE8BEA35178CDF1 /* //lib:lib_impl */ = { + 4F1627B7F69F8B8097C47C79 /* @//lib:lib_impl */ = { isa = PBXNativeTarget; - buildConfigurationList = 03537C1ECF5000F9C19E0A95 /* Build configuration list for PBXNativeTarget "//lib:lib_impl" */; + buildConfigurationList = 313FB64D909CA394B7DD3614 /* Build configuration list for PBXNativeTarget "@//lib:lib_impl" */; buildPhases = ( - 042395F96E1CF85EECBB3A6F /* Sources */, + 5646BA2D684660AEC21097F4 /* Sources */, ); buildRules = ( ); dependencies = ( - 5298EC7D24D5D6C536E99722 /* PBXTargetDependency */, + 166CF664F831AB12BD9AFE9D /* PBXTargetDependency */, ); - name = "//lib:lib_impl"; + name = "@//lib:lib_impl"; productName = lib_impl; productType = "com.apple.product-type.library.static"; }; - E97BB4F5E7A1A5667030D4C5 /* //lib2:lib_impl */ = { + 5B96F6D9D67FE0B0221407C1 /* @//lib2:lib_impl */ = { isa = PBXNativeTarget; - buildConfigurationList = BAF5CB3FC59AE25AA03E4FDE /* Build configuration list for PBXNativeTarget "//lib2:lib_impl" */; + buildConfigurationList = E5D8364B15B4BD2AB3D675CC /* Build configuration list for PBXNativeTarget "@//lib2:lib_impl" */; buildPhases = ( - FD466E179925521F063E6736 /* Sources */, + DA8B0E9B0EEF18F59B6D53B0 /* Sources */, ); buildRules = ( ); dependencies = ( - 86FC71DA204ADE2206CFECF7 /* PBXTargetDependency */, + 410ADAA968B4E06B1D84096C /* PBXTargetDependency */, ); - name = "//lib2:lib_impl"; + name = "@//lib2:lib_impl"; productName = lib_impl; productType = "com.apple.product-type.library.static"; }; @@ -309,16 +309,16 @@ CreatedOnToolsVersion = 13.2.1; LastSwiftMigration = 9999; }; - 7E7D155EBCA520F35DEA3571 = { + 4F1627B7F69F8B8097C47C79 = { CreatedOnToolsVersion = 13.2.1; + LastSwiftMigration = 9999; }; - DA1CC6F7CBE8BEA35178CDF1 = { + 5B96F6D9D67FE0B0221407C1 = { CreatedOnToolsVersion = 13.2.1; LastSwiftMigration = 9999; }; - E97BB4F5E7A1A5667030D4C5 = { + 7E7D155EBCA520F35DEA3571 = { CreatedOnToolsVersion = 13.2.1; - LastSwiftMigration = 9999; }; }; }; @@ -336,9 +336,9 @@ projectRoot = ""; targets = ( 7E7D155EBCA520F35DEA3571 /* BazelDependencies */, + 4F1627B7F69F8B8097C47C79 /* @//lib:lib_impl */, + 5B96F6D9D67FE0B0221407C1 /* @//lib2:lib_impl */, 0CEAA3455274D4DE9B4B82BF /* @examples_cc_external//:lib_impl */, - DA1CC6F7CBE8BEA35178CDF1 /* //lib:lib_impl */, - E97BB4F5E7A1A5667030D4C5 /* //lib2:lib_impl */, 27EDD304E889980DC176FF62 /* tool */, ); }; @@ -425,11 +425,11 @@ ); runOnlyForDeploymentPostprocessing = 0; }; - 042395F96E1CF85EECBB3A6F /* Sources */ = { + 5646BA2D684660AEC21097F4 /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 80A6741D0B0D88FD1395524A /* lib.c in Sources */, + 4D7D6BF252B1F2BB8BCCA2B2 /* lib.c in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -441,11 +441,11 @@ ); runOnlyForDeploymentPostprocessing = 0; }; - FD466E179925521F063E6736 /* Sources */ = { + DA8B0E9B0EEF18F59B6D53B0 /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 9639B0DDE138496A9E661EEE /* lib.c in Sources */, + B32F269ED12B4DFACBB2A17F /* lib.c in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -458,41 +458,41 @@ target = 0CEAA3455274D4DE9B4B82BF /* @examples_cc_external//:lib_impl */; targetProxy = 2D50AC8D57F94038C0E530C9 /* PBXContainerItemProxy */; }; - 3A2CA71B65BCAEF5539BE49D /* PBXTargetDependency */ = { + 11D5EC37A0BCE6BF6015ECA8 /* PBXTargetDependency */ = { isa = PBXTargetDependency; - name = "//lib2:lib_impl"; - target = E97BB4F5E7A1A5667030D4C5 /* //lib2:lib_impl */; - targetProxy = 1D339408DBF7C3E910376D67 /* PBXContainerItemProxy */; + name = "@//lib:lib_impl"; + target = 4F1627B7F69F8B8097C47C79 /* @//lib:lib_impl */; + targetProxy = 9557E02729B04E773AE3B59B /* PBXContainerItemProxy */; }; - 43831FD0645D4D31D8BF9F3C /* PBXTargetDependency */ = { + 166CF664F831AB12BD9AFE9D /* PBXTargetDependency */ = { isa = PBXTargetDependency; name = BazelDependencies; target = 7E7D155EBCA520F35DEA3571 /* BazelDependencies */; - targetProxy = 222EDD9A43AD7060E37D98C1 /* PBXContainerItemProxy */; - }; - 4D16E1442BB4054D34F691C4 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - name = "//lib:lib_impl"; - target = DA1CC6F7CBE8BEA35178CDF1 /* //lib:lib_impl */; - targetProxy = 4747345E3F51DB581B6B4D58 /* PBXContainerItemProxy */; + targetProxy = 5FD413763AE8F987FC778F0D /* PBXContainerItemProxy */; }; - 5298EC7D24D5D6C536E99722 /* PBXTargetDependency */ = { + 410ADAA968B4E06B1D84096C /* PBXTargetDependency */ = { isa = PBXTargetDependency; name = BazelDependencies; target = 7E7D155EBCA520F35DEA3571 /* BazelDependencies */; - targetProxy = 230C74027CF49296E318C22E /* PBXContainerItemProxy */; + targetProxy = 41A85DCF88F765027016DA3F /* PBXContainerItemProxy */; }; - 7176C357250A109C7B9B42E1 /* PBXTargetDependency */ = { + 43831FD0645D4D31D8BF9F3C /* PBXTargetDependency */ = { isa = PBXTargetDependency; name = BazelDependencies; target = 7E7D155EBCA520F35DEA3571 /* BazelDependencies */; - targetProxy = 4EE0B41522461A6BD9642C81 /* PBXContainerItemProxy */; + targetProxy = 222EDD9A43AD7060E37D98C1 /* PBXContainerItemProxy */; + }; + 4F5306ADE88BA1E845CBB036 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = "@//lib2:lib_impl"; + target = 5B96F6D9D67FE0B0221407C1 /* @//lib2:lib_impl */; + targetProxy = 8AEF3D20012797DE8D00DC2A /* PBXContainerItemProxy */; }; - 86FC71DA204ADE2206CFECF7 /* PBXTargetDependency */ = { + 7176C357250A109C7B9B42E1 /* PBXTargetDependency */ = { isa = PBXTargetDependency; name = BazelDependencies; target = 7E7D155EBCA520F35DEA3571 /* BazelDependencies */; - targetProxy = 138D72E83A5A533D00999AB1 /* PBXContainerItemProxy */; + targetProxy = 4EE0B41522461A6BD9642C81 /* PBXContainerItemProxy */; }; /* End PBXTargetDependency section */ @@ -564,30 +564,43 @@ }; name = Debug; }; - 33E2D0F5AC3B2BC775FF1871 /* Debug */ = { + 5AFD85147E5F7EEA259481C2 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + BAZEL_CONFIG = rules_xcodeproj; + BAZEL_PACKAGE_BIN_DIR = rules_xcodeproj; + CALCULATE_OUTPUT_GROUPS_SCRIPT = "$(BAZEL_INTEGRATION_DIR)/calculate_output_groups.py"; + GENERATOR_LABEL = "@//test/fixtures:xcodeproj_bwb.generator"; + GENERATOR_PACKAGE_BIN_DIR = "darwin_x86_64-dbg-ST-14942f8a2d44/bin/test/fixtures"; + GENERATOR_TARGET_NAME = xcodeproj_bwb.generator; + INDEX_DATA_STORE_DIR = "$(INDEX_DATA_STORE_DIR)"; + INDEX_IMPORT = "$(BAZEL_OUT)/darwin_x86_64-opt-exec-2B5CBBC6-ST-8b5ad9965560/bin/external/rules_xcodeproj_index_import/index-import"; + RESOLVED_EXTERNAL_REPOSITORIES = "\"examples_cc_external\" \"$(SRCROOT)/external\""; + RULES_XCODEPROJ_BUILD_MODE = bazel; + SUPPORTED_PLATFORMS = macosx; + SUPPORTS_MACCATALYST = YES; + TARGET_NAME = BazelDependencies; + }; + name = Debug; + }; + 68C938018FFE7E1E16F38C1A /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { ARCHS = x86_64; - BAZEL_LABEL = "//lib:lib_impl"; - BAZEL_PACKAGE_BIN_DIR = "bazel-out/darwin_x86_64-dbg-ST-a9822d5480e1/bin/lib"; - BAZEL_TARGET_ID = "//lib:lib_impl darwin_x86_64-dbg-ST-a9822d5480e1"; + BAZEL_LABEL = "@//lib2:lib_impl"; + BAZEL_PACKAGE_BIN_DIR = "bazel-out/darwin_x86_64-dbg-ST-a9822d5480e1/bin/lib2"; + BAZEL_TARGET_ID = "//lib2:lib_impl darwin_x86_64-dbg-ST-a9822d5480e1"; "BAZEL_TARGET_ID[sdk=macosx*]" = "$(BAZEL_TARGET_ID)"; CLANG_CXX_LANGUAGE_STANDARD = "c++0x"; COMPILE_TARGET_NAME = lib_impl; DEBUG_INFORMATION_FORMAT = dwarf; ENABLE_BITCODE = NO; - EXECUTABLE_EXTENSION = lo; GCC_OPTIMIZATION_LEVEL = 0; GCC_PREPROCESSOR_DEFINITIONS = ( "_FORTIFY_SOURCE=1", "__DATE__=\"redacted\"", "__TIMESTAMP__=\"redacted\"", "__TIME__=\"redacted\"", - "SECRET_3=\\\"Hello\\\"", - ); - HEADER_SEARCH_PATHS = ( - lib/private, - "$(BAZEL_OUT)/darwin_x86_64-dbg-ST-a9822d5480e1/bin/lib/private", ); MACOSX_DEPLOYMENT_TARGET = 12.0; OTHER_CFLAGS = ( @@ -622,6 +635,10 @@ SWIFT_OBJC_INTERFACE_HEADER_NAME = ""; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; SWIFT_VERSION = 5.0; + SYSTEM_HEADER_SEARCH_PATHS = ( + lib2/includes, + "$(BAZEL_OUT)/darwin_x86_64-dbg-ST-a9822d5480e1/bin/lib2/includes", + ); TARGET_NAME = lib_impl; USER_HEADER_SEARCH_PATHS = ( "$(BAZEL_EXEC_ROOT)", @@ -630,30 +647,11 @@ }; name = Debug; }; - 5AFD85147E5F7EEA259481C2 /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - BAZEL_CONFIG = rules_xcodeproj; - BAZEL_PACKAGE_BIN_DIR = rules_xcodeproj; - CALCULATE_OUTPUT_GROUPS_SCRIPT = "$(BAZEL_INTEGRATION_DIR)/calculate_output_groups.py"; - GENERATOR_LABEL = "//test/fixtures:xcodeproj_bwb.generator"; - GENERATOR_PACKAGE_BIN_DIR = "darwin_x86_64-dbg-ST-14942f8a2d44/bin/test/fixtures"; - GENERATOR_TARGET_NAME = xcodeproj_bwb.generator; - INDEX_DATA_STORE_DIR = "$(INDEX_DATA_STORE_DIR)"; - INDEX_IMPORT = "$(BAZEL_OUT)/darwin_x86_64-opt-exec-2B5CBBC6-ST-8b5ad9965560/bin/external/rules_xcodeproj_index_import/index-import"; - RESOLVED_EXTERNAL_REPOSITORIES = "\"examples_cc_external\" \"$(SRCROOT)/external\""; - RULES_XCODEPROJ_BUILD_MODE = bazel; - SUPPORTED_PLATFORMS = macosx; - SUPPORTS_MACCATALYST = YES; - TARGET_NAME = BazelDependencies; - }; - name = Debug; - }; 6D957D3747854B613BE7F96E /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { ARCHS = x86_64; - BAZEL_LABEL = "//tool:tool"; + BAZEL_LABEL = "@//tool:tool"; BAZEL_OUTPUTS_PRODUCT = "$(BAZEL_OUT)/darwin_x86_64-dbg-ST-a9822d5480e1/bin/tool/rules_xcodeproj/tool/tool"; BAZEL_PACKAGE_BIN_DIR = "bazel-out/darwin_x86_64-dbg-ST-a9822d5480e1/bin/tool"; BAZEL_TARGET_ID = "//tool:tool darwin_x86_64-dbg-ST-a9822d5480e1"; @@ -773,24 +771,30 @@ }; name = Debug; }; - D09084456B2A974B7CAAF4F6 /* Debug */ = { + EFF47686C63922D44A470931 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { ARCHS = x86_64; - BAZEL_LABEL = "//lib2:lib_impl"; - BAZEL_PACKAGE_BIN_DIR = "bazel-out/darwin_x86_64-dbg-ST-a9822d5480e1/bin/lib2"; - BAZEL_TARGET_ID = "//lib2:lib_impl darwin_x86_64-dbg-ST-a9822d5480e1"; + BAZEL_LABEL = "@//lib:lib_impl"; + BAZEL_PACKAGE_BIN_DIR = "bazel-out/darwin_x86_64-dbg-ST-a9822d5480e1/bin/lib"; + BAZEL_TARGET_ID = "//lib:lib_impl darwin_x86_64-dbg-ST-a9822d5480e1"; "BAZEL_TARGET_ID[sdk=macosx*]" = "$(BAZEL_TARGET_ID)"; CLANG_CXX_LANGUAGE_STANDARD = "c++0x"; COMPILE_TARGET_NAME = lib_impl; DEBUG_INFORMATION_FORMAT = dwarf; ENABLE_BITCODE = NO; + EXECUTABLE_EXTENSION = lo; GCC_OPTIMIZATION_LEVEL = 0; GCC_PREPROCESSOR_DEFINITIONS = ( "_FORTIFY_SOURCE=1", "__DATE__=\"redacted\"", "__TIMESTAMP__=\"redacted\"", "__TIME__=\"redacted\"", + "SECRET_3=\\\"Hello\\\"", + ); + HEADER_SEARCH_PATHS = ( + lib/private, + "$(BAZEL_OUT)/darwin_x86_64-dbg-ST-a9822d5480e1/bin/lib/private", ); MACOSX_DEPLOYMENT_TARGET = 12.0; OTHER_CFLAGS = ( @@ -825,10 +829,6 @@ SWIFT_OBJC_INTERFACE_HEADER_NAME = ""; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; SWIFT_VERSION = 5.0; - SYSTEM_HEADER_SEARCH_PATHS = ( - lib2/includes, - "$(BAZEL_OUT)/darwin_x86_64-dbg-ST-a9822d5480e1/bin/lib2/includes", - ); TARGET_NAME = lib_impl; USER_HEADER_SEARCH_PATHS = ( "$(BAZEL_EXEC_ROOT)", @@ -840,10 +840,10 @@ /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ - 03537C1ECF5000F9C19E0A95 /* Build configuration list for PBXNativeTarget "//lib:lib_impl" */ = { + 313FB64D909CA394B7DD3614 /* Build configuration list for PBXNativeTarget "@//lib:lib_impl" */ = { isa = XCConfigurationList; buildConfigurations = ( - 33E2D0F5AC3B2BC775FF1871 /* Debug */, + EFF47686C63922D44A470931 /* Debug */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Debug; @@ -872,18 +872,18 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Debug; }; - BAF5CB3FC59AE25AA03E4FDE /* Build configuration list for PBXNativeTarget "//lib2:lib_impl" */ = { + D146AD00BEF0EE94F6F1E2AD /* Build configuration list for PBXNativeTarget "tool" */ = { isa = XCConfigurationList; buildConfigurations = ( - D09084456B2A974B7CAAF4F6 /* Debug */, + 6D957D3747854B613BE7F96E /* Debug */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Debug; }; - D146AD00BEF0EE94F6F1E2AD /* Build configuration list for PBXNativeTarget "tool" */ = { + E5D8364B15B4BD2AB3D675CC /* Build configuration list for PBXNativeTarget "@//lib2:lib_impl" */ = { isa = XCConfigurationList; buildConfigurations = ( - 6D957D3747854B613BE7F96E /* Debug */, + 68C938018FFE7E1E16F38C1A /* Debug */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Debug; diff --git a/examples/cc/test/fixtures/bwb.xcodeproj/xcshareddata/xcschemes/__lib_lib_impl.xcscheme b/examples/cc/test/fixtures/bwb.xcodeproj/xcshareddata/xcschemes/@__lib2_lib_impl.xcscheme similarity index 84% rename from examples/cc/test/fixtures/bwb.xcodeproj/xcshareddata/xcschemes/__lib_lib_impl.xcscheme rename to examples/cc/test/fixtures/bwb.xcodeproj/xcshareddata/xcschemes/@__lib2_lib_impl.xcscheme index 0a544a685b..943fbb4de6 100644 --- a/examples/cc/test/fixtures/bwb.xcodeproj/xcshareddata/xcschemes/__lib_lib_impl.xcscheme +++ b/examples/cc/test/fixtures/bwb.xcodeproj/xcshareddata/xcschemes/@__lib2_lib_impl.xcscheme @@ -14,9 +14,9 @@ @@ -25,14 +25,14 @@ @@ -48,9 +48,9 @@ buildForAnalyzing = "YES"> diff --git a/examples/cc/test/fixtures/bwb.xcodeproj/xcshareddata/xcschemes/__lib2_lib_impl.xcscheme b/examples/cc/test/fixtures/bwb.xcodeproj/xcshareddata/xcschemes/@__lib_lib_impl.xcscheme similarity index 85% rename from examples/cc/test/fixtures/bwb.xcodeproj/xcshareddata/xcschemes/__lib2_lib_impl.xcscheme rename to examples/cc/test/fixtures/bwb.xcodeproj/xcshareddata/xcschemes/@__lib_lib_impl.xcscheme index b343fbbc50..45dff465d3 100644 --- a/examples/cc/test/fixtures/bwb.xcodeproj/xcshareddata/xcschemes/__lib2_lib_impl.xcscheme +++ b/examples/cc/test/fixtures/bwb.xcodeproj/xcshareddata/xcschemes/@__lib_lib_impl.xcscheme @@ -14,9 +14,9 @@ @@ -25,14 +25,14 @@ @@ -48,9 +48,9 @@ buildForAnalyzing = "YES"> diff --git a/examples/cc/test/fixtures/bwb_spec.json b/examples/cc/test/fixtures/bwb_spec.json index 1c73467e4c..6e158ed0c0 100644 --- a/examples/cc/test/fixtures/bwb_spec.json +++ b/examples/cc/test/fixtures/bwb_spec.json @@ -34,7 +34,7 @@ "post_build_script": null, "pre_build_script": null, "replacement_labels": [], - "runner_label": "//test/fixtures:xcodeproj_bwb", + "runner_label": "@//test/fixtures:xcodeproj_bwb", "scheme_autogeneration_mode": "auto", "target_hosts": [], "target_merges": [], diff --git a/examples/cc/test/fixtures/bwx.xcodeproj/project.pbxproj b/examples/cc/test/fixtures/bwx.xcodeproj/project.pbxproj index 256c03fbcf..637e4faaff 100644 --- a/examples/cc/test/fixtures/bwx.xcodeproj/project.pbxproj +++ b/examples/cc/test/fixtures/bwx.xcodeproj/project.pbxproj @@ -22,20 +22,13 @@ /* End PBXAggregateTarget section */ /* Begin PBXBuildFile section */ + 00ED8A3F536ADE66E456058D /* lib.c in Sources */ = {isa = PBXBuildFile; fileRef = 48913068AF40B3160BE92F17 /* lib.c */; }; 051B8A7BC0F5DBB11025923F /* lib.c in Sources */ = {isa = PBXBuildFile; fileRef = 0282BFF13FDF4BED1663D2AF /* lib.c */; }; - 865464E17E0679228DB59369 /* lib.c in Sources */ = {isa = PBXBuildFile; fileRef = 48913068AF40B3160BE92F17 /* lib.c */; }; - 86F794CE905D2C30B1209936 /* lib.c in Sources */ = {isa = PBXBuildFile; fileRef = E63B352CAB2E709CD65F0205 /* lib.c */; }; + 9350287D00E6404D262D84E8 /* lib.c in Sources */ = {isa = PBXBuildFile; fileRef = E63B352CAB2E709CD65F0205 /* lib.c */; }; ED57A6A6DAC99D03BBA410CA /* main.c in Sources */ = {isa = PBXBuildFile; fileRef = C6EE2567643A48ED61BC352B /* main.c */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ - 3AB864198F725791FCF5CBA3 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 36B5F79C7ED8B081842AF69D /* Project object */; - proxyType = 1; - remoteGlobalIDString = FE59281FE487F27A37DC2EE7; - remoteInfo = BazelDependencies; - }; 42025A1CD8FA6A1FEB112EA2 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 36B5F79C7ED8B081842AF69D /* Project object */; @@ -43,12 +36,12 @@ remoteGlobalIDString = FE59281FE487F27A37DC2EE7; remoteInfo = BazelDependencies; }; - 452AA7B3D50C2DC7F0847760 /* PBXContainerItemProxy */ = { + 4DAEA7EC6CB13136037C9ABB /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 36B5F79C7ED8B081842AF69D /* Project object */; proxyType = 1; - remoteGlobalIDString = 27B7D45BB593CAD8F52196C6; - remoteInfo = "//lib:lib_impl"; + remoteGlobalIDString = 1674813229B44E631726DF6E; + remoteInfo = "@//lib2:lib_impl"; }; 59511478AA09290DC3C73AC2 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; @@ -64,20 +57,27 @@ remoteGlobalIDString = FE59281FE487F27A37DC2EE7; remoteInfo = BazelDependencies; }; - A25925C5CC812849E4CBC4BB /* PBXContainerItemProxy */ = { + C96C356A6F059727B4679041 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 36B5F79C7ED8B081842AF69D /* Project object */; proxyType = 1; - remoteGlobalIDString = 60E60B1F2298FD94DC0C0352; - remoteInfo = "//lib2:lib_impl"; + remoteGlobalIDString = FE59281FE487F27A37DC2EE7; + remoteInfo = BazelDependencies; }; - D84F676F7E7882F03DB781DC /* PBXContainerItemProxy */ = { + EBE081DB069A4BF46046FE21 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 36B5F79C7ED8B081842AF69D /* Project object */; proxyType = 1; remoteGlobalIDString = FE59281FE487F27A37DC2EE7; remoteInfo = BazelDependencies; }; + F9D69D94708B6ED5E45131FC /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 36B5F79C7ED8B081842AF69D /* Project object */; + proxyType = 1; + remoteGlobalIDString = E48E9FEBBB9A5F8F1FE1B1CD; + remoteInfo = "@//lib:lib_impl"; + }; /* End PBXContainerItemProxy section */ /* Begin PBXFileReference section */ @@ -225,48 +225,48 @@ /* End PBXGroup section */ /* Begin PBXNativeTarget section */ - 27B7D45BB593CAD8F52196C6 /* //lib:lib_impl */ = { + 1674813229B44E631726DF6E /* @//lib2:lib_impl */ = { isa = PBXNativeTarget; - buildConfigurationList = 8F144B3A4BA088394957B74A /* Build configuration list for PBXNativeTarget "//lib:lib_impl" */; + buildConfigurationList = 1991A681A5CB88561D37B886 /* Build configuration list for PBXNativeTarget "@//lib2:lib_impl" */; buildPhases = ( - BB974C61B608B2287A43A2A9 /* Sources */, + 328F1BE6C5C0895CC11A5EDB /* Sources */, ); buildRules = ( ); dependencies = ( - 48E3E6F91A68A97C56484D10 /* PBXTargetDependency */, + 22C38633AA1187EC6099A753 /* PBXTargetDependency */, ); - name = "//lib:lib_impl"; + name = "@//lib2:lib_impl"; productName = lib_impl; productType = "com.apple.product-type.library.static"; }; - 60E60B1F2298FD94DC0C0352 /* //lib2:lib_impl */ = { + 9DF8EA4260F38FC7243F6241 /* @examples_cc_external//:lib_impl */ = { isa = PBXNativeTarget; - buildConfigurationList = 913A85F38FB54FD89B673741 /* Build configuration list for PBXNativeTarget "//lib2:lib_impl" */; + buildConfigurationList = FA7CA526EED1582756E3E941 /* Build configuration list for PBXNativeTarget "@examples_cc_external//:lib_impl" */; buildPhases = ( - 03C989EFFCB845CC3833188A /* Sources */, + FFD93E746954CFC6BF3AD963 /* Sources */, ); buildRules = ( ); dependencies = ( - E3342E5867EF38BF0B0CE0A0 /* PBXTargetDependency */, + 285FA061754C2107327A45D8 /* PBXTargetDependency */, ); - name = "//lib2:lib_impl"; + name = "@examples_cc_external//:lib_impl"; productName = lib_impl; productType = "com.apple.product-type.library.static"; }; - 9DF8EA4260F38FC7243F6241 /* @examples_cc_external//:lib_impl */ = { + E48E9FEBBB9A5F8F1FE1B1CD /* @//lib:lib_impl */ = { isa = PBXNativeTarget; - buildConfigurationList = FA7CA526EED1582756E3E941 /* Build configuration list for PBXNativeTarget "@examples_cc_external//:lib_impl" */; + buildConfigurationList = 4193581FD52824B6B27A38B9 /* Build configuration list for PBXNativeTarget "@//lib:lib_impl" */; buildPhases = ( - FFD93E746954CFC6BF3AD963 /* Sources */, + 94D26C14F8860427A9AD2471 /* Sources */, ); buildRules = ( ); dependencies = ( - 285FA061754C2107327A45D8 /* PBXTargetDependency */, + 8714A281BD8DEB70EFAA3A22 /* PBXTargetDependency */, ); - name = "@examples_cc_external//:lib_impl"; + name = "@//lib:lib_impl"; productName = lib_impl; productType = "com.apple.product-type.library.static"; }; @@ -281,9 +281,9 @@ ); dependencies = ( C7CE0C2F304E0B02B1E4E5A4 /* PBXTargetDependency */, + 352DFDCEE489902F858A718F /* PBXTargetDependency */, + 33BE6091D980E6CC430D61CC /* PBXTargetDependency */, 59AC8FC7ED45C65DBD76BA41 /* PBXTargetDependency */, - 1E3E25F21FFFBE97D34A142E /* PBXTargetDependency */, - A54AEFAAFCE346283DA915AF /* PBXTargetDependency */, ); name = tool; productName = tool; @@ -300,15 +300,15 @@ LastSwiftUpdateCheck = 9999; LastUpgradeCheck = 9999; TargetAttributes = { - 27B7D45BB593CAD8F52196C6 = { + 1674813229B44E631726DF6E = { CreatedOnToolsVersion = 13.2.1; LastSwiftMigration = 9999; }; - 60E60B1F2298FD94DC0C0352 = { + 9DF8EA4260F38FC7243F6241 = { CreatedOnToolsVersion = 13.2.1; LastSwiftMigration = 9999; }; - 9DF8EA4260F38FC7243F6241 = { + E48E9FEBBB9A5F8F1FE1B1CD = { CreatedOnToolsVersion = 13.2.1; LastSwiftMigration = 9999; }; @@ -335,9 +335,9 @@ projectRoot = ""; targets = ( FE59281FE487F27A37DC2EE7 /* BazelDependencies */, + E48E9FEBBB9A5F8F1FE1B1CD /* @//lib:lib_impl */, + 1674813229B44E631726DF6E /* @//lib2:lib_impl */, 9DF8EA4260F38FC7243F6241 /* @examples_cc_external//:lib_impl */, - 27B7D45BB593CAD8F52196C6 /* //lib:lib_impl */, - 60E60B1F2298FD94DC0C0352 /* //lib2:lib_impl */, EC6A68AC956C60AA25485960 /* tool */, ); }; @@ -400,11 +400,11 @@ /* End PBXShellScriptBuildPhase section */ /* Begin PBXSourcesBuildPhase section */ - 03C989EFFCB845CC3833188A /* Sources */ = { + 328F1BE6C5C0895CC11A5EDB /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 86F794CE905D2C30B1209936 /* lib.c in Sources */, + 9350287D00E6404D262D84E8 /* lib.c in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -416,11 +416,11 @@ ); runOnlyForDeploymentPostprocessing = 0; }; - BB974C61B608B2287A43A2A9 /* Sources */ = { + 94D26C14F8860427A9AD2471 /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 865464E17E0679228DB59369 /* lib.c in Sources */, + 00ED8A3F536ADE66E456058D /* lib.c in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -435,11 +435,11 @@ /* End PBXSourcesBuildPhase section */ /* Begin PBXTargetDependency section */ - 1E3E25F21FFFBE97D34A142E /* PBXTargetDependency */ = { + 22C38633AA1187EC6099A753 /* PBXTargetDependency */ = { isa = PBXTargetDependency; - name = "//lib:lib_impl"; - target = 27B7D45BB593CAD8F52196C6 /* //lib:lib_impl */; - targetProxy = 452AA7B3D50C2DC7F0847760 /* PBXContainerItemProxy */; + name = BazelDependencies; + target = FE59281FE487F27A37DC2EE7 /* BazelDependencies */; + targetProxy = EBE081DB069A4BF46046FE21 /* PBXContainerItemProxy */; }; 285FA061754C2107327A45D8 /* PBXTargetDependency */ = { isa = PBXTargetDependency; @@ -447,11 +447,17 @@ target = FE59281FE487F27A37DC2EE7 /* BazelDependencies */; targetProxy = 42025A1CD8FA6A1FEB112EA2 /* PBXContainerItemProxy */; }; - 48E3E6F91A68A97C56484D10 /* PBXTargetDependency */ = { + 33BE6091D980E6CC430D61CC /* PBXTargetDependency */ = { isa = PBXTargetDependency; - name = BazelDependencies; - target = FE59281FE487F27A37DC2EE7 /* BazelDependencies */; - targetProxy = 3AB864198F725791FCF5CBA3 /* PBXContainerItemProxy */; + name = "@//lib2:lib_impl"; + target = 1674813229B44E631726DF6E /* @//lib2:lib_impl */; + targetProxy = 4DAEA7EC6CB13136037C9ABB /* PBXContainerItemProxy */; + }; + 352DFDCEE489902F858A718F /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = "@//lib:lib_impl"; + target = E48E9FEBBB9A5F8F1FE1B1CD /* @//lib:lib_impl */; + targetProxy = F9D69D94708B6ED5E45131FC /* PBXContainerItemProxy */; }; 59AC8FC7ED45C65DBD76BA41 /* PBXTargetDependency */ = { isa = PBXTargetDependency; @@ -459,51 +465,26 @@ target = 9DF8EA4260F38FC7243F6241 /* @examples_cc_external//:lib_impl */; targetProxy = 59511478AA09290DC3C73AC2 /* PBXContainerItemProxy */; }; - A54AEFAAFCE346283DA915AF /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - name = "//lib2:lib_impl"; - target = 60E60B1F2298FD94DC0C0352 /* //lib2:lib_impl */; - targetProxy = A25925C5CC812849E4CBC4BB /* PBXContainerItemProxy */; - }; - C7CE0C2F304E0B02B1E4E5A4 /* PBXTargetDependency */ = { + 8714A281BD8DEB70EFAA3A22 /* PBXTargetDependency */ = { isa = PBXTargetDependency; name = BazelDependencies; target = FE59281FE487F27A37DC2EE7 /* BazelDependencies */; - targetProxy = 880FFE0FA4EE63FB2C4847F8 /* PBXContainerItemProxy */; + targetProxy = C96C356A6F059727B4679041 /* PBXContainerItemProxy */; }; - E3342E5867EF38BF0B0CE0A0 /* PBXTargetDependency */ = { + C7CE0C2F304E0B02B1E4E5A4 /* PBXTargetDependency */ = { isa = PBXTargetDependency; name = BazelDependencies; target = FE59281FE487F27A37DC2EE7 /* BazelDependencies */; - targetProxy = D84F676F7E7882F03DB781DC /* PBXContainerItemProxy */; + targetProxy = 880FFE0FA4EE63FB2C4847F8 /* PBXContainerItemProxy */; }; /* End PBXTargetDependency section */ /* Begin XCBuildConfiguration section */ - 67F44AB65FA7A2E38A56F5FB /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - BAZEL_CONFIG = rules_xcodeproj; - BAZEL_PACKAGE_BIN_DIR = rules_xcodeproj; - CALCULATE_OUTPUT_GROUPS_SCRIPT = "$(BAZEL_INTEGRATION_DIR)/calculate_output_groups.py"; - GENERATOR_LABEL = "//test/fixtures:xcodeproj_bwx.generator"; - GENERATOR_PACKAGE_BIN_DIR = "darwin_x86_64-dbg-ST-14942f8a2d44/bin/test/fixtures"; - GENERATOR_TARGET_NAME = xcodeproj_bwx.generator; - INDEX_DATA_STORE_DIR = "$(INDEX_DATA_STORE_DIR)"; - INDEX_IMPORT = "$(BAZEL_OUT)/darwin_x86_64-opt-exec-2B5CBBC6-ST-8b5ad9965560/bin/external/rules_xcodeproj_index_import/index-import"; - RESOLVED_EXTERNAL_REPOSITORIES = "\"examples_cc_external\" \"$(SRCROOT)/external\""; - RULES_XCODEPROJ_BUILD_MODE = xcode; - SUPPORTED_PLATFORMS = macosx; - SUPPORTS_MACCATALYST = YES; - TARGET_NAME = BazelDependencies; - }; - name = Debug; - }; - A1A1448FC50C1E6FAD40CA08 /* Debug */ = { + 00E49FEAD01BA87C74959D6D /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { ARCHS = x86_64; - BAZEL_LABEL = "//lib:lib_impl"; + BAZEL_LABEL = "@//lib:lib_impl"; BAZEL_PACKAGE_BIN_DIR = "bazel-out/darwin_x86_64-dbg-ST-3688109ddba2/bin/lib"; BAZEL_TARGET_ID = "//lib:lib_impl darwin_x86_64-dbg-ST-3688109ddba2"; "BAZEL_TARGET_ID[sdk=macosx*]" = "$(BAZEL_TARGET_ID)"; @@ -570,11 +551,11 @@ }; name = Debug; }; - B43F155CDA3E79C52FA58839 /* Debug */ = { + 1A9608E2F82C2D509E2094E1 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { ARCHS = x86_64; - BAZEL_LABEL = "//lib2:lib_impl"; + BAZEL_LABEL = "@//lib2:lib_impl"; BAZEL_PACKAGE_BIN_DIR = "bazel-out/darwin_x86_64-dbg-ST-3688109ddba2/bin/lib2"; BAZEL_TARGET_ID = "//lib2:lib_impl darwin_x86_64-dbg-ST-3688109ddba2"; "BAZEL_TARGET_ID[sdk=macosx*]" = "$(BAZEL_TARGET_ID)"; @@ -639,6 +620,25 @@ }; name = Debug; }; + 67F44AB65FA7A2E38A56F5FB /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + BAZEL_CONFIG = rules_xcodeproj; + BAZEL_PACKAGE_BIN_DIR = rules_xcodeproj; + CALCULATE_OUTPUT_GROUPS_SCRIPT = "$(BAZEL_INTEGRATION_DIR)/calculate_output_groups.py"; + GENERATOR_LABEL = "@//test/fixtures:xcodeproj_bwx.generator"; + GENERATOR_PACKAGE_BIN_DIR = "darwin_x86_64-dbg-ST-14942f8a2d44/bin/test/fixtures"; + GENERATOR_TARGET_NAME = xcodeproj_bwx.generator; + INDEX_DATA_STORE_DIR = "$(INDEX_DATA_STORE_DIR)"; + INDEX_IMPORT = "$(BAZEL_OUT)/darwin_x86_64-opt-exec-2B5CBBC6-ST-8b5ad9965560/bin/external/rules_xcodeproj_index_import/index-import"; + RESOLVED_EXTERNAL_REPOSITORIES = "\"examples_cc_external\" \"$(SRCROOT)/external\""; + RULES_XCODEPROJ_BUILD_MODE = xcode; + SUPPORTED_PLATFORMS = macosx; + SUPPORTS_MACCATALYST = YES; + TARGET_NAME = BazelDependencies; + }; + name = Debug; + }; C221D886D6D02D33114D3473 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { @@ -683,7 +683,7 @@ isa = XCBuildConfiguration; buildSettings = { ARCHS = x86_64; - BAZEL_LABEL = "//tool:tool"; + BAZEL_LABEL = "@//tool:tool"; BAZEL_PACKAGE_BIN_DIR = "bazel-out/darwin_x86_64-dbg-ST-3688109ddba2/bin/tool"; BAZEL_TARGET_ID = "//tool:tool darwin_x86_64-dbg-ST-3688109ddba2"; "BAZEL_TARGET_ID[sdk=macosx*]" = "$(BAZEL_TARGET_ID)"; @@ -834,34 +834,34 @@ /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ - 85DAE5AD4B16C63749019BBB /* Build configuration list for PBXNativeTarget "tool" */ = { + 1991A681A5CB88561D37B886 /* Build configuration list for PBXNativeTarget "@//lib2:lib_impl" */ = { isa = XCConfigurationList; buildConfigurations = ( - DE39562D4492E281F18A3205 /* Debug */, + 1A9608E2F82C2D509E2094E1 /* Debug */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Debug; }; - 8C14447CB8BDD86ECF450932 /* Build configuration list for PBXProject "bwx" */ = { + 4193581FD52824B6B27A38B9 /* Build configuration list for PBXNativeTarget "@//lib:lib_impl" */ = { isa = XCConfigurationList; buildConfigurations = ( - C221D886D6D02D33114D3473 /* Debug */, + 00E49FEAD01BA87C74959D6D /* Debug */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Debug; }; - 8F144B3A4BA088394957B74A /* Build configuration list for PBXNativeTarget "//lib:lib_impl" */ = { + 85DAE5AD4B16C63749019BBB /* Build configuration list for PBXNativeTarget "tool" */ = { isa = XCConfigurationList; buildConfigurations = ( - A1A1448FC50C1E6FAD40CA08 /* Debug */, + DE39562D4492E281F18A3205 /* Debug */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Debug; }; - 913A85F38FB54FD89B673741 /* Build configuration list for PBXNativeTarget "//lib2:lib_impl" */ = { + 8C14447CB8BDD86ECF450932 /* Build configuration list for PBXProject "bwx" */ = { isa = XCConfigurationList; buildConfigurations = ( - B43F155CDA3E79C52FA58839 /* Debug */, + C221D886D6D02D33114D3473 /* Debug */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Debug; diff --git a/examples/cc/test/fixtures/bwx.xcodeproj/xcshareddata/xcschemes/__lib_lib_impl.xcscheme b/examples/cc/test/fixtures/bwx.xcodeproj/xcshareddata/xcschemes/@__lib2_lib_impl.xcscheme similarity index 84% rename from examples/cc/test/fixtures/bwx.xcodeproj/xcshareddata/xcschemes/__lib_lib_impl.xcscheme rename to examples/cc/test/fixtures/bwx.xcodeproj/xcshareddata/xcschemes/@__lib2_lib_impl.xcscheme index 73d47fd694..12f3ba0bb1 100644 --- a/examples/cc/test/fixtures/bwx.xcodeproj/xcshareddata/xcschemes/__lib_lib_impl.xcscheme +++ b/examples/cc/test/fixtures/bwx.xcodeproj/xcshareddata/xcschemes/@__lib2_lib_impl.xcscheme @@ -14,9 +14,9 @@ @@ -25,14 +25,14 @@ @@ -48,9 +48,9 @@ buildForAnalyzing = "YES"> diff --git a/examples/cc/test/fixtures/bwx.xcodeproj/xcshareddata/xcschemes/__lib2_lib_impl.xcscheme b/examples/cc/test/fixtures/bwx.xcodeproj/xcshareddata/xcschemes/@__lib_lib_impl.xcscheme similarity index 85% rename from examples/cc/test/fixtures/bwx.xcodeproj/xcshareddata/xcschemes/__lib2_lib_impl.xcscheme rename to examples/cc/test/fixtures/bwx.xcodeproj/xcshareddata/xcschemes/@__lib_lib_impl.xcscheme index 1f2859c3a1..36120d3bce 100644 --- a/examples/cc/test/fixtures/bwx.xcodeproj/xcshareddata/xcschemes/__lib2_lib_impl.xcscheme +++ b/examples/cc/test/fixtures/bwx.xcodeproj/xcshareddata/xcschemes/@__lib_lib_impl.xcscheme @@ -14,9 +14,9 @@ @@ -25,14 +25,14 @@ @@ -48,9 +48,9 @@ buildForAnalyzing = "YES"> diff --git a/examples/cc/test/fixtures/bwx_spec.json b/examples/cc/test/fixtures/bwx_spec.json index ddbde01e37..ef64d12243 100644 --- a/examples/cc/test/fixtures/bwx_spec.json +++ b/examples/cc/test/fixtures/bwx_spec.json @@ -34,7 +34,7 @@ "post_build_script": null, "pre_build_script": null, "replacement_labels": [], - "runner_label": "//test/fixtures:xcodeproj_bwx", + "runner_label": "@//test/fixtures:xcodeproj_bwx", "scheme_autogeneration_mode": "auto", "target_hosts": [], "target_merges": [], diff --git a/examples/integration/test/fixtures/bwb.xcodeproj/project.pbxproj b/examples/integration/test/fixtures/bwb.xcodeproj/project.pbxproj index 60417985c9..cdbed22b89 100644 --- a/examples/integration/test/fixtures/bwb.xcodeproj/project.pbxproj +++ b/examples/integration/test/fixtures/bwb.xcodeproj/project.pbxproj @@ -5737,7 +5737,7 @@ BAZEL_COMPILE_TARGET_ID = "//UI:UI watchos-x86_64-min7.0-applebin_watchos-watchos_x86_64-dbg-ST-25d904fdfd32"; "BAZEL_COMPILE_TARGET_ID[sdk=watchos*]" = "//UI:UI watchos-arm64_32-min7.0-applebin_watchos-watchos_arm64_32-dbg-ST-3f6925aafe90"; "BAZEL_COMPILE_TARGET_ID[sdk=watchsimulator*]" = "$(BAZEL_COMPILE_TARGET_ID)"; - BAZEL_LABEL = "//UI:UIFramework.watchOS"; + BAZEL_LABEL = "@//UI:UIFramework.watchOS"; BAZEL_OUTPUTS_PRODUCT = "$(BAZEL_OUT)/applebin_watchos-watchos_x86_64-dbg-ST-25d904fdfd32/bin/UI/UIFramework.watchOS.framework"; "BAZEL_OUTPUTS_PRODUCT[sdk=watchos*]" = "$(BAZEL_OUT)/applebin_watchos-watchos_arm64_32-dbg-ST-3f6925aafe90/bin/UI/UIFramework.watchOS.framework"; BAZEL_PACKAGE_BIN_DIR = "bazel-out/applebin_watchos-watchos_x86_64-dbg-ST-25d904fdfd32/bin/UI"; @@ -5818,7 +5818,7 @@ APPLICATION_EXTENSION_API_ONLY = YES; ARCHS = x86_64; "ARCHS[sdk=iphoneos*]" = arm64; - BAZEL_LABEL = "//Lib/dist/dynamic:iOS"; + BAZEL_LABEL = "@//Lib/dist/dynamic:iOS"; BAZEL_OUTPUTS_PRODUCT = "$(BAZEL_OUT)/applebin_ios-ios_x86_64-dbg-ST-9fcfb6a7af56/bin/Lib/dist/dynamic/Lib.framework"; "BAZEL_OUTPUTS_PRODUCT[sdk=iphoneos*]" = "$(BAZEL_OUT)/applebin_ios-ios_arm64-dbg-ST-b625d7c0bd00/bin/Lib/dist/dynamic/Lib.framework"; BAZEL_PACKAGE_BIN_DIR = "bazel-out/applebin_ios-ios_x86_64-dbg-ST-9fcfb6a7af56/bin/Lib/dist/dynamic"; @@ -5889,7 +5889,7 @@ BAZEL_COMPILE_TARGET_ID = "//iOSApp/Source:iOSApp.library ios-x86_64-min15.0-applebin_ios-ios_x86_64-dbg-ST-9fcfb6a7af56"; "BAZEL_COMPILE_TARGET_ID[sdk=iphoneos*]" = "//iOSApp/Source:iOSApp.library ios-arm64-min15.0-applebin_ios-ios_arm64-dbg-ST-b625d7c0bd00"; "BAZEL_COMPILE_TARGET_ID[sdk=iphonesimulator*]" = "$(BAZEL_COMPILE_TARGET_ID)"; - BAZEL_LABEL = "//iOSApp/Source:iOSApp"; + BAZEL_LABEL = "@//iOSApp/Source:iOSApp"; BAZEL_OUTPUTS_PRODUCT = "$(BAZEL_OUT)/applebin_ios-ios_x86_64-dbg-ST-9fcfb6a7af56/bin/iOSApp/Source/iOSApp.app"; "BAZEL_OUTPUTS_PRODUCT[sdk=iphoneos*]" = "$(BAZEL_OUT)/applebin_ios-ios_arm64-dbg-ST-b625d7c0bd00/bin/iOSApp/Source/iOSApp.app"; BAZEL_PACKAGE_BIN_DIR = "bazel-out/applebin_ios-ios_x86_64-dbg-ST-9fcfb6a7af56/bin/iOSApp/Source"; @@ -5993,7 +5993,7 @@ BAZEL_COMPILE_TARGET_ID = "//UI:UI tvos-x86_64-min15.0-applebin_tvos-tvos_x86_64-dbg-ST-b6268cc80bf2"; "BAZEL_COMPILE_TARGET_ID[sdk=appletvos*]" = "//UI:UI tvos-arm64-min15.0-applebin_tvos-tvos_arm64-dbg-ST-70b4e492b765"; "BAZEL_COMPILE_TARGET_ID[sdk=appletvsimulator*]" = "$(BAZEL_COMPILE_TARGET_ID)"; - BAZEL_LABEL = "//UI:UIFramework.tvOS"; + BAZEL_LABEL = "@//UI:UIFramework.tvOS"; BAZEL_OUTPUTS_PRODUCT = "$(BAZEL_OUT)/applebin_tvos-tvos_x86_64-dbg-ST-b6268cc80bf2/bin/UI/UIFramework.tvOS.framework"; "BAZEL_OUTPUTS_PRODUCT[sdk=appletvos*]" = "$(BAZEL_OUT)/applebin_tvos-tvos_arm64-dbg-ST-70b4e492b765/bin/UI/UIFramework.tvOS.framework"; BAZEL_PACKAGE_BIN_DIR = "bazel-out/applebin_tvos-tvos_x86_64-dbg-ST-b6268cc80bf2/bin/UI"; @@ -6074,7 +6074,7 @@ ARCHS = x86_64; BAZEL_COMPILE_TARGET_ID = "//CommandLine/CommandLineTool:tool.library macos-x86_64-min11.0-applebin_macos-darwin_x86_64-dbg-ST-c0ef0a258197"; "BAZEL_COMPILE_TARGET_ID[sdk=macosx*]" = "$(BAZEL_COMPILE_TARGET_ID)"; - BAZEL_LABEL = "//CommandLine/CommandLineTool:CommandLineTool"; + BAZEL_LABEL = "@//CommandLine/CommandLineTool:CommandLineTool"; BAZEL_OUTPUTS_PRODUCT = "$(BAZEL_OUT)/applebin_macos-darwin_x86_64-dbg-ST-c0ef0a258197/bin/CommandLine/CommandLineTool/rules_xcodeproj/CommandLineTool/CommandLineTool"; BAZEL_PACKAGE_BIN_DIR = "bazel-out/applebin_macos-darwin_x86_64-dbg-ST-c0ef0a258197/bin/CommandLine/CommandLineTool"; BAZEL_TARGET_ID = "//CommandLine/CommandLineTool:CommandLineTool applebin_macos-darwin_x86_64-dbg-ST-c0ef0a258197"; @@ -6180,7 +6180,7 @@ APPLICATION_EXTENSION_API_ONLY = YES; ARCHS = x86_64; "ARCHS[sdk=watchos*]" = arm64_32; - BAZEL_LABEL = "//Lib:Lib"; + BAZEL_LABEL = "@//Lib:Lib"; BAZEL_PACKAGE_BIN_DIR = "bazel-out/watchos-x86_64-min7.0-applebin_watchos-watchos_x86_64-dbg-ST-25d904fdfd32/bin/Lib"; "BAZEL_PACKAGE_BIN_DIR[sdk=watchos*]" = "bazel-out/watchos-arm64_32-min7.0-applebin_watchos-watchos_arm64_32-dbg-ST-3f6925aafe90/bin/Lib"; BAZEL_TARGET_ID = "//Lib:Lib watchos-x86_64-min7.0-applebin_watchos-watchos_x86_64-dbg-ST-25d904fdfd32"; @@ -6232,7 +6232,7 @@ ARCHS = x86_64; BAZEL_COMPILE_TARGET_ID = "//watchOSAppExtension/Test/UnitTests:watchOSAppExtensionUnitTests.library watchos-x86_64-min7.0-applebin_watchos-watchos_x86_64-dbg-ST-25d904fdfd32"; "BAZEL_COMPILE_TARGET_ID[sdk=watchsimulator*]" = "$(BAZEL_COMPILE_TARGET_ID)"; - BAZEL_LABEL = "//watchOSAppExtension/Test/UnitTests:watchOSAppExtensionUnitTests"; + BAZEL_LABEL = "@//watchOSAppExtension/Test/UnitTests:watchOSAppExtensionUnitTests"; BAZEL_OUTPUTS_PRODUCT = "$(BAZEL_OUT)/applebin_watchos-watchos_x86_64-dbg-ST-25d904fdfd32/bin/watchOSAppExtension/Test/UnitTests/watchOSAppExtensionUnitTests.xctest"; BAZEL_PACKAGE_BIN_DIR = "bazel-out/applebin_watchos-watchos_x86_64-dbg-ST-25d904fdfd32/bin/watchOSAppExtension/Test/UnitTests"; BAZEL_TARGET_ID = "//watchOSAppExtension/Test/UnitTests:watchOSAppExtensionUnitTests.__internal__.__test_bundle applebin_watchos-watchos_x86_64-dbg-ST-25d904fdfd32"; @@ -6285,7 +6285,7 @@ APPLICATION_EXTENSION_API_ONLY = YES; ARCHS = x86_64; "ARCHS[sdk=appletvos*]" = arm64; - BAZEL_LABEL = "//Lib/dist/dynamic:tvOS"; + BAZEL_LABEL = "@//Lib/dist/dynamic:tvOS"; BAZEL_OUTPUTS_PRODUCT = "$(BAZEL_OUT)/applebin_tvos-tvos_x86_64-dbg-ST-b6268cc80bf2/bin/Lib/dist/dynamic/Lib.framework"; "BAZEL_OUTPUTS_PRODUCT[sdk=appletvos*]" = "$(BAZEL_OUT)/applebin_tvos-tvos_arm64-dbg-ST-70b4e492b765/bin/Lib/dist/dynamic/Lib.framework"; BAZEL_PACKAGE_BIN_DIR = "bazel-out/applebin_tvos-tvos_x86_64-dbg-ST-b6268cc80bf2/bin/Lib/dist/dynamic"; @@ -6354,10 +6354,10 @@ BAZEL_COMPILE_TARGET_ID = "//watchOSAppExtension:watchOSAppExtension.library watchos-x86_64-min7.0-applebin_watchos-watchos_x86_64-dbg-ST-25d904fdfd32"; "BAZEL_COMPILE_TARGET_ID[sdk=watchos*]" = "//watchOSAppExtension:watchOSAppExtension.library watchos-arm64_32-min7.0-applebin_watchos-watchos_arm64_32-dbg-ST-3f6925aafe90"; "BAZEL_COMPILE_TARGET_ID[sdk=watchsimulator*]" = "$(BAZEL_COMPILE_TARGET_ID)"; - BAZEL_HOST_LABEL_0 = "//watchOSApp:watchOSApp"; + BAZEL_HOST_LABEL_0 = "@//watchOSApp:watchOSApp"; BAZEL_HOST_TARGET_ID_0 = "//watchOSApp:watchOSApp applebin_watchos-watchos_x86_64-dbg-ST-3df60cf154e9"; "BAZEL_HOST_TARGET_ID_0[sdk=watchos*]" = "//watchOSApp:watchOSApp applebin_watchos-watchos_arm64_32-dbg-ST-56a8163e2aa7"; - BAZEL_LABEL = "//watchOSAppExtension:watchOSAppExtension"; + BAZEL_LABEL = "@//watchOSAppExtension:watchOSAppExtension"; BAZEL_OUTPUTS_PRODUCT = "$(BAZEL_OUT)/applebin_watchos-watchos_x86_64-dbg-ST-25d904fdfd32/bin/watchOSAppExtension/watchOSAppExtension.appex"; "BAZEL_OUTPUTS_PRODUCT[sdk=watchos*]" = "$(BAZEL_OUT)/applebin_watchos-watchos_arm64_32-dbg-ST-3f6925aafe90/bin/watchOSAppExtension/watchOSAppExtension.appex"; BAZEL_PACKAGE_BIN_DIR = "bazel-out/applebin_watchos-watchos_x86_64-dbg-ST-25d904fdfd32/bin/watchOSAppExtension"; @@ -6435,7 +6435,7 @@ ARCHS = x86_64; BAZEL_COMPILE_TARGET_ID = "//tvOSApp/Test/UnitTests:tvOSAppUnitTests.library tvos-x86_64-min15.0-applebin_tvos-tvos_x86_64-dbg-ST-b6268cc80bf2"; "BAZEL_COMPILE_TARGET_ID[sdk=appletvsimulator*]" = "$(BAZEL_COMPILE_TARGET_ID)"; - BAZEL_LABEL = "//tvOSApp/Test/UnitTests:tvOSAppUnitTests"; + BAZEL_LABEL = "@//tvOSApp/Test/UnitTests:tvOSAppUnitTests"; BAZEL_OUTPUTS_PRODUCT = "$(BAZEL_OUT)/applebin_tvos-tvos_x86_64-dbg-ST-b6268cc80bf2/bin/tvOSApp/Test/UnitTests/tvOSAppUnitTests.xctest"; BAZEL_PACKAGE_BIN_DIR = "bazel-out/applebin_tvos-tvos_x86_64-dbg-ST-b6268cc80bf2/bin/tvOSApp/Test/UnitTests"; BAZEL_TARGET_ID = "//tvOSApp/Test/UnitTests:tvOSAppUnitTests.__internal__.__test_bundle applebin_tvos-tvos_x86_64-dbg-ST-b6268cc80bf2"; @@ -6485,7 +6485,7 @@ isa = XCBuildConfiguration; buildSettings = { ARCHS = x86_64; - BAZEL_LABEL = "//CommandLine/CommandLineToolLib:private_swift_lib"; + BAZEL_LABEL = "@//CommandLine/CommandLineToolLib:private_swift_lib"; BAZEL_PACKAGE_BIN_DIR = "bazel-out/macos-x86_64-min11.0-applebin_macos-darwin_x86_64-dbg-ST-c0ef0a258197/bin/CommandLine/CommandLineToolLib"; BAZEL_TARGET_ID = "//CommandLine/CommandLineToolLib:private_swift_lib macos-x86_64-min11.0-applebin_macos-darwin_x86_64-dbg-ST-c0ef0a258197"; "BAZEL_TARGET_ID[sdk=macosx*]" = "$(BAZEL_TARGET_ID)"; @@ -6518,7 +6518,7 @@ APPLICATION_EXTENSION_API_ONLY = YES; ARCHS = x86_64; "ARCHS[sdk=appletvos*]" = arm64; - BAZEL_LABEL = "//Lib:LibFramework.tvOS"; + BAZEL_LABEL = "@//Lib:LibFramework.tvOS"; BAZEL_OUTPUTS_PRODUCT = "$(BAZEL_OUT)/applebin_tvos-tvos_x86_64-dbg-ST-b6268cc80bf2/bin/Lib/LibFramework.tvOS.framework"; "BAZEL_OUTPUTS_PRODUCT[sdk=appletvos*]" = "$(BAZEL_OUT)/applebin_tvos-tvos_arm64-dbg-ST-70b4e492b765/bin/Lib/LibFramework.tvOS.framework"; BAZEL_PACKAGE_BIN_DIR = "bazel-out/applebin_tvos-tvos_x86_64-dbg-ST-b6268cc80bf2/bin/Lib"; @@ -6586,7 +6586,7 @@ BAZEL_COMPILE_TARGET_ID = "//tvOSApp/Source:tvOSApp.library tvos-x86_64-min15.0-applebin_tvos-tvos_x86_64-dbg-ST-b6268cc80bf2"; "BAZEL_COMPILE_TARGET_ID[sdk=appletvos*]" = "//tvOSApp/Source:tvOSApp.library tvos-arm64-min15.0-applebin_tvos-tvos_arm64-dbg-ST-70b4e492b765"; "BAZEL_COMPILE_TARGET_ID[sdk=appletvsimulator*]" = "$(BAZEL_COMPILE_TARGET_ID)"; - BAZEL_LABEL = "//tvOSApp/Source:tvOSApp"; + BAZEL_LABEL = "@//tvOSApp/Source:tvOSApp"; BAZEL_OUTPUTS_PRODUCT = "$(BAZEL_OUT)/applebin_tvos-tvos_x86_64-dbg-ST-b6268cc80bf2/bin/tvOSApp/Source/tvOSApp.app"; "BAZEL_OUTPUTS_PRODUCT[sdk=appletvos*]" = "$(BAZEL_OUT)/applebin_tvos-tvos_arm64-dbg-ST-70b4e492b765/bin/tvOSApp/Source/tvOSApp.app"; BAZEL_PACKAGE_BIN_DIR = "bazel-out/applebin_tvos-tvos_x86_64-dbg-ST-b6268cc80bf2/bin/tvOSApp/Source"; @@ -6666,7 +6666,7 @@ BAZEL_COMPILE_TARGET_ID = "//UI:UI ios-x86_64-min15.0-applebin_ios-ios_x86_64-dbg-ST-9fcfb6a7af56"; "BAZEL_COMPILE_TARGET_ID[sdk=iphoneos*]" = "//UI:UI ios-arm64-min15.0-applebin_ios-ios_arm64-dbg-ST-b625d7c0bd00"; "BAZEL_COMPILE_TARGET_ID[sdk=iphonesimulator*]" = "$(BAZEL_COMPILE_TARGET_ID)"; - BAZEL_LABEL = "//UI:UIFramework.iOS"; + BAZEL_LABEL = "@//UI:UIFramework.iOS"; BAZEL_OUTPUTS_PRODUCT = "$(BAZEL_OUT)/applebin_ios-ios_x86_64-dbg-ST-9fcfb6a7af56/bin/UI/UIFramework.iOS.framework"; "BAZEL_OUTPUTS_PRODUCT[sdk=iphoneos*]" = "$(BAZEL_OUT)/applebin_ios-ios_arm64-dbg-ST-b625d7c0bd00/bin/UI/UIFramework.iOS.framework"; BAZEL_PACKAGE_BIN_DIR = "bazel-out/applebin_ios-ios_x86_64-dbg-ST-9fcfb6a7af56/bin/UI"; @@ -6747,7 +6747,7 @@ isa = XCBuildConfiguration; buildSettings = { ARCHS = x86_64; - BAZEL_LABEL = "//CommandLine/CommandLineToolLib:lib_swift"; + BAZEL_LABEL = "@//CommandLine/CommandLineToolLib:lib_swift"; BAZEL_PACKAGE_BIN_DIR = "bazel-out/macos-x86_64-min11.0-applebin_macos-darwin_x86_64-dbg-ST-c0ef0a258197/bin/CommandLine/CommandLineToolLib"; BAZEL_TARGET_ID = "//CommandLine/CommandLineToolLib:lib_swift macos-x86_64-min11.0-applebin_macos-darwin_x86_64-dbg-ST-c0ef0a258197"; "BAZEL_TARGET_ID[sdk=macosx*]" = "$(BAZEL_TARGET_ID)"; @@ -6784,7 +6784,7 @@ BAZEL_CONFIG = rules_xcodeproj_integration; BAZEL_PACKAGE_BIN_DIR = rules_xcodeproj; CALCULATE_OUTPUT_GROUPS_SCRIPT = "$(BAZEL_INTEGRATION_DIR)/calculate_output_groups.py"; - GENERATOR_LABEL = "//test/fixtures:xcodeproj_bwb.generator"; + GENERATOR_LABEL = "@//test/fixtures:xcodeproj_bwb.generator"; GENERATOR_PACKAGE_BIN_DIR = "darwin_x86_64-dbg-ST-14942f8a2d44/bin/test/fixtures"; GENERATOR_TARGET_NAME = xcodeproj_bwb.generator; INDEX_DATA_STORE_DIR = "$(INDEX_DATA_STORE_DIR)"; @@ -6801,7 +6801,7 @@ isa = XCBuildConfiguration; buildSettings = { ARCHS = x86_64; - BAZEL_LABEL = "//CommandLine/CommandLineToolLib:lib_impl"; + BAZEL_LABEL = "@//CommandLine/CommandLineToolLib:lib_impl"; BAZEL_PACKAGE_BIN_DIR = "bazel-out/macos-x86_64-min11.0-applebin_macos-darwin_x86_64-dbg-ST-c0ef0a258197/bin/CommandLine/CommandLineToolLib"; BAZEL_TARGET_ID = "//CommandLine/CommandLineToolLib:lib_impl macos-x86_64-min11.0-applebin_macos-darwin_x86_64-dbg-ST-c0ef0a258197"; "BAZEL_TARGET_ID[sdk=macosx*]" = "$(BAZEL_TARGET_ID)"; @@ -6889,7 +6889,7 @@ APPLICATION_EXTENSION_API_ONLY = YES; ARCHS = x86_64; "ARCHS[sdk=watchos*]" = arm64_32; - BAZEL_LABEL = "//Lib/dist/dynamic:watchOS"; + BAZEL_LABEL = "@//Lib/dist/dynamic:watchOS"; BAZEL_OUTPUTS_PRODUCT = "$(BAZEL_OUT)/applebin_watchos-watchos_x86_64-dbg-ST-25d904fdfd32/bin/Lib/dist/dynamic/Lib.framework"; "BAZEL_OUTPUTS_PRODUCT[sdk=watchos*]" = "$(BAZEL_OUT)/applebin_watchos-watchos_arm64_32-dbg-ST-3f6925aafe90/bin/Lib/dist/dynamic/Lib.framework"; BAZEL_PACKAGE_BIN_DIR = "bazel-out/applebin_watchos-watchos_x86_64-dbg-ST-25d904fdfd32/bin/Lib/dist/dynamic"; @@ -6958,7 +6958,7 @@ BAZEL_COMPILE_TARGET_ID = "//AppClip:AppClip.library ios-x86_64-min15.0-applebin_ios-ios_x86_64-dbg-ST-9fcfb6a7af56"; "BAZEL_COMPILE_TARGET_ID[sdk=iphoneos*]" = "//AppClip:AppClip.library ios-arm64-min15.0-applebin_ios-ios_arm64-dbg-ST-b625d7c0bd00"; "BAZEL_COMPILE_TARGET_ID[sdk=iphonesimulator*]" = "$(BAZEL_COMPILE_TARGET_ID)"; - BAZEL_LABEL = "//AppClip:AppClip"; + BAZEL_LABEL = "@//AppClip:AppClip"; BAZEL_OUTPUTS_PRODUCT = "$(BAZEL_OUT)/applebin_ios-ios_x86_64-dbg-ST-9fcfb6a7af56/bin/AppClip/AppClip.app"; "BAZEL_OUTPUTS_PRODUCT[sdk=iphoneos*]" = "$(BAZEL_OUT)/applebin_ios-ios_arm64-dbg-ST-b625d7c0bd00/bin/AppClip/AppClip.app"; BAZEL_PACKAGE_BIN_DIR = "bazel-out/applebin_ios-ios_x86_64-dbg-ST-9fcfb6a7af56/bin/AppClip"; @@ -7040,7 +7040,7 @@ ARCHS = x86_64; "ARCHS[sdk=appletvos*]" = arm64; "ARCHS[sdk=iphoneos*]" = arm64; - BAZEL_LABEL = "//Lib:Lib"; + BAZEL_LABEL = "@//Lib:Lib"; BAZEL_PACKAGE_BIN_DIR = "bazel-out/ios-x86_64-min15.0-applebin_ios-ios_x86_64-dbg-ST-9fcfb6a7af56/bin/Lib"; "BAZEL_PACKAGE_BIN_DIR[sdk=appletvos*]" = "bazel-out/tvos-arm64-min15.0-applebin_tvos-tvos_arm64-dbg-ST-70b4e492b765/bin/Lib"; "BAZEL_PACKAGE_BIN_DIR[sdk=appletvsimulator*]" = "bazel-out/tvos-x86_64-min15.0-applebin_tvos-tvos_x86_64-dbg-ST-b6268cc80bf2/bin/Lib"; @@ -7116,7 +7116,7 @@ APPLICATION_EXTENSION_API_ONLY = YES; ARCHS = x86_64; "ARCHS[sdk=watchos*]" = arm64_32; - BAZEL_LABEL = "//Lib:LibFramework.watchOS"; + BAZEL_LABEL = "@//Lib:LibFramework.watchOS"; BAZEL_OUTPUTS_PRODUCT = "$(BAZEL_OUT)/applebin_watchos-watchos_x86_64-dbg-ST-25d904fdfd32/bin/Lib/LibFramework.watchOS.framework"; "BAZEL_OUTPUTS_PRODUCT[sdk=watchos*]" = "$(BAZEL_OUT)/applebin_watchos-watchos_arm64_32-dbg-ST-3f6925aafe90/bin/Lib/LibFramework.watchOS.framework"; BAZEL_PACKAGE_BIN_DIR = "bazel-out/applebin_watchos-watchos_x86_64-dbg-ST-25d904fdfd32/bin/Lib"; @@ -7182,7 +7182,7 @@ ARCHS = x86_64; BAZEL_COMPILE_TARGET_ID = "//macOSApp/Test/UITests:macOSAppUITests.library macos-x86_64-min12.0-applebin_macos-darwin_x86_64-dbg-ST-e4309a660cc1"; "BAZEL_COMPILE_TARGET_ID[sdk=macosx*]" = "$(BAZEL_COMPILE_TARGET_ID)"; - BAZEL_LABEL = "//macOSApp/Test/UITests:macOSAppUITests"; + BAZEL_LABEL = "@//macOSApp/Test/UITests:macOSAppUITests"; BAZEL_OUTPUTS_PRODUCT = "$(BAZEL_OUT)/applebin_macos-darwin_x86_64-dbg-ST-e4309a660cc1/bin/macOSApp/Test/UITests/macOSAppUITests.xctest"; BAZEL_PACKAGE_BIN_DIR = "bazel-out/applebin_macos-darwin_x86_64-dbg-ST-e4309a660cc1/bin/macOSApp/Test/UITests"; BAZEL_TARGET_ID = "//macOSApp/Test/UITests:macOSAppUITests.__internal__.__test_bundle applebin_macos-darwin_x86_64-dbg-ST-e4309a660cc1"; @@ -7231,9 +7231,9 @@ ARCHS = x86_64; BAZEL_COMPILE_TARGET_ID = "//iMessageApp:iMessageAppExtension.library ios-x86_64-min15.0-applebin_ios-ios_x86_64-dbg-ST-9fcfb6a7af56"; "BAZEL_COMPILE_TARGET_ID[sdk=iphonesimulator*]" = "$(BAZEL_COMPILE_TARGET_ID)"; - BAZEL_HOST_LABEL_0 = "//iMessageApp:iMessageApp"; + BAZEL_HOST_LABEL_0 = "@//iMessageApp:iMessageApp"; BAZEL_HOST_TARGET_ID_0 = "//iMessageApp:iMessageApp applebin_ios-ios_x86_64-dbg-ST-9fcfb6a7af56"; - BAZEL_LABEL = "//iMessageApp:iMessageAppExtension"; + BAZEL_LABEL = "@//iMessageApp:iMessageAppExtension"; BAZEL_OUTPUTS_PRODUCT = "$(BAZEL_OUT)/applebin_ios-ios_x86_64-dbg-ST-9fcfb6a7af56/bin/iMessageApp/iMessageAppExtension.appex"; BAZEL_PACKAGE_BIN_DIR = "bazel-out/applebin_ios-ios_x86_64-dbg-ST-9fcfb6a7af56/bin/iMessageApp"; BAZEL_TARGET_ID = "//iMessageApp:iMessageAppExtension applebin_ios-ios_x86_64-dbg-ST-9fcfb6a7af56"; @@ -7287,7 +7287,7 @@ buildSettings = { ARCHS = x86_64; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - BAZEL_LABEL = "//iMessageApp:iMessageApp"; + BAZEL_LABEL = "@//iMessageApp:iMessageApp"; BAZEL_OUTPUTS_PRODUCT = "$(BAZEL_OUT)/applebin_ios-ios_x86_64-dbg-ST-9fcfb6a7af56/bin/iMessageApp/iMessageApp.app"; BAZEL_PACKAGE_BIN_DIR = "bazel-out/applebin_ios-ios_x86_64-dbg-ST-9fcfb6a7af56/bin/iMessageApp"; BAZEL_TARGET_ID = "//iMessageApp:iMessageApp applebin_ios-ios_x86_64-dbg-ST-9fcfb6a7af56"; @@ -7380,7 +7380,7 @@ isa = XCBuildConfiguration; buildSettings = { ARCHS = x86_64; - BAZEL_LABEL = "//CommandLine/swift_c_module:c_lib"; + BAZEL_LABEL = "@//CommandLine/swift_c_module:c_lib"; BAZEL_PACKAGE_BIN_DIR = "bazel-out/macos-x86_64-min11.0-applebin_macos-darwin_x86_64-dbg-ST-c0ef0a258197/bin/CommandLine/swift_c_module"; BAZEL_TARGET_ID = "//CommandLine/swift_c_module:c_lib macos-x86_64-min11.0-applebin_macos-darwin_x86_64-dbg-ST-c0ef0a258197"; "BAZEL_TARGET_ID[sdk=macosx*]" = "$(BAZEL_TARGET_ID)"; @@ -7442,7 +7442,7 @@ ARCHS = x86_64; BAZEL_COMPILE_TARGET_ID = "//watchOSApp/Test/UITests:watchOSAppUITests.library watchos-x86_64-min7.0-applebin_watchos-watchos_x86_64-dbg-ST-25d904fdfd32"; "BAZEL_COMPILE_TARGET_ID[sdk=watchsimulator*]" = "$(BAZEL_COMPILE_TARGET_ID)"; - BAZEL_LABEL = "//watchOSApp/Test/UITests:watchOSAppUITests"; + BAZEL_LABEL = "@//watchOSApp/Test/UITests:watchOSAppUITests"; BAZEL_OUTPUTS_PRODUCT = "$(BAZEL_OUT)/applebin_watchos-watchos_x86_64-dbg-ST-25d904fdfd32/bin/watchOSApp/Test/UITests/watchOSAppUITests.xctest"; BAZEL_PACKAGE_BIN_DIR = "bazel-out/applebin_watchos-watchos_x86_64-dbg-ST-25d904fdfd32/bin/watchOSApp/Test/UITests"; BAZEL_TARGET_ID = "//watchOSApp/Test/UITests:watchOSAppUITests.__internal__.__test_bundle applebin_watchos-watchos_x86_64-dbg-ST-25d904fdfd32"; @@ -7493,10 +7493,10 @@ BAZEL_COMPILE_TARGET_ID = "//WidgetExtension:WidgetExtension.library ios-x86_64-min15.0-applebin_ios-ios_x86_64-dbg-ST-9fcfb6a7af56"; "BAZEL_COMPILE_TARGET_ID[sdk=iphoneos*]" = "//WidgetExtension:WidgetExtension.library ios-arm64-min15.0-applebin_ios-ios_arm64-dbg-ST-b625d7c0bd00"; "BAZEL_COMPILE_TARGET_ID[sdk=iphonesimulator*]" = "$(BAZEL_COMPILE_TARGET_ID)"; - BAZEL_HOST_LABEL_0 = "//iOSApp/Source:iOSApp"; + BAZEL_HOST_LABEL_0 = "@//iOSApp/Source:iOSApp"; BAZEL_HOST_TARGET_ID_0 = "//iOSApp/Source:iOSApp applebin_ios-ios_x86_64-dbg-ST-9fcfb6a7af56"; "BAZEL_HOST_TARGET_ID_0[sdk=iphoneos*]" = "//iOSApp/Source:iOSApp applebin_ios-ios_arm64-dbg-ST-b625d7c0bd00"; - BAZEL_LABEL = "//WidgetExtension:WidgetExtension"; + BAZEL_LABEL = "@//WidgetExtension:WidgetExtension"; BAZEL_OUTPUTS_PRODUCT = "$(BAZEL_OUT)/applebin_ios-ios_x86_64-dbg-ST-9fcfb6a7af56/bin/WidgetExtension/WidgetExtension.appex"; "BAZEL_OUTPUTS_PRODUCT[sdk=iphoneos*]" = "$(BAZEL_OUT)/applebin_ios-ios_arm64-dbg-ST-b625d7c0bd00/bin/WidgetExtension/WidgetExtension.appex"; BAZEL_PACKAGE_BIN_DIR = "bazel-out/applebin_ios-ios_x86_64-dbg-ST-9fcfb6a7af56/bin/WidgetExtension"; @@ -7574,7 +7574,7 @@ ARCHS = x86_64; BAZEL_COMPILE_TARGET_ID = "//tvOSApp/Test/UITests:tvOSAppUITests.library tvos-x86_64-min15.0-applebin_tvos-tvos_x86_64-dbg-ST-b6268cc80bf2"; "BAZEL_COMPILE_TARGET_ID[sdk=appletvsimulator*]" = "$(BAZEL_COMPILE_TARGET_ID)"; - BAZEL_LABEL = "//tvOSApp/Test/UITests:tvOSAppUITests"; + BAZEL_LABEL = "@//tvOSApp/Test/UITests:tvOSAppUITests"; BAZEL_OUTPUTS_PRODUCT = "$(BAZEL_OUT)/applebin_tvos-tvos_x86_64-dbg-ST-b6268cc80bf2/bin/tvOSApp/Test/UITests/tvOSAppUITests.xctest"; BAZEL_PACKAGE_BIN_DIR = "bazel-out/applebin_tvos-tvos_x86_64-dbg-ST-b6268cc80bf2/bin/tvOSApp/Test/UITests"; BAZEL_TARGET_ID = "//tvOSApp/Test/UITests:tvOSAppUITests.__internal__.__test_bundle applebin_tvos-tvos_x86_64-dbg-ST-b6268cc80bf2"; @@ -7622,7 +7622,7 @@ ARCHS = x86_64; BAZEL_COMPILE_TARGET_ID = "//CommandLine/Tests:CommandLineLibSwiftTestsLib macos-x86_64-min11.0-applebin_macos-darwin_x86_64-dbg-ST-c0ef0a258197"; "BAZEL_COMPILE_TARGET_ID[sdk=macosx*]" = "$(BAZEL_COMPILE_TARGET_ID)"; - BAZEL_LABEL = "//CommandLine/Tests:CommandLineToolTests"; + BAZEL_LABEL = "@//CommandLine/Tests:CommandLineToolTests"; BAZEL_OUTPUTS_PRODUCT = "$(BAZEL_OUT)/applebin_macos-darwin_x86_64-dbg-ST-c0ef0a258197/bin/CommandLine/Tests/CommandLineToolTests.xctest"; BAZEL_PACKAGE_BIN_DIR = "bazel-out/applebin_macos-darwin_x86_64-dbg-ST-c0ef0a258197/bin/CommandLine/Tests"; BAZEL_TARGET_ID = "//CommandLine/Tests:CommandLineToolTests.__internal__.__test_bundle applebin_macos-darwin_x86_64-dbg-ST-c0ef0a258197"; @@ -7673,7 +7673,7 @@ isa = XCBuildConfiguration; buildSettings = { ARCHS = x86_64; - BAZEL_LABEL = "//CommandLine/CommandLineToolLib:private_lib"; + BAZEL_LABEL = "@//CommandLine/CommandLineToolLib:private_lib"; BAZEL_PACKAGE_BIN_DIR = "bazel-out/macos-x86_64-min11.0-applebin_macos-darwin_x86_64-dbg-ST-c0ef0a258197/bin/CommandLine/CommandLineToolLib"; BAZEL_TARGET_ID = "//CommandLine/CommandLineToolLib:private_lib macos-x86_64-min11.0-applebin_macos-darwin_x86_64-dbg-ST-c0ef0a258197"; "BAZEL_TARGET_ID[sdk=macosx*]" = "$(BAZEL_TARGET_ID)"; @@ -7736,7 +7736,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; BAZEL_COMPILE_TARGET_ID = "//macOSApp/Source:macOSApp.library macos-x86_64-min12.0-applebin_macos-darwin_x86_64-dbg-ST-e4309a660cc1"; "BAZEL_COMPILE_TARGET_ID[sdk=macosx*]" = "$(BAZEL_COMPILE_TARGET_ID)"; - BAZEL_LABEL = "//macOSApp/Source:macOSApp"; + BAZEL_LABEL = "@//macOSApp/Source:macOSApp"; BAZEL_OUTPUTS_PRODUCT = "$(BAZEL_OUT)/applebin_macos-darwin_x86_64-dbg-ST-e4309a660cc1/bin/macOSApp/Source/macOSApp.app"; BAZEL_PACKAGE_BIN_DIR = "bazel-out/applebin_macos-darwin_x86_64-dbg-ST-e4309a660cc1/bin/macOSApp/Source"; BAZEL_TARGET_ID = "//macOSApp/Source:macOSApp applebin_macos-darwin_x86_64-dbg-ST-e4309a660cc1"; @@ -7786,10 +7786,10 @@ ARCHS = x86_64; "ARCHS[sdk=watchos*]" = arm64_32; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - BAZEL_HOST_LABEL_0 = "//iOSApp/Source:iOSApp"; + BAZEL_HOST_LABEL_0 = "@//iOSApp/Source:iOSApp"; BAZEL_HOST_TARGET_ID_0 = "//iOSApp/Source:iOSApp applebin_ios-ios_x86_64-dbg-ST-9fcfb6a7af56"; "BAZEL_HOST_TARGET_ID_0[sdk=watchos*]" = "//iOSApp/Source:iOSApp applebin_ios-ios_arm64-dbg-ST-b625d7c0bd00"; - BAZEL_LABEL = "//watchOSApp:watchOSApp"; + BAZEL_LABEL = "@//watchOSApp:watchOSApp"; BAZEL_OUTPUTS_PRODUCT = "$(BAZEL_OUT)/applebin_watchos-watchos_x86_64-dbg-ST-3df60cf154e9/bin/watchOSApp/watchOSApp.app"; "BAZEL_OUTPUTS_PRODUCT[sdk=watchos*]" = "$(BAZEL_OUT)/applebin_watchos-watchos_arm64_32-dbg-ST-56a8163e2aa7/bin/watchOSApp/watchOSApp.app"; BAZEL_PACKAGE_BIN_DIR = "bazel-out/applebin_watchos-watchos_x86_64-dbg-ST-3df60cf154e9/bin/watchOSApp"; @@ -7847,7 +7847,7 @@ BAZEL_COMPILE_TARGET_ID = "//iOSApp/Source/CoreUtilsObjC:CoreUtilsObjC ios-x86_64-min15.0-applebin_ios-ios_x86_64-dbg-ST-9fcfb6a7af56"; "BAZEL_COMPILE_TARGET_ID[sdk=iphoneos*]" = "//iOSApp/Source/CoreUtilsObjC:CoreUtilsObjC ios-arm64-min15.0-applebin_ios-ios_arm64-dbg-ST-b625d7c0bd00"; "BAZEL_COMPILE_TARGET_ID[sdk=iphonesimulator*]" = "$(BAZEL_COMPILE_TARGET_ID)"; - BAZEL_LABEL = "//iOSApp/Source/CoreUtilsObjC:FrameworkCoreUtilsObjC"; + BAZEL_LABEL = "@//iOSApp/Source/CoreUtilsObjC:FrameworkCoreUtilsObjC"; BAZEL_OUTPUTS_PRODUCT = "$(BAZEL_OUT)/applebin_ios-ios_x86_64-dbg-ST-9fcfb6a7af56/bin/iOSApp/Source/CoreUtilsObjC/CoreUtilsObjC.framework"; "BAZEL_OUTPUTS_PRODUCT[sdk=iphoneos*]" = "$(BAZEL_OUT)/applebin_ios-ios_arm64-dbg-ST-b625d7c0bd00/bin/iOSApp/Source/CoreUtilsObjC/CoreUtilsObjC.framework"; BAZEL_PACKAGE_BIN_DIR = "bazel-out/applebin_ios-ios_x86_64-dbg-ST-9fcfb6a7af56/bin/iOSApp/Source/CoreUtilsObjC"; diff --git a/examples/integration/test/fixtures/bwb_spec.json b/examples/integration/test/fixtures/bwb_spec.json index e59d991cd6..39cf8bab2b 100644 --- a/examples/integration/test/fixtures/bwb_spec.json +++ b/examples/integration/test/fixtures/bwb_spec.json @@ -428,19 +428,19 @@ "pre_build_script": null, "replacement_labels": [ "//CommandLine/Tests:CommandLineToolTests.__internal__.__test_bundle applebin_macos-darwin_x86_64-dbg-ST-c0ef0a258197", - "//CommandLine/Tests:CommandLineToolTests", + "@//CommandLine/Tests:CommandLineToolTests", "//macOSApp/Test/UITests:macOSAppUITests.__internal__.__test_bundle applebin_macos-darwin_x86_64-dbg-ST-e4309a660cc1", - "//macOSApp/Test/UITests:macOSAppUITests", + "@//macOSApp/Test/UITests:macOSAppUITests", "//tvOSApp/Test/UITests:tvOSAppUITests.__internal__.__test_bundle applebin_tvos-tvos_x86_64-dbg-ST-b6268cc80bf2", - "//tvOSApp/Test/UITests:tvOSAppUITests", + "@//tvOSApp/Test/UITests:tvOSAppUITests", "//tvOSApp/Test/UnitTests:tvOSAppUnitTests.__internal__.__test_bundle applebin_tvos-tvos_x86_64-dbg-ST-b6268cc80bf2", - "//tvOSApp/Test/UnitTests:tvOSAppUnitTests", + "@//tvOSApp/Test/UnitTests:tvOSAppUnitTests", "//watchOSApp/Test/UITests:watchOSAppUITests.__internal__.__test_bundle applebin_watchos-watchos_x86_64-dbg-ST-25d904fdfd32", - "//watchOSApp/Test/UITests:watchOSAppUITests", + "@//watchOSApp/Test/UITests:watchOSAppUITests", "//watchOSAppExtension/Test/UnitTests:watchOSAppExtensionUnitTests.__internal__.__test_bundle applebin_watchos-watchos_x86_64-dbg-ST-25d904fdfd32", - "//watchOSAppExtension/Test/UnitTests:watchOSAppExtensionUnitTests" + "@//watchOSAppExtension/Test/UnitTests:watchOSAppExtensionUnitTests" ], - "runner_label": "//test/fixtures:xcodeproj_bwb", + "runner_label": "@//test/fixtures:xcodeproj_bwb", "scheme_autogeneration_mode": "auto", "target_hosts": [ "//WidgetExtension:WidgetExtension applebin_ios-ios_arm64-dbg-ST-b625d7c0bd00", diff --git a/examples/integration/test/fixtures/bwx.xcodeproj/project.pbxproj b/examples/integration/test/fixtures/bwx.xcodeproj/project.pbxproj index de4b327f20..b48ad7ac59 100644 --- a/examples/integration/test/fixtures/bwx.xcodeproj/project.pbxproj +++ b/examples/integration/test/fixtures/bwx.xcodeproj/project.pbxproj @@ -5783,7 +5783,7 @@ BAZEL_COMPILE_TARGET_ID = "//iOSApp/Source/CoreUtilsObjC:CoreUtilsObjC ios-x86_64-min15.0-applebin_ios-ios_x86_64-dbg-ST-7aac51e4b353"; "BAZEL_COMPILE_TARGET_ID[sdk=iphoneos*]" = "//iOSApp/Source/CoreUtilsObjC:CoreUtilsObjC ios-arm64-min15.0-applebin_ios-ios_arm64-dbg-ST-3a05e106c3dd"; "BAZEL_COMPILE_TARGET_ID[sdk=iphonesimulator*]" = "$(BAZEL_COMPILE_TARGET_ID)"; - BAZEL_LABEL = "//iOSApp/Source/CoreUtilsObjC:FrameworkCoreUtilsObjC"; + BAZEL_LABEL = "@//iOSApp/Source/CoreUtilsObjC:FrameworkCoreUtilsObjC"; BAZEL_PACKAGE_BIN_DIR = "bazel-out/applebin_ios-ios_x86_64-dbg-ST-7aac51e4b353/bin/iOSApp/Source/CoreUtilsObjC"; "BAZEL_PACKAGE_BIN_DIR[sdk=iphoneos*]" = "bazel-out/applebin_ios-ios_arm64-dbg-ST-3a05e106c3dd/bin/iOSApp/Source/CoreUtilsObjC"; BAZEL_TARGET_ID = "//iOSApp/Source/CoreUtilsObjC:FrameworkCoreUtilsObjC applebin_ios-ios_x86_64-dbg-ST-7aac51e4b353"; @@ -5970,7 +5970,7 @@ isa = XCBuildConfiguration; buildSettings = { ARCHS = x86_64; - BAZEL_LABEL = "//CommandLine/swift_c_module:c_lib"; + BAZEL_LABEL = "@//CommandLine/swift_c_module:c_lib"; BAZEL_PACKAGE_BIN_DIR = "bazel-out/macos-x86_64-min11.0-applebin_macos-darwin_x86_64-dbg-ST-7ab8ee5d0803/bin/CommandLine/swift_c_module"; BAZEL_TARGET_ID = "//CommandLine/swift_c_module:c_lib macos-x86_64-min11.0-applebin_macos-darwin_x86_64-dbg-ST-7ab8ee5d0803"; "BAZEL_TARGET_ID[sdk=macosx*]" = "$(BAZEL_TARGET_ID)"; @@ -6037,10 +6037,10 @@ ARCHS = x86_64; "ARCHS[sdk=watchos*]" = arm64_32; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - BAZEL_HOST_LABEL_0 = "//iOSApp/Source:iOSApp"; + BAZEL_HOST_LABEL_0 = "@//iOSApp/Source:iOSApp"; BAZEL_HOST_TARGET_ID_0 = "//iOSApp/Source:iOSApp applebin_ios-ios_x86_64-dbg-ST-7aac51e4b353"; "BAZEL_HOST_TARGET_ID_0[sdk=watchos*]" = "//iOSApp/Source:iOSApp applebin_ios-ios_arm64-dbg-ST-3a05e106c3dd"; - BAZEL_LABEL = "//watchOSApp:watchOSApp"; + BAZEL_LABEL = "@//watchOSApp:watchOSApp"; BAZEL_PACKAGE_BIN_DIR = "bazel-out/applebin_watchos-watchos_x86_64-dbg-ST-2f849b1d5a93/bin/watchOSApp"; "BAZEL_PACKAGE_BIN_DIR[sdk=watchos*]" = "bazel-out/applebin_watchos-watchos_arm64_32-dbg-ST-8e65bd00489d/bin/watchOSApp"; BAZEL_TARGET_ID = "//watchOSApp:watchOSApp applebin_watchos-watchos_x86_64-dbg-ST-2f849b1d5a93"; @@ -6098,7 +6098,7 @@ APPLICATION_EXTENSION_API_ONLY = YES; ARCHS = x86_64; "ARCHS[sdk=iphoneos*]" = arm64; - BAZEL_LABEL = "//Lib:LibFramework.iOS"; + BAZEL_LABEL = "@//Lib:LibFramework.iOS"; BAZEL_PACKAGE_BIN_DIR = "bazel-out/applebin_ios-ios_x86_64-dbg-ST-7aac51e4b353/bin/Lib"; "BAZEL_PACKAGE_BIN_DIR[sdk=iphoneos*]" = "bazel-out/applebin_ios-ios_arm64-dbg-ST-3a05e106c3dd/bin/Lib"; BAZEL_TARGET_ID = "//Lib:LibFramework.iOS applebin_ios-ios_x86_64-dbg-ST-7aac51e4b353"; @@ -6178,7 +6178,7 @@ ARCHS = x86_64; BAZEL_COMPILE_TARGET_ID = "//tvOSApp/Test/UITests:tvOSAppUITests.library tvos-x86_64-min15.0-applebin_tvos-tvos_x86_64-dbg-ST-bb5377ca9332"; "BAZEL_COMPILE_TARGET_ID[sdk=appletvsimulator*]" = "$(BAZEL_COMPILE_TARGET_ID)"; - BAZEL_LABEL = "//tvOSApp/Test/UITests:tvOSAppUITests"; + BAZEL_LABEL = "@//tvOSApp/Test/UITests:tvOSAppUITests"; BAZEL_PACKAGE_BIN_DIR = "bazel-out/applebin_tvos-tvos_x86_64-dbg-ST-bb5377ca9332/bin/tvOSApp/Test/UITests"; BAZEL_TARGET_ID = "//tvOSApp/Test/UITests:tvOSAppUITests.__internal__.__test_bundle applebin_tvos-tvos_x86_64-dbg-ST-bb5377ca9332"; "BAZEL_TARGET_ID[sdk=appletvsimulator*]" = "$(BAZEL_TARGET_ID)"; @@ -6225,7 +6225,7 @@ APPLICATION_EXTENSION_API_ONLY = YES; ARCHS = x86_64; "ARCHS[sdk=watchos*]" = arm64_32; - BAZEL_LABEL = "//Lib/dist/dynamic:watchOS"; + BAZEL_LABEL = "@//Lib/dist/dynamic:watchOS"; BAZEL_PACKAGE_BIN_DIR = "bazel-out/applebin_watchos-watchos_x86_64-dbg-ST-38a9c27fdda0/bin/Lib/dist/dynamic"; "BAZEL_PACKAGE_BIN_DIR[sdk=watchos*]" = "bazel-out/applebin_watchos-watchos_arm64_32-dbg-ST-899e4c5ca1ae/bin/Lib/dist/dynamic"; BAZEL_TARGET_ID = "//Lib/dist/dynamic:watchOS applebin_watchos-watchos_x86_64-dbg-ST-38a9c27fdda0"; @@ -6302,7 +6302,7 @@ buildSettings = { ARCHS = x86_64; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - BAZEL_LABEL = "//iMessageApp:iMessageApp"; + BAZEL_LABEL = "@//iMessageApp:iMessageApp"; BAZEL_PACKAGE_BIN_DIR = "bazel-out/applebin_ios-ios_x86_64-dbg-ST-7aac51e4b353/bin/iMessageApp"; BAZEL_TARGET_ID = "//iMessageApp:iMessageApp applebin_ios-ios_x86_64-dbg-ST-7aac51e4b353"; "BAZEL_TARGET_ID[sdk=iphonesimulator*]" = "$(BAZEL_TARGET_ID)"; @@ -6383,7 +6383,7 @@ ARCHS = x86_64; BAZEL_COMPILE_TARGET_ID = "//watchOSAppExtension/Test/UnitTests:watchOSAppExtensionUnitTests.library watchos-x86_64-min7.0-applebin_watchos-watchos_x86_64-dbg-ST-38a9c27fdda0"; "BAZEL_COMPILE_TARGET_ID[sdk=watchsimulator*]" = "$(BAZEL_COMPILE_TARGET_ID)"; - BAZEL_LABEL = "//watchOSAppExtension/Test/UnitTests:watchOSAppExtensionUnitTests"; + BAZEL_LABEL = "@//watchOSAppExtension/Test/UnitTests:watchOSAppExtensionUnitTests"; BAZEL_PACKAGE_BIN_DIR = "bazel-out/applebin_watchos-watchos_x86_64-dbg-ST-38a9c27fdda0/bin/watchOSAppExtension/Test/UnitTests"; BAZEL_TARGET_ID = "//watchOSAppExtension/Test/UnitTests:watchOSAppExtensionUnitTests.__internal__.__test_bundle applebin_watchos-watchos_x86_64-dbg-ST-38a9c27fdda0"; "BAZEL_TARGET_ID[sdk=watchsimulator*]" = "$(BAZEL_TARGET_ID)"; @@ -6437,7 +6437,7 @@ APPLICATION_EXTENSION_API_ONLY = YES; ARCHS = x86_64; "ARCHS[sdk=appletvos*]" = arm64; - BAZEL_LABEL = "//Lib:LibFramework.tvOS"; + BAZEL_LABEL = "@//Lib:LibFramework.tvOS"; BAZEL_PACKAGE_BIN_DIR = "bazel-out/applebin_tvos-tvos_x86_64-dbg-ST-bb5377ca9332/bin/Lib"; "BAZEL_PACKAGE_BIN_DIR[sdk=appletvos*]" = "bazel-out/applebin_tvos-tvos_arm64-dbg-ST-252684668b52/bin/Lib"; BAZEL_TARGET_ID = "//Lib:LibFramework.tvOS applebin_tvos-tvos_x86_64-dbg-ST-bb5377ca9332"; @@ -6518,7 +6518,7 @@ BAZEL_COMPILE_TARGET_ID = "//UI:UI tvos-x86_64-min15.0-applebin_tvos-tvos_x86_64-dbg-ST-bb5377ca9332"; "BAZEL_COMPILE_TARGET_ID[sdk=appletvos*]" = "//UI:UI tvos-arm64-min15.0-applebin_tvos-tvos_arm64-dbg-ST-252684668b52"; "BAZEL_COMPILE_TARGET_ID[sdk=appletvsimulator*]" = "$(BAZEL_COMPILE_TARGET_ID)"; - BAZEL_LABEL = "//UI:UIFramework.tvOS"; + BAZEL_LABEL = "@//UI:UIFramework.tvOS"; BAZEL_PACKAGE_BIN_DIR = "bazel-out/applebin_tvos-tvos_x86_64-dbg-ST-bb5377ca9332/bin/UI"; "BAZEL_PACKAGE_BIN_DIR[sdk=appletvos*]" = "bazel-out/applebin_tvos-tvos_arm64-dbg-ST-252684668b52/bin/UI"; BAZEL_TARGET_ID = "//UI:UIFramework.tvOS applebin_tvos-tvos_x86_64-dbg-ST-bb5377ca9332"; @@ -6636,7 +6636,7 @@ BAZEL_CONFIG = rules_xcodeproj_integration; BAZEL_PACKAGE_BIN_DIR = rules_xcodeproj; CALCULATE_OUTPUT_GROUPS_SCRIPT = "$(BAZEL_INTEGRATION_DIR)/calculate_output_groups.py"; - GENERATOR_LABEL = "//test/fixtures:xcodeproj_bwx.generator"; + GENERATOR_LABEL = "@//test/fixtures:xcodeproj_bwx.generator"; GENERATOR_PACKAGE_BIN_DIR = "darwin_x86_64-dbg-ST-14942f8a2d44/bin/test/fixtures"; GENERATOR_TARGET_NAME = xcodeproj_bwx.generator; INDEX_DATA_STORE_DIR = "$(INDEX_DATA_STORE_DIR)"; @@ -6658,7 +6658,7 @@ BAZEL_COMPILE_TARGET_ID = "//iOSApp/Source:iOSApp.library ios-x86_64-min15.0-applebin_ios-ios_x86_64-dbg-ST-7aac51e4b353"; "BAZEL_COMPILE_TARGET_ID[sdk=iphoneos*]" = "//iOSApp/Source:iOSApp.library ios-arm64-min15.0-applebin_ios-ios_arm64-dbg-ST-3a05e106c3dd"; "BAZEL_COMPILE_TARGET_ID[sdk=iphonesimulator*]" = "$(BAZEL_COMPILE_TARGET_ID)"; - BAZEL_LABEL = "//iOSApp/Source:iOSApp"; + BAZEL_LABEL = "@//iOSApp/Source:iOSApp"; BAZEL_PACKAGE_BIN_DIR = "bazel-out/applebin_ios-ios_x86_64-dbg-ST-7aac51e4b353/bin/iOSApp/Source"; "BAZEL_PACKAGE_BIN_DIR[sdk=iphoneos*]" = "bazel-out/applebin_ios-ios_arm64-dbg-ST-3a05e106c3dd/bin/iOSApp/Source"; BAZEL_TARGET_ID = "//iOSApp/Source:iOSApp applebin_ios-ios_x86_64-dbg-ST-7aac51e4b353"; @@ -6766,7 +6766,7 @@ APPLICATION_EXTENSION_API_ONLY = YES; ARCHS = x86_64; "ARCHS[sdk=appletvos*]" = arm64; - BAZEL_LABEL = "//Lib/dist/dynamic:tvOS"; + BAZEL_LABEL = "@//Lib/dist/dynamic:tvOS"; BAZEL_PACKAGE_BIN_DIR = "bazel-out/applebin_tvos-tvos_x86_64-dbg-ST-bb5377ca9332/bin/Lib/dist/dynamic"; "BAZEL_PACKAGE_BIN_DIR[sdk=appletvos*]" = "bazel-out/applebin_tvos-tvos_arm64-dbg-ST-252684668b52/bin/Lib/dist/dynamic"; BAZEL_TARGET_ID = "//Lib/dist/dynamic:tvOS applebin_tvos-tvos_x86_64-dbg-ST-bb5377ca9332"; @@ -6842,7 +6842,7 @@ ARCHS = x86_64; BAZEL_COMPILE_TARGET_ID = "//watchOSApp/Test/UITests:watchOSAppUITests.library watchos-x86_64-min7.0-applebin_watchos-watchos_x86_64-dbg-ST-38a9c27fdda0"; "BAZEL_COMPILE_TARGET_ID[sdk=watchsimulator*]" = "$(BAZEL_COMPILE_TARGET_ID)"; - BAZEL_LABEL = "//watchOSApp/Test/UITests:watchOSAppUITests"; + BAZEL_LABEL = "@//watchOSApp/Test/UITests:watchOSAppUITests"; BAZEL_PACKAGE_BIN_DIR = "bazel-out/applebin_watchos-watchos_x86_64-dbg-ST-38a9c27fdda0/bin/watchOSApp/Test/UITests"; BAZEL_TARGET_ID = "//watchOSApp/Test/UITests:watchOSAppUITests.__internal__.__test_bundle applebin_watchos-watchos_x86_64-dbg-ST-38a9c27fdda0"; "BAZEL_TARGET_ID[sdk=watchsimulator*]" = "$(BAZEL_TARGET_ID)"; @@ -6892,7 +6892,7 @@ BAZEL_COMPILE_TARGET_ID = "//AppClip:AppClip.library ios-x86_64-min15.0-applebin_ios-ios_x86_64-dbg-ST-7aac51e4b353"; "BAZEL_COMPILE_TARGET_ID[sdk=iphoneos*]" = "//AppClip:AppClip.library ios-arm64-min15.0-applebin_ios-ios_arm64-dbg-ST-3a05e106c3dd"; "BAZEL_COMPILE_TARGET_ID[sdk=iphonesimulator*]" = "$(BAZEL_COMPILE_TARGET_ID)"; - BAZEL_LABEL = "//AppClip:AppClip"; + BAZEL_LABEL = "@//AppClip:AppClip"; BAZEL_PACKAGE_BIN_DIR = "bazel-out/applebin_ios-ios_x86_64-dbg-ST-7aac51e4b353/bin/AppClip"; "BAZEL_PACKAGE_BIN_DIR[sdk=iphoneos*]" = "bazel-out/applebin_ios-ios_arm64-dbg-ST-3a05e106c3dd/bin/AppClip"; BAZEL_TARGET_ID = "//AppClip:AppClip applebin_ios-ios_x86_64-dbg-ST-7aac51e4b353"; @@ -6968,7 +6968,7 @@ isa = XCBuildConfiguration; buildSettings = { ARCHS = x86_64; - BAZEL_LABEL = "//CommandLine/CommandLineToolLib:lib_swift"; + BAZEL_LABEL = "@//CommandLine/CommandLineToolLib:lib_swift"; BAZEL_PACKAGE_BIN_DIR = "bazel-out/macos-x86_64-min11.0-applebin_macos-darwin_x86_64-dbg-ST-7ab8ee5d0803/bin/CommandLine/CommandLineToolLib"; BAZEL_TARGET_ID = "//CommandLine/CommandLineToolLib:lib_swift macos-x86_64-min11.0-applebin_macos-darwin_x86_64-dbg-ST-7ab8ee5d0803"; "BAZEL_TARGET_ID[sdk=macosx*]" = "$(BAZEL_TARGET_ID)"; @@ -7004,7 +7004,7 @@ isa = XCBuildConfiguration; buildSettings = { ARCHS = x86_64; - BAZEL_LABEL = "//CommandLine/CommandLineToolLib:private_lib"; + BAZEL_LABEL = "@//CommandLine/CommandLineToolLib:private_lib"; BAZEL_PACKAGE_BIN_DIR = "bazel-out/macos-x86_64-min11.0-applebin_macos-darwin_x86_64-dbg-ST-7ab8ee5d0803/bin/CommandLine/CommandLineToolLib"; BAZEL_TARGET_ID = "//CommandLine/CommandLineToolLib:private_lib macos-x86_64-min11.0-applebin_macos-darwin_x86_64-dbg-ST-7ab8ee5d0803"; "BAZEL_TARGET_ID[sdk=macosx*]" = "$(BAZEL_TARGET_ID)"; @@ -7075,7 +7075,7 @@ BAZEL_COMPILE_TARGET_ID = "//tvOSApp/Source:tvOSApp.library tvos-x86_64-min15.0-applebin_tvos-tvos_x86_64-dbg-ST-bb5377ca9332"; "BAZEL_COMPILE_TARGET_ID[sdk=appletvos*]" = "//tvOSApp/Source:tvOSApp.library tvos-arm64-min15.0-applebin_tvos-tvos_arm64-dbg-ST-252684668b52"; "BAZEL_COMPILE_TARGET_ID[sdk=appletvsimulator*]" = "$(BAZEL_COMPILE_TARGET_ID)"; - BAZEL_LABEL = "//tvOSApp/Source:tvOSApp"; + BAZEL_LABEL = "@//tvOSApp/Source:tvOSApp"; BAZEL_PACKAGE_BIN_DIR = "bazel-out/applebin_tvos-tvos_x86_64-dbg-ST-bb5377ca9332/bin/tvOSApp/Source"; "BAZEL_PACKAGE_BIN_DIR[sdk=appletvos*]" = "bazel-out/applebin_tvos-tvos_arm64-dbg-ST-252684668b52/bin/tvOSApp/Source"; BAZEL_TARGET_ID = "//tvOSApp/Source:tvOSApp applebin_tvos-tvos_x86_64-dbg-ST-bb5377ca9332"; @@ -7154,7 +7154,7 @@ ARCHS = x86_64; BAZEL_COMPILE_TARGET_ID = "//macOSApp/Test/UITests:macOSAppUITests.library macos-x86_64-min12.0-applebin_macos-darwin_x86_64-dbg-ST-0c83c5e59889"; "BAZEL_COMPILE_TARGET_ID[sdk=macosx*]" = "$(BAZEL_COMPILE_TARGET_ID)"; - BAZEL_LABEL = "//macOSApp/Test/UITests:macOSAppUITests"; + BAZEL_LABEL = "@//macOSApp/Test/UITests:macOSAppUITests"; BAZEL_PACKAGE_BIN_DIR = "bazel-out/applebin_macos-darwin_x86_64-dbg-ST-0c83c5e59889/bin/macOSApp/Test/UITests"; BAZEL_TARGET_ID = "//macOSApp/Test/UITests:macOSAppUITests.__internal__.__test_bundle applebin_macos-darwin_x86_64-dbg-ST-0c83c5e59889"; "BAZEL_TARGET_ID[sdk=macosx*]" = "$(BAZEL_TARGET_ID)"; @@ -7201,7 +7201,7 @@ APPLICATION_EXTENSION_API_ONLY = YES; ARCHS = x86_64; "ARCHS[sdk=iphoneos*]" = arm64; - BAZEL_LABEL = "//Lib/dist/dynamic:iOS"; + BAZEL_LABEL = "@//Lib/dist/dynamic:iOS"; BAZEL_PACKAGE_BIN_DIR = "bazel-out/applebin_ios-ios_x86_64-dbg-ST-7aac51e4b353/bin/Lib/dist/dynamic"; "BAZEL_PACKAGE_BIN_DIR[sdk=iphoneos*]" = "bazel-out/applebin_ios-ios_arm64-dbg-ST-3a05e106c3dd/bin/Lib/dist/dynamic"; BAZEL_TARGET_ID = "//Lib/dist/dynamic:iOS applebin_ios-ios_x86_64-dbg-ST-7aac51e4b353"; @@ -7284,7 +7284,7 @@ BAZEL_COMPILE_TARGET_ID = "//UI:UI watchos-x86_64-min7.0-applebin_watchos-watchos_x86_64-dbg-ST-38a9c27fdda0"; "BAZEL_COMPILE_TARGET_ID[sdk=watchos*]" = "//UI:UI watchos-arm64_32-min7.0-applebin_watchos-watchos_arm64_32-dbg-ST-899e4c5ca1ae"; "BAZEL_COMPILE_TARGET_ID[sdk=watchsimulator*]" = "$(BAZEL_COMPILE_TARGET_ID)"; - BAZEL_LABEL = "//UI:UIFramework.watchOS"; + BAZEL_LABEL = "@//UI:UIFramework.watchOS"; BAZEL_PACKAGE_BIN_DIR = "bazel-out/applebin_watchos-watchos_x86_64-dbg-ST-38a9c27fdda0/bin/UI"; "BAZEL_PACKAGE_BIN_DIR[sdk=watchos*]" = "bazel-out/applebin_watchos-watchos_arm64_32-dbg-ST-899e4c5ca1ae/bin/UI"; BAZEL_TARGET_ID = "//UI:UIFramework.watchOS applebin_watchos-watchos_x86_64-dbg-ST-38a9c27fdda0"; @@ -7370,7 +7370,7 @@ ARCHS = x86_64; "ARCHS[sdk=appletvos*]" = arm64; "ARCHS[sdk=iphoneos*]" = arm64; - BAZEL_LABEL = "//Lib:Lib"; + BAZEL_LABEL = "@//Lib:Lib"; BAZEL_PACKAGE_BIN_DIR = "bazel-out/ios-x86_64-min15.0-applebin_ios-ios_x86_64-dbg-ST-7aac51e4b353/bin/Lib"; "BAZEL_PACKAGE_BIN_DIR[sdk=appletvos*]" = "bazel-out/tvos-arm64-min15.0-applebin_tvos-tvos_arm64-dbg-ST-252684668b52/bin/Lib"; "BAZEL_PACKAGE_BIN_DIR[sdk=appletvsimulator*]" = "bazel-out/tvos-x86_64-min15.0-applebin_tvos-tvos_x86_64-dbg-ST-bb5377ca9332/bin/Lib"; @@ -7447,7 +7447,7 @@ ARCHS = x86_64; BAZEL_COMPILE_TARGET_ID = "//CommandLine/CommandLineTool:tool.library macos-x86_64-min11.0-applebin_macos-darwin_x86_64-dbg-ST-7ab8ee5d0803"; "BAZEL_COMPILE_TARGET_ID[sdk=macosx*]" = "$(BAZEL_COMPILE_TARGET_ID)"; - BAZEL_LABEL = "//CommandLine/CommandLineTool:CommandLineTool"; + BAZEL_LABEL = "@//CommandLine/CommandLineTool:CommandLineTool"; BAZEL_PACKAGE_BIN_DIR = "bazel-out/applebin_macos-darwin_x86_64-dbg-ST-7ab8ee5d0803/bin/CommandLine/CommandLineTool"; BAZEL_TARGET_ID = "//CommandLine/CommandLineTool:CommandLineTool applebin_macos-darwin_x86_64-dbg-ST-7ab8ee5d0803"; "BAZEL_TARGET_ID[sdk=macosx*]" = "$(BAZEL_TARGET_ID)"; @@ -7556,7 +7556,7 @@ APPLICATION_EXTENSION_API_ONLY = YES; ARCHS = x86_64; "ARCHS[sdk=watchos*]" = arm64_32; - BAZEL_LABEL = "//Lib:Lib"; + BAZEL_LABEL = "@//Lib:Lib"; BAZEL_PACKAGE_BIN_DIR = "bazel-out/watchos-x86_64-min7.0-applebin_watchos-watchos_x86_64-dbg-ST-38a9c27fdda0/bin/Lib"; "BAZEL_PACKAGE_BIN_DIR[sdk=watchos*]" = "bazel-out/watchos-arm64_32-min7.0-applebin_watchos-watchos_arm64_32-dbg-ST-899e4c5ca1ae/bin/Lib"; BAZEL_TARGET_ID = "//Lib:Lib watchos-x86_64-min7.0-applebin_watchos-watchos_x86_64-dbg-ST-38a9c27fdda0"; @@ -7649,7 +7649,7 @@ ARCHS = x86_64; BAZEL_COMPILE_TARGET_ID = "//CommandLine/Tests:CommandLineLibSwiftTestsLib macos-x86_64-min11.0-applebin_macos-darwin_x86_64-dbg-ST-7ab8ee5d0803"; "BAZEL_COMPILE_TARGET_ID[sdk=macosx*]" = "$(BAZEL_COMPILE_TARGET_ID)"; - BAZEL_LABEL = "//CommandLine/Tests:CommandLineToolTests"; + BAZEL_LABEL = "@//CommandLine/Tests:CommandLineToolTests"; BAZEL_PACKAGE_BIN_DIR = "bazel-out/applebin_macos-darwin_x86_64-dbg-ST-7ab8ee5d0803/bin/CommandLine/Tests"; BAZEL_TARGET_ID = "//CommandLine/Tests:CommandLineToolTests.__internal__.__test_bundle applebin_macos-darwin_x86_64-dbg-ST-7ab8ee5d0803"; "BAZEL_TARGET_ID[sdk=macosx*]" = "$(BAZEL_TARGET_ID)"; @@ -7701,7 +7701,7 @@ APPLICATION_EXTENSION_API_ONLY = YES; ARCHS = x86_64; "ARCHS[sdk=watchos*]" = arm64_32; - BAZEL_LABEL = "//Lib:LibFramework.watchOS"; + BAZEL_LABEL = "@//Lib:LibFramework.watchOS"; BAZEL_PACKAGE_BIN_DIR = "bazel-out/applebin_watchos-watchos_x86_64-dbg-ST-38a9c27fdda0/bin/Lib"; "BAZEL_PACKAGE_BIN_DIR[sdk=watchos*]" = "bazel-out/applebin_watchos-watchos_arm64_32-dbg-ST-899e4c5ca1ae/bin/Lib"; BAZEL_TARGET_ID = "//Lib:LibFramework.watchOS applebin_watchos-watchos_x86_64-dbg-ST-38a9c27fdda0"; @@ -7777,7 +7777,7 @@ isa = XCBuildConfiguration; buildSettings = { ARCHS = x86_64; - BAZEL_LABEL = "//CommandLine/CommandLineToolLib:private_swift_lib"; + BAZEL_LABEL = "@//CommandLine/CommandLineToolLib:private_swift_lib"; BAZEL_PACKAGE_BIN_DIR = "bazel-out/macos-x86_64-min11.0-applebin_macos-darwin_x86_64-dbg-ST-7ab8ee5d0803/bin/CommandLine/CommandLineToolLib"; BAZEL_TARGET_ID = "//CommandLine/CommandLineToolLib:private_swift_lib macos-x86_64-min11.0-applebin_macos-darwin_x86_64-dbg-ST-7ab8ee5d0803"; "BAZEL_TARGET_ID[sdk=macosx*]" = "$(BAZEL_TARGET_ID)"; @@ -7809,7 +7809,7 @@ isa = XCBuildConfiguration; buildSettings = { ARCHS = x86_64; - BAZEL_LABEL = "//CommandLine/CommandLineToolLib:lib_impl"; + BAZEL_LABEL = "@//CommandLine/CommandLineToolLib:lib_impl"; BAZEL_PACKAGE_BIN_DIR = "bazel-out/macos-x86_64-min11.0-applebin_macos-darwin_x86_64-dbg-ST-7ab8ee5d0803/bin/CommandLine/CommandLineToolLib"; BAZEL_TARGET_ID = "//CommandLine/CommandLineToolLib:lib_impl macos-x86_64-min11.0-applebin_macos-darwin_x86_64-dbg-ST-7ab8ee5d0803"; "BAZEL_TARGET_ID[sdk=macosx*]" = "$(BAZEL_TARGET_ID)"; @@ -7905,10 +7905,10 @@ BAZEL_COMPILE_TARGET_ID = "//watchOSAppExtension:watchOSAppExtension.library watchos-x86_64-min7.0-applebin_watchos-watchos_x86_64-dbg-ST-38a9c27fdda0"; "BAZEL_COMPILE_TARGET_ID[sdk=watchos*]" = "//watchOSAppExtension:watchOSAppExtension.library watchos-arm64_32-min7.0-applebin_watchos-watchos_arm64_32-dbg-ST-899e4c5ca1ae"; "BAZEL_COMPILE_TARGET_ID[sdk=watchsimulator*]" = "$(BAZEL_COMPILE_TARGET_ID)"; - BAZEL_HOST_LABEL_0 = "//watchOSApp:watchOSApp"; + BAZEL_HOST_LABEL_0 = "@//watchOSApp:watchOSApp"; BAZEL_HOST_TARGET_ID_0 = "//watchOSApp:watchOSApp applebin_watchos-watchos_x86_64-dbg-ST-2f849b1d5a93"; "BAZEL_HOST_TARGET_ID_0[sdk=watchos*]" = "//watchOSApp:watchOSApp applebin_watchos-watchos_arm64_32-dbg-ST-8e65bd00489d"; - BAZEL_LABEL = "//watchOSAppExtension:watchOSAppExtension"; + BAZEL_LABEL = "@//watchOSAppExtension:watchOSAppExtension"; BAZEL_PACKAGE_BIN_DIR = "bazel-out/applebin_watchos-watchos_x86_64-dbg-ST-38a9c27fdda0/bin/watchOSAppExtension"; "BAZEL_PACKAGE_BIN_DIR[sdk=watchos*]" = "bazel-out/applebin_watchos-watchos_arm64_32-dbg-ST-899e4c5ca1ae/bin/watchOSAppExtension"; BAZEL_TARGET_ID = "//watchOSAppExtension:watchOSAppExtension applebin_watchos-watchos_x86_64-dbg-ST-38a9c27fdda0"; @@ -7993,10 +7993,10 @@ BAZEL_COMPILE_TARGET_ID = "//WidgetExtension:WidgetExtension.library ios-x86_64-min15.0-applebin_ios-ios_x86_64-dbg-ST-7aac51e4b353"; "BAZEL_COMPILE_TARGET_ID[sdk=iphoneos*]" = "//WidgetExtension:WidgetExtension.library ios-arm64-min15.0-applebin_ios-ios_arm64-dbg-ST-3a05e106c3dd"; "BAZEL_COMPILE_TARGET_ID[sdk=iphonesimulator*]" = "$(BAZEL_COMPILE_TARGET_ID)"; - BAZEL_HOST_LABEL_0 = "//iOSApp/Source:iOSApp"; + BAZEL_HOST_LABEL_0 = "@//iOSApp/Source:iOSApp"; BAZEL_HOST_TARGET_ID_0 = "//iOSApp/Source:iOSApp applebin_ios-ios_x86_64-dbg-ST-7aac51e4b353"; "BAZEL_HOST_TARGET_ID_0[sdk=iphoneos*]" = "//iOSApp/Source:iOSApp applebin_ios-ios_arm64-dbg-ST-3a05e106c3dd"; - BAZEL_LABEL = "//WidgetExtension:WidgetExtension"; + BAZEL_LABEL = "@//WidgetExtension:WidgetExtension"; BAZEL_PACKAGE_BIN_DIR = "bazel-out/applebin_ios-ios_x86_64-dbg-ST-7aac51e4b353/bin/WidgetExtension"; "BAZEL_PACKAGE_BIN_DIR[sdk=iphoneos*]" = "bazel-out/applebin_ios-ios_arm64-dbg-ST-3a05e106c3dd/bin/WidgetExtension"; BAZEL_TARGET_ID = "//WidgetExtension:WidgetExtension applebin_ios-ios_x86_64-dbg-ST-7aac51e4b353"; @@ -8073,7 +8073,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; BAZEL_COMPILE_TARGET_ID = "//macOSApp/Source:macOSApp.library macos-x86_64-min12.0-applebin_macos-darwin_x86_64-dbg-ST-0c83c5e59889"; "BAZEL_COMPILE_TARGET_ID[sdk=macosx*]" = "$(BAZEL_COMPILE_TARGET_ID)"; - BAZEL_LABEL = "//macOSApp/Source:macOSApp"; + BAZEL_LABEL = "@//macOSApp/Source:macOSApp"; BAZEL_PACKAGE_BIN_DIR = "bazel-out/applebin_macos-darwin_x86_64-dbg-ST-0c83c5e59889/bin/macOSApp/Source"; BAZEL_TARGET_ID = "//macOSApp/Source:macOSApp applebin_macos-darwin_x86_64-dbg-ST-0c83c5e59889"; "BAZEL_TARGET_ID[sdk=macosx*]" = "$(BAZEL_TARGET_ID)"; @@ -8123,9 +8123,9 @@ ARCHS = x86_64; BAZEL_COMPILE_TARGET_ID = "//iMessageApp:iMessageAppExtension.library ios-x86_64-min15.0-applebin_ios-ios_x86_64-dbg-ST-7aac51e4b353"; "BAZEL_COMPILE_TARGET_ID[sdk=iphonesimulator*]" = "$(BAZEL_COMPILE_TARGET_ID)"; - BAZEL_HOST_LABEL_0 = "//iMessageApp:iMessageApp"; + BAZEL_HOST_LABEL_0 = "@//iMessageApp:iMessageApp"; BAZEL_HOST_TARGET_ID_0 = "//iMessageApp:iMessageApp applebin_ios-ios_x86_64-dbg-ST-7aac51e4b353"; - BAZEL_LABEL = "//iMessageApp:iMessageAppExtension"; + BAZEL_LABEL = "@//iMessageApp:iMessageAppExtension"; BAZEL_PACKAGE_BIN_DIR = "bazel-out/applebin_ios-ios_x86_64-dbg-ST-7aac51e4b353/bin/iMessageApp"; BAZEL_TARGET_ID = "//iMessageApp:iMessageAppExtension applebin_ios-ios_x86_64-dbg-ST-7aac51e4b353"; "BAZEL_TARGET_ID[sdk=iphonesimulator*]" = "$(BAZEL_TARGET_ID)"; @@ -8179,7 +8179,7 @@ ARCHS = x86_64; BAZEL_COMPILE_TARGET_ID = "//tvOSApp/Test/UnitTests:tvOSAppUnitTests.library tvos-x86_64-min15.0-applebin_tvos-tvos_x86_64-dbg-ST-bb5377ca9332"; "BAZEL_COMPILE_TARGET_ID[sdk=appletvsimulator*]" = "$(BAZEL_COMPILE_TARGET_ID)"; - BAZEL_LABEL = "//tvOSApp/Test/UnitTests:tvOSAppUnitTests"; + BAZEL_LABEL = "@//tvOSApp/Test/UnitTests:tvOSAppUnitTests"; BAZEL_PACKAGE_BIN_DIR = "bazel-out/applebin_tvos-tvos_x86_64-dbg-ST-bb5377ca9332/bin/tvOSApp/Test/UnitTests"; BAZEL_TARGET_ID = "//tvOSApp/Test/UnitTests:tvOSAppUnitTests.__internal__.__test_bundle applebin_tvos-tvos_x86_64-dbg-ST-bb5377ca9332"; "BAZEL_TARGET_ID[sdk=appletvsimulator*]" = "$(BAZEL_TARGET_ID)"; @@ -8233,7 +8233,7 @@ BAZEL_COMPILE_TARGET_ID = "//UI:UI ios-x86_64-min15.0-applebin_ios-ios_x86_64-dbg-ST-7aac51e4b353"; "BAZEL_COMPILE_TARGET_ID[sdk=iphoneos*]" = "//UI:UI ios-arm64-min15.0-applebin_ios-ios_arm64-dbg-ST-3a05e106c3dd"; "BAZEL_COMPILE_TARGET_ID[sdk=iphonesimulator*]" = "$(BAZEL_COMPILE_TARGET_ID)"; - BAZEL_LABEL = "//UI:UIFramework.iOS"; + BAZEL_LABEL = "@//UI:UIFramework.iOS"; BAZEL_PACKAGE_BIN_DIR = "bazel-out/applebin_ios-ios_x86_64-dbg-ST-7aac51e4b353/bin/UI"; "BAZEL_PACKAGE_BIN_DIR[sdk=iphoneos*]" = "bazel-out/applebin_ios-ios_arm64-dbg-ST-3a05e106c3dd/bin/UI"; BAZEL_TARGET_ID = "//UI:UIFramework.iOS applebin_ios-ios_x86_64-dbg-ST-7aac51e4b353"; diff --git a/examples/integration/test/fixtures/bwx_spec.json b/examples/integration/test/fixtures/bwx_spec.json index 1c6df8d411..d17fc9ec38 100644 --- a/examples/integration/test/fixtures/bwx_spec.json +++ b/examples/integration/test/fixtures/bwx_spec.json @@ -365,19 +365,19 @@ "pre_build_script": null, "replacement_labels": [ "//CommandLine/Tests:CommandLineToolTests.__internal__.__test_bundle applebin_macos-darwin_x86_64-dbg-ST-7ab8ee5d0803", - "//CommandLine/Tests:CommandLineToolTests", + "@//CommandLine/Tests:CommandLineToolTests", "//macOSApp/Test/UITests:macOSAppUITests.__internal__.__test_bundle applebin_macos-darwin_x86_64-dbg-ST-0c83c5e59889", - "//macOSApp/Test/UITests:macOSAppUITests", + "@//macOSApp/Test/UITests:macOSAppUITests", "//tvOSApp/Test/UITests:tvOSAppUITests.__internal__.__test_bundle applebin_tvos-tvos_x86_64-dbg-ST-bb5377ca9332", - "//tvOSApp/Test/UITests:tvOSAppUITests", + "@//tvOSApp/Test/UITests:tvOSAppUITests", "//tvOSApp/Test/UnitTests:tvOSAppUnitTests.__internal__.__test_bundle applebin_tvos-tvos_x86_64-dbg-ST-bb5377ca9332", - "//tvOSApp/Test/UnitTests:tvOSAppUnitTests", + "@//tvOSApp/Test/UnitTests:tvOSAppUnitTests", "//watchOSApp/Test/UITests:watchOSAppUITests.__internal__.__test_bundle applebin_watchos-watchos_x86_64-dbg-ST-38a9c27fdda0", - "//watchOSApp/Test/UITests:watchOSAppUITests", + "@//watchOSApp/Test/UITests:watchOSAppUITests", "//watchOSAppExtension/Test/UnitTests:watchOSAppExtensionUnitTests.__internal__.__test_bundle applebin_watchos-watchos_x86_64-dbg-ST-38a9c27fdda0", - "//watchOSAppExtension/Test/UnitTests:watchOSAppExtensionUnitTests" + "@//watchOSAppExtension/Test/UnitTests:watchOSAppExtensionUnitTests" ], - "runner_label": "//test/fixtures:xcodeproj_bwx", + "runner_label": "@//test/fixtures:xcodeproj_bwx", "scheme_autogeneration_mode": "auto", "target_hosts": [ "//WidgetExtension:WidgetExtension applebin_ios-ios_arm64-dbg-ST-3a05e106c3dd", diff --git a/examples/sanitizers/test/fixtures/bwb.xcodeproj/project.pbxproj b/examples/sanitizers/test/fixtures/bwb.xcodeproj/project.pbxproj index 30a1c182d2..151226d575 100644 --- a/examples/sanitizers/test/fixtures/bwb.xcodeproj/project.pbxproj +++ b/examples/sanitizers/test/fixtures/bwb.xcodeproj/project.pbxproj @@ -577,7 +577,7 @@ ARCHS = x86_64; BAZEL_COMPILE_TARGET_ID = "//UndefinedBehaviorSanitizerApp:UndefinedBehaviorSanitizerApp.library ios-x86_64-min15.0-applebin_ios-ios_x86_64-dbg-ST-9fcfb6a7af56"; "BAZEL_COMPILE_TARGET_ID[sdk=iphonesimulator*]" = "$(BAZEL_COMPILE_TARGET_ID)"; - BAZEL_LABEL = "//UndefinedBehaviorSanitizerApp:UndefinedBehaviorSanitizerApp"; + BAZEL_LABEL = "@//UndefinedBehaviorSanitizerApp:UndefinedBehaviorSanitizerApp"; BAZEL_OUTPUTS_PRODUCT = "$(BAZEL_OUT)/applebin_ios-ios_x86_64-dbg-ST-9fcfb6a7af56/bin/UndefinedBehaviorSanitizerApp/UndefinedBehaviorSanitizerApp.ipa"; BAZEL_PACKAGE_BIN_DIR = "bazel-out/applebin_ios-ios_x86_64-dbg-ST-9fcfb6a7af56/bin/UndefinedBehaviorSanitizerApp"; BAZEL_TARGET_ID = "//UndefinedBehaviorSanitizerApp:UndefinedBehaviorSanitizerApp applebin_ios-ios_x86_64-dbg-ST-9fcfb6a7af56"; @@ -685,7 +685,7 @@ BAZEL_CONFIG = rules_xcodeproj; BAZEL_PACKAGE_BIN_DIR = rules_xcodeproj; CALCULATE_OUTPUT_GROUPS_SCRIPT = "$(BAZEL_INTEGRATION_DIR)/calculate_output_groups.py"; - GENERATOR_LABEL = "//test/fixtures:xcodeproj_bwb.generator"; + GENERATOR_LABEL = "@//test/fixtures:xcodeproj_bwb.generator"; GENERATOR_PACKAGE_BIN_DIR = "darwin_x86_64-dbg-ST-14942f8a2d44/bin/test/fixtures"; GENERATOR_TARGET_NAME = xcodeproj_bwb.generator; INDEX_DATA_STORE_DIR = "$(INDEX_DATA_STORE_DIR)"; @@ -752,7 +752,7 @@ ARCHS = x86_64; BAZEL_COMPILE_TARGET_ID = "//ThreadSanitizerApp:ThreadSanitizerApp.library ios-x86_64-min15.0-applebin_ios-ios_x86_64-dbg-ST-9fcfb6a7af56"; "BAZEL_COMPILE_TARGET_ID[sdk=iphonesimulator*]" = "$(BAZEL_COMPILE_TARGET_ID)"; - BAZEL_LABEL = "//ThreadSanitizerApp:ThreadSanitizerApp"; + BAZEL_LABEL = "@//ThreadSanitizerApp:ThreadSanitizerApp"; BAZEL_OUTPUTS_PRODUCT = "$(BAZEL_OUT)/applebin_ios-ios_x86_64-dbg-ST-9fcfb6a7af56/bin/ThreadSanitizerApp/ThreadSanitizerApp.ipa"; BAZEL_PACKAGE_BIN_DIR = "bazel-out/applebin_ios-ios_x86_64-dbg-ST-9fcfb6a7af56/bin/ThreadSanitizerApp"; BAZEL_TARGET_ID = "//ThreadSanitizerApp:ThreadSanitizerApp applebin_ios-ios_x86_64-dbg-ST-9fcfb6a7af56"; @@ -803,7 +803,7 @@ ARCHS = x86_64; BAZEL_COMPILE_TARGET_ID = "//AddressSanitizerApp:AddressSanitizerApp.library ios-x86_64-min15.0-applebin_ios-ios_x86_64-dbg-ST-9fcfb6a7af56"; "BAZEL_COMPILE_TARGET_ID[sdk=iphonesimulator*]" = "$(BAZEL_COMPILE_TARGET_ID)"; - BAZEL_LABEL = "//AddressSanitizerApp:AddressSanitizerApp"; + BAZEL_LABEL = "@//AddressSanitizerApp:AddressSanitizerApp"; BAZEL_OUTPUTS_PRODUCT = "$(BAZEL_OUT)/applebin_ios-ios_x86_64-dbg-ST-9fcfb6a7af56/bin/AddressSanitizerApp/AddressSanitizerApp.ipa"; BAZEL_PACKAGE_BIN_DIR = "bazel-out/applebin_ios-ios_x86_64-dbg-ST-9fcfb6a7af56/bin/AddressSanitizerApp"; BAZEL_TARGET_ID = "//AddressSanitizerApp:AddressSanitizerApp applebin_ios-ios_x86_64-dbg-ST-9fcfb6a7af56"; diff --git a/examples/sanitizers/test/fixtures/bwb_spec.json b/examples/sanitizers/test/fixtures/bwb_spec.json index 6295f1b8b8..e4c783f512 100644 --- a/examples/sanitizers/test/fixtures/bwb_spec.json +++ b/examples/sanitizers/test/fixtures/bwb_spec.json @@ -26,7 +26,7 @@ } }, "env": {}, - "target": "//AddressSanitizerApp:AddressSanitizerApp", + "target": "@//AddressSanitizerApp:AddressSanitizerApp", "working_directory": null }, "name": "AddressSanitizer", @@ -45,7 +45,7 @@ } }, "env": {}, - "target": "//ThreadSanitizerApp:ThreadSanitizerApp", + "target": "@//ThreadSanitizerApp:ThreadSanitizerApp", "working_directory": null }, "name": "ThreadSanitizer", @@ -64,7 +64,7 @@ } }, "env": {}, - "target": "//UndefinedBehaviorSanitizerApp:UndefinedBehaviorSanitizerApp", + "target": "@//UndefinedBehaviorSanitizerApp:UndefinedBehaviorSanitizerApp", "working_directory": null }, "name": "UndefinedBehaviorSanitizer", @@ -102,7 +102,7 @@ "post_build_script": null, "pre_build_script": null, "replacement_labels": [], - "runner_label": "//test/fixtures:xcodeproj_bwb", + "runner_label": "@//test/fixtures:xcodeproj_bwb", "scheme_autogeneration_mode": "none", "target_hosts": [], "target_merges": [ diff --git a/examples/sanitizers/test/fixtures/bwx.xcodeproj/project.pbxproj b/examples/sanitizers/test/fixtures/bwx.xcodeproj/project.pbxproj index 6dafaf6d2b..849f25ec15 100644 --- a/examples/sanitizers/test/fixtures/bwx.xcodeproj/project.pbxproj +++ b/examples/sanitizers/test/fixtures/bwx.xcodeproj/project.pbxproj @@ -523,7 +523,7 @@ BAZEL_CONFIG = rules_xcodeproj; BAZEL_PACKAGE_BIN_DIR = rules_xcodeproj; CALCULATE_OUTPUT_GROUPS_SCRIPT = "$(BAZEL_INTEGRATION_DIR)/calculate_output_groups.py"; - GENERATOR_LABEL = "//test/fixtures:xcodeproj_bwx.generator"; + GENERATOR_LABEL = "@//test/fixtures:xcodeproj_bwx.generator"; GENERATOR_PACKAGE_BIN_DIR = "darwin_x86_64-dbg-ST-14942f8a2d44/bin/test/fixtures"; GENERATOR_TARGET_NAME = xcodeproj_bwx.generator; INDEX_DATA_STORE_DIR = "$(INDEX_DATA_STORE_DIR)"; @@ -542,7 +542,7 @@ ARCHS = x86_64; BAZEL_COMPILE_TARGET_ID = "//AddressSanitizerApp:AddressSanitizerApp.library ios-x86_64-min15.0-applebin_ios-ios_x86_64-dbg-ST-7aac51e4b353"; "BAZEL_COMPILE_TARGET_ID[sdk=iphonesimulator*]" = "$(BAZEL_COMPILE_TARGET_ID)"; - BAZEL_LABEL = "//AddressSanitizerApp:AddressSanitizerApp"; + BAZEL_LABEL = "@//AddressSanitizerApp:AddressSanitizerApp"; BAZEL_PACKAGE_BIN_DIR = "bazel-out/applebin_ios-ios_x86_64-dbg-ST-7aac51e4b353/bin/AddressSanitizerApp"; BAZEL_TARGET_ID = "//AddressSanitizerApp:AddressSanitizerApp applebin_ios-ios_x86_64-dbg-ST-7aac51e4b353"; "BAZEL_TARGET_ID[sdk=iphonesimulator*]" = "$(BAZEL_TARGET_ID)"; @@ -592,7 +592,7 @@ ARCHS = x86_64; BAZEL_COMPILE_TARGET_ID = "//UndefinedBehaviorSanitizerApp:UndefinedBehaviorSanitizerApp.library ios-x86_64-min15.0-applebin_ios-ios_x86_64-dbg-ST-7aac51e4b353"; "BAZEL_COMPILE_TARGET_ID[sdk=iphonesimulator*]" = "$(BAZEL_COMPILE_TARGET_ID)"; - BAZEL_LABEL = "//UndefinedBehaviorSanitizerApp:UndefinedBehaviorSanitizerApp"; + BAZEL_LABEL = "@//UndefinedBehaviorSanitizerApp:UndefinedBehaviorSanitizerApp"; BAZEL_PACKAGE_BIN_DIR = "bazel-out/applebin_ios-ios_x86_64-dbg-ST-7aac51e4b353/bin/UndefinedBehaviorSanitizerApp"; BAZEL_TARGET_ID = "//UndefinedBehaviorSanitizerApp:UndefinedBehaviorSanitizerApp applebin_ios-ios_x86_64-dbg-ST-7aac51e4b353"; "BAZEL_TARGET_ID[sdk=iphonesimulator*]" = "$(BAZEL_TARGET_ID)"; @@ -743,7 +743,7 @@ ARCHS = x86_64; BAZEL_COMPILE_TARGET_ID = "//ThreadSanitizerApp:ThreadSanitizerApp.library ios-x86_64-min15.0-applebin_ios-ios_x86_64-dbg-ST-7aac51e4b353"; "BAZEL_COMPILE_TARGET_ID[sdk=iphonesimulator*]" = "$(BAZEL_COMPILE_TARGET_ID)"; - BAZEL_LABEL = "//ThreadSanitizerApp:ThreadSanitizerApp"; + BAZEL_LABEL = "@//ThreadSanitizerApp:ThreadSanitizerApp"; BAZEL_PACKAGE_BIN_DIR = "bazel-out/applebin_ios-ios_x86_64-dbg-ST-7aac51e4b353/bin/ThreadSanitizerApp"; BAZEL_TARGET_ID = "//ThreadSanitizerApp:ThreadSanitizerApp applebin_ios-ios_x86_64-dbg-ST-7aac51e4b353"; "BAZEL_TARGET_ID[sdk=iphonesimulator*]" = "$(BAZEL_TARGET_ID)"; diff --git a/examples/sanitizers/test/fixtures/bwx_spec.json b/examples/sanitizers/test/fixtures/bwx_spec.json index 7729528c8d..15bf7f3d45 100644 --- a/examples/sanitizers/test/fixtures/bwx_spec.json +++ b/examples/sanitizers/test/fixtures/bwx_spec.json @@ -26,7 +26,7 @@ } }, "env": {}, - "target": "//AddressSanitizerApp:AddressSanitizerApp", + "target": "@//AddressSanitizerApp:AddressSanitizerApp", "working_directory": null }, "name": "AddressSanitizer", @@ -45,7 +45,7 @@ } }, "env": {}, - "target": "//ThreadSanitizerApp:ThreadSanitizerApp", + "target": "@//ThreadSanitizerApp:ThreadSanitizerApp", "working_directory": null }, "name": "ThreadSanitizer", @@ -64,7 +64,7 @@ } }, "env": {}, - "target": "//UndefinedBehaviorSanitizerApp:UndefinedBehaviorSanitizerApp", + "target": "@//UndefinedBehaviorSanitizerApp:UndefinedBehaviorSanitizerApp", "working_directory": null }, "name": "UndefinedBehaviorSanitizer", @@ -102,7 +102,7 @@ "post_build_script": null, "pre_build_script": null, "replacement_labels": [], - "runner_label": "//test/fixtures:xcodeproj_bwx", + "runner_label": "@//test/fixtures:xcodeproj_bwx", "scheme_autogeneration_mode": "none", "target_hosts": [], "target_merges": [ diff --git a/examples/simple/test/fixtures/bwb.xcodeproj/project.pbxproj b/examples/simple/test/fixtures/bwb.xcodeproj/project.pbxproj index 5bb8a4ba79..83747c252c 100644 --- a/examples/simple/test/fixtures/bwb.xcodeproj/project.pbxproj +++ b/examples/simple/test/fixtures/bwb.xcodeproj/project.pbxproj @@ -272,7 +272,7 @@ isa = XCBuildConfiguration; buildSettings = { ARCHS = x86_64; - BAZEL_LABEL = "//:SwiftBin"; + BAZEL_LABEL = "@//:SwiftBin"; BAZEL_OUTPUTS_PRODUCT = "$(BAZEL_OUT)/darwin_x86_64-dbg-ST-a9822d5480e1/bin/rules_xcodeproj/SwiftBin/SwiftBin"; BAZEL_PACKAGE_BIN_DIR = "bazel-out/darwin_x86_64-dbg-ST-a9822d5480e1/bin"; BAZEL_TARGET_ID = "//:SwiftBin darwin_x86_64-dbg-ST-a9822d5480e1"; @@ -311,7 +311,7 @@ BAZEL_CONFIG = rules_xcodeproj; BAZEL_PACKAGE_BIN_DIR = rules_xcodeproj; CALCULATE_OUTPUT_GROUPS_SCRIPT = "$(BAZEL_INTEGRATION_DIR)/calculate_output_groups.py"; - GENERATOR_LABEL = "//test/fixtures:xcodeproj_bwb.generator"; + GENERATOR_LABEL = "@//test/fixtures:xcodeproj_bwb.generator"; GENERATOR_PACKAGE_BIN_DIR = "darwin_x86_64-dbg-ST-14942f8a2d44/bin/test/fixtures"; GENERATOR_TARGET_NAME = xcodeproj_bwb.generator; INDEX_DATA_STORE_DIR = "$(INDEX_DATA_STORE_DIR)"; diff --git a/examples/simple/test/fixtures/bwb_spec.json b/examples/simple/test/fixtures/bwb_spec.json index 74ce1a5d5d..ba8fcb687c 100644 --- a/examples/simple/test/fixtures/bwb_spec.json +++ b/examples/simple/test/fixtures/bwb_spec.json @@ -27,7 +27,7 @@ "post_build_script": "\"$PROJECT_DIR/post-build w spaces.sh\"\n", "pre_build_script": "echo 'Pre-building...'", "replacement_labels": [], - "runner_label": "//test/fixtures:xcodeproj_bwb", + "runner_label": "@//test/fixtures:xcodeproj_bwb", "scheme_autogeneration_mode": "auto", "target_hosts": [], "target_merges": [], diff --git a/examples/simple/test/fixtures/bwx.xcodeproj/project.pbxproj b/examples/simple/test/fixtures/bwx.xcodeproj/project.pbxproj index 604b1c1cc3..e88c1a06bf 100644 --- a/examples/simple/test/fixtures/bwx.xcodeproj/project.pbxproj +++ b/examples/simple/test/fixtures/bwx.xcodeproj/project.pbxproj @@ -149,7 +149,7 @@ isa = XCBuildConfiguration; buildSettings = { ARCHS = x86_64; - BAZEL_LABEL = "//:SwiftBin"; + BAZEL_LABEL = "@//:SwiftBin"; BAZEL_PACKAGE_BIN_DIR = "bazel-out/darwin_x86_64-dbg-ST-3688109ddba2/bin"; BAZEL_TARGET_ID = "//:SwiftBin darwin_x86_64-dbg-ST-3688109ddba2"; "BAZEL_TARGET_ID[sdk=macosx*]" = "$(BAZEL_TARGET_ID)"; diff --git a/examples/simple/test/fixtures/bwx_spec.json b/examples/simple/test/fixtures/bwx_spec.json index 5abb956d0b..fce16585dd 100644 --- a/examples/simple/test/fixtures/bwx_spec.json +++ b/examples/simple/test/fixtures/bwx_spec.json @@ -27,7 +27,7 @@ "post_build_script": "\"$PROJECT_DIR/post-build w spaces.sh\"\n", "pre_build_script": "echo 'Pre-building...'", "replacement_labels": [], - "runner_label": "//test/fixtures:xcodeproj_bwx", + "runner_label": "@//test/fixtures:xcodeproj_bwx", "scheme_autogeneration_mode": "auto", "target_hosts": [], "target_merges": [], diff --git a/test/fixtures/generator/bwb.xcodeproj/project.pbxproj b/test/fixtures/generator/bwb.xcodeproj/project.pbxproj index 4986444621..b8fbd18a89 100644 --- a/test/fixtures/generator/bwb.xcodeproj/project.pbxproj +++ b/test/fixtures/generator/bwb.xcodeproj/project.pbxproj @@ -2576,7 +2576,7 @@ BAZEL_CONFIG = rules_xcodeproj; BAZEL_PACKAGE_BIN_DIR = rules_xcodeproj; CALCULATE_OUTPUT_GROUPS_SCRIPT = "$(BAZEL_INTEGRATION_DIR)/calculate_output_groups.py"; - GENERATOR_LABEL = "//test/fixtures/generator:xcodeproj_bwb.generator"; + GENERATOR_LABEL = "@//test/fixtures/generator:xcodeproj_bwb.generator"; GENERATOR_PACKAGE_BIN_DIR = "darwin_x86_64-dbg-ST-14942f8a2d44/bin/test/fixtures/generator"; GENERATOR_TARGET_NAME = xcodeproj_bwb.generator; INDEX_DATA_STORE_DIR = "$(INDEX_DATA_STORE_DIR)"; @@ -2595,7 +2595,7 @@ ARCHS = x86_64; BAZEL_COMPILE_TARGET_ID = "//xcodeproj/internal/bazel_integration_files:swiftc_stub.library macos-x86_64-min12.0-applebin_macos-darwin_x86_64-dbg-ST-fd2ea17bd000"; "BAZEL_COMPILE_TARGET_ID[sdk=macosx*]" = "$(BAZEL_COMPILE_TARGET_ID)"; - BAZEL_LABEL = "//xcodeproj/internal/bazel_integration_files:swiftc"; + BAZEL_LABEL = "@//xcodeproj/internal/bazel_integration_files:swiftc"; BAZEL_OUTPUTS_PRODUCT = "$(BAZEL_OUT)/applebin_macos-darwin_x86_64-dbg-ST-fd2ea17bd000/bin/xcodeproj/internal/bazel_integration_files/rules_xcodeproj/swiftc/swiftc"; BAZEL_PACKAGE_BIN_DIR = "bazel-out/applebin_macos-darwin_x86_64-dbg-ST-fd2ea17bd000/bin/xcodeproj/internal/bazel_integration_files"; BAZEL_TARGET_ID = "//xcodeproj/internal/bazel_integration_files:swiftc applebin_macos-darwin_x86_64-dbg-ST-fd2ea17bd000"; @@ -2778,7 +2778,7 @@ ARCHS = x86_64; BAZEL_COMPILE_TARGET_ID = "//tools/generator/test:tests.library macos-x86_64-min12.0-applebin_macos-darwin_x86_64-dbg-ST-fd2ea17bd000"; "BAZEL_COMPILE_TARGET_ID[sdk=macosx*]" = "$(BAZEL_COMPILE_TARGET_ID)"; - BAZEL_LABEL = "//tools/generator/test:tests"; + BAZEL_LABEL = "@//tools/generator/test:tests"; BAZEL_OUTPUTS_PRODUCT = "$(BAZEL_OUT)/applebin_macos-darwin_x86_64-dbg-ST-fd2ea17bd000/bin/tools/generator/test/tests.__internal__.__test_bundle.zip"; BAZEL_PACKAGE_BIN_DIR = "bazel-out/applebin_macos-darwin_x86_64-dbg-ST-fd2ea17bd000/bin/tools/generator/test"; BAZEL_TARGET_ID = "//tools/generator/test:tests.__internal__.__test_bundle applebin_macos-darwin_x86_64-dbg-ST-fd2ea17bd000"; @@ -2853,7 +2853,7 @@ isa = XCBuildConfiguration; buildSettings = { ARCHS = x86_64; - BAZEL_LABEL = "//tools/generator:generator"; + BAZEL_LABEL = "@//tools/generator:generator"; BAZEL_OUTPUTS_PRODUCT = "$(BAZEL_OUT)/applebin_macos-darwin_x86_64-dbg-ST-fd2ea17bd000/bin/tools/generator/rules_xcodeproj/generator/generator"; BAZEL_PACKAGE_BIN_DIR = "bazel-out/applebin_macos-darwin_x86_64-dbg-ST-fd2ea17bd000/bin/tools/generator"; BAZEL_TARGET_ID = "//tools/generator:generator applebin_macos-darwin_x86_64-dbg-ST-fd2ea17bd000"; @@ -2894,7 +2894,7 @@ isa = XCBuildConfiguration; buildSettings = { ARCHS = x86_64; - BAZEL_LABEL = "//tools/generator:generator.library"; + BAZEL_LABEL = "@//tools/generator:generator.library"; BAZEL_PACKAGE_BIN_DIR = "bazel-out/macos-x86_64-min12.0-applebin_macos-darwin_x86_64-dbg-ST-fd2ea17bd000/bin/tools/generator"; BAZEL_TARGET_ID = "//tools/generator:generator.library macos-x86_64-min12.0-applebin_macos-darwin_x86_64-dbg-ST-fd2ea17bd000"; "BAZEL_TARGET_ID[sdk=macosx*]" = "$(BAZEL_TARGET_ID)"; diff --git a/test/fixtures/generator/bwb_spec.json b/test/fixtures/generator/bwb_spec.json index c335ccdc62..047fddabb7 100644 --- a/test/fixtures/generator/bwb_spec.json +++ b/test/fixtures/generator/bwb_spec.json @@ -17,14 +17,14 @@ "build_action": { "post_actions": [ { - "expand_variables_based_on": "//tools/generator:generator", + "expand_variables_based_on": "@//tools/generator:generator", "name": "Example: Stop build time tracking...", "script": "echo 'Completed Building target: generator'" } ], "pre_actions": [ { - "expand_variables_based_on": "//tools/generator:generator", + "expand_variables_based_on": "@//tools/generator:generator", "name": "Example: Start build time tracking...", "script": "echo 'Building target: generator'" } @@ -38,7 +38,7 @@ "running": "unspecified", "testing": "unspecified" }, - "label": "//tools/generator:generator" + "label": "@//tools/generator:generator" } ] }, @@ -58,7 +58,7 @@ "env": { "CUSTOM_ENV_VAR": "hello" }, - "target": "//tools/generator:generator", + "target": "@//tools/generator:generator", "working_directory": "$(BUILD_WORKSPACE_DIRECTORY)" }, "name": "generator", @@ -70,7 +70,7 @@ }, "expand_variables_based_on": null, "targets": [ - "//tools/generator/test:tests" + "@//tools/generator/test:tests" ] } }, @@ -87,7 +87,7 @@ "running": "enabled", "testing": "enabled" }, - "label": "//xcodeproj/internal/bazel_integration_files:swiftc" + "label": "@//xcodeproj/internal/bazel_integration_files:swiftc" } ] }, @@ -121,9 +121,9 @@ "pre_build_script": null, "replacement_labels": [ "//tools/generator/test:tests.__internal__.__test_bundle applebin_macos-darwin_x86_64-dbg-ST-fd2ea17bd000", - "//tools/generator/test:tests" + "@//tools/generator/test:tests" ], - "runner_label": "//test/fixtures/generator:xcodeproj_bwb", + "runner_label": "@//test/fixtures/generator:xcodeproj_bwb", "scheme_autogeneration_mode": "none", "target_hosts": [], "target_merges": [ diff --git a/test/fixtures/generator/bwx.xcodeproj/project.pbxproj b/test/fixtures/generator/bwx.xcodeproj/project.pbxproj index 9da204cbaf..7bc10e7fc8 100644 --- a/test/fixtures/generator/bwx.xcodeproj/project.pbxproj +++ b/test/fixtures/generator/bwx.xcodeproj/project.pbxproj @@ -2455,7 +2455,7 @@ isa = XCBuildConfiguration; buildSettings = { ARCHS = x86_64; - BAZEL_LABEL = "//tools/generator:generator.library"; + BAZEL_LABEL = "@//tools/generator:generator.library"; BAZEL_PACKAGE_BIN_DIR = "bazel-out/macos-x86_64-min12.0-applebin_macos-darwin_x86_64-dbg-ST-0c83c5e59889/bin/tools/generator"; BAZEL_TARGET_ID = "//tools/generator:generator.library macos-x86_64-min12.0-applebin_macos-darwin_x86_64-dbg-ST-0c83c5e59889"; "BAZEL_TARGET_ID[sdk=macosx*]" = "$(BAZEL_TARGET_ID)"; @@ -2488,7 +2488,7 @@ isa = XCBuildConfiguration; buildSettings = { ARCHS = x86_64; - BAZEL_LABEL = "//tools/generator:generator"; + BAZEL_LABEL = "@//tools/generator:generator"; BAZEL_PACKAGE_BIN_DIR = "bazel-out/applebin_macos-darwin_x86_64-dbg-ST-0c83c5e59889/bin/tools/generator"; BAZEL_TARGET_ID = "//tools/generator:generator applebin_macos-darwin_x86_64-dbg-ST-0c83c5e59889"; "BAZEL_TARGET_ID[sdk=macosx*]" = "$(BAZEL_TARGET_ID)"; @@ -2535,7 +2535,7 @@ BAZEL_CONFIG = rules_xcodeproj; BAZEL_PACKAGE_BIN_DIR = rules_xcodeproj; CALCULATE_OUTPUT_GROUPS_SCRIPT = "$(BAZEL_INTEGRATION_DIR)/calculate_output_groups.py"; - GENERATOR_LABEL = "//test/fixtures/generator:xcodeproj_bwx.generator"; + GENERATOR_LABEL = "@//test/fixtures/generator:xcodeproj_bwx.generator"; GENERATOR_PACKAGE_BIN_DIR = "darwin_x86_64-dbg-ST-14942f8a2d44/bin/test/fixtures/generator"; GENERATOR_TARGET_NAME = xcodeproj_bwx.generator; INDEX_DATA_STORE_DIR = "$(INDEX_DATA_STORE_DIR)"; @@ -2586,7 +2586,7 @@ ARCHS = x86_64; BAZEL_COMPILE_TARGET_ID = "//xcodeproj/internal/bazel_integration_files:swiftc_stub.library macos-x86_64-min12.0-applebin_macos-darwin_x86_64-dbg-ST-0c83c5e59889"; "BAZEL_COMPILE_TARGET_ID[sdk=macosx*]" = "$(BAZEL_COMPILE_TARGET_ID)"; - BAZEL_LABEL = "//xcodeproj/internal/bazel_integration_files:swiftc"; + BAZEL_LABEL = "@//xcodeproj/internal/bazel_integration_files:swiftc"; BAZEL_PACKAGE_BIN_DIR = "bazel-out/applebin_macos-darwin_x86_64-dbg-ST-0c83c5e59889/bin/xcodeproj/internal/bazel_integration_files"; BAZEL_TARGET_ID = "//xcodeproj/internal/bazel_integration_files:swiftc applebin_macos-darwin_x86_64-dbg-ST-0c83c5e59889"; "BAZEL_TARGET_ID[sdk=macosx*]" = "$(BAZEL_TARGET_ID)"; @@ -2626,7 +2626,7 @@ ARCHS = x86_64; BAZEL_COMPILE_TARGET_ID = "//tools/generator/test:tests.library macos-x86_64-min12.0-applebin_macos-darwin_x86_64-dbg-ST-0c83c5e59889"; "BAZEL_COMPILE_TARGET_ID[sdk=macosx*]" = "$(BAZEL_COMPILE_TARGET_ID)"; - BAZEL_LABEL = "//tools/generator/test:tests"; + BAZEL_LABEL = "@//tools/generator/test:tests"; BAZEL_PACKAGE_BIN_DIR = "bazel-out/applebin_macos-darwin_x86_64-dbg-ST-0c83c5e59889/bin/tools/generator/test"; BAZEL_TARGET_ID = "//tools/generator/test:tests.__internal__.__test_bundle applebin_macos-darwin_x86_64-dbg-ST-0c83c5e59889"; "BAZEL_TARGET_ID[sdk=macosx*]" = "$(BAZEL_TARGET_ID)"; diff --git a/test/fixtures/generator/bwx_spec.json b/test/fixtures/generator/bwx_spec.json index 11cfcdd428..760bcbe8d5 100644 --- a/test/fixtures/generator/bwx_spec.json +++ b/test/fixtures/generator/bwx_spec.json @@ -17,14 +17,14 @@ "build_action": { "post_actions": [ { - "expand_variables_based_on": "//tools/generator:generator", + "expand_variables_based_on": "@//tools/generator:generator", "name": "Example: Stop build time tracking...", "script": "echo 'Completed Building target: generator'" } ], "pre_actions": [ { - "expand_variables_based_on": "//tools/generator:generator", + "expand_variables_based_on": "@//tools/generator:generator", "name": "Example: Start build time tracking...", "script": "echo 'Building target: generator'" } @@ -38,7 +38,7 @@ "running": "unspecified", "testing": "unspecified" }, - "label": "//tools/generator:generator" + "label": "@//tools/generator:generator" } ] }, @@ -58,7 +58,7 @@ "env": { "CUSTOM_ENV_VAR": "hello" }, - "target": "//tools/generator:generator", + "target": "@//tools/generator:generator", "working_directory": "$(BUILD_WORKSPACE_DIRECTORY)" }, "name": "generator", @@ -70,7 +70,7 @@ }, "expand_variables_based_on": null, "targets": [ - "//tools/generator/test:tests" + "@//tools/generator/test:tests" ] } }, @@ -87,7 +87,7 @@ "running": "enabled", "testing": "enabled" }, - "label": "//xcodeproj/internal/bazel_integration_files:swiftc" + "label": "@//xcodeproj/internal/bazel_integration_files:swiftc" } ] }, @@ -121,9 +121,9 @@ "pre_build_script": null, "replacement_labels": [ "//tools/generator/test:tests.__internal__.__test_bundle applebin_macos-darwin_x86_64-dbg-ST-0c83c5e59889", - "//tools/generator/test:tests" + "@//tools/generator/test:tests" ], - "runner_label": "//test/fixtures/generator:xcodeproj_bwx", + "runner_label": "@//test/fixtures/generator:xcodeproj_bwx", "scheme_autogeneration_mode": "none", "target_hosts": [], "target_merges": [ diff --git a/test/internal/bazel_labels/normalize_tests.bzl b/test/internal/bazel_labels/normalize_tests.bzl index 427dde621e..6871ee3c84 100644 --- a/test/internal/bazel_labels/normalize_tests.bzl +++ b/test/internal/bazel_labels/normalize_tests.bzl @@ -26,7 +26,7 @@ def _relative_label_test(ctx): value = ":chicken" actual = bazel_labels.normalize(value) - expected = "//Sources/Foo:chicken" + expected = "@//Sources/Foo:chicken" asserts.equals(env, expected, actual) return unittest.end(env) @@ -50,7 +50,7 @@ def _absolute_label_without_repo_name_test(ctx): value = "//Sources/Foo:chicken" actual = bazel_labels.normalize(value) - expected = "//Sources/Foo:chicken" + expected = "@//Sources/Foo:chicken" asserts.equals(env, expected, actual) return unittest.end(env) diff --git a/tools/generator/src/DTO/BazelLabel.swift b/tools/generator/src/DTO/BazelLabel.swift index fe0a3eb79b..1daaa1e727 100644 --- a/tools/generator/src/DTO/BazelLabel.swift +++ b/tools/generator/src/DTO/BazelLabel.swift @@ -27,7 +27,12 @@ extension BazelLabel { throw ParseError.missingOrTooManyRootSeparators } - let repository = rootParts[0] + var repository = rootParts[0] + if repository == "" { + // Support for `--noincompatible_unambiguous_label_stringification` + repository = "@" + } + let packageAndNameParts = rootParts[1].components(separatedBy: Self.nameSeparator) let package: String diff --git a/tools/generator/test/AddTargetsTests.swift b/tools/generator/test/AddTargetsTests.swift index b0364da0a2..8d18fdcea3 100644 --- a/tools/generator/test/AddTargetsTests.swift +++ b/tools/generator/test/AddTargetsTests.swift @@ -14,7 +14,7 @@ final class AddTargetsTests: XCTestCase { let expectedPBXProj = Fixtures.pbxProj() let expectedMainGroup = expectedPBXProj.rootObject!.mainGroup! - let generatorLabel = "//:project" + let generatorLabel = "@//:project" let generatorConfiguration = "1234zyx" let consolidatedTargets = Fixtures.consolidatedTargets let workspaceDirectory: Path = "/app-project" diff --git a/tools/generator/test/BazelLabelTests.swift b/tools/generator/test/BazelLabelTests.swift index e9eb105d54..9e4f9eeae7 100644 --- a/tools/generator/test/BazelLabelTests.swift +++ b/tools/generator/test/BazelLabelTests.swift @@ -4,8 +4,8 @@ import XCTest class BazelLabelTests: XCTestCase { func test_init_withStringLiteral_noRepository() throws { - let label: BazelLabel = "//foo/bar:hello" - XCTAssertEqual(label.repository, "") + let label: BazelLabel = "@//foo/bar:hello" + XCTAssertEqual(label.repository, "@") XCTAssertEqual(label.package, "foo/bar") XCTAssertEqual(label.name, "hello") } @@ -18,8 +18,8 @@ class BazelLabelTests: XCTestCase { } func test_init_withStringLiteral_noName() throws { - let label: BazelLabel = "//foo/bar" - XCTAssertEqual(label.repository, "") + let label: BazelLabel = "@//foo/bar" + XCTAssertEqual(label.repository, "@") XCTAssertEqual(label.package, "foo/bar") XCTAssertEqual(label.name, "bar") } @@ -31,24 +31,24 @@ class BazelLabelTests: XCTestCase { } func test_customString_noRepository() throws { - let label: BazelLabel = "//foo/bar:hello" + let label: BazelLabel = "@//foo/bar:hello" let actual = "\(label)" - XCTAssertEqual("//foo/bar:hello", actual) + XCTAssertEqual("@//foo/bar:hello", actual) } func test_customString_noName() throws { - let label: BazelLabel = "//foo/bar" + let label: BazelLabel = "@//foo/bar" let actual = "\(label)" - XCTAssertEqual("//foo/bar:bar", actual) + XCTAssertEqual("@//foo/bar:bar", actual) } func test_encodingAndDecoding() throws { - let label: BazelLabel = "//foo/bar:hello" + let label: BazelLabel = "@//foo/bar:hello" let encoder = JSONEncoder() let data = try encoder.encode(label) let dataStr = String(data: data, encoding: .utf8)! - XCTAssertEqual(dataStr, "\"\\/\\/foo\\/bar:hello\"") + XCTAssertEqual(dataStr, "\"@\\/\\/foo\\/bar:hello\"") let decoder = JSONDecoder() let result = try decoder.decode(BazelLabel.self, from: data) @@ -72,9 +72,21 @@ class BazelLabelTests: XCTestCase { } func test_init_withInvalidValues() throws { - assertParseError(value: ":hello", expectedError: .missingOrTooManyRootSeparators) - assertParseError(value: "//howdy//:hello", expectedError: .missingOrTooManyRootSeparators) - assertParseError(value: "//", expectedError: .missingNameAndPackage) - assertParseError(value: "//foo:hello:bar", expectedError: .tooManyColons) + assertParseError( + value: ":hello", + expectedError: .missingOrTooManyRootSeparators + ) + assertParseError( + value: "//howdy//:hello", + expectedError: .missingOrTooManyRootSeparators + ) + assertParseError( + value: "//", + expectedError: .missingNameAndPackage + ) + assertParseError( + value: "@//foo:hello:bar", + expectedError: .tooManyColons + ) } } diff --git a/tools/generator/test/ConsolidatedTargetExtensionsTests.swift b/tools/generator/test/ConsolidatedTargetExtensionsTests.swift index b7ef7a2d9a..be5e9042d1 100644 --- a/tools/generator/test/ConsolidatedTargetExtensionsTests.swift +++ b/tools/generator/test/ConsolidatedTargetExtensionsTests.swift @@ -6,7 +6,7 @@ class ConsolidatedTargetExtensionsTests: XCTestCase { let consolidatedTarget = ConsolidatedTarget( targets: [ "id": Target.mock( - label: "//a:FooBar", + label: "@//a:FooBar", product: .init(type: .staticLibrary, name: "FooBar", path: "") ), ] @@ -17,6 +17,6 @@ class ConsolidatedTargetExtensionsTests: XCTestCase { } func test_normalizedLabel() throws { - XCTAssertEqual(consolidatedTarget.normalizedLabel, "//a:foobar") + XCTAssertEqual(consolidatedTarget.normalizedLabel, "@//a:foobar") } } diff --git a/tools/generator/test/CreateCustomXCSchemesTests.swift b/tools/generator/test/CreateCustomXCSchemesTests.swift index 86c5bcce43..e4715964c3 100644 --- a/tools/generator/test/CreateCustomXCSchemesTests.swift +++ b/tools/generator/test/CreateCustomXCSchemesTests.swift @@ -26,7 +26,7 @@ extension CreateCustomXCSchemesTests { } class CreateCustomXCSchemesTests: XCTestCase { - let runnerLabel = BazelLabel("//foo") + let runnerLabel = BazelLabel("@//foo") let filePathResolver = FilePathResolver( workspaceDirectory: "/Users/TimApple/app", diff --git a/tools/generator/test/Dictionary+ExtensionTests.swift b/tools/generator/test/Dictionary+ExtensionTests.swift index ddb53d7d26..f4d6582e66 100644 --- a/tools/generator/test/Dictionary+ExtensionTests.swift +++ b/tools/generator/test/Dictionary+ExtensionTests.swift @@ -11,7 +11,7 @@ extension DictionaryExtensionTests { func test_value_keyDoesNotExist_noContext() throws { var thrown: Error? XCTAssertThrowsError( - try targetIDsByLabel.value(for: "//:does_not_exist") + try targetIDsByLabel.value(for: "@//:does_not_exist") ) { thrown = $0 } @@ -20,10 +20,12 @@ extension DictionaryExtensionTests { return } let expectedMainMsg = """ -Unable to find the `TargetID` for the `BazelLabel`, "//:does_not_exist". +Unable to find the `TargetID` for the `BazelLabel`, "@//:does_not_exist". """ XCTAssertTrue(error.message.contains(expectedMainMsg)) - let expectedPostMsgFragment = "function: test_value_keyDoesNotExist_noContext()" + let expectedPostMsgFragment = """ +function: test_value_keyDoesNotExist_noContext() +""" XCTAssertTrue(error.message.contains(expectedPostMsgFragment)) } @@ -31,7 +33,7 @@ Unable to find the `TargetID` for the `BazelLabel`, "//:does_not_exist". var thrown: Error? XCTAssertThrowsError( try targetIDsByLabel.value( - for: "//:does_not_exist", + for: "@//:does_not_exist", context: "performing a test" ) ) { @@ -42,7 +44,8 @@ Unable to find the `TargetID` for the `BazelLabel`, "//:does_not_exist". return } XCTAssertEqual(error.message, """ -Unable to find the `TargetID` for the `BazelLabel`, "//:does_not_exist", while performing a test. +Unable to find the `TargetID` for the `BazelLabel`, "@//:does_not_exist", \ +while performing a test. """) } @@ -50,7 +53,10 @@ Unable to find the `TargetID` for the `BazelLabel`, "//:does_not_exist", while p let customErrorMessage = "Custom error message." var thrown: Error? XCTAssertThrowsError( - try targetIDsByLabel.value(for: "//:does_not_exist", message: customErrorMessage) + try targetIDsByLabel.value( + for: "@//:does_not_exist", + message: customErrorMessage + ) ) { thrown = $0 } @@ -63,7 +69,7 @@ Unable to find the `TargetID` for the `BazelLabel`, "//:does_not_exist", while p } class DictionaryExtensionTests: XCTestCase { - let labelA: BazelLabel = "//:A" + let labelA: BazelLabel = "@//:A" let targetA: TargetID = "targetA" lazy var targetIDsByLabel: [BazelLabel: TargetID] = [labelA: targetA] diff --git a/tools/generator/test/DisambiguateTargetsTests.swift b/tools/generator/test/DisambiguateTargetsTests.swift index 7a16e969fc..84121f9b49 100644 --- a/tools/generator/test/DisambiguateTargetsTests.swift +++ b/tools/generator/test/DisambiguateTargetsTests.swift @@ -10,39 +10,39 @@ final class DisambiguateTargetsTests: XCTestCase { // Arrange let targets: [TargetID: Target] = [ "A 1": Target.mock( - label: "//a:A", + label: "@//a:A", product: .init(type: .staticLibrary, name: "A", path: "") ), "A 2": Target.mock( - label: "//b:A", + label: "@//b:A", product: .init(type: .application, name: "A", path: "") ), "A 3": Target.mock( - label: "//b:A", + label: "@//b:A", product: .init(type: .staticLibrary, name: "A", path: "") ), "B": Target.mock( - label: "//a:B", + label: "@//a:B", product: .init(type: .staticLibrary, name: "B", path: "") ), // The following targets only differ by case "C 1": Target.mock( - label: "//c:A", + label: "@//c:A", product: .init(type: .staticLibrary, name: "A", path: "") ), "C 2": Target.mock( - label: "//c:a", + label: "@//c:a", product: .init(type: .application, name: "a", path: "") ), ] let consolidatedTargets = ConsolidatedTargets(targets: targets) let expectedTargetNames: [ConsolidatedTarget.Key: String] = [ - "A 1": "//a:A", - "A 2": "//b:A (App)", - "A 3": "//b:A (Library)", + "A 1": "@//a:A", + "A 2": "@//b:A (App)", + "A 3": "@//b:A (Library)", "B": "B", - "C 1": "//c:A (Library)", - "C 2": "//c:a (App)", + "C 1": "@//c:A (Library)", + "C 2": "@//c:a (App)", ] // Act diff --git a/tools/generator/test/Fixtures.swift b/tools/generator/test/Fixtures.swift index efada80e13..56ea26bae7 100644 --- a/tools/generator/test/Fixtures.swift +++ b/tools/generator/test/Fixtures.swift @@ -9,8 +9,8 @@ enum Fixtures { name: "Bazel", bazelWorkspaceName: "bazel_workspace", bazelConfig: "rules_xcodeproj_fixtures", - generatorLabel: "//:xcodeproj.generator", - runnerLabel: "//:xcodeproj", + generatorLabel: "@//:xcodeproj.generator", + runnerLabel: "@//:xcodeproj", configuration: "z3y2z", buildSettings: [ "ALWAYS_SEARCH_USER_PATHS": .bool(false), @@ -2157,7 +2157,7 @@ touch "$SCRIPT_OUTPUT_FILE_1" let bazelDependenciesTarget = Fixtures.bazelDependenciesTarget( in: pbxProj, - generatorLabel: "//:xcodeproj", + generatorLabel: "@//:xcodeproj", generatorConfiguration: "xyz321" ) @@ -2228,7 +2228,7 @@ touch "$SCRIPT_OUTPUT_FILE_1" let buildSettings: [ConsolidatedTarget.Key: [String: Any]] = [ "A 1": targets["A 1"]!.buildSettings.asDictionary.merging([ "ARCHS": "arm64", - "BAZEL_LABEL": "//some/package:a", + "BAZEL_LABEL": "@//some/package:a", "BAZEL_PACKAGE_BIN_DIR": "bazel-out/a1b2c/bin/A 1", "BAZEL_TARGET_ID": "A 1", "BAZEL_TARGET_ID[sdk=macosx*]": "$(BAZEL_TARGET_ID)", @@ -2245,7 +2245,7 @@ touch "$SCRIPT_OUTPUT_FILE_1" ]) { $1 }, "A 2": targets["A 2"]!.buildSettings.asDictionary.merging([ "ARCHS": "arm64", - "BAZEL_LABEL": "//some/package:A", + "BAZEL_LABEL": "@//some/package:A", "BAZEL_PACKAGE_BIN_DIR": "bazel-out/a1b2c/bin/A 2", "BUILT_PRODUCTS_DIR": "$(CONFIGURATION_BUILD_DIR)", "BAZEL_TARGET_ID": "A 2", @@ -2282,7 +2282,7 @@ $(PREVIEWS_SWIFT_INCLUDE_PATH__$(ENABLE_PREVIEWS)) $(BUILD_DIR)/bazel-out/z ]) { $1 }, "AC": targets["AC"]!.buildSettings.asDictionary.merging([ "ARCHS": "arm64", - "BAZEL_LABEL": "//some/package:AC", + "BAZEL_LABEL": "@//some/package:AC", "BAZEL_PACKAGE_BIN_DIR": "bazel-out/a1b2c/bin/AC", "BUILT_PRODUCTS_DIR": "$(CONFIGURATION_BUILD_DIR)", "BAZEL_TARGET_ID": "AC", @@ -2311,7 +2311,7 @@ $(PREVIEWS_SWIFT_INCLUDE_PATH__$(ENABLE_PREVIEWS)) $(BUILD_DIR)/bazel-out/z ]) { $1 }, "B 1": targets["B 1"]!.buildSettings.asDictionary.merging([ "ARCHS": "arm64", - "BAZEL_LABEL": "//some/package:b", + "BAZEL_LABEL": "@//some/package:b", "BAZEL_PACKAGE_BIN_DIR": "bazel-out/a1b2c/bin/B 1", "BAZEL_TARGET_ID": "B 1", "BAZEL_TARGET_ID[sdk=macosx*]": "$(BAZEL_TARGET_ID)", @@ -2335,7 +2335,7 @@ $(PREVIEWS_SWIFT_INCLUDE_PATH__$(ENABLE_PREVIEWS)) $(BUILD_DIR)/bazel-out/z ]) { $1 }, "B 2": targets["B 2"]!.buildSettings.asDictionary.merging([ "ARCHS": "arm64", - "BAZEL_LABEL": "//some/package:B", + "BAZEL_LABEL": "@//some/package:B", "BAZEL_PACKAGE_BIN_DIR": "bazel-out/a1b2c/bin/B 2", "BUILT_PRODUCTS_DIR": "$(CONFIGURATION_BUILD_DIR)", "BAZEL_TARGET_ID": "B 2", @@ -2370,7 +2370,7 @@ $(BUILD_DIR)/bazel-out/a1b2c/bin/A 2/A.app/A_ExecutableName ]) { $1 }, "B 3": targets["B 3"]!.buildSettings.asDictionary.merging([ "ARCHS": "arm64", - "BAZEL_LABEL": "//some/package:B3", + "BAZEL_LABEL": "@//some/package:B3", "BAZEL_PACKAGE_BIN_DIR": "bazel-out/a1b2c/bin/B 3", "BUILT_PRODUCTS_DIR": "$(CONFIGURATION_BUILD_DIR)", "BAZEL_TARGET_ID": "B 3", @@ -2400,7 +2400,7 @@ $(INTERNAL_DIR)/targets/a1b2c/B 3/B3.link.params ]) { $1 }, "C 1": targets["C 1"]!.buildSettings.asDictionary.merging([ "ARCHS": "arm64", - "BAZEL_LABEL": "//some/package:c", + "BAZEL_LABEL": "@//some/package:c", "BAZEL_PACKAGE_BIN_DIR": "bazel-out/a1b2c/bin/C 1", "BAZEL_TARGET_ID": "C 1", "BAZEL_TARGET_ID[sdk=macosx*]": "$(BAZEL_TARGET_ID)", @@ -2424,7 +2424,7 @@ $(INTERNAL_DIR)/targets/a1b2c/B 3/B3.link.params ]) { $1 }, "C 2": targets["C 2"]!.buildSettings.asDictionary.merging([ "ARCHS": "arm64", - "BAZEL_LABEL": "//some/package:d", + "BAZEL_LABEL": "@//some/package:d", "BAZEL_PACKAGE_BIN_DIR": "bazel-out/a1b2c/bin/C 2", "BUILT_PRODUCTS_DIR": "$(CONFIGURATION_BUILD_DIR)", "BAZEL_TARGET_ID": "C 2", @@ -2453,7 +2453,7 @@ $(INTERNAL_DIR)/targets/a1b2c/C 2/d.link.params ]) { $1 }, "E1": targets["E1"]!.buildSettings.asDictionary.merging([ "ARCHS": "x86_64", - "BAZEL_LABEL": "//some/package:E1", + "BAZEL_LABEL": "@//some/package:E1", "BAZEL_PACKAGE_BIN_DIR": "bazel-out/a1b2c/bin/E1", "BAZEL_TARGET_ID": "E1", "BAZEL_TARGET_ID[sdk=watchos*]": "$(BAZEL_TARGET_ID)", @@ -2474,7 +2474,7 @@ $(INTERNAL_DIR)/targets/a1b2c/C 2/d.link.params ]) { $1 }, "E2": targets["E2"]!.buildSettings.asDictionary.merging([ "ARCHS": "arm64", - "BAZEL_LABEL": "//some/package:E2", + "BAZEL_LABEL": "@//some/package:E2", "BAZEL_PACKAGE_BIN_DIR": "bazel-out/a1b2c/bin/E2", "BAZEL_TARGET_ID": "E2", "BAZEL_TARGET_ID[sdk=appletvos*]": "$(BAZEL_TARGET_ID)", @@ -2491,7 +2491,7 @@ $(INTERNAL_DIR)/targets/a1b2c/C 2/d.link.params ]) { $1 }, "I": targets["I"]!.buildSettings.asDictionary.merging([ "ARCHS": "arm64", - "BAZEL_LABEL": "//some/package:I", + "BAZEL_LABEL": "@//some/package:I", "BAZEL_PACKAGE_BIN_DIR": "bazel-out/a1b2c/bin/I", "BUILT_PRODUCTS_DIR": "$(CONFIGURATION_BUILD_DIR)", "BAZEL_TARGET_ID": "I", @@ -2534,7 +2534,7 @@ $(BAZEL_OUT)/some/quote/includes/parent/dir ]) { $1 }, "R 1": targets["R 1"]!.buildSettings.asDictionary.merging([ "ARCHS": "arm64", - "BAZEL_LABEL": "//some/package:R 1", + "BAZEL_LABEL": "@//some/package:R 1", "BAZEL_PACKAGE_BIN_DIR": "bazel-out/a1b2c/bin/R 1", "BAZEL_TARGET_ID": "R 1", "BAZEL_TARGET_ID[sdk=macosx*]": "$(BAZEL_TARGET_ID)", @@ -2558,7 +2558,7 @@ $(BAZEL_OUT)/some/quote/includes/parent/dir .asDictionary.merging( [ "ARCHS": "arm64", - "BAZEL_LABEL": "//some/package:t", + "BAZEL_LABEL": "@//some/package:t", "BAZEL_PACKAGE_BIN_DIR": "bazel-out/a1b2c/bin/T 3", "BAZEL_PACKAGE_BIN_DIR[sdk=iphoneos*]": """ bazel-out/a1b2c/bin/T 1 @@ -2607,12 +2607,12 @@ $(MACOSX_FILES) ]) { $1 }, "W": targets["W"]!.buildSettings.asDictionary.merging([ "ARCHS": "arm64", - "BAZEL_LABEL": "//some/package:W", + "BAZEL_LABEL": "@//some/package:W", "BAZEL_PACKAGE_BIN_DIR": "bazel-out/a1b2c/bin/W", "BUILT_PRODUCTS_DIR": "$(CONFIGURATION_BUILD_DIR)", "BAZEL_TARGET_ID": "W", "BAZEL_TARGET_ID[sdk=watchos*]": "$(BAZEL_TARGET_ID)", - "BAZEL_HOST_LABEL_0": "//some/package:I", + "BAZEL_HOST_LABEL_0": "@//some/package:I", "BAZEL_HOST_TARGET_ID_0": "I", "COMPILE_TARGET_NAME": targets["W"]!.name, "DEPLOYMENT_LOCATION": "NO", @@ -2633,12 +2633,12 @@ $(MACOSX_FILES) ]) { $1 }, "WDKE": targets["WDKE"]!.buildSettings.asDictionary.merging([ "ARCHS": "arm64", - "BAZEL_LABEL": "//some/package:WDKE", + "BAZEL_LABEL": "@//some/package:WDKE", "BAZEL_PACKAGE_BIN_DIR": "bazel-out/a1b2c/bin/WDKE", "BUILT_PRODUCTS_DIR": "$(CONFIGURATION_BUILD_DIR)", "BAZEL_TARGET_ID": "WDKE", "BAZEL_TARGET_ID[sdk=iphoneos*]": "$(BAZEL_TARGET_ID)", - "BAZEL_HOST_LABEL_0": "//some/package:I", + "BAZEL_HOST_LABEL_0": "@//some/package:I", "BAZEL_HOST_TARGET_ID_0": "I", "COMPILE_TARGET_NAME": targets["WDKE"]!.name, "DEPLOYMENT_LOCATION": "NO", @@ -2665,12 +2665,12 @@ $(MACOSX_FILES) ]) { $1 }, "WKE": targets["WKE"]!.buildSettings.asDictionary.merging([ "ARCHS": "arm64", - "BAZEL_LABEL": "//some/package:WKE", + "BAZEL_LABEL": "@//some/package:WKE", "BAZEL_PACKAGE_BIN_DIR": "bazel-out/a1b2c/bin/WKE", "BUILT_PRODUCTS_DIR": "$(CONFIGURATION_BUILD_DIR)", "BAZEL_TARGET_ID": "WKE", "BAZEL_TARGET_ID[sdk=watchos*]": "$(BAZEL_TARGET_ID)", - "BAZEL_HOST_LABEL_0": "//some/package:W", + "BAZEL_HOST_LABEL_0": "@//some/package:W", "BAZEL_HOST_TARGET_ID_0": "W", "COMPILE_TARGET_NAME": targets["WKE"]!.name, "DEPLOYMENT_LOCATION": "NO", diff --git a/tools/generator/test/GeneratorTests.swift b/tools/generator/test/GeneratorTests.swift index c50451a362..a181ef211b 100644 --- a/tools/generator/test/GeneratorTests.swift +++ b/tools/generator/test/GeneratorTests.swift @@ -13,8 +13,8 @@ final class GeneratorTests: XCTestCase { name: "P", bazelWorkspaceName: "bazel_workspace", bazelConfig: "rules_xcodeproj_test", - generatorLabel: "//a/P:xcodeproj.gen", - runnerLabel: "//a/P:xcodeproj", + generatorLabel: "@//a/P:xcodeproj.gen", + runnerLabel: "@//a/P:xcodeproj", configuration: "abc123", buildSettings: [:], targets: Fixtures.targets, @@ -65,22 +65,22 @@ final class GeneratorTests: XCTestCase { let replacedLabelsTargets: [TargetID: Target] = [ "I 0": Target.mock( - label: "//:I0", + label: "@//:I0", configuration: "1a2b3", product: .init(type: .staticLibrary, name: "I 0", path: "") ), "I 1": Target.mock( - label: "//:I1", + label: "@//:I1", configuration: "1a2b3", product: .init(type: .application, name: "I 1", path: "") ), "I 2": Target.mock( - label: "//:I2", + label: "@//:I2", configuration: "1a2b3", product: .init(type: .application, name: "I 2", path: "") ), "WKE": Target.mock( - label: "//:WKE", + label: "@//:WKE", platform: .device(os: .watchOS), product: .init( type: .watch2Extension, @@ -89,29 +89,29 @@ final class GeneratorTests: XCTestCase { ) ), "Y": Target.mock( - label: "//:Y", + label: "@//:Y", configuration: "a1b2c", product: .init(type: .staticLibrary, name: "Y", path: "") ), "Z": Target.mock( - label: "//:Z", + label: "@//:Z", configuration: "1a2b3", product: .init(type: .application, name: "Z", path: "") ), ] let mergedTargets: [TargetID: Target] = [ "I 1": Target.mock( - label: "//:I1", + label: "@//:I1", configuration: "1a2b3", product: .init(type: .application, name: "I 1", path: "") ), "I 2": Target.mock( - label: "//:I2", + label: "@//:I2", configuration: "1a2b3", product: .init(type: .application, name: "I 2", path: "") ), "WKE": Target.mock( - label: "//:WKE", + label: "@//:WKE", platform: .device(os: .watchOS), product: .init( type: .watch2Extension, @@ -120,12 +120,12 @@ final class GeneratorTests: XCTestCase { ) ), "Y": Target.mock( - label: "//:Y", + label: "@//:Y", configuration: "a1b2c", product: .init(type: .staticLibrary, name: "Y", path: "") ), "Z": Target.mock( - label: "//:Z", + label: "@//:Z", configuration: "1a2b3", product: .init(type: .application, name: "Z", path: "") ), diff --git a/tools/generator/test/PBXTarget+ExtensionsTests.swift b/tools/generator/test/PBXTarget+ExtensionsTests.swift index 6ce55f9768..f1b22c4c2e 100644 --- a/tools/generator/test/PBXTarget+ExtensionsTests.swift +++ b/tools/generator/test/PBXTarget+ExtensionsTests.swift @@ -34,10 +34,10 @@ class PBXTargetExtensionsTests: XCTestCase { } func test_getSchemeName_withSlashesInBuildableName() throws { - pbxTarget.name = "//examples/chicken:smidgen" + pbxTarget.name = "@//examples/chicken:smidgen" XCTAssertEqual( pbxTarget.schemeName, - "__examples_chicken_smidgen" + "@__examples_chicken_smidgen" ) } diff --git a/tools/generator/test/Target+Testing.swift b/tools/generator/test/Target+Testing.swift index cb305e8b5e..ef33896b26 100644 --- a/tools/generator/test/Target+Testing.swift +++ b/tools/generator/test/Target+Testing.swift @@ -33,7 +33,7 @@ extension Target { ) -> Self { return Target( name: product.name, - label: label ?? .init(nilIfInvalid: "//some/package:\(product.name)")!, + label: label ?? .init(nilIfInvalid: "@//some/package:\(product.name)")!, configuration: configuration, compileTarget: compileTarget, packageBinDir: packageBinDir, diff --git a/tools/generator/test/TargetIDTargetDictionary+ExtensionsTests.swift b/tools/generator/test/TargetIDTargetDictionary+ExtensionsTests.swift index f4bed23af0..fd3067bfa8 100644 --- a/tools/generator/test/TargetIDTargetDictionary+ExtensionsTests.swift +++ b/tools/generator/test/TargetIDTargetDictionary+ExtensionsTests.swift @@ -107,10 +107,10 @@ class TargetIDTargetDictionaryExtensionsTests: XCTestCase { // E // Targets C and E have the same label, but different configurations - let fooLabel: BazelLabel = "//:foo" - let barLabel: BazelLabel = "//:bar" - let helloLabel: BazelLabel = "//:hello" - let goodbyeLabel: BazelLabel = "//:goodbye" + let fooLabel: BazelLabel = "@//:foo" + let barLabel: BazelLabel = "@//:bar" + let helloLabel: BazelLabel = "@//:hello" + let goodbyeLabel: BazelLabel = "@//:goodbye" let chickenConfiguration = "chicken" let beefConfiguration = "beef" diff --git a/tools/generator/test/XCSchemeInfo+PrePostActionInfoTests.swift b/tools/generator/test/XCSchemeInfo+PrePostActionInfoTests.swift index dcd5c38def..6181c91e86 100644 --- a/tools/generator/test/XCSchemeInfo+PrePostActionInfoTests.swift +++ b/tools/generator/test/XCSchemeInfo+PrePostActionInfoTests.swift @@ -138,7 +138,7 @@ extension XCSchemeInfoPrePostActionInfoTests { func test_customInit_validActionTargetInfo() throws { // given - let targetBazelLabel = BazelLabel("//some/package:A") + let targetBazelLabel = BazelLabel("@//some/package:A") let prePostAction = XcodeScheme.PrePostAction( name: "Run Script", expandVariablesBasedOn: .target(targetBazelLabel), @@ -223,7 +223,7 @@ extension XCSchemeInfoPrePostActionInfoTests { func test_resolveHosts_validActionTargetInfo_withTopLevelTargetInfos() throws { // given - let targetBazelLabel = BazelLabel("//some/package:W") + let targetBazelLabel = BazelLabel("@//some/package:W") let prePostAction = XcodeScheme.PrePostAction( name: "Run Script", expandVariablesBasedOn: .target(targetBazelLabel), @@ -275,7 +275,7 @@ extension XCSchemeInfoPrePostActionInfoTests { func test_resolveHosts_validActionTargetInfo_withoutHostInfos_withoutTopLevelTargetInfos() throws { // given - let targetBazelLabel = BazelLabel("//some/package:A") + let targetBazelLabel = BazelLabel("@//some/package:A") let prePostAction = XcodeScheme.PrePostAction( name: "Run Script", expandVariablesBasedOn: .target(targetBazelLabel), diff --git a/tools/generator/test/XcodeScheme+ExtensionsTests.swift b/tools/generator/test/XcodeScheme+ExtensionsTests.swift index c3477633cc..cad20e5545 100644 --- a/tools/generator/test/XcodeScheme+ExtensionsTests.swift +++ b/tools/generator/test/XcodeScheme+ExtensionsTests.swift @@ -87,7 +87,7 @@ extension XcodeSchemeExtensionsTests { extension XcodeSchemeExtensionsTests { func test_LabelTargetInfo_best_noTargets() throws { - let targetInfo = XcodeScheme.LabelTargetInfo(label: "//foo", isTopLevel: false) + let targetInfo = XcodeScheme.LabelTargetInfo(label: "@//foo", isTopLevel: false) var thrown: Error? XCTAssertThrowsError(try targetInfo.best) { @@ -98,7 +98,7 @@ extension XcodeSchemeExtensionsTests { return } XCTAssertEqual(preconditionError.message, """ -Unable to find the best `TargetWithID` for "//foo:foo" +Unable to find the best `TargetWithID` for "@//foo:foo" """) } @@ -127,12 +127,12 @@ class XcodeSchemeExtensionsTests: XCTestCase { // Labels - let libLabel: BazelLabel = "//examples/integration/Lib:Lib" - let libTestsLabel: BazelLabel = "//examples/integration/LibTests:LibTests.__internal__.__test_bundle" - let toolLabel: BazelLabel = "//examples/integration/Tool:Tool" - let iOSAppLabel: BazelLabel = "//examples/integration/iOSApp:iOSApp" - let tvOSAppLabel: BazelLabel = "//examples/integration/tvOSApp:tvOSApp" - let watchOSAppLabel: BazelLabel = "//examples/integration/watchOSApp:watchOSApp" + let libLabel: BazelLabel = "@//examples/integration/Lib:Lib" + let libTestsLabel: BazelLabel = "@//examples/integration/LibTests:LibTests.__internal__.__test_bundle" + let toolLabel: BazelLabel = "@//examples/integration/Tool:Tool" + let iOSAppLabel: BazelLabel = "@//examples/integration/iOSApp:iOSApp" + let tvOSAppLabel: BazelLabel = "@//examples/integration/tvOSApp:tvOSApp" + let watchOSAppLabel: BazelLabel = "@//examples/integration/watchOSApp:watchOSApp" // Configurations diff --git a/tools/generator/test/XcodeSchemeTests.swift b/tools/generator/test/XcodeSchemeTests.swift index 4f53f713f4..122acd6ffb 100644 --- a/tools/generator/test/XcodeSchemeTests.swift +++ b/tools/generator/test/XcodeSchemeTests.swift @@ -6,7 +6,7 @@ import XCTest extension XcodeSchemeTests { func test_BuildAction_init_noDuplicateLabels() throws { let buildTarget = try XcodeScheme.BuildAction( - targets: [.init(label: "//foo"), .init(label: "//bar")] + targets: [.init(label: "@//foo"), .init(label: "@//bar")] ) XCTAssertEqual(buildTarget.targets.count, 2) } @@ -14,18 +14,21 @@ extension XcodeSchemeTests { func test_BuildAction_init_withDuplicateLabels() throws { assertPreconditionError( try XcodeScheme.BuildAction( - targets: [.init(label: "//foo"), .init(label: "//foo")] + targets: [.init(label: "@//foo"), .init(label: "@//foo")] ), expectedMessage: """ -Found a duplicate label //foo:foo in provided `XcodeScheme.BuildTarget` values. +Found a duplicate label @//foo:foo in provided `XcodeScheme.BuildTarget` values. """ ) } func test_BuildAction_init_noTargets() throws { - assertPreconditionError(try XcodeScheme.BuildAction(targets: []), expectedMessage: """ + assertPreconditionError( + try XcodeScheme.BuildAction(targets: []), + expectedMessage: """ No `XcodeScheme.BuildTarget` values were provided to `XcodeScheme.BuildAction`. -""") +""" + ) } } @@ -43,8 +46,10 @@ extension XcodeSchemeTests { } func test_VariableExpansionContext_rawValue_labelString() throws { - let labelString = "//path/to/target:target" - let context = XcodeScheme.VariableExpansionContext(rawValue: labelString) + let labelString = "@//path/to/target:target" + let context = XcodeScheme.VariableExpansionContext( + rawValue: labelString + ) XCTAssertEqual(context, XcodeScheme.VariableExpansionContext.target( try BazelLabel(labelString) )) @@ -66,13 +71,18 @@ extension XcodeSchemeTests { extension XcodeSchemeTests { func test_TestAction_init_noTargets() throws { - assertPreconditionError(try XcodeScheme.TestAction(targets: []), expectedMessage: """ + assertPreconditionError( + try XcodeScheme.TestAction(targets: []), + expectedMessage: """ No `BazelLabel` values were provided to `XcodeScheme.TestAction`. -""") +""" + ) } func test_TestAction_init_withTargets() throws { - let actual = try XcodeScheme.TestAction(targets: [unitTestLabel, uiTestLabel]) + let actual = try XcodeScheme.TestAction( + targets: [unitTestLabel, uiTestLabel] + ) XCTAssertEqual(actual.targets, [unitTestLabel, uiTestLabel]) XCTAssertEqual(actual.args, []) XCTAssertEqual(actual.env, [:]) @@ -96,9 +106,12 @@ No `BazelLabel` values were provided to `XcodeScheme.TestAction`. extension XcodeSchemeTests { func test_XcodeScheme_init_noActions() throws { - assertPreconditionError(try XcodeScheme(name: "Foo"), expectedMessage: """ + assertPreconditionError( + try XcodeScheme(name: "Foo"), + expectedMessage: """ No actions were provided for the scheme "Foo". -""") +""" + ) } } @@ -145,11 +158,18 @@ extension XcodeSchemeTests { targets: [ .init( label: macOSAppLabel, - buildFor: .init(running: .enabled, archiving: .enabled, analyzing: .enabled) + buildFor: .init( + running: .enabled, + archiving: .enabled, + analyzing: .enabled + ) ), .init( label: iOSAppLabel, - buildFor: .init(profiling: .enabled, analyzing: .enabled) + buildFor: .init( + profiling: .enabled, + analyzing: .enabled + ) ), ] ), @@ -175,9 +195,15 @@ extension XcodeSchemeTests { let expected = try XcodeScheme( name: schemeName, buildAction: try .init(targets: [ - .init(label: macOSAppLabel, buildFor: .init( - running: .enabled, profiling: .enabled, archiving: .enabled, analyzing: .enabled - )), + .init( + label: macOSAppLabel, + buildFor: .init( + running: .enabled, + profiling: .enabled, + archiving: .enabled, + analyzing: .enabled + ) + ), ]), launchAction: .init(target: macOSAppLabel), profileAction: .init(target: macOSAppLabel) @@ -216,42 +242,63 @@ extension XcodeSchemeTests { let xcodeScheme = try XcodeScheme( name: schemeName, buildAction: try .init(targets: [ - .init(label: macOSAppLabel, buildFor: .init(running: .disabled)), + .init( + label: macOSAppLabel, + buildFor: .init(running: .disabled) + ), ]), launchAction: .init(target: macOSAppLabel) ) - assertUsageError(try xcodeScheme.withDefaults, expectedMessage: """ -The `build_for` value, "running", for "\(macOSAppLabel)" in the "\(schemeName)" Xcode scheme was \ -disabled, but the target is referenced in the scheme's launch action. -""") + assertUsageError( + try xcodeScheme.withDefaults, + expectedMessage: """ +The `build_for` value, "running", for "\(macOSAppLabel)" in the \ +"\(schemeName)" Xcode scheme was disabled, but the target is referenced in the \ +scheme's launch action. +""" + ) } func test_XcodeScheme_withDefaults_withBuild_withProifle_profilingDisabled() throws { let xcodeScheme = try XcodeScheme( name: schemeName, buildAction: try .init(targets: [ - .init(label: macOSAppLabel, buildFor: .init(profiling: .disabled)), + .init( + label: macOSAppLabel, + buildFor: .init(profiling: .disabled) + ), ]), profileAction: .init(target: macOSAppLabel) ) - assertUsageError(try xcodeScheme.withDefaults, expectedMessage: """ -The `build_for` value, "profiling", for "\(macOSAppLabel)" in the "\(schemeName)" Xcode scheme was \ -disabled, but the target is referenced in the scheme's profile action. -""") + assertUsageError( + try xcodeScheme.withDefaults, + expectedMessage: """ +The `build_for` value, "profiling", for "\(macOSAppLabel)" in the \ +"\(schemeName)" Xcode scheme was disabled, but the target is referenced in the \ +scheme's profile action. +""" + ) } func test_XcodeScheme_withDefaults_withBuild_withTest_testingDisabled() throws { let xcodeScheme = try XcodeScheme( name: schemeName, buildAction: try .init(targets: [ - .init(label: unitTestLabel, buildFor: .init(testing: .disabled)), + .init( + label: unitTestLabel, + buildFor: .init(testing: .disabled) + ), ]), testAction: .init(targets: [unitTestLabel]) ) - assertUsageError(try xcodeScheme.withDefaults, expectedMessage: """ -The `build_for` value, "testing", for "\(unitTestLabel)" in the "\(schemeName)" Xcode scheme was \ -disabled, but the target is referenced in the scheme's test action. -""") + assertUsageError( + try xcodeScheme.withDefaults, + expectedMessage: """ +The `build_for` value, "testing", for "\(unitTestLabel)" in the \ +"\(schemeName)" Xcode scheme was disabled, but the target is referenced in the \ +scheme's test action. +""" + ) } func test_XcodeScheme_withDefaults_noTargetsWithRunningEnabled() throws { @@ -309,7 +356,12 @@ extension XcodeSchemeTests { ) return } - XCTAssertEqual(usageError.message, expectedMessage, file: file, line: line) + XCTAssertEqual( + usageError.message, + expectedMessage, + file: file, + line: line + ) } func assertPreconditionError( @@ -324,13 +376,19 @@ extension XcodeSchemeTests { } guard let preconditionError = thrown as? PreconditionError else { XCTFail( - "Expected `PreconditionError`, but was \(String(describing: thrown)).", + """ +Expected `PreconditionError`, but was \(String(describing: thrown)). +""", file: file, line: line ) return } - XCTAssertEqual(preconditionError.message, expectedMessage, file: file, line: line) + XCTAssertEqual( + preconditionError.message, expectedMessage, + file: file, + line: line + ) } } diff --git a/xcodeproj/internal/bazel_labels.bzl b/xcodeproj/internal/bazel_labels.bzl index 3f53596716..76c035e540 100644 --- a/xcodeproj/internal/bazel_labels.bzl +++ b/xcodeproj/internal/bazel_labels.bzl @@ -87,17 +87,21 @@ def make_bazel_labels(workspace_name_resolvers = workspace_name_resolvers): ) def _normalize(value): - parts = _parse(value) - - # If the label is for the default/current repository, use the shorthand - # label expression and not include the repository name. - if parts.repository_name == "@": - repo_name = "" + if type(value) == "Label": + repository_name = value.workspace_name + if not repository_name.startswith("@"): + # Support `--noincompatible_unambiguous_label_stringification` + repository_name = "@" + repository_name + parts = _create_label_parts( + repository_name = repository_name, + package = value.package, + name = value.name, + ) else: - repo_name = parts.repository_name + parts = _parse(value) return "{repo_name}//{package}:{name}".format( - repo_name = repo_name, + repo_name = parts.repository_name, package = parts.package, name = parts.name, ) diff --git a/xcodeproj/internal/xcodeproj_rule.bzl b/xcodeproj/internal/xcodeproj_rule.bzl index 54be86d6ac..fc275c7a95 100644 --- a/xcodeproj/internal/xcodeproj_rule.bzl +++ b/xcodeproj/internal/xcodeproj_rule.bzl @@ -4,6 +4,7 @@ load("@bazel_skylib//lib:dicts.bzl", "dicts") load("@bazel_skylib//lib:paths.bzl", "paths") load("@bazel_skylib//lib:sets.bzl", "sets") load("@bazel_skylib//rules:common_settings.bzl", "BuildSettingInfo") +load(":bazel_labels.bzl", "bazel_labels") load(":collections.bzl", "set_if_true", "uniq") load(":configuration.bzl", "get_configuration") load(":files.bzl", "file_path", "file_path_to_dto", "parsed_file_path") @@ -101,7 +102,12 @@ def _process_extra_files( # Apply replacement labels extra_files = [ - (str(replacement_labels_by_label.get(label, label)), files) + ( + bazel_labels.normalize( + replacement_labels_by_label.get(label, label), + ), + files, + ) for label, files in extra_files ] @@ -159,7 +165,7 @@ def _process_targets( } targets_labels = sets.make([ - str(replacement_labels.get(t.id, t.label)) + bazel_labels.normalize(replacement_labels.get(t.id, t.label)) for t in unprocessed_targets.values() ]) @@ -185,7 +191,7 @@ targets. xcode_target.id, xcode_target.label, ) - label_str = str(label) + label_str = bazel_labels.normalize(label) if (sets.contains(unfocused_labels, label_str) or (has_focused_labels and not sets.contains(focused_labels, label_str))): @@ -214,7 +220,7 @@ targets. xcode_target.id, xcode_target.label, ) - label_str = str(label) + label_str = bazel_labels.normalize(label) # Remove from unfocused (to support `xcode_required_targets`) unfocused_targets.pop(xcode_target.id, default = None) @@ -234,9 +240,11 @@ targets. target_merge_dests = {} for merge in potential_target_merges: src_target = unprocessed_targets[merge.src.id] + src_label = bazel_labels.normalize(src_target.label) dest_target = unprocessed_targets[merge.dest] - if (sets.contains(unfocused_labels, str(src_target.label)) or - sets.contains(unfocused_labels, str(dest_target.label))): + dest_label = bazel_labels.normalize(dest_target.label) + if (sets.contains(unfocused_labels, src_label) or + sets.contains(unfocused_labels, dest_label)): continue target_merge_dests.setdefault(merge.dest, []).append(merge.src.id) @@ -245,12 +253,16 @@ targets. # We can only merge targets with a single library dependency continue dest_target = unprocessed_targets[dest] - dest_label = str(replacement_labels.get(dest, dest_target.label)) + dest_label = bazel_labels.normalize( + replacement_labels.get(dest, dest_target.label), + ) if not sets.contains(focused_labels, dest_label): continue src = src_ids[0] src_target = unprocessed_targets[src] - src_label = str(replacement_labels.get(src, src_target.label)) + src_label = bazel_labels.normalize( + replacement_labels.get(src, src_target.label), + ) # Always include src of target merge if dest is included focused_targets[src] = src_target @@ -363,8 +375,9 @@ Are you using an `alias`? `associated_extra_files` requires labels of the actual targets: {} """.format(invalid_extra_files_targets)) + label_str = bazel_labels.normalize(label) for file, owner_label in owned_extra_files.items(): - if str(label) == str(owner_label): + if label_str == owner_label: for f in file.files.to_list(): focused_targets_extra_files.append((label, [file_path(f)])) @@ -542,7 +555,7 @@ def _write_json_spec( replacement_labels = json.encode( flattened_key_values.to_list( { - id: str(label) + id: bazel_labels.normalize(label) for id, label in replacement_labels.items() if id in targets },