diff options
Diffstat (limited to 'scripts/include.sh/build-dep.sh')
| -rwxr-xr-x | scripts/include.sh/build-dep.sh | 33 |
1 files changed, 5 insertions, 28 deletions
diff --git a/scripts/include.sh/build-dep.sh b/scripts/include.sh/build-dep.sh index 32534c27..714c4a6c 100755 --- a/scripts/include.sh/build-dep.sh +++ b/scripts/include.sh/build-dep.sh @@ -7,31 +7,8 @@ build_git_ios() fi simarchs="i386 x86_64" - if xcodebuild -showsdks 2>/dev/null|grep iphoneos8.3 >/dev/null ; then - sdkversion=8.3 - devicearchs="armv7 armv7s arm64" - elif xcodebuild -showsdks 2>/dev/null|grep iphoneos8.2 >/dev/null ; then - sdkversion=8.2 - devicearchs="armv7 armv7s arm64" - elif xcodebuild -showsdks 2>/dev/null|grep iphoneos8.1 >/dev/null ; then - sdkversion=8.1 - devicearchs="armv7 armv7s arm64" - elif xcodebuild -showsdks 2>/dev/null|grep iphoneos8.0 >/dev/null ; then - sdkversion=8.0 - devicearchs="armv7 armv7s arm64" - elif xcodebuild -showsdks 2>/dev/null|grep iphoneos7.1 >/dev/null ; then - sdkversion=7.1 - devicearchs="armv7 armv7s arm64" - elif xcodebuild -showsdks 2>/dev/null|grep iphoneos7.0 >/dev/null ; then - sdkversion=7.0 - devicearchs="armv7 armv7s arm64" - elif xcodebuild -showsdks 2>/dev/null|grep iphoneos6.1 >/dev/null ; then - sdkversion=6.1 - devicearchs="armv7 armv7s" - else - echo SDK not found - exit 1 - fi + sdkversion="`xcodebuild -showsdks 2>/dev/null | grep iphoneos | sed 's/.*iphoneos\(.*\)/\1/'`" + devicearchs="armv7 armv7s arm64" versions_path="$scriptpath/deps-versions.plist" version="`defaults read "$versions_path" "$name" 2>/dev/null`" @@ -90,14 +67,14 @@ build_git_ios() cd "$srcdir/$name/build-mac" sdk="iphoneos$sdkversion" echo building $sdk - xctool -project "$xcode_project" -sdk $sdk -scheme "$xcode_target" -configuration Release SYMROOT="$tmpdir/bin" OBJROOT="$tmpdir/obj" ARCHS="$devicearchs" IPHONEOS_DEPLOYMENT_TARGET="$sdkversion" + xctool -project "$xcode_project" -sdk $sdk -scheme "$xcode_target" -configuration Release SYMROOT="$tmpdir/bin" OBJROOT="$tmpdir/obj" ARCHS="$devicearchs" IPHONEOS_DEPLOYMENT_TARGET="$sdkversion" OTHER_CFLAGS="-fembed-bitcode" if test x$? != x0 ; then echo failed exit 1 fi sdk="iphonesimulator$sdkversion" echo building $sdk - xctool -project "$xcode_project" -sdk $sdk -scheme "$xcode_target" -configuration Release SYMROOT="$tmpdir/bin" OBJROOT="$tmpdir/obj" ARCHS="$simarchs" IPHONEOS_DEPLOYMENT_TARGET="$sdkversion" + xctool -project "$xcode_project" -sdk $sdk -scheme "$xcode_target" -configuration Release SYMROOT="$tmpdir/bin" OBJROOT="$tmpdir/obj" ARCHS="$simarchs" IPHONEOS_DEPLOYMENT_TARGET="$sdkversion" OTHER_CFLAGS="-fembed-bitcode" if test x$? != x0 ; then echo failed exit 1 @@ -169,7 +146,7 @@ build_git_ios() build_git_osx() { - sdk="macosx10.9" + sdk="`xcodebuild -showsdks 2>/dev/null | grep macosx | sed 's/.*macosx\(.*\)/\1/'`" archs="x86_64" if test "x$name" = x ; then |