From 96d4e4ad112a9383bae25c5a44355bdca51a35b8 Mon Sep 17 00:00:00 2001 From: cparsons Date: Tue, 5 Sep 2017 21:43:45 +0200 Subject: Change xcode_config rule semantics to fit current usage - require_defined_versions is deprecated and a no-op. A version must match existing defined versions if any exist - default label must be present in versions labels if any are defined - default label may not exist if no versions are defined - when --xcode_version is specified on the command line, it must match a defined version if any are defined. If none are defined, this flag is a no-op RELNOTES: None. PiperOrigin-RevId: 167616628 --- .../build/lib/packages/util/MockObjcSupport.java | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) (limited to 'src/test/java/com/google/devtools/build/lib/packages/util/MockObjcSupport.java') diff --git a/src/test/java/com/google/devtools/build/lib/packages/util/MockObjcSupport.java b/src/test/java/com/google/devtools/build/lib/packages/util/MockObjcSupport.java index 73f9e9b491..d42f6f720a 100644 --- a/src/test/java/com/google/devtools/build/lib/packages/util/MockObjcSupport.java +++ b/src/test/java/com/google/devtools/build/lib/packages/util/MockObjcSupport.java @@ -97,12 +97,26 @@ public final class MockObjcSupport { String.format( " srcs = ['%s//objcproto:well_known_type.proto'],", TestConstants.TOOLS_REPOSITORY), ")", - "xcode_config(name = 'host_xcodes', default = ':version7_3_1')", + "xcode_config(name = 'host_xcodes',", + " default = ':version7_3_1',", + " versions = [':version7_3_1', 'version5_0', 'version7_3', 'version5_8'])", "xcode_version(", " name = 'version7_3_1',", " version = '" + DEFAULT_XCODE_VERSION + "',", " default_ios_sdk_version = \"" + DEFAULT_IOS_SDK_VERSION + "\",", ")", + "xcode_version(", + " name = 'version7_3',", + " version = '7.3',", + ")", + "xcode_version(", + " name = 'version5_0',", + " version = '5.0',", + ")", + "xcode_version(", + " name = 'version5_8',", + " version = '5.8',", + ")", "objc_library(name = 'dummy_lib', srcs = ['objc_dummy.mm'])"); // If the bazel tools repository is not in the workspace, also create a workspace tools/objc // package with a few lingering dependencies. -- cgit v1.2.3