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 --- compile.sh | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'compile.sh') diff --git a/compile.sh b/compile.sh index b68f343c6b..c863c83d91 100755 --- a/compile.sh +++ b/compile.sh @@ -109,10 +109,13 @@ if [ $DO_TOOLS_COMPILATION ]; then bazel_bootstrap //src/java_tools/buildjar/java/com/google/devtools/build/buildjar/genclass:GenClass_deploy.jar \ tools/jdk/GenClass_deploy.jar if [[ $PLATFORM == "darwin" ]]; then - bazel_bootstrap //src/tools/xcode/actoolwrapper:actoolwrapper tools/objc/actoolwrapper.sh 0755 - bazel_bootstrap //src/tools/xcode/ibtoolwrapper:ibtoolwrapper tools/objc/ibtoolwrapper.sh 0755 - bazel_bootstrap //src/tools/xcode/momcwrapper:momcwrapper tools/objc/momcwrapper.sh 0755 - bazel_bootstrap //src/tools/xcode/swiftstdlibtoolwrapper:swiftstdlibtoolwrapper tools/objc/swiftstdlibtoolzip.sh 0755 + bazel_bootstrap //src/tools/xcode-common/java/com/google/devtools/build/xcode/actoolzip:actoolzip_deploy.jar \ + tools/objc/precomp_actoolzip_deploy.jar + bazel_bootstrap //src/tools/xcode/ibtoolwrapper:ibtoolwrapper tools/objc/ibtoolwrapper 0755 + bazel_bootstrap //src/tools/xcode-common/java/com/google/devtools/build/xcode/swiftstdlibtoolzip:swiftstdlibtoolzip_deploy.jar \ + tools/objc/precomp_swiftstdlibtoolzip_deploy.jar + bazel_bootstrap //src/objc_tools/momczip:momczip_deploy.jar \ + tools/objc/precomp_momczip_deploy.jar bazel_bootstrap //src/objc_tools/bundlemerge:bundlemerge_deploy.jar \ tools/objc/precomp_bundlemerge_deploy.jar bazel_bootstrap //src/objc_tools/plmerge:plmerge_deploy.jar \ -- cgit v1.2.3