summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2010-04-12 11:12:22 +1000
committerAndrew Tridgell <tridge@samba.org>2010-04-12 11:17:35 +1000
commit98942c8d840745d72f0ef19636752128236a9bbd (patch)
tree6773ac70749925b49890f2573ee7545f23ebb93a
parent9ffd6c0ec339aa6e70543cfecfb2bab93705e603 (diff)
downloadsamba-98942c8d840745d72f0ef19636752128236a9bbd.tar.gz
samba-98942c8d840745d72f0ef19636752128236a9bbd.tar.bz2
samba-98942c8d840745d72f0ef19636752128236a9bbd.zip
build: use a common autogen-waf.sh for all builds
the symlink will get updated with the right target when waf dist is used in each directory
-rwxr-xr-xbuildtools/scripts/autogen-waf.sh27
l---------[-rwxr-xr-x]lib/replace/autogen-waf.sh23
l---------[-rwxr-xr-x]lib/talloc/autogen-waf.sh23
l---------[-rwxr-xr-x]lib/tdb/autogen-waf.sh23
l---------[-rwxr-xr-x]lib/tevent/autogen-waf.sh23
l---------[-rwxr-xr-x]source4/autogen-waf.sh28
l---------[-rwxr-xr-x]source4/lib/ldb/autogen-waf.sh23
7 files changed, 33 insertions, 137 deletions
diff --git a/buildtools/scripts/autogen-waf.sh b/buildtools/scripts/autogen-waf.sh
new file mode 100755
index 0000000000..7a6e94c5ec
--- /dev/null
+++ b/buildtools/scripts/autogen-waf.sh
@@ -0,0 +1,27 @@
+#!/bin/sh
+
+p=`dirname $0`
+
+echo "Setting up for waf build"
+
+echo "Looking for the buildtools directory"
+
+d="buildtools"
+while test \! -d "$p/$d"; do d="../$d"; done
+
+echo "Found buildtools in $p/$d"
+
+echo "Setting up configure"
+rm -f $p/configure $p/include/config*.h*
+sed "s|BUILDTOOLS|$d|g;s|BUILDPATH|$p|g" < "$p/$d/scripts/configure.waf" > $p/configure
+chmod +x $p/configure
+
+echo "Setting up Makefile"
+rm -f $p/makefile $p/Makefile
+sed "s|BUILDTOOLS|$d|g" < "$p/$d/scripts/Makefile.waf" > $p/Makefile
+
+echo "done. Now run $p/configure or $p/configure.developer then make."
+if [ $p != "." ]; then
+ echo "Notice: The build invoke path is not 'source4'! Use make with the parameter"
+ echo "-C <'source4' path>. Example: make -C source4 all"
+fi
diff --git a/lib/replace/autogen-waf.sh b/lib/replace/autogen-waf.sh
index 9cb144afcf..99150f3a28 100755..120000
--- a/lib/replace/autogen-waf.sh
+++ b/lib/replace/autogen-waf.sh
@@ -1,22 +1 @@
-#!/bin/sh
-
-echo "Setting up for waf build"
-
-echo "Looking for the buildtools directory"
-
-d="buildtools"
-while test \! -d $d; do d="../$d"; done
-
-echo "Found buildtools in $d"
-
-echo "Setting up configure"
-rm -f configure
-sed "s|BUILDTOOLS|$d|g" < "$d/scripts/configure.waf" > configure
-chmod +x configure
-
-echo "Setting up makefile"
-# this relies on the fact that make looks for 'makefile' before 'Makefile'
-rm -f makefile
-sed "s|BUILDTOOLS|$d|g" < "$d/scripts/Makefile.waf" > makefile
-
-echo "done. Now run ./configure or ./configure.developer then make"
+../../buildtools/scripts/autogen-waf.sh \ No newline at end of file
diff --git a/lib/talloc/autogen-waf.sh b/lib/talloc/autogen-waf.sh
index 9cb144afcf..99150f3a28 100755..120000
--- a/lib/talloc/autogen-waf.sh
+++ b/lib/talloc/autogen-waf.sh
@@ -1,22 +1 @@
-#!/bin/sh
-
-echo "Setting up for waf build"
-
-echo "Looking for the buildtools directory"
-
-d="buildtools"
-while test \! -d $d; do d="../$d"; done
-
-echo "Found buildtools in $d"
-
-echo "Setting up configure"
-rm -f configure
-sed "s|BUILDTOOLS|$d|g" < "$d/scripts/configure.waf" > configure
-chmod +x configure
-
-echo "Setting up makefile"
-# this relies on the fact that make looks for 'makefile' before 'Makefile'
-rm -f makefile
-sed "s|BUILDTOOLS|$d|g" < "$d/scripts/Makefile.waf" > makefile
-
-echo "done. Now run ./configure or ./configure.developer then make"
+../../buildtools/scripts/autogen-waf.sh \ No newline at end of file
diff --git a/lib/tdb/autogen-waf.sh b/lib/tdb/autogen-waf.sh
index 9cb144afcf..99150f3a28 100755..120000
--- a/lib/tdb/autogen-waf.sh
+++ b/lib/tdb/autogen-waf.sh
@@ -1,22 +1 @@
-#!/bin/sh
-
-echo "Setting up for waf build"
-
-echo "Looking for the buildtools directory"
-
-d="buildtools"
-while test \! -d $d; do d="../$d"; done
-
-echo "Found buildtools in $d"
-
-echo "Setting up configure"
-rm -f configure
-sed "s|BUILDTOOLS|$d|g" < "$d/scripts/configure.waf" > configure
-chmod +x configure
-
-echo "Setting up makefile"
-# this relies on the fact that make looks for 'makefile' before 'Makefile'
-rm -f makefile
-sed "s|BUILDTOOLS|$d|g" < "$d/scripts/Makefile.waf" > makefile
-
-echo "done. Now run ./configure or ./configure.developer then make"
+../../buildtools/scripts/autogen-waf.sh \ No newline at end of file
diff --git a/lib/tevent/autogen-waf.sh b/lib/tevent/autogen-waf.sh
index 9cb144afcf..99150f3a28 100755..120000
--- a/lib/tevent/autogen-waf.sh
+++ b/lib/tevent/autogen-waf.sh
@@ -1,22 +1 @@
-#!/bin/sh
-
-echo "Setting up for waf build"
-
-echo "Looking for the buildtools directory"
-
-d="buildtools"
-while test \! -d $d; do d="../$d"; done
-
-echo "Found buildtools in $d"
-
-echo "Setting up configure"
-rm -f configure
-sed "s|BUILDTOOLS|$d|g" < "$d/scripts/configure.waf" > configure
-chmod +x configure
-
-echo "Setting up makefile"
-# this relies on the fact that make looks for 'makefile' before 'Makefile'
-rm -f makefile
-sed "s|BUILDTOOLS|$d|g" < "$d/scripts/Makefile.waf" > makefile
-
-echo "done. Now run ./configure or ./configure.developer then make"
+../../buildtools/scripts/autogen-waf.sh \ No newline at end of file
diff --git a/source4/autogen-waf.sh b/source4/autogen-waf.sh
index 7a6e94c5ec..153637b1d9 100755..120000
--- a/source4/autogen-waf.sh
+++ b/source4/autogen-waf.sh
@@ -1,27 +1 @@
-#!/bin/sh
-
-p=`dirname $0`
-
-echo "Setting up for waf build"
-
-echo "Looking for the buildtools directory"
-
-d="buildtools"
-while test \! -d "$p/$d"; do d="../$d"; done
-
-echo "Found buildtools in $p/$d"
-
-echo "Setting up configure"
-rm -f $p/configure $p/include/config*.h*
-sed "s|BUILDTOOLS|$d|g;s|BUILDPATH|$p|g" < "$p/$d/scripts/configure.waf" > $p/configure
-chmod +x $p/configure
-
-echo "Setting up Makefile"
-rm -f $p/makefile $p/Makefile
-sed "s|BUILDTOOLS|$d|g" < "$p/$d/scripts/Makefile.waf" > $p/Makefile
-
-echo "done. Now run $p/configure or $p/configure.developer then make."
-if [ $p != "." ]; then
- echo "Notice: The build invoke path is not 'source4'! Use make with the parameter"
- echo "-C <'source4' path>. Example: make -C source4 all"
-fi
+../buildtools/scripts/autogen-waf.sh \ No newline at end of file
diff --git a/source4/lib/ldb/autogen-waf.sh b/source4/lib/ldb/autogen-waf.sh
index 9cb144afcf..672a86b206 100755..120000
--- a/source4/lib/ldb/autogen-waf.sh
+++ b/source4/lib/ldb/autogen-waf.sh
@@ -1,22 +1 @@
-#!/bin/sh
-
-echo "Setting up for waf build"
-
-echo "Looking for the buildtools directory"
-
-d="buildtools"
-while test \! -d $d; do d="../$d"; done
-
-echo "Found buildtools in $d"
-
-echo "Setting up configure"
-rm -f configure
-sed "s|BUILDTOOLS|$d|g" < "$d/scripts/configure.waf" > configure
-chmod +x configure
-
-echo "Setting up makefile"
-# this relies on the fact that make looks for 'makefile' before 'Makefile'
-rm -f makefile
-sed "s|BUILDTOOLS|$d|g" < "$d/scripts/Makefile.waf" > makefile
-
-echo "done. Now run ./configure or ./configure.developer then make"
+../../../buildtools/scripts/autogen-waf.sh \ No newline at end of file