Improved build scripts

10 files changed, 53 insertions, 28 deletions

diff --git a/scripts/get-prebuilt.sh b/scripts/get-prebuilt.sh
index a059bae3..7d02e3ff 100755
--- a/scripts/get-prebuilt.sh
+++ b/scripts/get-prebuilt.sh
@@ -1,6 +1,7 @@
 #!/bin/sh
 
-url_prefix="https://github.com/MailCore/mailcore2-deps/raw/master"
+url="https://github.com/MailCore/mailcore2-deps"
+url_prefix="$url/raw/master"
 
 if test x$1 != xskipprebuilt ; then
   file_timestamp=0
@@ -22,21 +23,28 @@ if test x$1 != xskipprebuilt ; then
     fi
     
     mv prebuilt.list.tmp prebuilt.list
-  fi
   
-  if test -f prebuilt.list ; then
-    files=`cat prebuilt.list`
-    mkdir -p ../Externals/builds/builds
-    mkdir -p ../Externals/prebuilt/mailcore2-deps
-    pushd ../Externals/prebuilt/mailcore2-deps
-    rm -rf .git
-    for filename in $files ; do
-      if test ! -f $filename ; then
-        echo get $filename
-        curl -L -O "$url_prefix/$filename"
+    if test -f prebuilt.list ; then
+      files=`cat prebuilt.list`
+      mkdir -p ../Externals/builds/builds
+      mkdir -p ../Externals/prebuilt/mailcore2-deps
+      pushd ../Externals/prebuilt
+      rm -rf .git
+      if test -d mailcore2-deps ; then
+        cd mailcore2-deps
+        git pull --rebase
+        cd ..
+      else
+        git clone --depth 1 "$url"
       fi
-    done
-    rsync --exclude=.git -av ./ ../../builds/builds/
-    popd
-  fi
+      # for filename in $files ; do
+        #   if test ! -f $filename ; then
+        #     echo get $filename
+        #     curl -L -O "$url_prefix/$filename"
+        #   fi
+        # done
+        rsync --exclude=.git -av mailcore2-deps/ ../builds/builds/
+        popd
+      fi
+    fi
 fi
diff --git a/scripts/prepare-ctemplate-ios.sh b/scripts/prepare-ctemplate-ios.sh
index 240dc5d9..512bdc9e 100755
--- a/scripts/prepare-ctemplate-ios.sh
+++ b/scripts/prepare-ctemplate-ios.sh
@@ -42,6 +42,8 @@ if test -f "$resultdir/ctemplate-ios-$version.zip" ; then
 	mkdir -p ../Externals/tmp
 	unzip -q "$resultdir/ctemplate-ios-$version.zip" -d ../Externals/tmp
 	mv "../Externals/tmp/ctemplate-ios-$version/ctemplate-ios" ../Externals
+  mkdir -p ../Externals/installed
+  ln -s "$resultdir/ctemplate-ios-$version.zip" ../Externals/installed
 	rm -rf ../Externals/tmp
 	exit 0
 fi
diff --git a/scripts/prepare-ctemplate-macos.sh b/scripts/prepare-ctemplate-macos.sh
index bea782f9..43b0e8fa 100755
--- a/scripts/prepare-ctemplate-macos.sh
+++ b/scripts/prepare-ctemplate-macos.sh
@@ -48,6 +48,8 @@ if test -f "$resultdir/ctemplate-$version.zip" ; then
 	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 -s "$resultdir/ctemplate-$version.zip" ../Externals/installed
 	rm -rf ../Externals/tmp
 	exit 0
 fi
diff --git a/scripts/prepare-icu4c-ios.sh b/scripts/prepare-icu4c-ios.sh
index 9d50d985..a915df76 100755
--- a/scripts/prepare-icu4c-ios.sh
+++ b/scripts/prepare-icu4c-ios.sh
@@ -27,6 +27,8 @@ if test -f "$resultdir/icu4c-ios-$version.zip" ; then
 	mkdir -p ../Externals/tmp
 	unzip -q "$resultdir/icu4c-ios-$version.zip" -d ../Externals/tmp
 	mv "../Externals/tmp/icu4c-ios-$version/icu4c-ios" ../Externals
+  mkdir -p ../Externals/installed
+  ln -s "$resultdir/icu4c-ios-$version.zip" ../Externals/installed
 	rm -rf ../Externals/tmp
 	exit 0
 fi
