diff options
author | Googler <noreply@google.com> | 2015-07-07 23:40:10 +0000 |
---|---|---|
committer | Han-Wen Nienhuys <hanwen@google.com> | 2015-07-08 11:42:04 +0000 |
commit | 9cac1635f82e85765ec6e7e859cf5e270301f892 (patch) | |
tree | efe2f82e9675384f2a3cc31aa519577891da60b7 /compile.sh | |
parent | 766e96f76a9c62fd1b6779588874a6329080c2c1 (diff) |
Moves ibtoolzip from src/tools/xcode-common/j/c/g/devtools/ to src/tools/xcode.
Moves ibtoolzip from being java based to being bash based for easier dev/testing.
Changes the name of ibtoolzip to ibtoolwrapper to avoid conflicts with currently deployed bazel depending on the ibtoolzip name.
Updates realpath
Cleans up update_binaries.sh
--
MOS_MIGRATED_REVID=97724252
Diffstat (limited to 'compile.sh')
-rwxr-xr-x | compile.sh | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/compile.sh b/compile.sh index da1667abc7..30b97d0fac 100755 --- a/compile.sh +++ b/compile.sh @@ -109,8 +109,7 @@ if [ $DO_TOOLS_COMPILATION ]; then if [[ $PLATFORM == "darwin" ]]; then 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-common/java/com/google/devtools/build/xcode/ibtoolzip:ibtoolzip_deploy.jar \ - tools/objc/precomp_ibtoolzip_deploy.jar + bazel_bootstrap //src/tools/xcode/ibtoolwrapper:ibtoolwrapper tools/objc/ibtoolwrapper 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 \ @@ -123,8 +122,7 @@ if [ $DO_TOOLS_COMPILATION ]; then tools/objc/precomp_xcodegen_deploy.jar bazel_bootstrap //src/tools/xcode/stdredirect:StdRedirect.dylib \ tools/objc/StdRedirect.dylib - bazel_bootstrap //src/tools/xcode/realpath:realpath \ - tools/objc/realpath + bazel_bootstrap //src/tools/xcode/realpath:realpath tools/objc/realpath fi fi |