Refactored build system of dependencies

26 files changed, 375 insertions, 1278 deletions

diff --git a/build-mac/mailcore2.xcodeproj/project.pbxproj b/build-mac/mailcore2.xcodeproj/project.pbxproj
index 8005804b..b9e97e69 100755
--- a/build-mac/mailcore2.xcodeproj/project.pbxproj
+++ b/build-mac/mailcore2.xcodeproj/project.pbxproj
@@ -4014,7 +4014,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "cd \"$SRCROOT/../scripts\"\n./prepare.sh\nif test x$? != x0 ; then\n  exit 1\nfi\nfor lib in ctemplate icu4c libetpan ; do\n  rsync -av \"$SRCROOT/../Externals/$lib/lib/\" \"$BUILT_PRODUCTS_DIR\"\ndone\n";
+			shellScript = "\"$SRCROOT/../scripts/get-mac.sh\"\n";
 		};
 		C6BA2B0A1705F4E6003F0E9E /* ShellScript */ = {
 			isa = PBXShellScriptBuildPhase;
@@ -4027,7 +4027,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "cd \"$SRCROOT/../scripts\"\n./prepare-ios.sh\nif test x$? != x0 ; then\n  exit 1\nfi\nfor lib in ctemplate-ios  icu4c-ios libetpan-ios libsasl-ios    tidy-html5-ios ; do\n  rsync -av \"$SRCROOT/../Externals/$lib/lib/\" \"$BUILT_PRODUCTS_DIR\"\ndone\n";
+			shellScript = "\"$SRCROOT/../scripts/get-ios.sh\"\n";
 		};
 		C6BD28A6170BD87600A91AC1 /* ShellScript */ = {
 			isa = PBXShellScriptBuildPhase;
@@ -4632,8 +4632,8 @@
 				"HEADER_SEARCH_PATHS[sdk=iphoneos*]" = "$(IOS_HEADERS_SEARCH_PATHS)";
 				"HEADER_SEARCH_PATHS[sdk=iphonesimulator*]" = "$(IOS_HEADERS_SEARCH_PATHS)";
 				"HEADER_SEARCH_PATHS[sdk=macosx*]" = "$(OSX_HEADERS_SEARCH_PATHS)";
-				IOS_HEADERS_SEARCH_PATHS = "\"$(SRCROOT)/../Externals/libetpan-ios/include\" \"$(SRCROOT)/../Externals/icu4c-ios/include\" \"$(SRCROOT)/../Externals/ctemplate-ios/include\" \"$(SRCROOT)/../Externals/tidy-html5-ios/include/tidy\" /usr/include/libxml2";
-				IOS_LIBRARY_SEARCH_PATHS = "\"$(SRCROOT)/../Externals/libetpan-ios/lib\" \"$(SRCROOT)/../Externals/icu4c-ios/lib\" \"$(SRCROOT)/../Externals/ctemplate-ios/lib\" \"$(SRCROOT)/../Externals/libsasl-ios/lib\" \"$(SRCROOT)/../Externals/tidy-html5-ios/lib\"";
+				IOS_HEADERS_SEARCH_PATHS = "\"$(SRCROOT)/../Externals/libetpan-ios/include\" \"$(SRCROOT)/../Externals/ctemplate-ios/include\" \"$(SRCROOT)/../Externals/tidy-html5-ios/include/tidy\" \"$(SRCROOT)/../Externals/uchardet-ios/include\" /usr/include/libxml2";
+				IOS_LIBRARY_SEARCH_PATHS = "\"$(SRCROOT)/../Externals/libetpan-ios/lib\" \"$(SRCROOT)/../Externals/ctemplate-ios/lib\" \"$(SRCROOT)/../Externals/libsasl-ios/lib\" \"$(SRCROOT)/../Externals/tidy-html5-ios/lib\" \"$(SRCROOT)/../Externals/uchardet-ios/include\"";
 				LIBRARY_SEARCH_PATHS = (
 					"\"$(SRCROOT)/../Externals/libetpan/lib\"",
 					"\"$(SRCROOT)/../Externals/icu4c/lib\"",
@@ -4644,8 +4644,8 @@
 				"LIBRARY_SEARCH_PATHS[sdk=macosx*]" = "$(OSX_LIBRARY_SEARCH_PATHS)";
 				MACOSX_DEPLOYMENT_TARGET = 10.8;
 				ONLY_ACTIVE_ARCH = YES;
-				OSX_HEADERS_SEARCH_PATHS = "\"$(SRCROOT)/../Externals/libetpan/include\" \"$(SRCROOT)/../Externals/icu4c/include\" \"$(SRCROOT)/../Externals/ctemplate/include\" \"$(SRCROOT)/../Externals/uchardet/include\" /usr/include/tidy /usr/include/libxml2";
-				OSX_LIBRARY_SEARCH_PATHS = "\"$(SRCROOT)/../Externals/libetpan/lib\" \"$(SRCROOT)/../Externals/icu4c/lib\" \"$(SRCROOT)/../Externals/uchardet/lib\" \"$(SRCROOT)/../Externals/ctemplate/lib\"";
+				OSX_HEADERS_SEARCH_PATHS = "\"$(SRCROOT)/../Externals/libetpan-osx/include\" \"$(SRCROOT)/../Externals/ctemplate-osx/include\" \"$(SRCROOT)/../Externals/uchardet-osx/include\" /usr/include/tidy /usr/include/libxml2";
+				OSX_LIBRARY_SEARCH_PATHS = "\"$(SRCROOT)/../Externals/libetpan-osx/lib\" \"$(SRCROOT)/../Externals/uchardet-osx/lib\" \"$(SRCROOT)/../Externals/ctemplate-osx/lib\"";
 			};
 			name = Debug;
 		};
@@ -4680,8 +4680,8 @@
 				"HEADER_SEARCH_PATHS[sdk=iphoneos*]" = "$(IOS_HEADERS_SEARCH_PATHS)";
 				"HEADER_SEARCH_PATHS[sdk=iphonesimulator*]" = "$(IOS_HEADERS_SEARCH_PATHS)";
 				"HEADER_SEARCH_PATHS[sdk=macosx*]" = "$(OSX_HEADERS_SEARCH_PATHS)";
-				IOS_HEADERS_SEARCH_PATHS = "\"$(SRCROOT)/../Externals/libetpan-ios/include\" \"$(SRCROOT)/../Externals/icu4c-ios/include\" \"$(SRCROOT)/../Externals/ctemplate-ios/include\" \"$(SRCROOT)/../Externals/tidy-html5-ios/include/tidy\" /usr/include/libxml2";
-				IOS_LIBRARY_SEARCH_PATHS = "\"$(SRCROOT)/../Externals/libetpan-ios/lib\" \"$(SRCROOT)/../Externals/icu4c-ios/lib\" \"$(SRCROOT)/../Externals/ctemplate-ios/lib\" \"$(SRCROOT)/../Externals/libsasl-ios/lib\" \"$(SRCROOT)/../Externals/tidy-html5-ios/lib\"";
+				IOS_HEADERS_SEARCH_PATHS = "\"$(SRCROOT)/../Externals/libetpan-ios/include\" \"$(SRCROOT)/../Externals/ctemplate-ios/include\" \"$(SRCROOT)/../Externals/tidy-html5-ios/include/tidy\" \"$(SRCROOT)/../Externals/uchardet-ios/include\" /usr/include/libxml2";
+				IOS_LIBRARY_SEARCH_PATHS = "\"$(SRCROOT)/../Externals/libetpan-ios/lib\" \"$(SRCROOT)/../Externals/ctemplate-ios/lib\" \"$(SRCROOT)/../Externals/libsasl-ios/lib\" \"$(SRCROOT)/../Externals/tidy-html5-ios/lib\" \"$(SRCROOT)/../Externals/uchardet-ios/include\"";
 				LIBRARY_SEARCH_PATHS = (
 					"\"$(SRCROOT)/../Externals/libetpan/lib\"",
 					"\"$(SRCROOT)/../Externals/icu4c/lib\"",
@@ -4691,8 +4691,8 @@
 				"LIBRARY_SEARCH_PATHS[sdk=iphonesimulator*]" = "$(IOS_LIBRARY_SEARCH_PATHS)";
 				"LIBRARY_SEARCH_PATHS[sdk=macosx*]" = "$(OSX_LIBRARY_SEARCH_PATHS)";
 				MACOSX_DEPLOYMENT_TARGET = 10.8;
-				OSX_HEADERS_SEARCH_PATHS = "\"$(SRCROOT)/../Externals/libetpan/include\" \"$(SRCROOT)/../Externals/icu4c/include\" \"$(SRCROOT)/../Externals/ctemplate/include\" \"$(SRCROOT)/../Externals/uchardet/include\" /usr/include/tidy /usr/include/libxml2";
-				OSX_LIBRARY_SEARCH_PATHS = "\"$(SRCROOT)/../Externals/libetpan/lib\" \"$(SRCROOT)/../Externals/icu4c/lib\" \"$(SRCROOT)/../Externals/uchardet/lib\" \"$(SRCROOT)/../Externals/ctemplate/lib\"";
+				OSX_HEADERS_SEARCH_PATHS = "\"$(SRCROOT)/../Externals/libetpan-osx/include\" \"$(SRCROOT)/../Externals/ctemplate-osx/include\" \"$(SRCROOT)/../Externals/uchardet-osx/include\" /usr/include/tidy /usr/include/libxml2";
+				OSX_LIBRARY_SEARCH_PATHS = "\"$(SRCROOT)/../Externals/libetpan-osx/lib\" \"$(SRCROOT)/../Externals/uchardet-osx/lib\" \"$(SRCROOT)/../Externals/ctemplate-osx/lib\"";
 			};
 			name = Release;
 		};