diff --git a/scripts/prepare-icu4c-macos.sh b/scripts/prepare-icu4c-macos.sh
index 903d2fa8..dcc6421a 100755
--- a/scripts/prepare-icu4c-macos.sh
+++ b/scripts/prepare-icu4c-macos.sh
@@ -32,6 +32,8 @@ if test -f "$resultdir/icu4c-$version.zip" ; then
 	mkdir -p ../Externals/tmp
 	unzip -q "$resultdir/icu4c-$version.zip" -d ../Externals/tmp
 	mv "../Externals/tmp/icu4c-$version/icu4c" ../Externals
+  mkdir -p ../Externals/installed
+  ln -s "$resultdir/icu4c-$version.zip" ../Externals/installed
 	rm -rf ../Externals/tmp
 	exit 0
 fi
diff --git a/scripts/prepare-ios.sh b/scripts/prepare-ios.sh
index 44ccb2e0..49bac30e 100755
--- a/scripts/prepare-ios.sh
+++ b/scripts/prepare-ios.sh
@@ -1,15 +1,15 @@
 #!/bin/sh
 ./get-prebuilt.sh
 
-if test ! -d ../Externals/tidy-html5-ios ; then
+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
-fi
-if test ! -d ../Externals/icu4c-ios ; then
   ./prepare-icu4c-ios.sh
-fi
-if test ! -d ../Externals/libetpan-ios ; then
   ./prepare-libetpan-ios.sh
-fi
-if test ! -d ../Externals/ctemplate-ios ; then
   ./prepare-ctemplate-ios.sh
 fi
diff --git a/scripts/prepare-libetpan-ios.sh b/scripts/prepare-libetpan-ios.sh
index 5ab8a8a6..d416df67 100755
--- a/scripts/prepare-libetpan-ios.sh
+++ b/scripts/prepare-libetpan-ios.sh
@@ -46,6 +46,9 @@ if test -f "$resultdir/libetpan-ios-$version.zip" ; then
 	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 -s "$resultdir/libetpan-ios-$version.zip" ../Externals/installed
+  ln -s "$resultdir/libsasl-ios-$version.zip" ../Externals/installed
 	rm -rf ../Externals/tmp
 	exit 0
 fi
diff --git a/scripts/prepare-libetpan-macos.sh b/scripts/prepare-libetpan-macos.sh
index 1972bf84..555d47e5 100755
--- a/scripts/prepare-libetpan-macos.sh
+++ b/scripts/prepare-libetpan-macos.sh
@@ -42,6 +42,8 @@ if test -f "$resultdir/libetpan-$version.zip" ; then
 	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 -s "$resultdir/libetpan-$version.zip" ../Externals/installed
 	rm -rf ../Externals/tmp
 	exit 0
 fi
diff --git a/scripts/prepare-mac.sh b/scripts/prepare-mac.sh
index f29dfa04..2b9fdca8 100755
--- a/scripts/prepare-mac.sh
+++ b/scripts/prepare-mac.sh
@@ -1,13 +1,15 @@
 #!/bin/sh
 ./get-prebuilt.sh
 
-if test ! -d ../Externals/icu4c ; then
+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
-fi
-if test ! -d ../Externals/libetpan ; then
   ./prepare-libetpan-macos.sh
-fi
-if test ! -d ../Externals/ctemplate ; then
   ./prepare-ctemplate-macos.sh
 fi
 
diff --git a/scripts/prepare-tidy-ios.sh b/scripts/prepare-tidy-ios.sh
index 55435e2b..e24bb678 100755
--- a/scripts/prepare-tidy-ios.sh
+++ b/scripts/prepare-tidy-ios.sh
@@ -41,6 +41,8 @@ if test -f "$resultdir/tidy-html5-ios-$version.zip" ; then
 	mkdir -p ../Externals/tmp
 	unzip -q "$resultdir/tidy-html5-ios-$version.zip" -d ../Externals/tmp
 	mv "../Externals/tmp/tidy-html5-ios-$version/tidy-html5-ios" ../Externals
+  mkdir -p ../Externals/installed
+  ln -s "$resultdir/tidy-html5-ios-$version.zip" ../Externals/installed
 	rm -rf ../Externals/tmp
 	exit 0
 fi