Merge update-waf.sh into update-external.sh

Signed-off-by: Jelmer Vernooij <jelmer@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>

diff --git a/buildtools/update-waf.sh b/buildtools/update-waf.sh
deleted file mode 100755 (executable)
index 277111f..0000000
--- a/buildtools/update-waf.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/sh
-# Update our copy of waf
-
-TARGETDIR="`dirname $0`"
-WORKDIR="`mktemp -d -t update-waf-XXXXXX`"
-
-mkdir -p "$WORKDIR"
-
-git clone https://code.google.com/p/waf.waf15/ "$WORKDIR"
-
-rsync -C -avz --delete "$WORKDIR/wafadmin/" "$TARGETDIR/wafadmin/"
-
-rm -rf "$WORKDIR"

diff --git a/lib/update-external.sh b/lib/update-external.sh
index b6b5d1169b9ae5eddfefbd6a6a51f925d4a70e8c..7a22c36cecdf72dada38064eb11689720301c714 100755 (executable)
--- a/lib/update-external.sh
+++ b/lib/update-external.sh
@@ -28,4 +28,9 @@ hg clone https://bitbucket.org/micktwomey/pyiso8601 "$WORKDIR/pyiso8601"
 rm -rf "$WORKDIR/pyiso8601/.hg"
 rsync -avz --delete "$WORKDIR/pyiso8601/" "$THIRD_PARTY_DIR/pyiso8601/"
 
+echo "Updating waf..."
+git clone git://git.samba.org/third_party/waf.waf15/ "$WORKDIR/waf"
+rm -rf "$WORKDIR/waf/.git"
+rsync -C -avz --delete "$WORKDIR/waf/" "$THIRD_PARTY_DIR/waf/"
+
 rm -rf "$WORKDIR"