diff --git a/scripts/build-ctemplate-ios.sh b/scripts/build-ctemplate-ios.sh
new file mode 100755
index 00000000..56f79f6c
--- /dev/null
+++ b/scripts/build-ctemplate-ios.sh
@@ -0,0 +1,17 @@
+#!/bin/sh
+
+pushd "`dirname $0`" > /dev/null
+scriptpath="`pwd`"
+popd > /dev/null
+
+. "$scriptpath/include.sh/build-dep.sh"
+
+url="https://github.com/dinhviethoa/ctemplate"
+rev=b50f83f26ce3658889db1ae41b6a2d5874a3a10f
+name="ctemplate-ios"
+xcode_target="ctemplate-ios"
+xcode_project="ctemplate.xcodeproj"
+library="libctemplate-ios.a"
+embedded_deps=""
+
+build_git_ios
diff --git a/scripts/build-ctemplate-osx.sh b/scripts/build-ctemplate-osx.sh
new file mode 100755
index 00000000..d2ccf6dc
--- /dev/null
+++ b/scripts/build-ctemplate-osx.sh
@@ -0,0 +1,17 @@
+#!/bin/sh
+
+pushd "`dirname $0`" > /dev/null
+scriptpath="`pwd`"
+popd > /dev/null
+
+. "$scriptpath/include.sh/build-dep.sh"
+
+url="https://github.com/dinhviethoa/ctemplate"
+rev=b50f83f26ce3658889db1ae41b6a2d5874a3a10f
+name="ctemplate-osx"
+xcode_target="ctemplate"
+xcode_project="ctemplate.xcodeproj"
+library="libctemplate.a"
+embedded_deps=""
+
+build_git_osx
diff --git a/scripts/build-libetpan-ios.sh b/scripts/build-libetpan-ios.sh
new file mode 100755
index 00000000..db7e3ecd
--- /dev/null
+++ b/scripts/build-libetpan-ios.sh
@@ -0,0 +1,17 @@
+#!/bin/sh
+
+pushd "`dirname $0`" > /dev/null
+scriptpath="`pwd`"
+popd > /dev/null
+
+. "$scriptpath/include.sh/build-dep.sh"
+
+url="https://github.com/dinhviethoa/libetpan.git"
+rev=7020007cfcc75b58af4d12248f1e687f21a1986d
+name="libetpan-ios"
+xcode_target="libetpan ios"
+xcode_project="libetpan.xcodeproj"
+library="libetpan-ios.a"
+embedded_deps="libsasl-ios"
+
+build_git_ios
diff --git a/scripts/build-libetpan-osx.sh b/scripts/build-libetpan-osx.sh
new file mode 100755
index 00000000..e090411f
--- /dev/null
+++ b/scripts/build-libetpan-osx.sh
@@ -0,0 +1,17 @@
+#!/bin/sh
+
+pushd "`dirname $0`" > /dev/null
+scriptpath="`pwd`"
+popd > /dev/null
+
+. "$scriptpath/include.sh/build-dep.sh"
+
+url="https://github.com/dinhviethoa/libetpan.git"
+rev=7020007cfcc75b58af4d12248f1e687f21a1986d
+name="libetpan-osx"
+xcode_target="static libetpan"
+xcode_project="libetpan.xcodeproj"
+library="libetpan.a"
+embedded_deps=""
+
+build_git_osx
diff --git a/scripts/build-mailcore2-ios.sh b/scripts/build-mailcore2-ios.sh
deleted file mode 100755
index d388d530..00000000
--- a/scripts/build-mailcore2-ios.sh
+++ /dev/null
@@ -1,104 +0,0 @@
-#!/bin/sh
-
-if xcodebuild -showsdks|grep iphoneos8.1 >/dev/null ; then
-	sdkversion=8.1
-	devicearchs="armv7 armv7s arm64"
-elif xcodebuild -showsdks|grep iphoneos8.0 >/dev/null ; then
-	sdkversion=8.0
-	devicearchs="armv7 armv7s arm64"
-elif xcodebuild -showsdks|grep iphoneos7.1 >/dev/null ; then
-	sdkversion=7.1
-	devicearchs="armv7 armv7s arm64"
-elif xcodebuild -showsdks|grep iphoneos7.0 >/dev/null ; then
-	sdkversion=7.0
-	devicearchs="armv7 armv7s arm64"
-elif xcodebuild -showsdks|grep iphoneos6.1 >/dev/null ; then
-	sdkversion=6.1
-	devicearchs="armv7 armv7s"
-else
-	echo SDK not found
-	exit 1
-fi	
-url="https://github.com/MailCore/mailcore2.git"
-
-pushd `dirname $0` > /dev/null
-scriptpath=`pwd`
-popd > /dev/null
-builddir="$scriptpath/../Externals/builds"
-
-BUILD_TIMESTAMP=`date +'%Y%m%d%H%M%S'`
-tempbuilddir="$builddir/workdir/$BUILD_TIMESTAMP"
-mkdir -p "$tempbuilddir"
-srcdir="$tempbuilddir/src"
-logdir="$tempbuilddir/log"
-resultdir="$builddir/builds"
-tmpdir="$tempbuilddir/tmp"
-
-mkdir -p "$resultdir"
-mkdir -p "$logdir"
-mkdir -p "$tmpdir"
-mkdir -p "$srcdir"
-
-pushd . >/dev/null
-mkdir -p "$builddir/downloads"
-cd "$builddir/downloads"
-if test -d mailcore2 ; then
-	cd mailcore2
-	git pull --rebase
-else
-	git clone $url
-	cd mailcore2
-fi
-version=`git rev-parse HEAD | cut -c1-10`
-
-cp -R "$builddir/downloads/mailcore2" "$srcdir/mailcore2"
-echo copying deps
-
-mkdir -p "$srcdir/mailcore2/Externals"
-cd "$scriptpath/../Externals"
-for filename in * ; do
-  if test x$filename != xbuilds ; then
-    cp -R "$scriptpath/../Externals/$filename" "$srcdir/mailcore2/Externals"
-  fi
-done
-
-echo building mailcore2
-cd "$srcdir/mailcore2/build-mac"
-sdk="iphoneos$sdkversion"
-echo building $sdk
-xcodebuild -project mailcore2.xcodeproj -sdk $sdk -target "static mailcore2 ios" -configuration Release SYMROOT="$tmpdir/bin" OBJROOT="$tmpdir/obj" ARCHS="$devicearchs"
-if test x$? != x0 ; then
-  echo failed
-  exit 1
-fi
-sdk="iphonesimulator$sdkversion"
-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
-  echo failed
-  exit 1
-fi
-echo finished
-
-cd "$tmpdir/bin"
-mkdir -p "mailcore2-ios-$version/mailcore2-ios"
-mkdir -p "mailcore2-ios-$version/mailcore2-ios/lib"
-mv Release-iphoneos/include "mailcore2-ios-$version/mailcore2-ios"
-lipo -create Release-iphoneos/libMailCore-ios.a \
-  Release-iphonesimulator/libMailCore-ios.a \
-  -output "mailcore2-ios-$version/mailcore2-ios/lib/libMailCore-ios.a"
-zip -qry "$resultdir/mailcore2-ios-$version.zip" "mailcore2-ios-$version"
-rm -f "$resultdir/mailcore2-ios-latest.zip"
-cd "$resultdir"
-ln -s "mailcore2-ios-$version.zip" "mailcore2-ios-latest.zip"
-
-echo build of mailcore2-ios-$version done
-
-popd >/dev/null
-
-rm -rf ../Externals/tmp
-
-echo cleaning
-rm -rf "$tempbuilddir"
-echo "$tempbuilddir"
diff --git a/scripts/build-mailcore2-macos.sh b/scripts/build-mailcore2-macos.sh
deleted file mode 100755
index 63e0b6c0..00000000
--- a/scripts/build-mailcore2-macos.sh
+++ /dev/null
@@ -1,67 +0,0 @@
-#!/bin/sh
-
-url="https://github.com/MailCore/mailcore2.git"
-
-pushd `dirname $0` > /dev/null
-scriptpath=`pwd`
-popd > /dev/null
-builddir="$scriptpath/../Externals/builds"
-
-BUILD_TIMESTAMP=`date +'%Y%m%d%H%M%S'`
-tempbuilddir="$builddir/workdir/$BUILD_TIMESTAMP"
-mkdir -p "$tempbuilddir"
-srcdir="$tempbuilddir/src"
-logdir="$tempbuilddir/log"
-resultdir="$builddir/builds"
-tmpdir="$tempbuilddir/tmp"
-
-mkdir -p "$resultdir"
-mkdir -p "$logdir"
-mkdir -p "$tmpdir"
-mkdir -p "$srcdir"
-
-pushd . >/dev/null
-mkdir -p "$builddir/downloads"
-cd "$builddir/downloads"
-if test -d mailcore2 ; then
-	cd mailcore2
-	git pull --rebase
-else
-	git clone $url
-	cd mailcore2
-fi
-version=`git rev-parse HEAD | cut -c1-10`
-
-cp -R "$builddir/downloads/mailcore2" "$srcdir/mailcore2"
-echo copying deps
-
-mkdir -p "$srcdir/mailcore2/Externals"
-cd "$scriptpath/../Externals"
-for filename in * ; do
-  if test x$filename != xbuilds ; then
-    cp -R "$scriptpath/../Externals/$filename" "$srcdir/mailcore2/Externals"
-  fi
-done
-echo building mailcore2
-cd "$srcdir/mailcore2/build-mac"
-xcodebuild -project mailcore2.xcodeproj -target "mailcore osx" -configuration Release SYMROOT="$tmpdir/bin" OBJROOT="$tmpdir/obj"
-if test x$? != x0 ; then
-  echo failed
-  exit 1
-fi
-echo finished
-
-cd "$tmpdir/bin/Release"
-zip -qry "$resultdir/mailcore2-$version.zip" MailCore.framework MailCore.framework.dSYM
-cd "$resultdir"
-ln -s "mailcore2-$version.zip" "mailcore2-latest.zip"
-
-echo build of mailcore2-$version done
-
-popd >/dev/null
-
-rm -rf ../Externals/tmp
-
-echo cleaning
-rm -rf "$tempbuilddir"
-echo "$tempbuilddir"
diff --git a/scripts/build-tidy-ios.sh b/scripts/build-tidy-ios.sh
new file mode 100755
index 00000000..9cac7ecc
--- /dev/null
+++ b/scripts/build-tidy-ios.sh
@@ -0,0 +1,17 @@
+#!/bin/sh
+
+pushd "`dirname $0`" > /dev/null
+scriptpath="`pwd`"
+popd > /dev/null
+
+. "$scriptpath/include.sh/build-dep.sh"
+
+url="https://github.com/dinhviethoa/tidy-html5"
+rev=7361665fe46de3ec86dc508876866614f7053160
+name="tidy-html5-ios"
+xcode_target="tidy"
+xcode_project="Tidy.xcodeproj"
+library="libtidy.a"
+embedded_deps=""
+
+build_git_ios
diff --git a/scripts/build-uchardet-ios.sh b/scripts/build-uchardet-ios.sh
new file mode 100755
index 00000000..3a22961c
--- /dev/null
+++ b/scripts/build-uchardet-ios.sh
@@ -0,0 +1,17 @@
+#!/bin/sh
+
+pushd "`dirname $0`" > /dev/null
+scriptpath="`pwd`"
+popd > /dev/null
+
+. "$scriptpath/include.sh/build-dep.sh"
+
+url="https://github.com/dinhviethoa/uchardet"
+rev=56b8581a701c3c51d489ab2f21124da8a1f2c77b
+name="uchardet-ios"
+xcode_target="uchardet-ios"
+xcode_project="uchardet.xcodeproj"
+library="libuchardet-ios.a"
+embedded_deps=""
+
+build_git_ios
diff --git a/scripts/build-uchardet-osx.sh b/scripts/build-uchardet-osx.sh
new file mode 100755
index 00000000..68bb9639
--- /dev/null
+++ b/scripts/build-uchardet-osx.sh
@@ -0,0 +1,17 @@
+#!/bin/sh
+
+pushd "`dirname $0`" > /dev/null
+scriptpath="`pwd`"
+popd > /dev/null
+
+. "$scriptpath/include.sh/build-dep.sh"
+
+url="https://github.com/dinhviethoa/uchardet"
+rev=56b8581a701c3c51d489ab2f21124da8a1f2c77b
+name="uchardet-osx"
+xcode_target="uchardet"
+xcode_project="uchardet.xcodeproj"
+library="libuchardet.a"
+embedded_deps=""
+
+build_git_osx
diff --git a/scripts/deps-versions.plist b/scripts/deps-versions.plist
new file mode 100644
index 00000000..6ccdffa5
--- /dev/null
+++ b/scripts/deps-versions.plist
diff --git a/scripts/get-ios.sh b/scripts/get-ios.sh
new file mode 100755
index 00000000..1ebc5dbb
--- /dev/null
+++ b/scripts/get-ios.sh
@@ -0,0 +1,15 @@
+#!/bin/sh
+
+pushd "`dirname $0`" > /dev/null
+scriptpath="`pwd`"
+popd > /dev/null
+
+. "$scriptpath/include.sh/build-dep.sh"
+
+deps="ctemplate-ios libetpan-ios tidy-html5-ios uchardet-ios"
+for dep in $deps ; do
+  if test ! -d "$scriptpath/../Externals/$dep" ; then
+    name="$dep"
+    get_prebuilt_dep
+  fi
+done
diff --git a/scripts/get-mac.sh b/scripts/get-mac.sh
new file mode 100755
index 00000000..9ce0cece
--- /dev/null
+++ b/scripts/get-mac.sh
@@ -0,0 +1,15 @@
+#!/bin/sh
+
+pushd "`dirname $0`" > /dev/null
+scriptpath="`pwd`"
+popd > /dev/null
+
+. "$scriptpath/include.sh/build-dep.sh"
+
+deps="ctemplate-osx libetpan-osx uchardet-osx"
+for dep in $deps ; do
+  if test ! -d "$scriptpath/../Externals/$dep" ; then
+    name="$dep"
+    get_prebuilt_dep
+  fi
+done
diff --git a/scripts/get-prebuilt.sh b/scripts/get-prebuilt.sh
deleted file mode 100755
index b7d76670..00000000
--- a/scripts/get-prebuilt.sh
+++ /dev/null
@@ -1,49 +0,0 @@
-#!/bin/sh
-
-url="https://github.com/MailCore/mailcore2-deps"
-url_prefix="$url/raw/master"
-content_prefix="https://raw.githubusercontent.com/MailCore/mailcore2-deps/master"
-
-if test x$1 != xskipprebuilt ; then
-  file_timestamp=0
-  if test -f prebuilt.list ; then
-    file_timestamp=`stat -f '%m' prebuilt.list`
-  fi
-  timestamp=`ruby -e 'puts Time.now.to_i'`
-  age=$((($timestamp-$file_timestamp)/3600)) # in hours
-  if test ! -d ../Externals/prebuilt ; then
-    age=1
-  fi
-  if test $age -gt 0 ; then
-    networkerror=no
-    curl -s -L "$content_prefix/prebuilt.list" > prebuilt.list.tmp
-    if test x$? != x0 ; then
-      networkerror=yes
-    fi
-    
-    if test x$networkerror = xyes ; then
-      echo WARNING: could not get prebuilt.list from repository
-      exit 1
-    fi
-    
-    mv prebuilt.list.tmp prebuilt.list
-  
-    if test -f prebuilt.list ; then
-      files=`cat prebuilt.list`
-      mkdir -p ../Externals/builds/builds
-      mkdir -p ../Externals/prebuilt
-      pushd ../Externals/prebuilt
-      rm -rf .git
-      echo Getting prebuilt libraries...
-      if test -d mailcore2-deps ; then
-        cd mailcore2-deps
-        git pull --rebase
-        cd ..
-      else
-        git clone --depth 1 "$url"
-      fi
-      rsync --exclude=.git -av mailcore2-deps/ ../builds/builds/
-      popd
-    fi
-  fi
-fi
diff --git a/scripts/icu4c-ios.patch b/scripts/icu4c-ios.patch
deleted file mode 100644
index 3794dd1f..00000000
--- a/scripts/icu4c-ios.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- a/source/common/umutex.h    2013-08-02 08:46:47.000000000 +0200
-+++ b/source/common/umutex.h    2013-08-02 08:49:38.000000000 +0200
-@@ -50,12 +50,16 @@
- #if U_PLATFORM_IS_DARWIN_BASED
- #if defined(__STRICT_ANSI__)
- #define UPRV_REMAP_INLINE
-+#if !defined(__clang_major__) || (defined(__clang_major__) && __clang_major__ < 5)
- #define inline
-+#endif // #if __clang_major__ < 5
- #endif
- #include <libkern/OSAtomic.h>
- #define USE_MAC_OS_ATOMIC_INCREMENT 1
- #if defined(UPRV_REMAP_INLINE)
-+#if !defined(__clang_major__) || (defined(__clang_major__) && __clang_major__ < 5)
- #undef inline
-+#endif // #if __clang_major__ < 5
- #undef UPRV_REMAP_INLINE
- #endif
- #endif
\ No newline at end of file
diff --git a/scripts/include.sh/build-dep.sh b/scripts/include.sh/build-dep.sh
new file mode 100755
index 00000000..1af2a5c4
--- /dev/null
+++ b/scripts/include.sh/build-dep.sh
@@ -0,0 +1,216 @@
+#!/bin/sh
+
+build_git_ios()
+{
+  if test "x$name" = x ; then
+    return
+  fi
+
+  simarchs="i386 x86_64"
+  if 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
+
+  versions_path="$scriptpath/deps-versions.plist"
+  version="`defaults read "$versions_path" "$name" 2>/dev/null`"
+  version="$(($version+1))"
+
+  builddir="$HOME/MailCore-Builds/dependencies"
+  BUILD_TIMESTAMP=`date +'%Y%m%d%H%M%S'`
+  tempbuilddir="$builddir/workdir/$BUILD_TIMESTAMP"
+  mkdir -p "$tempbuilddir"
+  srcdir="$tempbuilddir/src"
+  logdir="$tempbuilddir/log"
+  resultdir="$builddir/builds"
+  tmpdir="$tempbuilddir/tmp"
+
+  echo "working in $tempbuilddir"
+
+  mkdir -p "$resultdir"
+  mkdir -p "$logdir"
+  mkdir -p "$tmpdir"
+  mkdir -p "$srcdir"
+
+  pushd . >/dev/null
+  mkdir -p "$builddir/downloads"
+  cd "$builddir/downloads"
+  if test -d "$name" ; then
+    cd "$name"
+    git pull --rebase
+  else
+    git clone $url "$name"
+    cd "$name"
+  fi
+  #version=`echo $rev | cut -c1-10`
+
+  popd >/dev/null
+
+  pushd . >/dev/null
+
+  cp -R "$builddir/downloads/$name" "$srcdir/$name"
+  cd "$srcdir/$name"
+  git checkout -q $rev
+  echo building $name $version - $rev
+
+  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"
+  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"
+  if test x$? != x0 ; then
+    echo failed
+    exit 1
+  fi
+  echo finished
+
+  cd "$tmpdir/bin"
+  mkdir -p "$name-$version/$name"
+  mkdir -p "$name-$version/$name/lib"
+  mv Release-iphoneos/include "$name-$version/$name"
+  lipo -create "Release-iphoneos/$library" \
+    "Release-iphonesimulator/$library" \
+      -output "$name-$version/$name/lib/$library"
+  for dep in $embedded_deps ; do
+    mv "$srcdir/$name/build-mac/$dep" "$name-$version"
+  done
+  echo "$rev"> "$name-$version/git-rev"
+  mkdir -p "$resultdir/$name"
+  zip -qry "$resultdir/$name/$name-$version.zip" "$name-$version"
+
+  echo build of $name-$version done
+
+  popd >/dev/null
+
+  echo cleaning
+  rm -rf "$tempbuilddir"
+  echo "$tempbuilddir"
+
+  defaults write "$versions_path" "$name" "$version"
+}
+
+build_git_osx()
+{
+  sdk="macosx10.9"
+  archs="x86_64"
+  
+  if test "x$name" = x ; then
+    return
+  fi
+  
+  versions_path="$scriptpath/deps-versions.plist"
+  version="`defaults read "$versions_path" "$name" 2>/dev/null`"
+  version="$(($version+1))"
+
+  builddir="$HOME/MailCore-Builds/dependencies"
+  BUILD_TIMESTAMP=`date +'%Y%m%d%H%M%S'`
+  tempbuilddir="$builddir/workdir/$BUILD_TIMESTAMP"
+  mkdir -p "$tempbuilddir"
+  srcdir="$tempbuilddir/src"
+  logdir="$tempbuilddir/log"
+  resultdir="$builddir/builds"
+  tmpdir="$tempbuilddir/tmp"
+
+  echo "working in $tempbuilddir"
+
+  mkdir -p "$resultdir"
+  mkdir -p "$logdir"
+  mkdir -p "$tmpdir"
+  mkdir -p "$srcdir"
+
+  pushd . >/dev/null
+  mkdir -p "$builddir/downloads"
+  cd "$builddir/downloads"
+  if test -d "$name" ; then
+  	cd "$name"
+  	git pull --rebase
+  else
+  	git clone $url "$name"
+  	cd "$name"
+  fi
+  #version=`echo $rev | cut -c1-10`
+
+  popd >/dev/null
+
+  pushd . >/dev/null
+
+  cp -R "$builddir/downloads/$name" "$srcdir/$name"
+  cd "$srcdir/$name"
+  git checkout -q $rev
+  echo building $name $version - $rev
+
+  cd "$srcdir/$name/build-mac"
+  xctool -project "$xcode_project" -sdk $sdk -scheme "$xcode_target" -configuration Release ARCHS="$archs" SYMROOT="$tmpdir/bin" OBJROOT="$tmpdir/obj"
+  if test x$? != x0 ; then
+    echo failed
+    exit 1
+  fi
+  echo finished
+
+  cd "$tmpdir/bin"
+  mkdir -p "$name-$version/$name"
+  mkdir -p "$name-$version/$name/lib"
+  mv Release/include "$name-$version/$name"
+  mv "Release/$library" "$name-$version/$name/lib"
+  for dep in $embedded_deps ; do
+    mv "$srcdir/$name/build-mac/$dep" "$name-$version"
+  done
+  echo "$rev"> "$name-$version/git-rev"
+  mkdir -p "$resultdir/$name"
+  zip -qry "$resultdir/$name/$name-$version.zip" "$name-$version"
+
+  echo build of $name-$version done
+
+  popd >/dev/null
+
+  echo cleaning
+  rm -rf "$tempbuilddir"
+  echo "$tempbuilddir"
+
+  defaults write "$versions_path" "$name" "$version"
+}
+
+get_prebuilt_dep()
+{
+  url="http://d.etpan.org/mailcore2-deps"
+
+  if test "x$name" = x ; then
+    return
+  fi
+
+  versions_path="$scriptpath/deps-versions.plist"
+  version="`defaults read "$versions_path" "$name" 2>/dev/null`"
+
+  BUILD_TIMESTAMP=`date +'%Y%m%d%H%M%S'`
+  tempbuilddir="$scriptpath/../Externals/workdir/$BUILD_TIMESTAMP"
+  
+  mkdir -p "$tempbuilddir"
+  cd "$tempbuilddir"
+  echo "Downloading $name-$version"
+  curl -O "$url/$name/$name-$version.zip"
+  unzip -q "$name-$version.zip"
+  rm -rf "$scriptpath/../Externals/$name"
+  mv "$name-$version/$name" "$scriptpath/../Externals"
+  rm -rf "$tempbuilddir"
+}
diff --git a/scripts/prepare-ctemplate-ios.sh b/scripts/prepare-ctemplate-ios.sh
deleted file mode 100755
index 228f2294..00000000
--- a/scripts/prepare-ctemplate-ios.sh
+++ /dev/null
@@ -1,171 +0,0 @@
-#!/bin/sh
-
-url="https://github.com/dinhviethoa/ctemplate"
-
-if xcodebuild -showsdks|grep iphoneos8.1 >/dev/null ; then
-	sdkversion=8.1
-    MARCHS="armv7 armv7s arm64"
-elif xcodebuild -showsdks|grep iphoneos8.0 >/dev/null ; then
-	sdkversion=8.0
-    MARCHS="armv7 armv7s arm64"
-elif xcodebuild -showsdks|grep iphoneos7.1 >/dev/null ; then
-	sdkversion=7.1
-    MARCHS="armv7 armv7s arm64"
-elif xcodebuild -showsdks|grep iphoneos7.0 >/dev/null ; then
- 	sdkversion=7.0
-    MARCHS="armv7 armv7s arm64"
-elif xcodebuild -showsdks|grep iphoneos6.1 >/dev/null ; then
-	sdkversion=6.1
-    MARCHS="armv7 armv7s"
-else
-	echo SDK not found
-	exit 1
-fi	
-
-pushd `dirname $0` > /dev/null
-scriptpath=`pwd`
-popd > /dev/null
-builddir="$scriptpath/../Externals/builds"
-
-#builddir="$HOME/MailCore-Builds/dependencies"
-BUILD_TIMESTAMP=`date +'%Y%m%d%H%M%S'`
-tempbuilddir="$builddir/workdir/$BUILD_TIMESTAMP"
-mkdir -p "$tempbuilddir"
-srcdir="$tempbuilddir/src"
-logdir="$tempbuilddir/log"
-resultdir="$builddir/builds"
-tmpdir="$tempbuilddir/tmp"
-
-mkdir -p "$resultdir"
-mkdir -p "$logdir"
-mkdir -p "$tmpdir"
-mkdir -p "$srcdir"
-
-pushd . >/dev/null
-mkdir -p "$builddir/downloads"
-cd "$builddir/downloads"
-if test -d ctemplate ; then
-	cd ctemplate
-	git pull --rebase
-else
-	git clone $url
-	cd ctemplate
-fi
-version=`git rev-parse HEAD | cut -c1-10`
-build_version="$version~2"
-
-if test -f "$resultdir/ctemplate-ios-$build_version.zip" ; then
-	echo install from cache
-	popd >/dev/null
-	rm -rf ../Externals/ctemplate-ios
-	mkdir -p ../Externals/tmp
-	unzip -q "$resultdir/ctemplate-ios-$build_version.zip" -d ../Externals/tmp
-	mv "../Externals/tmp/ctemplate-ios-$build_version/ctemplate-ios" ../Externals
-  mkdir -p ../Externals/installed
-  ln -sf "$resultdir/ctemplate-ios-$build_version.zip" ../Externals/installed
-	rm -rf ../Externals/tmp
-	exit 0
-fi
-popd >/dev/null
-
-pushd . >/dev/null
-
-cp -R "$builddir/downloads/ctemplate" "$srcdir/ctemplate"
-echo building ctemplate
-cd "$srcdir/ctemplate"
-
-TOOLCHAIN=`xcode-select -p`/Toolchains/XcodeDefault.xctoolchain/usr/bin
-export CC=$TOOLCHAIN/clang
-export CXX=$TOOLCHAIN/clang++
-
-sdk="iphoneos$sdkversion"
-sysroot="`xcode-select -p`/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS$sdkversion.sdk"
-
-ARCH=arm
-for MARCH in $MARCHS; do
-  echo build for $MARCH
-  echo "$logdir/ctemplate-build.log"
-  export CPPFLAGS="-arch ${MARCH} -isysroot $sysroot -miphoneos-version-min=$sdkversion"
-  export CFLAGS="$CPPFLAGS"
-  export CXXFLAGS="$CFLAGS -stdlib=libc++"
-  export LDFLAGS="-lstdc++ -stdlib=libc++"
-  
-  ./configure --host=${ARCH} --disable-shared --disable-dependency-tracking >> "$logdir/ctemplate-build.log"
-  make >> "$logdir/ctemplate-build.log"
-  make install-libLTLIBRARIES "prefix=$tmpdir/bin/ctemplate-ios/$sdk/$MARCH" >> "$logdir/ctemplate-build.log"
-  if test x$? != x0 ; then
-    echo build of ctemplate failed
-    exit 1
-  fi
-  make install-nodist_ctemplateincludeHEADERS "prefix=$tmpdir/bin/ctemplate-ios" >> "$logdir/ctemplate-build.log"
-  if test x$? != x0 ; then
-  	echo install of ctemplate failed
-  	exit 1
-  fi
-  make distclean
-  find . -name *.o | xargs rm
-  find . -name config.cache -print0 | xargs -0 rm
-done
-
-sdk="iphonesimulator$sdkversion"
-sysroot="`xcode-select -p`/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator$sdkversion.sdk"
-
-ARCH=i386
-MARCHS="i386 x86_64"
-
-for MARCH in $MARCHS; do
-  echo build for $MARCH
-  echo "$logdir/ctemplate-build.log"
-  export CPPFLAGS="-arch ${MARCH} -isysroot $sysroot -miphoneos-version-min=$sdkversion"
-  export CFLAGS="$CPPFLAGS"
-  export CXXFLAGS="$CFLAGS -stdlib=libc++"
-  export LDFLAGS="-lstdc++ -stdlib=libc++"
-  
-  ./configure --host=${MARCH} --disable-shared --disable-dependency-tracking >> "$logdir/ctemplate-build.log"
-  make >> "$logdir/ctemplate-build.log"
-  make install-libLTLIBRARIES "prefix=$tmpdir/bin/ctemplate-ios/$sdk/$MARCH" >> "$logdir/ctemplate-build.log"
-  if test x$? != x0 ; then
-    echo build of ctemplate failed
-    exit 1
-  fi
-  make install-nodist_ctemplateincludeHEADERS "prefix=$tmpdir/bin/ctemplate-ios" >> "$logdir/ctemplate-build.log"
-  if test x$? != x0 ; then
-  	echo install of ctemplate failed
-  	exit 1
-  fi
-  make distclean
-  find . -name *.o | xargs rm
-  find . -name config.cache -print0 | xargs -0 rm
-done
-
-echo finished
-
-cd "$tmpdir/bin"
-mkdir -p "ctemplate-ios-$build_version/ctemplate-ios/lib"
-mv ctemplate-ios/include "ctemplate-ios-$build_version/ctemplate-ios"
-lipo -create ctemplate-ios/iphonesimulator$sdkversion/i386/lib/libctemplate.a \
-  ctemplate-ios/iphonesimulator$sdkversion/x86_64/lib/libctemplate.a \
-  ctemplate-ios/iphoneos$sdkversion/armv7/lib/libctemplate.a \
-  ctemplate-ios/iphoneos$sdkversion/armv7s/lib/libctemplate.a \
-  ctemplate-ios/iphoneos$sdkversion/arm64/lib/libctemplate.a \
-  -output "ctemplate-ios-$build_version/ctemplate-ios/lib/libctemplate-ios.a"
-rm -f "$resultdir/ctemplate-ios-$build_version.zip"
-zip -qry "$resultdir/ctemplate-ios-$build_version.zip" "ctemplate-ios-$build_version"
-rm -f "$resultdir/ctemplate-ios-latest.zip"
-cd "$resultdir"
-ln -s "ctemplate-ios-$build_version.zip" "ctemplate-ios-latest.zip"
-
-echo build of ctemplate-ios-$build_version done
-echo $tmpdir
-
-popd >/dev/null
-
-rm -rf ../Externals/ctemplate-ios
-mkdir -p ../Externals/tmp
-unzip -q "$resultdir/ctemplate-ios-$build_version.zip" -d ../Externals/tmp
-mv "../Externals/tmp/ctemplate-ios-$build_version/ctemplate-ios" ../Externals
-rm -rf ../Externals/tmp
-
-echo cleaning
-rm -rf "$tempbuilddir"
-echo "$tempbuilddir"
diff --git a/scripts/prepare-ctemplate-macos.sh b/scripts/prepare-ctemplate-macos.sh
deleted file mode 100755
index 718dd0bc..00000000
--- a/scripts/prepare-ctemplate-macos.sh
+++ /dev/null
@@ -1,109 +0,0 @@
-#!/bin/sh
-
-url="https://github.com/dinhviethoa/ctemplate"
-
-arch="x86_64"
-#sysrootpath="/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk"
-
-arch_flags=""
-for current_arch in $arch ; do
-	arch_flags="$arch_flags -arch $current_arch"
-done
-
-pushd `dirname $0` > /dev/null
-scriptpath=`pwd`
-popd > /dev/null
-builddir="$scriptpath/../Externals/builds"
-
-#builddir="$HOME/MailCore-Builds/dependencies"
-BUILD_TIMESTAMP=`date +'%Y%m%d%H%M%S'`
-tempbuilddir="$builddir/workdir/$BUILD_TIMESTAMP"
-mkdir -p "$tempbuilddir"
-srcdir="$tempbuilddir/src"
-logdir="$tempbuilddir/log"
-resultdir="$builddir/builds"
-tmpdir="$tempbuilddir/tmp"
-
-mkdir -p "$resultdir"
-mkdir -p "$logdir"
-mkdir -p "$tmpdir"
-mkdir -p "$srcdir"
-
-pushd . >/dev/null
-mkdir -p "$builddir/downloads"
-cd "$builddir/downloads"
-if test -d ctemplate ; then
-	cd ctemplate
-	git pull --rebase
-else
-	git clone $url
-	cd ctemplate
-fi
-version=`git rev-parse HEAD | cut -c1-10`
-
-if test -f "$resultdir/ctemplate-$version.zip" ; then
-	echo install from cache
-	popd >/dev/null
-	rm -rf ../Externals/ctemplate
-	mkdir -p ../Externals/tmp
-	unzip -q "$resultdir/ctemplate-$version.zip" -d ../Externals/tmp
-	mv "../Externals/tmp/ctemplate-$version/ctemplate" ../Externals
-  mkdir -p ../Externals/installed
-  ln -sf "$resultdir/ctemplate-$version.zip" ../Externals/installed
-	rm -rf ../Externals/tmp
-	exit 0
-fi
-popd >/dev/null
-
-pushd . >/dev/null
-
-cp -R "$builddir/downloads/ctemplate" "$srcdir/ctemplate"
-echo building ctemplate
-cd "$srcdir/ctemplate"
-
-export CC=clang
-export CXX=clang++
-export CFLAGS="$arch_flags"
-export CXXFLAGS="-std=c++11 -stdlib=libc++ $arch_flags"
-./configure --disable-shared --disable-dependency-tracking >> "$logdir/ctemplate-build.log"
-#make libctemplate.la >> "$logdir/ctemplate-build.log"
-#make libctemplate_nothreads.la >> "$logdir/ctemplate-build.log"
-#make install-libLTLIBRARIES "prefix=$tmpdir/bin/ctemplate" >> "$logdir/ctemplate-build.log"
-make >> "$logdir/ctemplate-build.log"
-make install-libLTLIBRARIES "prefix=$tmpdir/bin/ctemplate" >> "$logdir/ctemplate-build.log"
-if test x$? != x0 ; then
-	echo build of ctemplate failed
-	exit 1
-fi
-
-make install-nodist_ctemplateincludeHEADERS "prefix=$tmpdir/bin/ctemplate" >> "$logdir/ctemplate-build.log"
-if test x$? != x0 ; then
-	echo install of ctemplate failed
-	exit 1
-fi
-
-echo finished
-
-#mkdir -p "$tmpdir/bin"
-cd "$tmpdir/bin"
-mkdir -p "ctemplate-$version"
-mv ctemplate "ctemplate-$version"
-rm -f "$resultdir/ctemplate-$version.zip"
-zip -qry "$resultdir/ctemplate-$version.zip" "ctemplate-$version"
-rm -f "$resultdir/ctemplate-latest.zip"
-cd "$resultdir"
-ln -s "ctemplate-$version.zip" "ctemplate-latest.zip"
-
-echo build of ctemplate-$version done
-
-popd >/dev/null
-
-rm -rf ../Externals/ctemplate
-mkdir -p ../Externals/tmp
-unzip -q "$resultdir/ctemplate-$version.zip" -d ../Externals/tmp
-mv "../Externals/tmp/ctemplate-$version/ctemplate" ../Externals
-rm -rf ../Externals/tmp
-
-echo cleaning
-rm -rf "$tempbuilddir"
-echo "$tempbuilddir"
diff --git a/scripts/prepare-icu4c-ios.sh b/scripts/prepare-icu4c-ios.sh
deleted file mode 100755
index a6127f02..00000000
--- a/scripts/prepare-icu4c-ios.sh
+++ /dev/null
@@ -1,213 +0,0 @@
-#!/bin/sh
-
-if xcodebuild -showsdks|grep iphoneos8.1 >/dev/null ; then
-    sdkversion=8.1
-    devicearchs="armv7 armv7s arm64"
-    archs="armv7 armv7s arm64 i386 x86_64"
-elif xcodebuild -showsdks|grep iphoneos8.0 >/dev/null ; then
-    sdkversion=8.0
-    devicearchs="armv7 armv7s arm64"
-    archs="armv7 armv7s arm64 i386 x86_64"
-elif xcodebuild -showsdks|grep iphoneos7.1 >/dev/null ; then
-    sdkversion=7.1
-    devicearchs="armv7 armv7s arm64"
-    archs="armv7 armv7s arm64 i386 x86_64"
-elif xcodebuild -showsdks|grep iphoneos7.0 >/dev/null ; then
-    sdkversion=7.0
-    devicearchs="armv7 armv7s arm64"
-    archs="armv7 armv7s arm64 i386 x86_64"
-elif xcodebuild -showsdks|grep iphoneos6.1 >/dev/null ; then
-    sdkversion=6.1
-    devicearchs="armv7 armv7s"
-    archs="armv7 armv7s i386"
-else
-    echo SDK not found
-    exit 1
-fi	
-
-versionfolder='51.1'
-version='51_1'
-build_version="$version~3"
-url="http://download.icu-project.org/files/icu4c/$versionfolder/icu4c-$version-src.tgz"
-package_filename="icu4c-$version-src.tgz"
-sysrootpath="`xcode-select -p`/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk"
-enable_icu_data=0
-
-pushd `dirname $0` > /dev/null
-scriptpath=`pwd`
-popd > /dev/null
-builddir="$scriptpath/../Externals/builds"
-
-#builddir="$HOME/MailCore-Builds/dependencies"
-BUILD_TIMESTAMP=`date +'%Y%m%d%H%M%S'`
-tempbuilddir="$builddir/workdir/$BUILD_TIMESTAMP"
-mkdir -p "$tempbuilddir"
-srcdir="$tempbuilddir/src"
-logdir="$tempbuilddir/log"
-resultdir="$builddir/builds"
-tmpdir="$tempbuilddir/tmp"
-
-if test -f "$resultdir/icu4c-ios-$build_version.zip" ; then
-  echo install from cache
-  rm -rf ../Externals/icu4c-ios
-  mkdir -p ../Externals/tmp
-  unzip -q "$resultdir/icu4c-ios-$build_version.zip" -d ../Externals/tmp
-  mv "../Externals/tmp/icu4c-ios-$build_version/icu4c-ios" ../Externals
-  mkdir -p ../Externals/installed
-  ln -sf "$resultdir/icu4c-ios-$build_version.zip" ../Externals/installed
-  rm -rf ../Externals/tmp
-  exit 0
-fi
-
-mkdir -p "$resultdir"
-mkdir -p "$logdir"
-mkdir -p "$tmpdir"
-mkdir -p "$srcdir"
-
-pushd . >/dev/null
-
-echo get icu4c
-cd "$srcdir"
-if test -f "$builddir/downloads/$package_filename" ; then
-	cp "$builddir/downloads/$package_filename" .
-else
-	curl -L -O "$url"
-	if test x$? != x0 ; then
-		echo fetch of icu4c failed
-		exit 1
-	fi
-	mkdir -p "$builddir/downloads"
-	cp "$package_filename" "$builddir/downloads"
-fi
-
-tar xf "$package_filename"
-cd icu
-patch -p1 < "$scriptpath/icu4c-ios.patch"
-cd ..
-
-TOOLCHAIN=`xcode-select -p`/Toolchains/XcodeDefault.xctoolchain/usr/bin
-export CC=$TOOLCHAIN/clang
-export CXX=$TOOLCHAIN/clang++
-export SYSROOTPATH="`xcode-select -p`/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.9.sdk"
-export CPPFLAGS="-isysroot $SYSROOTPATH"
-export CFLAGS="$CPPFLAGS"
-export LDLAGS="-lc++ -isysroot $SYSROOTPATH"
-
-echo build x86_64
-MARCH=x86_64
-mkdir -p "$tmpdir/crossbuild/"
-cp -R "$srcdir" "$tmpdir/crossbuild/icu4c-$MARCH"
-cd "$tmpdir/crossbuild/icu4c-$MARCH"
-"icu/source/configure" --enable-static --disable-shared --with-data-packaging=archive # >> "$logdir/icu4c-build.log"
-make # >> "$logdir/icu4c-build.log"
-make install "prefix=$tmpdir/crossbuild/icu4c-$MARCH" # >> "$logdir/icu4c-build.log"
-
-ARCH=arm
-MARCHS="$devicearchs"
-
-iphonesdk="iphoneos$sdkversion"
-sysroot="`xcode-select -p`/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS$sdkversion.sdk"
-
-cd "$srcdir/icu/source"
-for MARCH in $MARCHS; do
-    export CPPFLAGS="-arch ${MARCH} -isysroot ${sysroot} -DUCONFIG_NO_FILE_IO=1 -miphoneos-version-min=$sdkversion"
-    export CFLAGS="$CPPFLAGS"
-    export CXXFLAGS="$CFLAGS -stdlib=libc++ -std=gnu++11"
-    export LDFLAGS="-lstdc++ -stdlib=libc++  -isysroot ${sysroot}"
-
-  echo building $MARCH
-  
-	mkdir -p "$tmpdir/build/icu4c-$MARCH"
-	cd "$tmpdir/build/icu4c-$MARCH"
-	"$srcdir/icu/source/configure" --host=$ARCH-apple-darwin10.6.0 --enable-static --disable-shared --with-data-packaging=archive --with-cross-build=$tmpdir/crossbuild/icu4c-x86_64 >> "$logdir/icu4c-build.log"
-	make >> "$logdir/icu4c-build.log"
-	make install "prefix=$tmpdir/bin/icu4c-$MARCH" >> "$logdir/icu4c-build.log"
-	if test x$? != x0 ; then
-		echo build of icu4c failed
-		exit 1
-	fi
-done
-
-sdk="iphonesimulator$sdkversion"
-sysroot="`xcode-select -p`/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator$sdkversion.sdk"
-
-ARCH=i386
-MARCHS="x86_64 i386"
-
-cd "$srcdir/icu/source"
-for MARCH in $MARCHS; do
-  export CPPFLAGS="-arch ${MARCH} -isysroot ${sysroot} -DUCONFIG_NO_FILE_IO=1 -miphoneos-version-min=$sdkversion"
-  export CFLAGS="$CPPFLAGS"
-  export CXXFLAGS="$CFLAGS -stdlib=libc++ -std=gnu++11"
-  export LDFLAGS="-lstdc++ -stdlib=libc++"
-
-  echo building $MARCH
-  
-	mkdir -p "$tmpdir/build/icu4c-$MARCH"
-	cd "$tmpdir/build/icu4c-$MARCH"
-	"$srcdir/icu/source/configure" --host=$MARCH-apple-darwin10.6.0 --enable-static --disable-shared --with-data-packaging=archive --with-cross-build=$tmpdir/crossbuild/icu4c-x86_64 >> "$logdir/icu4c-build.log"
-	make >> "$logdir/icu4c-build.log"
-	make install "prefix=$tmpdir/bin/icu4c-$MARCH" >> "$logdir/icu4c-build.log"
-	if test x$? != x0 ; then
-		echo build of icu4c failed
-		exit 1
-	fi
-done
-
-mkdir -p "$tmpdir/bin/icu4c-ios"
-cp -R $tmpdir/crossbuild/icu4c-x86_64/include "$tmpdir/bin/icu4c-ios"
-if test x$enable_icu_data = x1 ; then
-  mkdir -p "$tmpdir/bin/icu4c-ios/share/icu"
-  cp "$tmpdir/crossbuild/icu4c-x86_64/share/icu/$versionfolder/icudt51l.dat" "$tmpdir/bin/icu4c-ios/share/icu"
-fi
-mkdir -p "$tmpdir/bin/icu4c-ios/lib"
-cd "$tmpdir/bin"
-
-icudata_paths=""
-icui18n_paths=""
-icuio_paths=""
-icule_paths=""
-iculx_paths=""
-icutest_paths=""
-icutu_paths=""
-icuuc_paths=""
-for cur_arch in $archs ; do
-	icudata_paths="$icudata_paths icu4c-$cur_arch/lib/libicudata.a"
-	icui18n_paths="$icui18n_paths icu4c-$cur_arch/lib/libicui18n.a"
-	icuio_paths="$icuio_paths icu4c-$cur_arch/lib/libicuio.a"
-	icule_paths="$icule_paths icu4c-$cur_arch/lib/libicule.a"
-	iculx_paths="$iculx_paths icu4c-$cur_arch/lib/libiculx.a"
-	icutest_paths="$icutest_paths icu4c-$cur_arch/lib/libicutest.a"
-	icutu_paths="$icutu_paths icu4c-$cur_arch/lib/libicutu.a"
-	icuuc_paths="$icuuc_paths icu4c-$cur_arch/lib/libicuuc.a"
-done
-lipo -create $icudata_paths -output icu4c-ios/lib/libicudata.a
-lipo -create $icui18n_paths -output icu4c-ios/lib/libicui18n.a
-lipo -create $icuio_paths -output icu4c-ios/lib/libicuio.a
-lipo -create $icule_paths -output icu4c-ios/lib/libicule.a
-lipo -create $iculx_paths -output icu4c-ios/lib/libiculx.a
-lipo -create $icutest_paths -output icu4c-ios/lib/libicutest.a
-lipo -create $icutu_paths -output icu4c-ios/lib/libicutu.a
-lipo -create $icuuc_paths -output icu4c-ios/lib/libicuuc.a
-
-cd "$tmpdir/bin"
-mkdir -p "icu4c-ios-$build_version"
-mv icu4c-ios "icu4c-ios-$build_version"
-zip -qry "$resultdir/icu4c-ios-$build_version.zip" "icu4c-ios-$build_version"
-rm -f "$resultdir/icu4c-ios-latest.zip"
-cd "$resultdir"
-ln -s "icu4c-ios-$build_version.zip" "icu4c-ios-latest.zip"
-
-echo build of icu4c-$build_version done
-
-popd
-
-rm -rf ../Externals/icu4c-ios
-mkdir -p ../Externals/tmp
-unzip -q "$resultdir/icu4c-ios-$build_version.zip" -d ../Externals/tmp
-mv "../Externals/tmp/icu4c-ios-$build_version/icu4c-ios" ../Externals
-rm -rf ../Externals/tmp
-
-echo cleaning
-rm -rf "$tempbuilddir"
-echo "$tempbuilddir"
diff --git a/scripts/prepare-icu4c-macos.sh b/scripts/prepare-icu4c-macos.sh
deleted file mode 100755
index d7d6f46b..00000000
--- a/scripts/prepare-icu4c-macos.sh
+++ /dev/null
@@ -1,152 +0,0 @@
-#!/bin/sh
-
-versionfolder='51.1'
-version='51_1'
-build_version="$version~1"
-url="http://download.icu-project.org/files/icu4c/$versionfolder/icu4c-$version-src.tgz"
-package_filename="icu4c-$version-src.tgz"
-arch="x86_64"
-sysrootpath="/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.9.sdk"
-enable_icu_data=0
-
-arch_flags=""
-for current_arch in $arch ; do
-	arch_flags="$arch_flags -arch $current_arch"
-done
-
-pushd `dirname $0` > /dev/null
-scriptpath=`pwd`
-popd > /dev/null
-builddir="$scriptpath/../Externals/builds"
-
-#builddir="$HOME/MailCore-Builds/dependencies"
-BUILD_TIMESTAMP=`date +'%Y%m%d%H%M%S'`
-tempbuilddir="$builddir/workdir/$BUILD_TIMESTAMP"
-mkdir -p "$tempbuilddir"
-srcdir="$tempbuilddir/src"
-logdir="$tempbuilddir/log"
-resultdir="$builddir/builds"
-tmpdir="$tempbuilddir/tmp"
-
-if test -f "$resultdir/icu4c-$build_version.zip" ; then
-	echo install from cache
-	rm -rf ../Externals/icu4c
-	mkdir -p ../Externals/tmp
-	unzip -q "$resultdir/icu4c-$build_version.zip" -d ../Externals/tmp
-	mv "../Externals/tmp/icu4c-$build_version/icu4c" ../Externals
-  mkdir -p ../Externals/installed
-  ln -sf "$resultdir/icu4c-$build_version.zip" ../Externals/installed
-	rm -rf ../Externals/tmp
-	exit 0
-fi
-
-mkdir -p "$resultdir"
-mkdir -p "$logdir"
-mkdir -p "$tmpdir"
-mkdir -p "$srcdir"
-
-pushd . >/dev/null
-
-echo get icu4c
-cd "$srcdir"
-if test -f "$builddir/downloads/$package_filename" ; then
-	cp "$builddir/downloads/$package_filename" .
-else
-	curl -O "$url"
-	if test x$? != x0 ; then
-		echo fetch of icu4c failed
-		exit 1
-	fi
-	mkdir -p "$builddir/downloads"
-	cp "$package_filename" "$builddir/downloads"
-fi
-
-tar xf "$package_filename"
-cd icu
-patch -p1 < "$scriptpath/icu4c-ios.patch"
-cd ..
-
-echo building icu4c
-cd "$srcdir/icu/source"
-for cur_arch in $arch ; do
-	cur_arch_flags="-arch $cur_arch"
-	echo building icu4c for $cur_arch
-	export CFLAGS="$cur_arch_flags -isysroot $sysrootpath -mfix-and-continue -mmacosx-version-min=10.7"
-	export CXXFLAGS="$cur_arch_flags -isysroot $sysrootpath -mfix-and-continue -mmacosx-version-min=10.7"
-	export LDLAGS="$cur_arch_flags -isysroot $sysrootpath -mfix-and-continue -mmacosx-version-min=10.7"
-	mkdir -p "$tmpdir/build/icu4c-$cur_arch"
-	cd "$tmpdir/build/icu4c-$cur_arch"
-	if test "x$cur_arch" = xx86_64 ; then
-		"$srcdir/icu/source/configure" --enable-static --disable-shared --with-data-packaging=archive >> "$logdir/icu4c-build.log"
-	else
-		"$srcdir/icu/source/configure" --host=$cur_arch-apple-darwin10.6.0 --enable-static --disable-shared --with-data-packaging=archive --with-cross-build=$tmpdir/crossbuild/icu4c-x86_64 >> "$logdir/icu4c-build.log"
-	fi
-	make >> "$logdir/icu4c-build.log"
-	make install "prefix=$tmpdir/bin/icu4c-$cur_arch" >> "$logdir/icu4c-build.log"
-	if test "x$cur_arch" = xx86_64 ; then
-		make install "prefix=$tmpdir/crossbuild/icu4c-$cur_arch" >> "$logdir/icu4c-build.log"
-	fi
-	if test x$? != x0 ; then
-		echo build of icu4c failed
-		exit 1
-	fi
-	#make distclean
-done
-
-mkdir -p "$tmpdir/bin/icu4c"
-cp -R "$tmpdir/bin/icu4c-x86_64/include" "$tmpdir/bin/icu4c"
-if test x$enable_icu_data = x1 ; then
-  mkdir -p "$tmpdir/bin/icu4c/share/icu"
-  cp "$tmpdir/bin/icu4c-x86_64/share/icu/$versionfolder/icudt51l.dat" "$tmpdir/bin/icu4c/share/icu"
-fi
-mkdir -p "$tmpdir/bin/icu4c/lib"
-cd "$tmpdir/bin"
-
-icudata_paths="" #
-icui18n_paths="" #
-icuio_paths=""
-icule_paths=""
-iculx_paths=""
-icutest_paths=""
-icutu_paths=""
-icuuc_paths="" #
-for cur_arch in $arch ; do
-	icudata_paths="$icudata_paths icu4c-$cur_arch/lib/libicudata.a"
-	icui18n_paths="$icui18n_paths icu4c-$cur_arch/lib/libicui18n.a"
-	icuio_paths="$icuio_paths icu4c-$cur_arch/lib/libicuio.a"
-	icule_paths="$icule_paths icu4c-$cur_arch/lib/libicule.a"
-	iculx_paths="$iculx_paths icu4c-$cur_arch/lib/libiculx.a"
-	icutest_paths="$icutest_paths icu4c-$cur_arch/lib/libicutest.a"
-	icutu_paths="$icutu_paths icu4c-$cur_arch/lib/libicutu.a"
-	icuuc_paths="$icuuc_paths icu4c-$cur_arch/lib/libicuuc.a"
-done
-lipo -create $icudata_paths -output icu4c/lib/libicudata.a
-lipo -create $icui18n_paths -output icu4c/lib/libicui18n.a
-lipo -create $icuio_paths -output icu4c/lib/libicuio.a
-lipo -create $icule_paths -output icu4c/lib/libicule.a
-lipo -create $iculx_paths -output icu4c/lib/libiculx.a
-lipo -create $icutest_paths -output icu4c/lib/libicutest.a
-lipo -create $icutu_paths -output icu4c/lib/libicutu.a
-lipo -create $icuuc_paths -output icu4c/lib/libicuuc.a
-
-cd "$tmpdir/bin"
-mkdir -p "icu4c-$build_version"
-mv icu4c "icu4c-$build_version"
-zip -qry "$resultdir/icu4c-$build_version.zip" "icu4c-$build_version"
-rm -f "$resultdir/icu4c-latest.zip"
-cd "$resultdir"
-ln -s "icu4c-$build_version.zip" "icu4c-latest.zip"
-
-echo build of icu4c-$build_version done
-
-popd
-
-rm -rf ../Externals/icu4c
-mkdir -p ../Externals/tmp
-unzip -q "$resultdir/icu4c-$build_version.zip" -d ../Externals/tmp
-mv "../Externals/tmp/icu4c-$build_version/icu4c" ../Externals
-rm -rf ../Externals/tmp
-
-echo cleaning
-rm -rf "$tempbuilddir"
-echo "$tempbuilddir"
diff --git a/scripts/prepare-ios.sh b/scripts/prepare-ios.sh
deleted file mode 100755
index 49bac30e..00000000
--- a/scripts/prepare-ios.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/sh
-./get-prebuilt.sh
-
-missing=no
-for filename in `cat prebuilt.list|grep -- -ios` ; do
-  if test ! -f "../Externals/installed/$filename" ; then
-    missing=yes
-  fi
-done
-if test $missing = yes ; then
-  ./prepare-tidy-ios.sh
-  ./prepare-icu4c-ios.sh
-  ./prepare-libetpan-ios.sh
-  ./prepare-ctemplate-ios.sh
-fi
diff --git a/scripts/prepare-libetpan-ios.sh b/scripts/prepare-libetpan-ios.sh
deleted file mode 100755
index 7a581939..00000000
--- a/scripts/prepare-libetpan-ios.sh
+++ /dev/null
@@ -1,133 +0,0 @@
-#!/bin/sh
-
-if xcodebuild -showsdks|grep iphoneos8.1 >/dev/null ; then
-	sdkversion=8.1
-    devicearchs="armv7 armv7s arm64"
-elif xcodebuild -showsdks|grep iphoneos8.0 >/dev/null ; then
-	sdkversion=8.0
-    devicearchs="armv7 armv7s arm64"
-elif xcodebuild -showsdks|grep iphoneos7.1 >/dev/null ; then
-	sdkversion=7.1
-    devicearchs="armv7 armv7s arm64"
-elif xcodebuild -showsdks|grep iphoneos7.0 >/dev/null ; then
- 	sdkversion=7.0
-    devicearchs="armv7 armv7s arm64"
-elif xcodebuild -showsdks|grep iphoneos6.1 >/dev/null ; then
-	sdkversion=6.1
-    devicearchs="armv7 armv7s"
-else
-	echo SDK not found
-	exit 1
-fi	
-
-url="https://github.com/dinhviethoa/libetpan.git"
-rev=7020007cfcc75b58af4d12248f1e687f21a1986d
-
-pushd `dirname $0` > /dev/null
-scriptpath=`pwd`
-popd > /dev/null
-builddir="$scriptpath/../Externals/builds"
-
-#builddir="$HOME/MailCore-Builds/dependencies"
-BUILD_TIMESTAMP=`date +'%Y%m%d%H%M%S'`
-tempbuilddir="$builddir/workdir/$BUILD_TIMESTAMP"
-mkdir -p "$tempbuilddir"
-srcdir="$tempbuilddir/src"
-logdir="$tempbuilddir/log"
-resultdir="$builddir/builds"
-tmpdir="$tempbuilddir/tmp"
-
-mkdir -p "$resultdir"
-mkdir -p "$logdir"
-mkdir -p "$tmpdir"
-mkdir -p "$srcdir"
-
-pushd . >/dev/null
-mkdir -p "$builddir/downloads"
-cd "$builddir/downloads"
-if test -d libetpan ; then
-	cd libetpan
-	git pull --rebase
-else
-	git clone $url
-	cd libetpan
-fi
-#version=`git rev-parse HEAD | cut -c1-10`
-version=`echo $rev | cut -c1-10`
-
-if test -f "$resultdir/libetpan-ios-$version.zip" ; then
-	echo install from cache
-	popd >/dev/null
-	rm -rf ../Externals/libetpan-ios
-	rm -rf ../Externals/libsasl-ios
-	mkdir -p ../Externals/tmp
-	unzip -q "$resultdir/libetpan-ios-$version.zip" -d ../Externals/tmp
-	unzip -q "$resultdir/libsasl-ios-$version.zip" -d ../Externals/tmp
-	mv "../Externals/tmp/libetpan-ios-$version/libetpan-ios" ../Externals
-	mv "../Externals/tmp/libsasl-ios-$version/libsasl-ios" ../Externals
-  mkdir -p ../Externals/installed
-  ln -sf "$resultdir/libetpan-ios-$version.zip" ../Externals/installed
-  ln -sf "$resultdir/libsasl-ios-$version.zip" ../Externals/installed
-	rm -rf ../Externals/tmp
-	exit 0
-fi
-popd >/dev/null
-
-pushd . >/dev/null
-
-cp -R "$builddir/downloads/libetpan" "$srcdir/libetpan"
-cd "$srcdir/libetpan"
-git checkout $rev
-echo building libetpan
-
-cd "$srcdir/libetpan/build-mac"
-sdk="iphoneos$sdkversion"
-echo building $sdk
-xcodebuild -project libetpan.xcodeproj -sdk $sdk -target "libetpan ios" -configuration Release SYMROOT="$tmpdir/bin" OBJROOT="$tmpdir/obj" ARCHS="$devicearchs" IPHONEOS_DEPLOYMENT_TARGET="$sdkversion"
-if test x$? != x0 ; then
-  echo failed
-  exit 1
-fi
-sdk="iphonesimulator$sdkversion"
-simarchs="i386 x86_64"
-echo building $sdk
-xcodebuild -project libetpan.xcodeproj -sdk $sdk -target "libetpan ios" -configuration Release SYMROOT="$tmpdir/bin" OBJROOT="$tmpdir/obj" ARCHS="$simarchs" IPHONEOS_DEPLOYMENT_TARGET="$sdkversion"
-if test x$? != x0 ; then
-  echo failed
-  exit 1
-fi
-echo finished
-
-cd "$tmpdir/bin"
-mkdir -p "libetpan-ios-$version/libetpan-ios"
-mkdir -p "libetpan-ios-$version/libetpan-ios/lib"
-mv Release-iphoneos/include "libetpan-ios-$version/libetpan-ios"
-lipo -create Release-iphoneos/libetpan-ios.a \
-  Release-iphonesimulator/libetpan-ios.a \
-  -output "libetpan-ios-$version/libetpan-ios/lib/libetpan-ios.a"
-zip -qry "$resultdir/libetpan-ios-$version.zip" "libetpan-ios-$version"
-mkdir -p "libsasl-ios-$version"
-mv "$srcdir/libetpan/build-mac/libsasl-ios" "libsasl-ios-$version"
-zip -qry "$resultdir/libsasl-ios-$version.zip" "libsasl-ios-$version"
-rm -f "$resultdir/libetpan-ios-latest.zip"
-rm -f "$resultdir/libsasl-ios-latest.zip"
-cd "$resultdir"
-ln -s "libetpan-ios-$version.zip" "libetpan-ios-latest.zip"
-ln -s "libsasl-ios-$version.zip" "libsasl-ios-latest.zip"
-
-echo build of libetpan-ios-$version done
-
-popd >/dev/null
-
-rm -rf ../Externals/libetpan-ios
-rm -rf ../Externals/libsasl-ios
-mkdir -p ../Externals/tmp
-unzip -q "$resultdir/libetpan-ios-$version.zip" -d ../Externals/tmp
-unzip -q "$resultdir/libsasl-ios-$version.zip" -d ../Externals/tmp
-mv "../Externals/tmp/libetpan-ios-$version/libetpan-ios" ../Externals
-mv "../Externals/tmp/libsasl-ios-$version/libsasl-ios" ../Externals
-rm -rf ../Externals/tmp
-
-echo cleaning
-rm -rf "$tempbuilddir"
-echo "$tempbuilddir"
diff --git a/scripts/prepare-libetpan-macos.sh b/scripts/prepare-libetpan-macos.sh
deleted file mode 100755
index 6884bf04..00000000
--- a/scripts/prepare-libetpan-macos.sh
+++ /dev/null
@@ -1,89 +0,0 @@
-#!/bin/sh
-
-url="https://github.com/dinhviethoa/libetpan.git"
-rev=7020007cfcc75b58af4d12248f1e687f21a1986d
-
-pushd `dirname $0` > /dev/null
-scriptpath=`pwd`
-popd > /dev/null
-builddir="$scriptpath/../Externals/builds"
-
-#builddir="$HOME/MailCore-Builds/dependencies"
-BUILD_TIMESTAMP=`date +'%Y%m%d%H%M%S'`
-tempbuilddir="$builddir/workdir/$BUILD_TIMESTAMP"
-mkdir -p "$tempbuilddir"
-srcdir="$tempbuilddir/src"
-logdir="$tempbuilddir/log"
-resultdir="$builddir/builds"
-tmpdir="$tempbuilddir/tmp"
-
-mkdir -p "$resultdir"
-mkdir -p "$logdir"
-mkdir -p "$tmpdir"
-mkdir -p "$srcdir"
-
-pushd . >/dev/null
-mkdir -p "$builddir/downloads"
-cd "$builddir/downloads"
-if test -d libetpan ; then
-	cd libetpan
-	git pull --rebase
-else
-	git clone $url
-	cd libetpan
-fi
-#version=`git rev-parse HEAD | cut -c1-10`
-version=`echo $rev | cut -c1-10`
-
-if test -f "$resultdir/libetpan-$version.zip" ; then
-	echo install from cache
-	popd >/dev/null
-	rm -rf ../Externals/libetpan
-	mkdir -p ../Externals/tmp
-	unzip -q "$resultdir/libetpan-$version.zip" -d ../Externals/tmp
-	mv "../Externals/tmp/libetpan-$version/libetpan" ../Externals
-  mkdir -p ../Externals/installed
-  ln -sf "$resultdir/libetpan-$version.zip" ../Externals/installed
-	rm -rf ../Externals/tmp
-	exit 0
-fi
-popd >/dev/null
-
-pushd . >/dev/null
-
-cp -R "$builddir/downloads/libetpan" "$srcdir/libetpan"
-cd "$srcdir/libetpan"
-git checkout $rev
-echo building libetpan
-
-cd "$srcdir/libetpan/build-mac"
-xcodebuild -project libetpan.xcodeproj -target "static libetpan" -configuration Release SYMROOT="$tmpdir/bin" OBJROOT="$tmpdir/obj"
-if test x$? != x0 ; then
-  echo failed
-  exit 1
-fi
-echo finished
-
-cd "$tmpdir/bin"
-mkdir -p "libetpan-$version/libetpan"
-mkdir -p "libetpan-$version/libetpan/lib"
-mv Release/include "libetpan-$version/libetpan"
-mv Release/libetpan.a "libetpan-$version/libetpan/lib"
-zip -qry "$resultdir/libetpan-$version.zip" "libetpan-$version"
-rm -f "$resultdir/libetpan-latest.zip"
-cd "$resultdir"
-ln -s "libetpan-$version.zip" "libetpan-latest.zip"
-
-echo build of libetpan-$version done
-
-popd >/dev/null
-
-rm -rf ../Externals/libetpan
-mkdir -p ../Externals/tmp
-unzip -q "$resultdir/libetpan-$version.zip" -d ../Externals/tmp
-mv "../Externals/tmp/libetpan-$version/libetpan" ../Externals
-rm -rf ../Externals/tmp
-
-echo cleaning
-rm -rf "$tempbuilddir"
-echo "$tempbuilddir"
diff --git a/scripts/prepare-mac.sh b/scripts/prepare-mac.sh
deleted file mode 100755
index 2b9fdca8..00000000
--- a/scripts/prepare-mac.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/sh
-./get-prebuilt.sh
-
-missing=no
-for filename in `cat prebuilt.list|grep -v -- -ios` ; do
-  if test ! -f "../Externals/installed/$filename" ; then
-    missing=yes
-  fi
-done
-if test $missing = yes ; then
-  ./prepare-icu4c-macos.sh
-  ./prepare-libetpan-macos.sh
-  ./prepare-ctemplate-macos.sh
-fi
-
diff --git a/scripts/prepare-tidy-ios.sh b/scripts/prepare-tidy-ios.sh
deleted file mode 100755
index 0bce77d0..00000000
--- a/scripts/prepare-tidy-ios.sh
+++ /dev/null
@@ -1,117 +0,0 @@
-#!/bin/sh
-
-if xcodebuild -showsdks|grep iphoneos8.1 >/dev/null ; then
-	sdkversion=8.1
-    devicearchs="armv7 armv7s arm64"
-elif xcodebuild -showsdks|grep iphoneos8.0 >/dev/null ; then
-	sdkversion=8.0
-    devicearchs="armv7 armv7s arm64"
-elif xcodebuild -showsdks|grep iphoneos7.1 >/dev/null ; then
-    	sdkversion=7.1
-        devicearchs="armv7 armv7s arm64"	 
-elif xcodebuild -showsdks|grep iphoneos7.0 >/dev/null ; then
-	sdkversion=7.0
-    devicearchs="armv7 armv7s arm64"	 
-elif xcodebuild -showsdks|grep iphoneos6.1 >/dev/null ; then
-	sdkversion=6.1
-    devicearchs="armv7 armv7s"
-else
-	echo SDK not found
-	exit 1
-fi	
-url="https://github.com/dinhviethoa/tidy-html5.git"
-
-pushd `dirname $0` > /dev/null
-scriptpath=`pwd`
-popd > /dev/null
-builddir="$scriptpath/../Externals/builds"
-
-#builddir="$HOME/MailCore-Builds/dependencies"
-BUILD_TIMESTAMP=`date +'%Y%m%d%H%M%S'`
-tempbuilddir="$builddir/workdir/$BUILD_TIMESTAMP"
-mkdir -p "$tempbuilddir"
-srcdir="$tempbuilddir/src"
-logdir="$tempbuilddir/log"
-resultdir="$builddir/builds"
-tmpdir="$tempbuilddir/tmp"
-
-mkdir -p "$resultdir"
-mkdir -p "$logdir"
-mkdir -p "$tmpdir"
-mkdir -p "$srcdir"
-
-pushd . >/dev/null
-mkdir -p "$builddir/downloads"
-cd "$builddir/downloads"
-if test -d tidy-html5 ; then
-	cd tidy-html5
-	git pull --rebase
-else
-	git clone $url
-	cd tidy-html5
-fi
-version=`git rev-parse HEAD | cut -c1-10`
-build_version="$version~1"
-
-if test -f "$resultdir/tidy-html5-ios-$build_version.zip" ; then
-	echo install from cache
-	popd >/dev/null
-	rm -rf ../Externals/tidy-html5-ios
-	mkdir -p ../Externals/tmp
-	unzip -q "$resultdir/tidy-html5-ios-$build_version.zip" -d ../Externals/tmp
-	mv "../Externals/tmp/tidy-html5-ios-$build_version/tidy-html5-ios" ../Externals
-  mkdir -p ../Externals/installed
-  ln -sf "$resultdir/tidy-html5-ios-$build_version.zip" ../Externals/installed
-	rm -rf ../Externals/tmp
-	exit 0
-fi
-popd >/dev/null
-
-pushd . >/dev/null
-
-cp -R "$builddir/downloads/tidy-html5" "$srcdir/tidy-html5"
-echo building tidy-html5
-
-cd "$srcdir/tidy-html5/build-mac"
-sdk="iphoneos$sdkversion"
-echo building $sdk
-xcodebuild -project Tidy.xcodeproj -sdk $sdk -target "tidy" -configuration Release SYMROOT="$tmpdir/bin" OBJROOT="$tmpdir/obj" ARCHS="$devicearchs" IPHONEOS_DEPLOYMENT_TARGET="$sdkversion" >/dev/null 2>&1
-if test x$? != x0 ; then
-  echo failed
-  exit 1
-fi
-sdk="iphonesimulator$sdkversion"
-simarchs="i386 x86_64"
-echo building $sdk
-xcodebuild -project Tidy.xcodeproj -sdk $sdk -target "tidy" -configuration Release SYMROOT="$tmpdir/bin" OBJROOT="$tmpdir/obj" ARCHS="$simarchs" IPHONEOS_DEPLOYMENT_TARGET="$sdkversion" >/dev/null 2>&1
-if test x$? != x0 ; then
-  echo failed
-  exit 1
-fi
-echo finished
-
-cd "$tmpdir/bin"
-mkdir -p "tidy-html5-ios-$build_version/tidy-html5-ios"
-mkdir -p "tidy-html5-ios-$build_version/tidy-html5-ios/lib"
-lipo -create Release-iphoneos/libtidy.a \
-  Release-iphonesimulator/libtidy.a \
-  -output "tidy-html5-ios-$build_version/tidy-html5-ios/lib/libtidy.a"
-mv Release-iphoneos/include "tidy-html5-ios-$build_version/tidy-html5-ios"
-zip -qry "$resultdir/tidy-html5-ios-$build_version.zip" "tidy-html5-ios-$build_version"
-rm -f "$resultdir/tidy-html5-ios=latest.zip"
-cd "$resultdir"
-ln -s "tidy-html5-ios-$build_version.zip" "tidy-html5-ios-latest.zip"
-
-echo build of tidy-html5-ios-$build_version done
-
-popd >/dev/null
-
-rm -rf ../Externals/tidy-html5-ios
-mkdir -p ../Externals/tmp
-unzip -q "$resultdir/tidy-html5-ios-$build_version.zip" -d ../Externals/tmp
-mv "../Externals/tmp/tidy-html5-ios-$build_version/tidy-html5-ios" ../Externals
-rm -rf ../Externals/tmp
-
-echo cleaning
-rm -rf "$tempbuilddir"
-echo "$tempbuilddir"
diff --git a/scripts/prepare.sh b/scripts/prepare.sh
deleted file mode 100755
index 6ba0c188..00000000
--- a/scripts/prepare.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/sh
-
-# If this script is run outside of Xcode, prepare both platforms by default
-if [ -z "$SDKROOT" ]; then
-    SDKROOT="MacOSX iPhone"
-fi
-
-if echo "$SDKROOT" | grep -q "MacOSX"; then
-    echo "Preparing Mac"
-    ./prepare-mac.sh
-fi
-if echo "$SDKROOT" | grep -q "iPhone"; then
-    echo "Preparing iOS"
-    ./prepare-ios.sh
-fi