From 541cf837135b90e80dd9ff96cc63597da1f67cac Mon Sep 17 00:00:00 2001
From: "Hoa V. Dinh" <dinh.viet.hoa@gmail.com>
Date: Wed, 16 Sep 2015 17:02:28 -0700
Subject: Support of bitcode

---
 scripts/build-ctemplate-ios.sh  |  2 +-
 scripts/build-libetpan-ios.sh   |  2 +-
 scripts/build-tidy-ios.sh       |  2 +-
 scripts/include.sh/build-dep.sh | 33 +++++----------------------------
 4 files changed, 8 insertions(+), 31 deletions(-)

(limited to 'scripts')

diff --git a/scripts/build-ctemplate-ios.sh b/scripts/build-ctemplate-ios.sh
index 98dce131..43561617 100755
--- a/scripts/build-ctemplate-ios.sh
+++ b/scripts/build-ctemplate-ios.sh
@@ -7,7 +7,7 @@ popd > /dev/null
 . "$scriptpath/include.sh/build-dep.sh"
 
 url="https://github.com/dinhviethoa/ctemplate"
-rev=b50f83f26ce3658889db1ae41b6a2d5874a3a10f
+rev=2c6ff9ae7d0ae1b973e57dd19859b95282776194
 name="ctemplate-ios"
 xcode_target="ctemplate-ios"
 xcode_project="ctemplate.xcodeproj"
diff --git a/scripts/build-libetpan-ios.sh b/scripts/build-libetpan-ios.sh
index 98c9365d..75cdc0d7 100755
--- a/scripts/build-libetpan-ios.sh
+++ b/scripts/build-libetpan-ios.sh
@@ -7,7 +7,7 @@ popd > /dev/null
 . "$scriptpath/include.sh/build-dep.sh"
 
 url="https://github.com/dinhviethoa/libetpan.git"
-rev=9d88f56dde0eb709161814d7483af7a500ab8fac
+rev=84b22f9aa6467c97c214dc67a952de5b7a3d3d76
 name="libetpan-ios"
 xcode_target="libetpan ios"
 xcode_project="libetpan.xcodeproj"
diff --git a/scripts/build-tidy-ios.sh b/scripts/build-tidy-ios.sh
index 269ce6c8..5a840674 100755
--- a/scripts/build-tidy-ios.sh
+++ b/scripts/build-tidy-ios.sh
@@ -7,7 +7,7 @@ popd > /dev/null
 . "$scriptpath/include.sh/build-dep.sh"
 
 url="https://github.com/dinhviethoa/tidy-html5"
-rev=7361665fe46de3ec86dc508876866614f7053160
+rev=71aaa8669c664447743bba73e07d70c291548dca
 name="tidy-html5-ios"
 xcode_target="tidy"
 xcode_project="Tidy.xcodeproj"
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
-- 
cgit v1.2.3