summaryrefslogtreecommitdiffstats
path: root/script/autobuild.py
diff options
context:
space:
mode:
authorMichael Adam <obnox@samba.org>2013-09-26 00:43:56 +0200
committerMichael Adam <obnox@samba.org>2013-11-13 14:42:35 +0100
commitc4214a7942c2c544d2692375780c794272694027 (patch)
tree0c342006fdaa295e013599dff224b9528d325015 /script/autobuild.py
parent1da294a7eb2d76bd5312cc056fd13a6203270149 (diff)
downloadsamba-c4214a7942c2c544d2692375780c794272694027.tar.gz
samba-c4214a7942c2c544d2692375780c794272694027.tar.xz
samba-c4214a7942c2c544d2692375780c794272694027.zip
autobuild: extend samba-ctdb target to build ctdb, too
Signed-off-by: Michael Adam <obnox@samba.org> Reviewed-by: Stefan Metzmacher <metze@samba.org>
Diffstat (limited to 'script/autobuild.py')
-rwxr-xr-xscript/autobuild.py21
1 files changed, 14 insertions, 7 deletions
diff --git a/script/autobuild.py b/script/autobuild.py
index f62ce95f3a..48fbc3bf90 100755
--- a/script/autobuild.py
+++ b/script/autobuild.py
@@ -58,16 +58,23 @@ tasks = {
("tdb-make", "cd lib/tdb && make", "text/plain"),
("tdb-install", "cd lib/tdb && make install", "text/plain"),
- # install the ctdb headers under the prefix:
- ("ctdb-header-install", "cp ./ctdb/include/* ${PREFIX_DIR}/include", "text/plain"),
+ # build and install ctdb:
+ ("ctdb-autogen", "cd ./ctdb && ./autogen.sh", "text/plain"),
+ ("ctdb-configure", "cd ./ctdb && ./configure ${PREFIX} --enable-socket-wrapper --with-included-tdb=no", "text/plain"),
+ ("ctdb-make", "cd ./ctdb && make all", "text/plain"),
+ ("ctdb-install", "cd ./ctdb && make install", "text/plain"),
("ctdb-header-ls", "ls ${PREFIX_DIR}/include/ctdb.h", "text/plain"),
- ("configure", "PYTHONPATH=${PYTHON_PREFIX}/site-packages:$PYTHONPATH PKG_CONFIG_PATH=$PKG_CONFIG_PATH:${PREFIX_DIR}/lib/pkgconfig ./configure.developer ${PREFIX} --with-selftest-prefix=./bin/ab --with-cluster-support --with-ctdb-dir=${PREFIX_DIR} --bundled-libraries=!tdb", "text/plain"),
- ("make", "make", "text/plain"),
- ("check", "./bin/smbd -b | grep CLUSTER_SUPPORT", "text/plain"),
- ("install", "make install", "text/plain"),
+ # build samba with cluster support against this ctdb:
+ ("samba-configure", "PYTHONPATH=${PYTHON_PREFIX}/site-packages:$PYTHONPATH PKG_CONFIG_PATH=$PKG_CONFIG_PATH:${PREFIX_DIR}/lib/pkgconfig ./configure.developer ${PREFIX} --with-selftest-prefix=./bin/ab --with-cluster-support --with-ctdb-dir=${PREFIX_DIR} --bundled-libraries=!tdb", "text/plain"),
+ ("samba-make", "make", "text/plain"),
+ ("samba-check", "./bin/smbd -b | grep CLUSTER_SUPPORT", "text/plain"),
+ ("samba-install", "make install", "text/plain"),
+
+ # clean up:
("check-clean-tree", "script/clean-source-tree.sh", "text/plain"),
- ("clean", "make clean", "text/plain") ],
+ ("clean", "make clean", "text/plain"),
+ ("ctdb-clean", "cd ./ctdb && make clean", "text/plain") ],
"samba-libs" : [
("random-sleep", "script/random-sleep.sh 60 600", "text/plain"),