diff options
-rwxr-xr-x | scripts/build-libetpan-ios.sh | 2 | ||||
-rw-r--r-- | scripts/deps-versions.plist | bin | 239 -> 655 bytes | |||
-rwxr-xr-x | scripts/include.sh/build-dep.sh | 7 |
3 files changed, 6 insertions, 3 deletions
diff --git a/scripts/build-libetpan-ios.sh b/scripts/build-libetpan-ios.sh index 75cdc0d7..a6a2ac24 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=84b22f9aa6467c97c214dc67a952de5b7a3d3d76 +rev=fd95586c4140c4a40fd4a6ccd68fc8ddc4deca75 name="libetpan-ios" xcode_target="libetpan ios" xcode_project="libetpan.xcodeproj" diff --git a/scripts/deps-versions.plist b/scripts/deps-versions.plist Binary files differindex 0ffee26b..2a70169e 100644 --- a/scripts/deps-versions.plist +++ b/scripts/deps-versions.plist diff --git a/scripts/include.sh/build-dep.sh b/scripts/include.sh/build-dep.sh index 714c4a6c..c3dcd4aa 100755 --- a/scripts/include.sh/build-dep.sh +++ b/scripts/include.sh/build-dep.sh @@ -67,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" OTHER_CFLAGS="-fembed-bitcode" + 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='$(inherited) -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" OTHER_CFLAGS="-fembed-bitcode" + 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='$(inherited) -fembed-bitcode' if test x$? != x0 ; then echo failed exit 1 @@ -141,6 +141,7 @@ build_git_ios() if test x$build_for_external != x1 ; then defaults write "$versions_path" "$name" "$version" + plutil -convert xml1 "$versions_path" fi } @@ -273,6 +274,7 @@ build_git_osx() if test x$build_for_external != x1 ; then defaults write "$versions_path" "$name" "$version" + plutil -convert xml1 "$versions_path" fi } @@ -325,5 +327,6 @@ get_prebuilt_dep() if test -d "$scriptpath/../Externals/$name" ; then defaults write "$installed_versions_path" "$name" "$version" + plutil -convert xml1 "$installed_versions_path" fi } |