From 98942c8d840745d72f0ef19636752128236a9bbd Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Mon, 12 Apr 2010 11:12:22 +1000 Subject: 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 --- buildtools/scripts/autogen-waf.sh | 27 +++++++++++++++++++++++++++ lib/replace/autogen-waf.sh | 23 +---------------------- lib/talloc/autogen-waf.sh | 23 +---------------------- lib/tdb/autogen-waf.sh | 23 +---------------------- lib/tevent/autogen-waf.sh | 23 +---------------------- source4/autogen-waf.sh | 28 +--------------------------- source4/lib/ldb/autogen-waf.sh | 23 +---------------------- 7 files changed, 33 insertions(+), 137 deletions(-) create mode 100755 buildtools/scripts/autogen-waf.sh mode change 100755 => 120000 lib/replace/autogen-waf.sh mode change 100755 => 120000 lib/talloc/autogen-waf.sh mode change 100755 => 120000 lib/tdb/autogen-waf.sh mode change 100755 => 120000 lib/tevent/autogen-waf.sh mode change 100755 => 120000 source4/autogen-waf.sh mode change 100755 => 120000 source4/lib/ldb/autogen-waf.sh 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 deleted file mode 100755 index 9cb144afcf..0000000000 --- a/lib/replace/autogen-waf.sh +++ /dev/null @@ -1,22 +0,0 @@ -#!/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" diff --git a/lib/replace/autogen-waf.sh b/lib/replace/autogen-waf.sh new file mode 120000 index 0000000000..99150f3a28 --- /dev/null +++ b/lib/replace/autogen-waf.sh @@ -0,0 +1 @@ +../../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 deleted file mode 100755 index 9cb144afcf..0000000000 --- a/lib/talloc/autogen-waf.sh +++ /dev/null @@ -1,22 +0,0 @@ -#!/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" diff --git a/lib/talloc/autogen-waf.sh b/lib/talloc/autogen-waf.sh new file mode 120000 index 0000000000..99150f3a28 --- /dev/null +++ b/lib/talloc/autogen-waf.sh @@ -0,0 +1 @@ +../../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 deleted file mode 100755 index 9cb144afcf..0000000000 --- a/lib/tdb/autogen-waf.sh +++ /dev/null @@ -1,22 +0,0 @@ -#!/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" diff --git a/lib/tdb/autogen-waf.sh b/lib/tdb/autogen-waf.sh new file mode 120000 index 0000000000..99150f3a28 --- /dev/null +++ b/lib/tdb/autogen-waf.sh @@ -0,0 +1 @@ +../../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 deleted file mode 100755 index 9cb144afcf..0000000000 --- a/lib/tevent/autogen-waf.sh +++ /dev/null @@ -1,22 +0,0 @@ -#!/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" diff --git a/lib/tevent/autogen-waf.sh b/lib/tevent/autogen-waf.sh new file mode 120000 index 0000000000..99150f3a28 --- /dev/null +++ b/lib/tevent/autogen-waf.sh @@ -0,0 +1 @@ +../../buildtools/scripts/autogen-waf.sh \ No newline at end of file diff --git a/source4/autogen-waf.sh b/source4/autogen-waf.sh deleted file mode 100755 index 7a6e94c5ec..0000000000 --- a/source4/autogen-waf.sh +++ /dev/null @@ -1,27 +0,0 @@ -#!/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/source4/autogen-waf.sh b/source4/autogen-waf.sh new file mode 120000 index 0000000000..153637b1d9 --- /dev/null +++ b/source4/autogen-waf.sh @@ -0,0 +1 @@ +../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 deleted file mode 100755 index 9cb144afcf..0000000000 --- a/source4/lib/ldb/autogen-waf.sh +++ /dev/null @@ -1,22 +0,0 @@ -#!/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" diff --git a/source4/lib/ldb/autogen-waf.sh b/source4/lib/ldb/autogen-waf.sh new file mode 120000 index 0000000000..672a86b206 --- /dev/null +++ b/source4/lib/ldb/autogen-waf.sh @@ -0,0 +1 @@ +../../../buildtools/scripts/autogen-waf.sh \ No newline at end of file -- cgit