diff options
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/build-mailcore2-ios.sh | 17 | ||||
| -rwxr-xr-x | scripts/prepare-ctemplate-ios.sh | 5 | ||||
| -rwxr-xr-x | scripts/prepare-icu4c-ios.sh | 19 | ||||
| -rwxr-xr-x | scripts/prepare-libetpan-ios.sh | 5 | ||||
| -rwxr-xr-x | scripts/prepare-tidy-ios.sh | 7 |
5 files changed, 36 insertions, 17 deletions
diff --git a/scripts/build-mailcore2-ios.sh b/scripts/build-mailcore2-ios.sh index 733ab1de..d388d530 100755 --- a/scripts/build-mailcore2-ios.sh +++ b/scripts/build-mailcore2-ios.sh @@ -1,17 +1,20 @@ #!/bin/sh -if xcodebuild -showsdks|grep iphoneos6.1 >/dev/null ; then - sdkversion=6.1 - devicearchs="armv7 armv7s" -elif xcodebuild -showsdks|grep iphoneos7.0 >/dev/null ; then - sdkversion=7.0 +if xcodebuild -showsdks|grep iphoneos8.1 >/dev/null ; then + sdkversion=8.1 + devicearchs="armv7 armv7s arm64" +elif 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 iphoneos8.0 >/dev/null ; then - sdkversion=8.0 +elif xcodebuild -showsdks|grep iphoneos7.0 >/dev/null ; then + 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-ctemplate-ios.sh b/scripts/prepare-ctemplate-ios.sh index d23c10fd..228f2294 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 iphoneos8.0 >/dev/null ; then +if xcodebuild -showsdks|grep iphoneos8.1 >/dev/null ; then + sdkversion=8.1 + MARCHS="armv7 armv7s arm64" +elif xcodebuild -showsdks|grep iphoneos8.0 >/dev/null ; then sdkversion=8.0 MARCHS="armv7 armv7s arm64" elif xcodebuild -showsdks|grep iphoneos7.1 >/dev/null ; then diff --git a/scripts/prepare-icu4c-ios.sh b/scripts/prepare-icu4c-ios.sh index 31cb13d7..2e01c2db 100755 --- a/scripts/prepare-icu4c-ios.sh +++ b/scripts/prepare-icu4c-ios.sh @@ -1,11 +1,14 @@ #!/bin/sh -if xcodebuild -showsdks|grep iphoneos8.0 >/dev/null ; then +if xcodebuild -showsdks|grep iphoneos8.1 >/dev/null ; then + sdkversion=8.1 + archs="armv7 armv7s arm64 i386 x86_64" +elif 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" + 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" @@ -95,7 +98,13 @@ make # >> "$logdir/icu4c-build.log" make install "prefix=$tmpdir/crossbuild/icu4c-$MARCH" # >> "$logdir/icu4c-build.log" ARCH=arm -if xcodebuild -showsdks|grep iphoneos7.1 >/dev/null ; then +if xcodebuild -showsdks|grep iphoneos8.1 >/dev/null ; then + sdkversion=8.1 + MARCHS="armv7 armv7s arm64" +elif 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 @@ -103,8 +112,6 @@ elif xcodebuild -showsdks|grep iphoneos7.0 >/dev/null ; then MARCHS="armv7 armv7s arm64" elif xcodebuild -showsdks|grep iphoneos6.1 >/dev/null ; then MARCHS="armv7 armv7s" -elif xcodebuild -showsdks|grep iphoneos8.0 >/dev/null ; then - MARCHS="armv7 armv7s arm64" else echo SDK not found exit 1 diff --git a/scripts/prepare-libetpan-ios.sh b/scripts/prepare-libetpan-ios.sh index 549c1f0f..4634da61 100755 --- a/scripts/prepare-libetpan-ios.sh +++ b/scripts/prepare-libetpan-ios.sh @@ -1,6 +1,9 @@ #!/bin/sh -if xcodebuild -showsdks|grep iphoneos8.0 >/dev/null ; then +if xcodebuild -showsdks|grep iphoneos8.1 >/dev/null ; then + sdkversion=8.1 + devicearchs="armv7 armv7s arm64" +elif xcodebuild -showsdks|grep iphoneos8.0 >/dev/null ; then sdkversion=8.0 devicearchs="armv7 armv7s arm64" elif xcodebuild -showsdks|grep iphoneos7.1 >/dev/null ; then diff --git a/scripts/prepare-tidy-ios.sh b/scripts/prepare-tidy-ios.sh index cae34513..0bce77d0 100755 --- a/scripts/prepare-tidy-ios.sh +++ b/scripts/prepare-tidy-ios.sh @@ -1,8 +1,11 @@ #!/bin/sh -if xcodebuild -showsdks|grep iphoneos8.0 >/dev/null ; then +if xcodebuild -showsdks|grep iphoneos8.1 >/dev/null ; then + sdkversion=8.1 + devicearchs="armv7 armv7s arm64" +elif xcodebuild -showsdks|grep iphoneos8.0 >/dev/null ; then sdkversion=8.0 - devicearchs="armv7 armv7s arm64" + devicearchs="armv7 armv7s arm64" elif xcodebuild -showsdks|grep iphoneos7.1 >/dev/null ; then sdkversion=7.1 devicearchs="armv7 armv7s arm64" |