diff options
| author |  Googler <noreply@google.com> | 2016-04-05 21:56:05 +0000 |
|---|---|---|
| committer |  Lukacs Berki <lberki@google.com> | 2016-04-07 11:41:33 +0000 |
| commit | 4045c3649755aa6ec62b2050d37fb9637a8ff10a (patch) | |
| tree | 88f52d283d0f13d53d30a28d4a596c00a759bea8 /src | |
| parent | 0de15d13ea4ca01efd9d17db2905b7bee22b8aa5 (diff) | |
Override any existing watch stubs and watch application bundle artifacts when copying.
--
MOS_MIGRATED_REVID=119094214
Diffstat (limited to 'src')
3 files changed, 4 insertions, 4 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/AppleWatch1Extension.java b/src/main/java/com/google/devtools/build/lib/rules/objc/AppleWatch1Extension.java index 7e0b328549..1e802af12e 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/objc/AppleWatch1Extension.java +++ b/src/main/java/com/google/devtools/build/lib/rules/objc/AppleWatch1Extension.java @@ -173,7 +173,7 @@ public class AppleWatch1Extension implements RuleConfiguredTargetFactory { ImmutableList<String> command = ImmutableList.of( "mkdir -p " + workingDirectory, "&&", - String.format("/usr/bin/unzip -q %s -d %s", + String.format("/usr/bin/unzip -q -o %s -d %s", watchApplicationIpa.getExecPathString(), workingDirectory), "&&", diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/WatchApplicationSupport.java b/src/main/java/com/google/devtools/build/lib/rules/objc/WatchApplicationSupport.java index 1bfb602e2a..c0c330b01a 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/objc/WatchApplicationSupport.java +++ b/src/main/java/com/google/devtools/build/lib/rules/objc/WatchApplicationSupport.java @@ -188,12 +188,12 @@ final class WatchApplicationSupport { ImmutableList<String> command = ImmutableList.of( // 1. Copy WK stub as binary - String.format("cp %s %s", WatchUtils.WATCH_KIT_STUB_PATH, watchKitStubBinaryPath), + String.format("cp -f %s %s", WatchUtils.WATCH_KIT_STUB_PATH, watchKitStubBinaryPath), "&&", // 2. Copy WK stub as bundle resource. "mkdir -p " + watchKitStubResourcePath, "&&", - String.format("cp %s %s", WatchUtils.WATCH_KIT_STUB_PATH, watchKitStubResourcePath), + String.format("cp -f %s %s", WatchUtils.WATCH_KIT_STUB_PATH, watchKitStubResourcePath), // 3. Zip them. "&&", "cd " + workingDirectory, diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/WatchUtils.java b/src/main/java/com/google/devtools/build/lib/rules/objc/WatchUtils.java index cc3492f997..e8abe97212 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/objc/WatchUtils.java +++ b/src/main/java/com/google/devtools/build/lib/rules/objc/WatchUtils.java @@ -128,7 +128,7 @@ final class WatchUtils { // 1. Copy WK stub binary to watchKitSupportPath. "mkdir -p " + watchKitSupportPath, "&&", - String.format("cp %s %s", WATCH_KIT_STUB_PATH, watchKitSupportPath), + String.format("cp -f %s %s", WATCH_KIT_STUB_PATH, watchKitSupportPath), // 2. cd to working directory. "&&", "cd " + workingDirectory, |