forked from bazelbuild/bazel
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Split actoolzip and ibtoolzip into separate binaries
Have actoolzip abs-ify the partial info plist path because otherwise it picks seemingly random directories to which to output the info plist files. -- MOS_MIGRATED_REVID=88851706
- Loading branch information
1 parent
412ef48
commit 6683d64
Showing
8 changed files
with
182 additions
and
67 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
111 changes: 111 additions & 0 deletions
111
src/tools/xcode-common/java/com/google/devtools/build/xcode/actoolzip/ActoolZip.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,111 @@ | ||
| // 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.actoolzip; | ||
|
|
||
| import com.google.common.base.Function; | ||
| import com.google.common.collect.ImmutableList; | ||
| import com.google.common.collect.ImmutableSet; | ||
| 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.File; | ||
| import java.io.IOException; | ||
| import java.util.Set; | ||
|
|
||
| /** | ||
| * A tool which wraps actool by running actool and zipping its output. See the JavaDoc for | ||
| * {@link Wrapper} for more information. | ||
| */ | ||
| public class ActoolZip implements Wrapper { | ||
|
|
||
| private static final Function<String, String> CANONICAL_PATH = | ||
| new Function<String, String>() { | ||
| @Override | ||
| public String apply(String path) { | ||
| File file = new File(path); | ||
| if (file.exists()) { | ||
| try { | ||
| return file.getCanonicalPath(); | ||
| } catch (IOException e) { | ||
| // Pass through to return raw path | ||
| } | ||
| } | ||
| return path; | ||
| } | ||
| }; | ||
|
|
||
| @Override | ||
| public String name() { | ||
| return "ActoolZip"; | ||
| } | ||
|
|
||
| @Override | ||
| public String subtoolName() { | ||
| return "actool"; | ||
| } | ||
|
|
||
| @Override | ||
| public Iterable<String> subCommand(Arguments args, String outputDirectory) { | ||
| return new ImmutableList.Builder<String>() | ||
| .add(args.subtoolCmd()) | ||
| .add("--compile") | ||
| .add(outputDirectory) | ||
| // actool munges paths in some way which doesn't work if one of the directories in the path | ||
| // is a symlink. | ||
| .addAll(Iterables.transform(args.subtoolExtraArgs(), CANONICAL_PATH)) | ||
| .build(); | ||
| } | ||
|
|
||
| public static void main(String[] args) throws IOException, InterruptedException { | ||
| replaceInfoPlistPath(args); | ||
| Wrappers.execute(args, new ActoolZip()); | ||
| } | ||
|
|
||
| /** | ||
| * Absolute-ify output partial info plist's path. | ||
| * | ||
| * <p>actool occasionally writes the partial info plist file to the wrong directory if a | ||
| * non-absolute path is passed as --output-partial-info-plist, so we optimistically try to | ||
| * absolute-ify its path. This isn't caught by the "CANONICAL_PATH" transform above, because the | ||
| * file doesn't exist at the time of flag parsing. | ||
| * | ||
| * <p>Modifies args in-place. | ||
| */ | ||
| private static void replaceInfoPlistPath(String[] args) { | ||
| String flag = "output-partial-info-plist"; | ||
| Set<String> flagOptions = ImmutableSet.of( | ||
| "-" + flag, | ||
| "--" + flag); | ||
| for (int i = 0; i < args.length; ++i) { | ||
| for (String flagOption : flagOptions) { | ||
| String arg = args[i]; | ||
| String flagEquals = flagOption + "="; | ||
| if (arg.startsWith(flagEquals)) { | ||
| args[i] = flagEquals + new File(arg.substring(flagEquals.length())).getAbsolutePath(); | ||
| } | ||
| if (arg.equals(flagOption) && i + 1 < args.length) { | ||
| args[i + 1] = new File(args[i + 1]).getAbsolutePath(); | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| @Override | ||
| public boolean outputDirectoryMustExist() { | ||
| return true; | ||
| } | ||
| } |
4 changes: 4 additions & 0 deletions
4
src/tools/xcode-common/java/com/google/devtools/build/xcode/actoolzip/README
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
| actoolzip runs actool, which compiles asset catalog files and zips up the | ||
| output, because actool returns an unpredictable number of output files. | ||
|
|
||
| actool only runs on Darwin, so actoolzip only runs on Darwin. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
4 changes: 4 additions & 0 deletions
4
src/tools/xcode-common/java/com/google/devtools/build/xcode/ibtoolzip/README
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
| 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. |