diff options
| author |  Dave MacLachlan <dmaclach@google.com> | 2015-10-03 21:33:41 +0000 |
|---|---|---|
| committer |  Damien Martin-Guillerez <dmarting@google.com> | 2015-10-05 08:02:13 +0000 |
| commit | a510c3b5925605005b703534288256e398cfeaaf (patch) | |
| tree | 99491ee073990946a7bdec9e0edaa997c2b8158d /src | |
| parent | 6d00468b2eb976866cfb814d562e0d53a580a46f (diff) | |
Fix up actool, ibtool etc so that they can handle empty output.
--
MOS_MIGRATED_REVID=104581383
Diffstat (limited to 'src')
4 files changed, 16 insertions, 4 deletions
diff --git a/src/tools/xcode/actoolwrapper/actoolwrapper.sh b/src/tools/xcode/actoolwrapper/actoolwrapper.sh index 21fb17fc93..84829aa8cf 100755 --- a/src/tools/xcode/actoolwrapper/actoolwrapper.sh +++ b/src/tools/xcode/actoolwrapper/actoolwrapper.sh @@ -68,5 +68,8 @@ pushd "$TEMPDIR" > /dev/null # Reset all dates to Zip Epoch so that two identical zips created at different # times appear the exact same for comparison purposes. find . -exec touch -h -t 198001010000 {} \; -zip --symlinks --recurse-paths --quiet "$OUTZIP" . + +# Added include "*" to fix case where we may want an empty zip file because +# there is no data. +zip --symlinks --recurse-paths --quiet "$OUTZIP" . --include "*" popd > /dev/null diff --git a/src/tools/xcode/ibtoolwrapper/ibtoolwrapper.sh b/src/tools/xcode/ibtoolwrapper/ibtoolwrapper.sh index b8252ac01b..7b9220d553 100755 --- a/src/tools/xcode/ibtoolwrapper/ibtoolwrapper.sh +++ b/src/tools/xcode/ibtoolwrapper/ibtoolwrapper.sh @@ -66,5 +66,8 @@ pushd "$TEMPDIR" > /dev/null # Reset all dates to Zip Epoch so that two identical zips created at different # times appear the exact same for comparison purposes. find . -exec touch -h -t 198001010000 {} \; -zip --symlinks --recurse-paths --quiet "$OUTZIP" . + +# Added include "*" to fix case where we may want an empty zip file because +# there is no data. +zip --symlinks --recurse-paths --quiet "$OUTZIP" . --include "*" popd > /dev/null diff --git a/src/tools/xcode/momcwrapper/momcwrapper.sh b/src/tools/xcode/momcwrapper/momcwrapper.sh index 43c03695f4..46f578e7e1 100755 --- a/src/tools/xcode/momcwrapper/momcwrapper.sh +++ b/src/tools/xcode/momcwrapper/momcwrapper.sh @@ -36,5 +36,8 @@ pushd "$TEMPDIR" > /dev/null # Reset all dates to Zip Epoch so that two identical zips created at different # times appear the exact same for comparison purposes. find . -exec touch -h -t 198001010000 {} \; -zip --symlinks --recurse-paths --quiet "$OUTZIP" . + +# Added include "*" to fix case where we may want an empty zip file because +# there is no data. +zip --symlinks --recurse-paths --quiet "$OUTZIP" . --include "*" popd > /dev/null diff --git a/src/tools/xcode/swiftstdlibtoolwrapper/swiftstdlibtoolwrapper.sh b/src/tools/xcode/swiftstdlibtoolwrapper/swiftstdlibtoolwrapper.sh index 208f22e35e..e2fce6e383 100755 --- a/src/tools/xcode/swiftstdlibtoolwrapper/swiftstdlibtoolwrapper.sh +++ b/src/tools/xcode/swiftstdlibtoolwrapper/swiftstdlibtoolwrapper.sh @@ -36,5 +36,8 @@ pushd "$TEMPDIR" > /dev/null # Reset all dates to Zip Epoch so that two identical zips created at different # times appear the exact same for comparison purposes. find . -exec touch -h -t 198001010000 {} \; -zip --symlinks --recurse-paths --quiet "$OUTZIP" . + +# Added include "*" to fix case where we may want an empty zip file because +# there is no data. +zip --symlinks --recurse-paths --quiet "$OUTZIP" . --include "*" popd > /dev/null |