diff options
| author |  Viktor Gedzenko <foxinushka@gmail.com> | 2014-03-11 12:37:38 +0200 |
|---|---|---|
| committer |  Viktor Gedzenko <fox@readdle.com> | 2014-03-11 12:37:38 +0200 |
| commit | 404b01573f55f9627658b717364a8ce911a07cdf (patch) | |
| tree | 3ba18ff000eccd3104e3550900d36e24da806171 /scripts | |
| parent | 551a2a8dc7cdb5f0bf97505693ab176009c73f93 (diff) | |
Fixed build in XCode 5.1
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/prepare-ctemplate-ios.sh | 11 | ||||
| -rwxr-xr-x | scripts/prepare-icu4c-ios.sh | 5 | ||||
| -rwxr-xr-x | scripts/prepare-libetpan-ios.sh | 13 | ||||
| -rwxr-xr-x | scripts/prepare-tidy-ios.sh | 11 |
4 files changed, 26 insertions, 14 deletions
diff --git a/scripts/prepare-ctemplate-ios.sh b/scripts/prepare-ctemplate-ios.sh index 6456d532..96eda4dd 100755 --- a/scripts/prepare-ctemplate-ios.sh +++ b/scripts/prepare-ctemplate-ios.sh @@ -2,12 +2,15 @@ url="https://github.com/dinhviethoa/ctemplate" -if xcodebuild -showsdks|grep iphoneos7.0 >/dev/null ; then - sdkversion=7.0 - MARCHS="armv7 armv7s arm64" +if xcodebuild -showsdks|grep iphoneos7.1 >/dev/null ; then + sdkversion=7.1 + MARCHS="armv7 armv7s arm64" +elif xcodebuild -showsdks|grep iphoneos7.0 >/dev/null ; then + sdkversion=7.0 + MARCHS="armv7 armv7s arm64" elif xcodebuild -showsdks|grep iphoneos6.1 >/dev/null ; then sdkversion=6.1 - MARCHS="armv7 armv7s" + MARCHS="armv7 armv7s" else echo SDK not found exit 1 diff --git a/scripts/prepare-icu4c-ios.sh b/scripts/prepare-icu4c-ios.sh index 7d42d2dd..be224d82 100755 --- a/scripts/prepare-icu4c-ios.sh +++ b/scripts/prepare-icu4c-ios.sh @@ -1,6 +1,9 @@ #!/bin/sh -if xcodebuild -showsdks|grep iphoneos7.0 >/dev/null ; then +if xcodebuild -showsdks|grep iphoneos7.1 >/dev/null ; then + sdkversion=7.1 + archs="armv7 armv7s arm64 i386 x86_64" +elif xcodebuild -showsdks|grep iphoneos7.0 >/dev/null ; then sdkversion=7.0 archs="armv7 armv7s arm64 i386 x86_64" elif xcodebuild -showsdks|grep iphoneos6.1 >/dev/null ; then diff --git a/scripts/prepare-libetpan-ios.sh b/scripts/prepare-libetpan-ios.sh index d936aa9e..d4de737b 100755 --- a/scripts/prepare-libetpan-ios.sh +++ b/scripts/prepare-libetpan-ios.sh @@ -1,11 +1,14 @@ #!/bin/sh -if xcodebuild -showsdks|grep iphoneos6.1 >/dev/null ; then - sdkversion=6.1 - devicearchs="armv7 armv7s" +if xcodebuild -showsdks|grep iphoneos7.1 >/dev/null ; then + sdkversion=7.1 + devicearchs="armv7 armv7s arm64" elif xcodebuild -showsdks|grep iphoneos7.0 >/dev/null ; then - sdkversion=7.0 - devicearchs="armv7 armv7s arm64" + sdkversion=7.0 + devicearchs="armv7 armv7s arm64" +elif xcodebuild -showsdks|grep iphoneos6.1 >/dev/null ; then + sdkversion=6.1 + devicearchs="armv7 armv7s" else echo SDK not found exit 1 diff --git a/scripts/prepare-tidy-ios.sh b/scripts/prepare-tidy-ios.sh index 02aef85f..7879ffc6 100755 --- a/scripts/prepare-tidy-ios.sh +++ b/scripts/prepare-tidy-ios.sh @@ -1,11 +1,14 @@ #!/bin/sh -if xcodebuild -showsdks|grep iphoneos6.1 >/dev/null ; then - sdkversion=6.1 - devicearchs="armv7 armv7s" +if xcodebuild -showsdks|grep iphoneos7.1 >/dev/null ; then + sdkversion=7.1 + devicearchs="armv7 armv7s arm64" elif xcodebuild -showsdks|grep iphoneos7.0 >/dev/null ; then sdkversion=7.0 - devicearchs="armv7 armv7s arm64" + devicearchs="armv7 armv7s arm64" +elif xcodebuild -showsdks|grep iphoneos6.1 >/dev/null ; then + sdkversion=6.1 + devicearchs="armv7 armv7s" else echo SDK not found exit 1 |