The branch, master has been updated
via f99c009 replace: Build using waf by default.
via 4f22cc7 talloc: Switch over to using waf as the default build
system for the standalone build.
from 3deece5 s4: Remove the old perl/m4/make/mk-based build system.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit f99c009b61c9e8b5968a9b074546408ce93db73c
Author: Jelmer Vernooij <[email protected]>
Date: Sun Oct 31 02:44:32 2010 +0100
replace: Build using waf by default.
Autobuild-User: Jelmer Vernooij <[email protected]>
Autobuild-Date: Sun Oct 31 02:45:21 UTC 2010 on sn-devel-104
commit 4f22cc7a283d21000e8ffa0c39746aa9f824f49e
Author: Jelmer Vernooij <[email protected]>
Date: Sun Oct 31 02:31:59 2010 +0100
talloc: Switch over to using waf as the default build system for the
standalone build.
-----------------------------------------------------------------------
Summary of changes:
.gitignore | 2 --
.../scripts/Makefile.waf => lib/replace/Makefile | 8 +++++---
lib/replace/{autogen.sh => autogen-autotools.sh} | 0
lib/replace/autogen-waf.sh | 12 +++++++++++-
lib/replace/autogen.sh | 14 +-------------
{source4 => lib/replace}/configure | 2 +-
.../scripts/Makefile.waf => lib/talloc/Makefile | 8 +++++---
lib/talloc/{autogen.sh => autogen-autotools.sh} | 0
lib/talloc/autogen-waf.sh | 12 +++++++++++-
lib/talloc/autogen.sh | 15 +--------------
{source4 => lib/talloc}/configure | 2 +-
11 files changed, 36 insertions(+), 39 deletions(-)
copy buildtools/scripts/Makefile.waf => lib/replace/Makefile (75%)
copy lib/replace/{autogen.sh => autogen-autotools.sh} (100%)
mode change 120000 => 100755 lib/replace/autogen-waf.sh
mode change 100755 => 120000 lib/replace/autogen.sh
copy {source4 => lib/replace}/configure (88%)
copy buildtools/scripts/Makefile.waf => lib/talloc/Makefile (75%)
copy lib/talloc/{autogen.sh => autogen-autotools.sh} (100%)
mode change 120000 => 100755 lib/talloc/autogen-waf.sh
mode change 100755 => 120000 lib/talloc/autogen.sh
copy {source4 => lib/talloc}/configure (88%)
Changeset truncated at 500 lines:
diff --git a/.gitignore b/.gitignore
index 49b24a0..3c521a2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,8 +15,6 @@ config.log
config.status
source3/configure
source3/Makefile
-lib/talloc/configure
-lib/talloc/Makefile
lib/tdb/configure
lib/tdb/Makefile
*.d
diff --git a/buildtools/scripts/Makefile.waf b/lib/replace/Makefile
similarity index 75%
copy from buildtools/scripts/Makefile.waf
copy to lib/replace/Makefile
index c07f859..2cc2819 100644
--- a/buildtools/scripts/Makefile.waf
+++ b/lib/replace/Makefile
@@ -1,6 +1,8 @@
# simple makefile wrapper to run waf
-WAF=WAF_MAKE=1 BUILDTOOLS/bin/waf
+WAFPATH:=$(shell PATH=../../buildtools/bin:buildtools/bin:$(PATH) which waf)
+
+WAF=WAF_MAKE=1 $(WAFPATH)
all:
$(WAF) build
@@ -60,8 +62,8 @@ bin/%:: FORCE
$(WAF) --targets=`basename $...@`
FORCE:
-configure: autogen-waf.sh BUILDTOOLS/scripts/configure.waf
+configure: autogen-waf.sh ../../buildtools/scripts/configure.waf
./autogen-waf.sh
-Makefile: autogen-waf.sh configure BUILDTOOLS/scripts/Makefile.waf
+Makefile: autogen-waf.sh configure ../../buildtools/scripts/Makefile.waf
./autogen-waf.sh
diff --git a/lib/replace/autogen.sh b/lib/replace/autogen-autotools.sh
similarity index 100%
copy from lib/replace/autogen.sh
copy to lib/replace/autogen-autotools.sh
diff --git a/lib/replace/autogen-waf.sh b/lib/replace/autogen-waf.sh
deleted file mode 120000
index 99150f3..0000000
--- a/lib/replace/autogen-waf.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../buildtools/scripts/autogen-waf.sh
\ No newline at end of file
diff --git a/lib/replace/autogen-waf.sh b/lib/replace/autogen-waf.sh
new file mode 100755
index 0000000..ee95847
--- /dev/null
+++ b/lib/replace/autogen-waf.sh
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+p=`dirname $0`
+
+echo "Setting up for waf build"
+
+echo "done. Now run $p/configure or $p/configure.developer then make."
+if [ $p != "." ]; then
+ echo "Notice: The build invoke path is not the main directory! Use make
with the parameter"
+ echo "-C $p. Example: make -C $p all"
+fi
diff --git a/lib/replace/autogen.sh b/lib/replace/autogen.sh
deleted file mode 100755
index d46a427..0000000
--- a/lib/replace/autogen.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/sh
-
-rm -rf autom4te.cache
-rm -f configure config.h.in
-
-autoheader || exit 1
-autoconf || exit 1
-
-rm -rf autom4te.cache
-
-echo "Now run ./configure and then make."
-exit 0
-
diff --git a/lib/replace/autogen.sh b/lib/replace/autogen.sh
new file mode 120000
index 0000000..a229cc9
--- /dev/null
+++ b/lib/replace/autogen.sh
@@ -0,0 +1 @@
+autogen-waf.sh
\ No newline at end of file
diff --git a/source4/configure b/lib/replace/configure
similarity index 88%
copy from source4/configure
copy to lib/replace/configure
index fbd81fe..2d4aec7 100755
--- a/source4/configure
+++ b/lib/replace/configure
@@ -2,7 +2,7 @@
PREVPATH=`dirname $0`
-WAF=../buildtools/bin/waf
+WAF=../../buildtools/bin/waf
# using JOBS=1 gives maximum compatibility with
# systems like AIX which have broken threading in python
diff --git a/buildtools/scripts/Makefile.waf b/lib/talloc/Makefile
similarity index 75%
copy from buildtools/scripts/Makefile.waf
copy to lib/talloc/Makefile
index c07f859..2cc2819 100644
--- a/buildtools/scripts/Makefile.waf
+++ b/lib/talloc/Makefile
@@ -1,6 +1,8 @@
# simple makefile wrapper to run waf
-WAF=WAF_MAKE=1 BUILDTOOLS/bin/waf
+WAFPATH:=$(shell PATH=../../buildtools/bin:buildtools/bin:$(PATH) which waf)
+
+WAF=WAF_MAKE=1 $(WAFPATH)
all:
$(WAF) build
@@ -60,8 +62,8 @@ bin/%:: FORCE
$(WAF) --targets=`basename $...@`
FORCE:
-configure: autogen-waf.sh BUILDTOOLS/scripts/configure.waf
+configure: autogen-waf.sh ../../buildtools/scripts/configure.waf
./autogen-waf.sh
-Makefile: autogen-waf.sh configure BUILDTOOLS/scripts/Makefile.waf
+Makefile: autogen-waf.sh configure ../../buildtools/scripts/Makefile.waf
./autogen-waf.sh
diff --git a/lib/talloc/autogen.sh b/lib/talloc/autogen-autotools.sh
similarity index 100%
copy from lib/talloc/autogen.sh
copy to lib/talloc/autogen-autotools.sh
diff --git a/lib/talloc/autogen-waf.sh b/lib/talloc/autogen-waf.sh
deleted file mode 120000
index 99150f3..0000000
--- a/lib/talloc/autogen-waf.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../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
new file mode 100755
index 0000000..ee95847
--- /dev/null
+++ b/lib/talloc/autogen-waf.sh
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+p=`dirname $0`
+
+echo "Setting up for waf build"
+
+echo "done. Now run $p/configure or $p/configure.developer then make."
+if [ $p != "." ]; then
+ echo "Notice: The build invoke path is not the main directory! Use make
with the parameter"
+ echo "-C $p. Example: make -C $p all"
+fi
diff --git a/lib/talloc/autogen.sh b/lib/talloc/autogen.sh
deleted file mode 100755
index bf84eee..0000000
--- a/lib/talloc/autogen.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/sh
-
-rm -rf autom4te.cache
-rm -f configure config.h.in
-
-IPATHS="-I libreplace -I lib/replace -I ../libreplace -I ../replace"
-autoconf $IPATHS || exit 1
-autoheader $IPATHS || exit 1
-
-rm -rf autom4te.cache
-
-echo "Now run ./configure and then make."
-exit 0
-
diff --git a/lib/talloc/autogen.sh b/lib/talloc/autogen.sh
new file mode 120000
index 0000000..a229cc9
--- /dev/null
+++ b/lib/talloc/autogen.sh
@@ -0,0 +1 @@
+autogen-waf.sh
\ No newline at end of file
diff --git a/source4/configure b/lib/talloc/configure
similarity index 88%
copy from source4/configure
copy to lib/talloc/configure
index fbd81fe..2d4aec7 100755
--- a/source4/configure
+++ b/lib/talloc/configure
@@ -2,7 +2,7 @@
PREVPATH=`dirname $0`
-WAF=../buildtools/bin/waf
+WAF=../../buildtools/bin/waf
# using JOBS=1 gives maximum compatibility with
# systems like AIX which have broken threading in python
--
Samba Shared Repository
