aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/tools/xcode-common
diff options
context:
space:
mode:
authorGravatar Googler <noreply@google.com>2015-07-07 23:40:10 +0000
committerGravatar Han-Wen Nienhuys <hanwen@google.com>2015-07-08 11:42:04 +0000
commit9cac1635f82e85765ec6e7e859cf5e270301f892 (patch)
treeefe2f82e9675384f2a3cc31aa519577891da60b7 /src/tools/xcode-common
parent766e96f76a9c62fd1b6779588874a6329080c2c1 (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 'src/tools/xcode-common')
-rw-r--r--src/tools/xcode-common/BUILD1
-rw-r--r--src/tools/xcode-common/java/com/google/devtools/build/xcode/ibtoolzip/BUILD17
-rw-r--r--src/tools/xcode-common/java/com/google/devtools/build/xcode/ibtoolzip/IbtoolZip.java75
-rw-r--r--src/tools/xcode-common/java/com/google/devtools/build/xcode/ibtoolzip/README4
4 files changed, 0 insertions, 97 deletions
diff --git a/src/tools/xcode-common/BUILD b/src/tools/xcode-common/BUILD
index 187e8c1dfe..639c621679 100644
--- a/src/tools/xcode-common/BUILD
+++ b/src/tools/xcode-common/BUILD
@@ -5,7 +5,6 @@ filegroup(
srcs = [
"//src/tools/xcode-common/java/com/google/devtools/build/xcode/actoolzip:srcs",
"//src/tools/xcode-common/java/com/google/devtools/build/xcode/common:srcs",
- "//src/tools/xcode-common/java/com/google/devtools/build/xcode/ibtoolzip:srcs",
"//src/tools/xcode-common/java/com/google/devtools/build/xcode/swiftstdlibtoolzip:srcs",
"//src/tools/xcode-common/java/com/google/devtools/build/xcode/util:srcs",
"//src/tools/xcode-common/java/com/google/devtools/build/xcode/zip:srcs",
diff --git a/src/tools/xcode-common/java/com/google/devtools/build/xcode/ibtoolzip/BUILD b/src/tools/xcode-common/java/com/google/devtools/build/xcode/ibtoolzip/BUILD
deleted file mode 100644
index 7a9eab4da3..0000000000
--- a/src/tools/xcode-common/java/com/google/devtools/build/xcode/ibtoolzip/BUILD
+++ /dev/null
@@ -1,17 +0,0 @@
-package(default_visibility = ["//src:__subpackages__"])
-
-filegroup(
- name = "srcs",
- srcs = glob(["**"]),
-)
-
-java_binary(
- name = "ibtoolzip",
- srcs = ["IbtoolZip.java"],
- main_class = "com.google.devtools.build.xcode.ibtoolzip.IbtoolZip",
- visibility = ["//visibility:public"],
- deps = [
- "//src/tools/xcode-common/java/com/google/devtools/build/xcode/zippingoutput",
- "//third_party:guava",
- ],
-)
diff --git a/src/tools/xcode-common/java/com/google/devtools/build/xcode/ibtoolzip/IbtoolZip.java b/src/tools/xcode-common/java/com/google/devtools/build/xcode/ibtoolzip/IbtoolZip.java
deleted file mode 100644
index 180f541bc8..0000000000
--- a/src/tools/xcode-common/java/com/google/devtools/build/xcode/ibtoolzip/IbtoolZip.java
+++ /dev/null
@@ -1,75 +0,0 @@
-// Copyright 2014 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package com.google.devtools.build.xcode.ibtoolzip;
-
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.Iterables;
-import com.google.devtools.build.xcode.zippingoutput.Arguments;
-import com.google.devtools.build.xcode.zippingoutput.Wrapper;
-import com.google.devtools.build.xcode.zippingoutput.Wrappers;
-
-import java.io.IOException;
-
-/**
- * A tool which wraps ibtool by running ibtool and zipping its output. See the JavaDoc for
- * {@link Wrapper} for more information.
- */
-public class IbtoolZip implements Wrapper {
-
- @Override
- public String name() {
- return "IbtoolZip";
- }
-
- @Override
- public String subtoolName() {
- return "ibtool";
- }
-
- @Override
- public Iterable<String> subCommand(Arguments args, String outputDirectory) {
- // If we are running into problems figuring out ibtool issues, there are a couple
- // of env variables that may help. Both of the following must be set to work.
- // IBToolDebugLogFile=<OUTPUT FILE PATH>
- // IBToolDebugLogLevel=4
- // you may also see if
- // IBToolNeverDeque=1
- // helps.
-
- // IBTool needs to have absolute paths sent to it, so we call CANONICALIZE_IF_PATH
- // on all of them.
- // Radar 21045660 ibtool has difficulty dealing with relative paths.
- return new ImmutableList.Builder<String>()
- .add(args.subtoolCmd())
- .add("--errors")
- .add("--warnings")
- .add("--notices")
- .add("--auto-activate-custom-fonts")
- .add("--output-format").add("human-readable-text")
- .add("--compile")
- .add(Wrappers.CANONICALIZE_IF_PATH.apply(outputDirectory))
- .addAll(Iterables.transform(args.subtoolExtraArgs(), Wrappers.CANONICALIZE_IF_PATH))
- .build();
- }
-
- public static void main(String[] args) throws IOException, InterruptedException {
- Wrappers.executePipingOutput(args, new IbtoolZip());
- }
-
- @Override
- public boolean outputDirectoryMustExist() {
- return true;
- }
-}
diff --git a/src/tools/xcode-common/java/com/google/devtools/build/xcode/ibtoolzip/README b/src/tools/xcode-common/java/com/google/devtools/build/xcode/ibtoolzip/README
deleted file mode 100644
index a439bc4024..0000000000
--- a/src/tools/xcode-common/java/com/google/devtools/build/xcode/ibtoolzip/README
+++ /dev/null
@@ -1,4 +0,0 @@
-ibtoolzip runs ibtool, which compiles storyboards, and zips up the output,
-because ibtool returns an unpredictable number of output files.
-
-ibtool only runs on Darwin, so ibtoolzip only runs on Darwin.