diff options
| author | Volker Lendecke <vl@samba.org> | 2015-03-12 13:25:38 +0000 |
|---|---|---|
| committer | Michael Adam <obnox@samba.org> | 2015-03-17 11:30:51 +0100 |
| commit | 334015ebca42262668c82fbc9f5b2d25b0100b65 (patch) | |
| tree | 5971d882e8ed614d21dc991734cafdc22eabc9b1 /script | |
| parent | 89052936aee34af841fea230c92e133ad28e67c6 (diff) | |
| download | samba-334015ebca42262668c82fbc9f5b2d25b0100b65.tar.gz | |
autobuild: Remove ntdb target
Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Michael Adam <obnox@samba.org>
Diffstat (limited to 'script')
| -rwxr-xr-x | script/autobuild.py | 19 | ||||
| -rwxr-xr-x | script/librelease.sh | 2 |
2 files changed, 3 insertions, 18 deletions
diff --git a/script/autobuild.py b/script/autobuild.py index 6fcdcd45d0a..3175ff082fb 100755 --- a/script/autobuild.py +++ b/script/autobuild.py @@ -22,7 +22,6 @@ builddirs = { "samba-libs" : ".", "ldb" : "lib/ldb", "tdb" : "lib/tdb", - "ntdb" : "lib/ntdb", "talloc" : "lib/talloc", "replace" : "lib/replace", "tevent" : "lib/tevent", @@ -32,7 +31,7 @@ builddirs = { "retry" : "." } -defaulttasks = [ "ctdb", "samba", "samba-ctdb", "samba-libs", "ldb", "tdb", "ntdb", "talloc", "replace", "tevent", "pidl" ] +defaulttasks = [ "ctdb", "samba", "samba-ctdb", "samba-libs", "ldb", "tdb", "talloc", "replace", "tevent", "pidl" ] tasks = { "ctdb" : [ ("random-sleep", "../script/random-sleep.sh 60 600", "text/plain"), @@ -81,10 +80,6 @@ tasks = { ("tdb-make", "cd lib/tdb && make", "text/plain"), ("tdb-install", "cd lib/tdb && make install", "text/plain"), - ("ntdb-configure", "cd lib/ntdb && PYTHONPATH=${PYTHON_PREFIX}/site-packages:$PYTHONPATH PKG_CONFIG_PATH=$PKG_CONFIG_PATH:${PREFIX_DIR}/lib/pkgconfig ./configure --bundled-libraries=NONE --abi-check --enable-debug -C ${PREFIX}", "text/plain"), - ("ntdb-make", "cd lib/ntdb && make", "text/plain"), - ("ntdb-install", "cd lib/ntdb && make install", "text/plain"), - ("tevent-configure", "cd lib/tevent && PYTHONPATH=${PYTHON_PREFIX}/site-packages:$PYTHONPATH PKG_CONFIG_PATH=$PKG_CONFIG_PATH:${PREFIX_DIR}/lib/pkgconfig ./configure --bundled-libraries=NONE --abi-check --enable-debug -C ${PREFIX}", "text/plain"), ("tevent-make", "cd lib/tevent && make", "text/plain"), ("tevent-install", "cd lib/tevent && make install", "text/plain"), @@ -93,7 +88,7 @@ tasks = { ("ldb-make", "cd lib/ldb && make", "text/plain"), ("ldb-install", "cd lib/ldb && make install", "text/plain"), - ("configure", "PYTHONPATH=${PYTHON_PREFIX}/site-packages:$PYTHONPATH PKG_CONFIG_PATH=$PKG_CONFIG_PATH:${PREFIX_DIR}/lib/pkgconfig ./configure --bundled-libraries=!talloc,!tdb,!pytdb,!ntdb,!pyntdb,!ldb,!pyldb,!tevent,!pytevent --abi-check --enable-debug -C ${PREFIX}", "text/plain"), + ("configure", "PYTHONPATH=${PYTHON_PREFIX}/site-packages:$PYTHONPATH PKG_CONFIG_PATH=$PKG_CONFIG_PATH:${PREFIX_DIR}/lib/pkgconfig ./configure --bundled-libraries=!talloc,!tdb,!pytdb,!ldb,!pyldb,!tevent,!pytevent --abi-check --enable-debug -C ${PREFIX}", "text/plain"), ("make", "make", "text/plain"), ("install", "make install", "text/plain"), ("dist", "make dist", "text/plain")], @@ -118,16 +113,6 @@ tasks = { ("distcheck", "make distcheck", "text/plain"), ("clean", "make clean", "text/plain") ], - "ntdb" : [ - ("random-sleep", "../../script/random-sleep.sh 60 600", "text/plain"), - ("configure", "./configure --enable-developer -C ${PREFIX}", "text/plain"), - ("make", "make", "text/plain"), - ("install", "make install", "text/plain"), - ("test", "make test", "text/plain"), - ("check-clean-tree", "../../script/clean-source-tree.sh", "text/plain"), - ("distcheck", "make distcheck", "text/plain"), - ("clean", "make clean", "text/plain") ], - "talloc" : [ ("random-sleep", "../../script/random-sleep.sh 60 600", "text/plain"), ("configure", "./configure --enable-developer -C ${PREFIX}", "text/plain"), diff --git a/script/librelease.sh b/script/librelease.sh index 5119ca4aca7..7584e481d30 100755 --- a/script/librelease.sh +++ b/script/librelease.sh @@ -80,7 +80,7 @@ release_lib() { for lib in $*; do case $lib in - talloc | tdb | tevent | ldb) + talloc | tdb | ntdb | tevent | ldb) [ -z "$GPG_USER" ] && { GPG_USER='Samba Library Distribution Key <samba-bugs@samba.org>' } |