diff options
| author |  Hoa V. DINH <dinh.viet.hoa@gmail.com> | 2014-06-14 23:41:56 -0700 |
|---|---|---|
| committer | Hoa V. DINH <dinh.viet.hoa@gmail.com> | 2014-06-14 23:41:56 -0700 |
| commit | 56330352486f3fdb1360cf6a1157052680102cc9 (patch) | |
| tree | fbcffbbd8be3633b5a9202eaf013b01700d16de0 | |
| parent | ec5bab50312e7425010a5491a6fe7525d924417a (diff) | |
Fixed #755: fixed build on xcode6 with iOS8 SDK
| -rwxr-xr-x | scripts/build-mailcore2-ios.sh | 3 | ||||
| -rwxr-xr-x | scripts/prepare-ctemplate-ios.sh | 5 | ||||
| -rwxr-xr-x | scripts/prepare-icu4c-ios.sh | 7 | ||||
| -rwxr-xr-x | scripts/prepare-libetpan-ios.sh | 5 | ||||
| -rwxr-xr-x | scripts/prepare-tidy-ios.sh | 7 |
5 files changed, 21 insertions, 6 deletions
diff --git a/scripts/build-mailcore2-ios.sh b/scripts/build-mailcore2-ios.sh index 16417e32..77b2bf46 100755 --- a/scripts/build-mailcore2-ios.sh +++ b/scripts/build-mailcore2-ios.sh @@ -9,6 +9,9 @@ elif xcodebuild -showsdks|grep iphoneos7.0 >/dev/null ; then elif xcodebuild -showsdks|grep iphoneos7.1 >/dev/null ; then sdkversion=7.1 devicearchs="armv7 armv7s arm64" +elif xcodebuild -showsdks|grep iphoneos8.0 >/dev/null ; then + sdkversion=8.0 + devicearchs="armv7 armv7s arm64" else echo SDK not found exit 1 diff --git a/scripts/prepare-ctemplate-ios.sh b/scripts/prepare-ctemplate-ios.sh index 96eda4dd..3b6c0e0b 100755 --- a/scripts/prepare-ctemplate-ios.sh +++ b/scripts/prepare-ctemplate-ios.sh @@ -2,7 +2,10 @@ url="https://github.com/dinhviethoa/ctemplate" -if xcodebuild -showsdks|grep iphoneos7.1 >/dev/null ; then +if xcodebuild -showsdks|grep iphoneos8.0 >/dev/null ; then + sdkversion=8.0 + MARCHS="armv7 armv7s arm64" +elif xcodebuild -showsdks|grep iphoneos7.1 >/dev/null ; then sdkversion=7.1 MARCHS="armv7 armv7s arm64" elif xcodebuild -showsdks|grep iphoneos7.0 >/dev/null ; then diff --git a/scripts/prepare-icu4c-ios.sh b/scripts/prepare-icu4c-ios.sh index be224d82..f214399b 100755 --- a/scripts/prepare-icu4c-ios.sh +++ b/scripts/prepare-icu4c-ios.sh @@ -1,8 +1,11 @@ #!/bin/sh -if xcodebuild -showsdks|grep iphoneos7.1 >/dev/null ; then - sdkversion=7.1 +if xcodebuild -showsdks|grep iphoneos8.0 >/dev/null ; then + sdkversion=8.0 archs="armv7 armv7s arm64 i386 x86_64" +elif 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" diff --git a/scripts/prepare-libetpan-ios.sh b/scripts/prepare-libetpan-ios.sh index ba340873..031e33e1 100755 --- a/scripts/prepare-libetpan-ios.sh +++ b/scripts/prepare-libetpan-ios.sh @@ -1,6 +1,9 @@ #!/bin/sh -if xcodebuild -showsdks|grep iphoneos7.1 >/dev/null ; then +if xcodebuild -showsdks|grep iphoneos8.0 >/dev/null ; then + sdkversion=8.0 + devicearchs="armv7 armv7s arm64" +elif xcodebuild -showsdks|grep iphoneos7.1 >/dev/null ; then sdkversion=7.1 devicearchs="armv7 armv7s arm64" elif xcodebuild -showsdks|grep iphoneos7.0 >/dev/null ; then diff --git a/scripts/prepare-tidy-ios.sh b/scripts/prepare-tidy-ios.sh index 7879ffc6..cae34513 100755 --- a/scripts/prepare-tidy-ios.sh +++ b/scripts/prepare-tidy-ios.sh @@ -1,8 +1,11 @@ #!/bin/sh -if xcodebuild -showsdks|grep iphoneos7.1 >/dev/null ; then - sdkversion=7.1 +if xcodebuild -showsdks|grep iphoneos8.0 >/dev/null ; then + sdkversion=8.0 devicearchs="armv7 armv7s arm64" +elif 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" |