diff options
| author |  Marco Pifferi <piff@aroundmeapp.com> | 2014-10-08 11:02:49 +0200 |
|---|---|---|
| committer | Marco Pifferi <piff@aroundmeapp.com> | 2014-10-08 11:02:49 +0200 |
| commit | 253454ffec989815fcc796bb27f7df9ec08c7d31 (patch) | |
| tree | 7a88ec010b76be2042bedae27a0b67758a2c78b3 /scripts | |
| parent | 8f0cb30aa586c83bc53ef45158c9995bff2523f0 (diff) | |
| parent | 5c95fccab85d182976558e634fd4edf6dd8a0834 (diff) | |
Merge branch 'master' of https://github.com/MailCore/mailcore2
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/build-mailcore2-ios.sh | 2 | ||||
| -rwxr-xr-x | scripts/prepare-libetpan-ios.sh | 2 | ||||
| -rwxr-xr-x | scripts/prepare-libetpan-macos.sh | 2 | ||||
| -rwxr-xr-x | scripts/travis/script.sh | 12 |
4 files changed, 9 insertions, 9 deletions
diff --git a/scripts/build-mailcore2-ios.sh b/scripts/build-mailcore2-ios.sh index 977d6d1c..d388d530 100755 --- a/scripts/build-mailcore2-ios.sh +++ b/scripts/build-mailcore2-ios.sh @@ -72,7 +72,7 @@ if test x$? != x0 ; then exit 1 fi sdk="iphonesimulator$sdkversion" -simarchs="i386" +simarchs="i386 x86_64" echo building $sdk xcodebuild -project mailcore2.xcodeproj -sdk $sdk -target "static mailcore2 ios" -configuration Release SYMROOT="$tmpdir/bin" OBJROOT="$tmpdir/obj" ARCHS="$simarchs" if test x$? != x0 ; then diff --git a/scripts/prepare-libetpan-ios.sh b/scripts/prepare-libetpan-ios.sh index 2867f8ce..4634da61 100755 --- a/scripts/prepare-libetpan-ios.sh +++ b/scripts/prepare-libetpan-ios.sh @@ -21,7 +21,7 @@ else fi url="https://github.com/dinhviethoa/libetpan.git" -rev=51ca6bfc3cb34dcba1ead473223379eef495e9c7 +rev=ea6bc2eda09446b8c52406c3aa6a4e2273ff87db pushd `dirname $0` > /dev/null scriptpath=`pwd` diff --git a/scripts/prepare-libetpan-macos.sh b/scripts/prepare-libetpan-macos.sh index 1ce05d47..7f2397dc 100755 --- a/scripts/prepare-libetpan-macos.sh +++ b/scripts/prepare-libetpan-macos.sh @@ -1,7 +1,7 @@ #!/bin/sh url="https://github.com/dinhviethoa/libetpan.git" -rev=51ca6bfc3cb34dcba1ead473223379eef495e9c7 +rev=ea6bc2eda09446b8c52406c3aa6a4e2273ff87db pushd `dirname $0` > /dev/null scriptpath=`pwd` diff --git a/scripts/travis/script.sh b/scripts/travis/script.sh index 0790e1d3..36136240 100755 --- a/scripts/travis/script.sh +++ b/scripts/travis/script.sh @@ -6,20 +6,20 @@ uname if test x"`uname`" = xDarwin ; then echo Building library for iPhoneOS - xctool -project build-mac/mailcore2.xcodeproj -sdk iphoneos7.1 -scheme "static mailcore2 ios" build ARCHS="armv7 armv7s arm64" + xctool -project build-mac/mailcore2.xcodeproj -sdk iphoneos8.0 -scheme "static mailcore2 ios" build ARCHS="armv7 armv7s arm64" echo Building library for iPhoneSimulator - xctool -project build-mac/mailcore2.xcodeproj -sdk iphonesimulator7.1 -scheme "static mailcore2 ios" build ARCHS="i386 x86_64" + xctool -project build-mac/mailcore2.xcodeproj -sdk iphonesimulator8.0 -scheme "static mailcore2 ios" build ARCHS="i386 x86_64" #echo Link test for iPhoneOS #xcodebuild -project build-mac/mailcore2.xcodeproj -sdk iphoneos7.1 -target "test-ios" CODE_SIGN_IDENTITY="" build echo Link test for iPhoneSimulator - xctool -project build-mac/mailcore2.xcodeproj -sdk iphonesimulator7.1 -scheme "test-ios" build ARCHS="i386 x86_64" + xctool -project build-mac/mailcore2.xcodeproj -sdk iphonesimulator8.0 -scheme "test-ios" build ARCHS="i386 x86_64" echo Building library for Mac - xctool -project build-mac/mailcore2.xcodeproj -sdk macosx10.8 -scheme "static mailcore2 osx" build + xctool -project build-mac/mailcore2.xcodeproj -sdk macosx10.9 -scheme "static mailcore2 osx" build echo Building framework for Mac - xctool -project build-mac/mailcore2.xcodeproj -sdk macosx10.8 -scheme "mailcore osx" build + xctool -project build-mac/mailcore2.xcodeproj -sdk macosx10.9 -scheme "mailcore osx" build echo Link test for Mac - xctool -project build-mac/mailcore2.xcodeproj -sdk macosx10.8 -scheme "tests" build + xctool -project build-mac/mailcore2.xcodeproj -sdk macosx10.9 -scheme "tests" build fi echo Testing CMake build |