From 0caf33251bfb55d32e758d92a7db9e3f746ec06a Mon Sep 17 00:00:00 2001 From: Lukacs Berki Date: Tue, 21 Jul 2015 08:47:08 +0000 Subject: Rollback of commit b8d1e700841d8aa7186ccbdfb0eba53e12a672d0. *** Reason for rollback *** Breaks most of the iOS targets on our continuous build. *** Original change description *** Move actoolzip, momczip and swiftstdlibtoolzip to tools/xcode and convert them to scripts instead of java apps. RELNOTES: actoolzip, momczip and swiftstdlibtoolzip have all been made into bash scripts and have been renamed to actoolwrapper, momcwrapper and swiftstdlibtoolwrapper respectively. The old versions will be deleted in a later change. -- MOS_MIGRATED_REVID=98716081 --- .../devtools/build/lib/rules/objc/ObjcRuleClasses.java | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'src/main/java/com/google/devtools/build/lib/rules/objc/ObjcRuleClasses.java') diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcRuleClasses.java b/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcRuleClasses.java index a879f9d786..02d3566135 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcRuleClasses.java +++ b/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcRuleClasses.java @@ -66,6 +66,7 @@ public class ObjcRuleClasses { static final PathFragment LIBTOOL = new PathFragment(BIN_DIR + "/libtool"); static final PathFragment DSYMUTIL = new PathFragment(BIN_DIR + "/dsymutil"); static final PathFragment LIPO = new PathFragment(BIN_DIR + "/lipo"); + static final PathFragment SWIFT_STDLIB_TOOL = new PathFragment(BIN_DIR + "/swift-stdlib-tool"); static final PathFragment STRIP = new PathFragment(BIN_DIR + "/strip"); private static final PathFragment JAVA = new PathFragment("/usr/bin/java"); @@ -468,14 +469,16 @@ public class ObjcRuleClasses { return builder .add(attr("$plmerge", LABEL).cfg(HOST).exec() .value(env.getLabel("//tools/objc:plmerge"))) - .add(attr("$actoolwrapper", LABEL).cfg(HOST).exec() - .value(env.getLabel("//tools/objc:actoolwrapper"))) + .add(attr("$actoolzip_deploy", LABEL).cfg(HOST) + .value(env.getLabel("//tools/objc:actoolzip_deploy.jar"))) .add(attr("$ibtoolwrapper", LABEL).cfg(HOST).exec() .value(env.getLabel("//tools/objc:ibtoolwrapper"))) // TODO(dmaclach): Adding realpath here should not be required once // https://github.com/google/bazel/issues/285 is fixed. .add(attr("$realpath", LABEL).cfg(HOST).exec() .value(env.getLabel("//tools/objc:realpath"))) + .add(attr("$swiftstdlibtoolzip_deploy", LABEL).cfg(HOST) + .value(env.getLabel("//tools/objc:swiftstdlibtoolzip_deploy.jar"))) .build(); } @Override @@ -868,10 +871,8 @@ public class ObjcRuleClasses { */ .add(attr("families", STRING_LIST) .value(ImmutableList.of(TargetDeviceFamily.IPHONE.getNameInRule()))) - .add(attr("$momcwrapper", LABEL).cfg(HOST).exec() - .value(env.getLabel("//tools/objc:momcwrapper"))) - .add(attr("$swiftstdlibtoolwrapper", LABEL).cfg(HOST).exec() - .value(env.getLabel("//tools/objc:swiftstdlibtoolwrapper"))) + .add(attr("$momczip_deploy", LABEL).cfg(HOST) + .value(env.getLabel("//tools/objc:momczip_deploy.jar"))) .build(); } @Override -- cgit v1.2.3