diff options
| author |  Lukacs Berki <lberki@google.com> | 2015-07-21 08:47:08 +0000 |
|---|---|---|
| committer |  Kristina Chodorow <kchodorow@google.com> | 2015-07-21 15:13:38 -0400 |
| commit | 0caf33251bfb55d32e758d92a7db9e3f746ec06a (patch) | |
| tree | af635bc857aab5a039048530a0cd007a8c3716e6 /compile.sh | |
| parent | 73893ccb1b1a11d5146c246ac0f704c48ae0d506 (diff) | |
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
Diffstat (limited to 'compile.sh')
| -rwxr-xr-x | compile.sh | 11 |
1 files changed, 7 insertions, 4 deletions
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 \ |