diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2015-03-25 11:13:41 +0000 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2015-03-26 22:47:22 +0100 |
| commit | 483bb682a87b10b1faebb2eda40ed3bed2d7a0df (patch) | |
| tree | e1fc25099e74d6d09b6b6c126d5c4766dce871a2 | |
| parent | 90ec37cf90035576bcab4d7b36214c9c19a52d24 (diff) | |
| download | samba-483bb682a87b10b1faebb2eda40ed3bed2d7a0df.tar.gz | |
Merge update-waf.sh into update-external.sh
Signed-off-by: Jelmer Vernooij <jelmer@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
| -rwxr-xr-x | buildtools/update-waf.sh | 13 | ||||
| -rwxr-xr-x | lib/update-external.sh | 5 |
2 files changed, 5 insertions, 13 deletions
diff --git a/buildtools/update-waf.sh b/buildtools/update-waf.sh deleted file mode 100755 index 277111feb49..00000000000 --- 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 b6b5d1169b9..7a22c36cecd 100755 --- 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" |