From e42f643c6b2b266b678fbfe37f11172db822268c Mon Sep 17 00:00:00 2001
From: "Hoa V. DINH" <dinh.viet.hoa@gmail.com>
Date: Tue, 28 Mar 2017 07:24:54 -0700
Subject: Updated to libetpan 5164ba2ebd3c7cbc7a9230aad32bdf8e24e207de

---
 scripts/build-libetpan-ios.sh   | 2 +-
 scripts/build-libetpan-osx.sh   | 2 +-
 scripts/deps-versions.plist     | 4 ++--
 scripts/include.sh/build-dep.sh | 6 +++---
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/scripts/build-libetpan-ios.sh b/scripts/build-libetpan-ios.sh
index c0888693..8134a8c5 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=07508b7e44949dfc09d3494c5409b54ef96604d8
+rev=5164ba2ebd3c7cbc7a9230aad32bdf8e24e207de
 name="libetpan-ios"
 xcode_target="libetpan ios"
 xcode_project="libetpan.xcodeproj"
diff --git a/scripts/build-libetpan-osx.sh b/scripts/build-libetpan-osx.sh
index 75ce953a..34bb365b 100755
--- a/scripts/build-libetpan-osx.sh
+++ b/scripts/build-libetpan-osx.sh
@@ -7,7 +7,7 @@ popd > /dev/null
 . "$scriptpath/include.sh/build-dep.sh"
 
 url="https://github.com/dinhviethoa/libetpan.git"
-rev=07508b7e44949dfc09d3494c5409b54ef96604d8
+rev=5164ba2ebd3c7cbc7a9230aad32bdf8e24e207de
 name="libetpan-osx"
 xcode_target="static libetpan"
 xcode_project="libetpan.xcodeproj"
diff --git a/scripts/deps-versions.plist b/scripts/deps-versions.plist
index d91044de..0eedb4ba 100644
--- a/scripts/deps-versions.plist
+++ b/scripts/deps-versions.plist
@@ -7,9 +7,9 @@
 	<key>ctemplate-osx</key>
 	<string>3</string>
 	<key>libetpan-ios</key>
-	<string>20</string>
+	<string>21</string>
 	<key>libetpan-osx</key>
-	<string>20</string>
+	<string>21</string>
 	<key>mailcore2-framework-osx</key>
 	<string>9</string>
 	<key>mailcore2-ios</key>
diff --git a/scripts/include.sh/build-dep.sh b/scripts/include.sh/build-dep.sh
index e7724e66..8d12fcf2 100755
--- a/scripts/include.sh/build-dep.sh
+++ b/scripts/include.sh/build-dep.sh
@@ -75,14 +75,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="$sdkminversion" OTHER_CFLAGS="$XCTOOL_OTHERFLAGS" $XCODE_BITCODE_FLAGS
+  xcodebuild -project "$xcode_project" -sdk $sdk -scheme "$xcode_target" -configuration Release SYMROOT="$tmpdir/bin" OBJROOT="$tmpdir/obj" ARCHS="$devicearchs" IPHONEOS_DEPLOYMENT_TARGET="$sdkminversion" OTHER_CFLAGS="$XCTOOL_OTHERFLAGS" $XCODE_BITCODE_FLAGS
   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="$sdkminversion" OTHER_CFLAGS='$(inherited)'
+  xcodebuild -project "$xcode_project" -sdk $sdk -scheme "$xcode_target" -configuration Release SYMROOT="$tmpdir/bin" OBJROOT="$tmpdir/obj" ARCHS="$simarchs" IPHONEOS_DEPLOYMENT_TARGET="$sdkminversion" OTHER_CFLAGS='$(inherited)'
   if test x$? != x0 ; then
     echo failed
     exit 1
@@ -218,7 +218,7 @@ build_git_osx()
   echo building $name $version - $rev
 
   cd "$srcdir/$name/build-mac"
-  xctool -project "$xcode_project" -sdk macosx$sdk -scheme "$xcode_target" -configuration Release ARCHS="$archs" SYMROOT="$tmpdir/bin" OBJROOT="$tmpdir/obj" MACOSX_DEPLOYMENT_TARGET="$sdkminversion"
+  xcodebuild -project "$xcode_project" -sdk macosx$sdk -scheme "$xcode_target" -configuration Release ARCHS="$archs" SYMROOT="$tmpdir/bin" OBJROOT="$tmpdir/obj" MACOSX_DEPLOYMENT_TARGET="$sdkminversion"
   if test x$? != x0 ; then
     echo failed
     exit 1
-- 
cgit v1.2.3