[SCM] Samba Shared Repository - branch master updated
Andrew Tridgell
tridge at samba.org
Sun Feb 6 21:50:02 MST 2011
The branch, master has been updated
via 4d3de16 s4-build: fixed uses of os.path.relpath()
via 2e520ca build: removed unused build scripts
via 8b8caac build: removed the old autogen.sh and autogen-waf.sh scripts
via 9796f73 build: fixed error message for incorrect waf version
via a8a5072 autobuild: lib/replace doesn't need autogen.sh
via a20ce62 s3-torture: switch source3 to using top level samba4 build for smbtorture
from e196e526 s4-build: remove a bunch of unused build scripts
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 4d3de16b8b9e69408582ea9aa995b44b7a1e83f4
Author: Andrew Tridgell <tridge at samba.org>
Date: Mon Feb 7 15:03:26 2011 +1100
s4-build: fixed uses of os.path.relpath()
these should be os_path_relpath() to support older python versions.
This should fix the build on FreeBSD 7.2
Pair-Programmed-With: Andrew Bartlett <abartlet at samba.org>
Autobuild-User: Andrew Tridgell <tridge at samba.org>
Autobuild-Date: Mon Feb 7 05:49:58 CET 2011 on sn-devel-104
commit 2e520ca91180920e4c8b71be4eaa7fabb56d2a12
Author: Andrew Tridgell <tridge at samba.org>
Date: Mon Feb 7 14:55:18 2011 +1100
build: removed unused build scripts
each library has its own configure/Makefile now
Pair-Programmed-With: Andrew Bartlett <abartlet at samba.org>
commit 8b8caac6d0ac980e59bc5bcbfb06502deebb9f42
Author: Andrew Tridgell <tridge at samba.org>
Date: Mon Feb 7 14:50:30 2011 +1100
build: removed the old autogen.sh and autogen-waf.sh scripts
for the builds that use waf only, these are no longer needed and just
cause confusion
Pair-Programmed-With: Andrew Bartlett <abartlet at samba.org>
commit 9796f7398bb216d2bf2c384d0d3cbc7c140b8160
Author: Andrew Tridgell <tridge at samba.org>
Date: Mon Feb 7 14:43:52 2011 +1100
build: fixed error message for incorrect waf version
just need configure now
Pair-Programmed-With: Andrew Bartlett <abartlet at samba.org>
commit a8a507222c4aee4ef526cd7bd712d4b0d05d1fa4
Author: Andrew Tridgell <tridge at samba.org>
Date: Mon Feb 7 14:42:09 2011 +1100
autobuild: lib/replace doesn't need autogen.sh
Pair-Programmed-With: Andrew Bartlett <abartlet at samba.org>
commit a20ce625a29d66fa7747236bc5e5c302638a69ef
Author: Andrew Tridgell <tridge at samba.org>
Date: Mon Feb 7 13:57:57 2011 +1100
s3-torture: switch source3 to using top level samba4 build for smbtorture
this is in preparation for removing the source4/ build
Pair-Programmed-With: Andrew Bartlett <abartlet at samba.org>
-----------------------------------------------------------------------
Summary of changes:
buildtools/scripts/Makefile.waf | 72 -------------------------------------
buildtools/scripts/autogen-waf.sh | 27 --------------
buildtools/scripts/configure.waf | 14 -------
buildtools/wafsamba/samba_dist.py | 4 +-
buildtools/wafsamba/wafsamba.py | 5 +--
lib/replace/autogen-waf.sh | 11 ------
lib/replace/autogen.sh | 1 -
lib/talloc/autogen.sh | 11 ------
lib/tdb/autogen.sh | 11 ------
lib/tevent/autogen-waf.sh | 11 ------
lib/tevent/autogen.sh | 1 -
script/autobuild.py | 3 +-
source3/Makefile.in | 12 +++---
source4/autogen-waf.sh | 11 ------
source4/autogen.sh | 1 -
source4/dynconfig/wscript | 4 +-
source4/lib/ldb/autogen-waf.sh | 11 ------
source4/lib/ldb/autogen.sh | 1 -
18 files changed, 13 insertions(+), 198 deletions(-)
delete mode 100644 buildtools/scripts/Makefile.waf
delete mode 100755 buildtools/scripts/autogen-waf.sh
delete mode 100755 buildtools/scripts/configure.waf
delete mode 100755 lib/replace/autogen-waf.sh
delete mode 120000 lib/replace/autogen.sh
delete mode 100755 lib/talloc/autogen.sh
delete mode 100755 lib/tdb/autogen.sh
delete mode 100755 lib/tevent/autogen-waf.sh
delete mode 120000 lib/tevent/autogen.sh
delete mode 100755 source4/autogen-waf.sh
delete mode 120000 source4/autogen.sh
delete mode 100755 source4/lib/ldb/autogen-waf.sh
delete mode 120000 source4/lib/ldb/autogen.sh
Changeset truncated at 500 lines:
diff --git a/buildtools/scripts/Makefile.waf b/buildtools/scripts/Makefile.waf
deleted file mode 100644
index 716ab93..0000000
--- a/buildtools/scripts/Makefile.waf
+++ /dev/null
@@ -1,72 +0,0 @@
-# simple makefile wrapper to run waf
-
-WAF_BINARY=BUILDTOOLS/bin/waf
-WAF=WAF_MAKE=1 $(WAF_BINARY)
-
-all:
- $(WAF) build
-
-install:
- $(WAF) install
-
-uninstall:
- $(WAF) uninstall
-
-test:
- $(WAF) test $(TEST_OPTIONS)
-
-help:
- @echo NOTE: to run extended waf options use $(WAF_BINARY) or modify your PATH
- $(WAF) --help
-
-testenv:
- $(WAF) test --testenv $(TEST_OPTIONS)
-
-quicktest:
- $(WAF) test --quick $(TEST_OPTIONS)
-
-dist:
- $(WAF) dist
-
-distcheck:
- $(WAF) distcheck
-
-clean:
- $(WAF) clean
-
-distclean:
- $(WAF) distclean
-
-reconfigure: configure
- $(WAF) reconfigure
-
-show_waf_options:
- $(WAF) --help
-
-# some compatibility make targets
-everything: all
-
-testsuite: all
-
-check: test
-
-torture: all
-
-# this should do an install as well, once install is finished
-installcheck: test
-
-etags:
- $(WAF) etags
-
-ctags:
- $(WAF) ctags
-
-bin/%:: FORCE
- $(WAF) --targets=`basename $@`
-FORCE:
-
-configure: autogen-waf.sh BUILDTOOLS/scripts/configure.waf
- ./autogen-waf.sh
-
-Makefile: autogen-waf.sh configure BUILDTOOLS/scripts/Makefile.waf
- ./autogen-waf.sh
diff --git a/buildtools/scripts/autogen-waf.sh b/buildtools/scripts/autogen-waf.sh
deleted file mode 100755
index 7a6e94c..0000000
--- a/buildtools/scripts/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/buildtools/scripts/configure.waf b/buildtools/scripts/configure.waf
deleted file mode 100755
index a7d8d1d..0000000
--- a/buildtools/scripts/configure.waf
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/sh
-
-PREVPATH=`dirname $0`
-
-WAF=BUILDTOOLS/bin/waf
-
-# using JOBS=1 gives maximum compatibility with
-# systems like AIX which have broken threading in python
-JOBS=1
-export JOBS
-
-cd BUILDPATH || exit 1
-$WAF configure "$@" || exit 1
-cd $PREVPATH
diff --git a/buildtools/wafsamba/samba_dist.py b/buildtools/wafsamba/samba_dist.py
index d2be291..a11a37c 100644
--- a/buildtools/wafsamba/samba_dist.py
+++ b/buildtools/wafsamba/samba_dist.py
@@ -80,14 +80,14 @@ def vcs_dir_contents(path):
while repo != "/":
if os.path.isdir(os.path.join(repo, ".git")):
ls_files_cmd = [ 'git', 'ls-files', '--full-name',
- os.path.relpath(path, repo) ]
+ os_path_relpath(path, repo) ]
cwd = None
env = dict(os.environ)
env["GIT_DIR"] = os.path.join(repo, ".git")
break
elif os.path.isdir(os.path.join(repo, ".bzr")):
ls_files_cmd = [ 'bzr', 'ls', '--recursive', '--versioned',
- os.path.relpath(path, repo)]
+ os_path_relpath(path, repo)]
cwd = repo
env = None
break
diff --git a/buildtools/wafsamba/wafsamba.py b/buildtools/wafsamba/wafsamba.py
index dcf7198..0949949 100644
--- a/buildtools/wafsamba/wafsamba.py
+++ b/buildtools/wafsamba/wafsamba.py
@@ -46,9 +46,8 @@ Please use the version of waf that comes with Samba, not
a system installed version. See http://wiki.samba.org/index.php/Waf
for details.
-Alternatively, please use ./autogen-waf.sh, and then
-run ./configure and make as usual. That will call the right version of waf.
-''')
+Alternatively, please run ./configure and make as usual. That will
+call the right version of waf.''')
sys.exit(1)
diff --git a/lib/replace/autogen-waf.sh b/lib/replace/autogen-waf.sh
deleted file mode 100755
index ee95847..0000000
--- a/lib/replace/autogen-waf.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/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 120000
index a229cc9..0000000
--- a/lib/replace/autogen.sh
+++ /dev/null
@@ -1 +0,0 @@
-autogen-waf.sh
\ No newline at end of file
diff --git a/lib/talloc/autogen.sh b/lib/talloc/autogen.sh
deleted file mode 100755
index 3005239..0000000
--- a/lib/talloc/autogen.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/sh
-
-p=`dirname $0`
-
-echo "Setting up for waf build"
-
-echo "done. Now run $p/configure 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/tdb/autogen.sh b/lib/tdb/autogen.sh
deleted file mode 100755
index 3005239..0000000
--- a/lib/tdb/autogen.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/sh
-
-p=`dirname $0`
-
-echo "Setting up for waf build"
-
-echo "done. Now run $p/configure 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/tevent/autogen-waf.sh b/lib/tevent/autogen-waf.sh
deleted file mode 100755
index 3005239..0000000
--- a/lib/tevent/autogen-waf.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/sh
-
-p=`dirname $0`
-
-echo "Setting up for waf build"
-
-echo "done. Now run $p/configure 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/tevent/autogen.sh b/lib/tevent/autogen.sh
deleted file mode 120000
index a229cc9..0000000
--- a/lib/tevent/autogen.sh
+++ /dev/null
@@ -1 +0,0 @@
-autogen-waf.sh
\ No newline at end of file
diff --git a/script/autobuild.py b/script/autobuild.py
index efeb797..6c7b4c7 100755
--- a/script/autobuild.py
+++ b/script/autobuild.py
@@ -75,8 +75,7 @@ tasks = {
("distcheck", "make distcheck", "text/plain"),
("clean", "make clean", "text/plain") ],
- "replace" : [ ("autogen", "./autogen-waf.sh", "text/plain"),
- ("configure", "./configure --enable-developer -C ${PREFIX}", "text/plain"),
+ "replace" : [ ("configure", "./configure --enable-developer -C ${PREFIX}", "text/plain"),
("make", "make -j", "text/plain"),
("install", "make install", "text/plain"),
("test", "make test", "text/plain"),
diff --git a/source3/Makefile.in b/source3/Makefile.in
index 8e36b57..7ea24fb 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -3474,24 +3474,24 @@ libnetapi_examples: libnetapi
clean_libnetapi_examples:
$(MAKE) -C lib/netapi/examples clean
-WAF_BINARY=../buildtools/bin/waf
+WAF_BINARY=buildtools/bin/waf
WAF=$(WAF_BINARY)
WAF_BUILD=WAF_MAKE=1 $(WAF_BINARY)
SAMBA4_BINARIES="smbtorture,ndrdump"
samba4-configure:
- @(cd ../source4 && \
+ @(cd .. && \
CFLAGS='' $(WAF) reconfigure || \
CFLAGS='' $(WAF) configure --enable-developer --nonshared-binary=$(SAMBA4_BINARIES) --enable-auto-reconfigure )
.PHONY: samba4-configure
bin/smbtorture4: $(BINARY_PREREQS) samba4-configure
- cd ../source4 && $(WAF_BUILD) --targets=smbtorture
- cp ../source4/bin/smbtorture bin/smbtorture4
+ cd .. && $(WAF_BUILD) --targets=smbtorture
+ cp ../bin/smbtorture bin/smbtorture4
bin/ndrdump4: $(BINARY_PREREQS) samba4-configure
- cd ../source4 && $(WAF_BUILD) --targets=ndrdump
- cp ../source4/bin/ndrdump bin/ndrdump4
+ cd .. && $(WAF_BUILD) --targets=ndrdump
+ cp ../bin/ndrdump bin/ndrdump4
.PHONY: bin/smbtorture4
diff --git a/source4/autogen-waf.sh b/source4/autogen-waf.sh
deleted file mode 100755
index 6541688..0000000
--- a/source4/autogen-waf.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/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 'source4'! Use make with the parameter"
- echo "-C $p. Example: make -C $p all"
-fi
diff --git a/source4/autogen.sh b/source4/autogen.sh
deleted file mode 120000
index a229cc9..0000000
--- a/source4/autogen.sh
+++ /dev/null
@@ -1 +0,0 @@
-autogen-waf.sh
\ No newline at end of file
diff --git a/source4/dynconfig/wscript b/source4/dynconfig/wscript
index 6cebf7e..50ae44f 100644
--- a/source4/dynconfig/wscript
+++ b/source4/dynconfig/wscript
@@ -1,7 +1,7 @@
#!/usr/bin/env python
import string, Utils, Options, sys, Build, os
-from samba_utils import EXPAND_VARIABLES
+from samba_utils import EXPAND_VARIABLES, os_path_relpath
# list of directory options to offer in configure
dir_options = {
@@ -145,6 +145,6 @@ def build(bld):
bld.SAMBA_SUBSYSTEM('DYNCONFIG',
'dynconfig.c',
deps='replace talloc',
- public_headers=os.path.relpath(os.path.join(Options.launch_dir, 'version.h'), bld.curdir),
+ public_headers=os_path_relpath(os.path.join(Options.launch_dir, 'version.h'), bld.curdir),
header_path='samba',
cflags=cflags)
diff --git a/source4/lib/ldb/autogen-waf.sh b/source4/lib/ldb/autogen-waf.sh
deleted file mode 100755
index 4465b32..0000000
--- a/source4/lib/ldb/autogen-waf.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/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 base directory! Use make with the parameter"
- echo "-C $p. Example: make -C $p0 all"
-fi
diff --git a/source4/lib/ldb/autogen.sh b/source4/lib/ldb/autogen.sh
deleted file mode 120000
index a229cc9..0000000
--- a/source4/lib/ldb/autogen.sh
+++ /dev/null
@@ -1 +0,0 @@
-autogen-waf.sh
\ No newline at end of file
--
Samba Shared Repository
More information about the samba-cvs
mailing list