From 689a1ee747b3ae1e03bcdae2706ccbb552005a85 Mon Sep 17 00:00:00 2001 From: Tim Beale Date: Fri, 15 Feb 2019 12:17:49 +1300 Subject: autobuild: Replace samba-buildpy2-only with samba-nopython-py2 For Samba 4.11, the minimum python2 functionality we will support (for now, at least - we may change our minds) is for the --disable-python target, i.e. if you're excluding all the python functionality from samba, then WAF should still support being built with python2. The use case here is old unix platforms that want to use smbd, but don't have python3 support. Signed-off-by: Tim Beale Reviewed-by: Andrew Bartlett --- script/autobuild.py | 40 ++++++++++++++++++++++++++++++++-------- 1 file changed, 32 insertions(+), 8 deletions(-) (limited to 'script') diff --git a/script/autobuild.py b/script/autobuild.py index 2d37cffbd5d..91098f51074 100755 --- a/script/autobuild.py +++ b/script/autobuild.py @@ -50,7 +50,7 @@ builddirs = { "samba-ad-dc-backup": ".", "samba-systemkrb5": ".", "samba-nopython": ".", - "samba-buildpy2-only": ".", + "samba-nopython-py2": ".", "ldb": "lib/ldb", "tdb": "lib/tdb", "talloc": "lib/talloc", @@ -337,7 +337,38 @@ tasks = { ("libs-clean", "make clean", "text/plain") ], + # check we can do the same thing using python2 + "samba-nopython-py2": [ + ("random-sleep", "script/random-sleep.sh 60 600", "text/plain"), + ("configure", "PYTHON=python2 ./configure.developer --picky-developer ${PREFIX} --with-profiling-data --disable-python --without-ad-dc", "text/plain"), + ("make", "PYTHON=python2 make -j", "text/plain"), + ("install", "PYTHON=python2 make install", "text/plain"), + ("check-clean-tree", "script/clean-source-tree.sh", "text/plain"), + ("clean", "PYTHON=python2 make clean", "text/plain"), + + ("talloc-configure", "cd lib/talloc && PYTHON=python2 " + samba_libs_configure_base + " --bundled-libraries=cmocka,NONE --disable-python", "text/plain"), + ("talloc-make", "cd lib/talloc && PYTHON=python2 make", "text/plain"), + ("talloc-install", "cd lib/talloc && PYTHON=python2 make install", "text/plain"), + ("tdb-configure", "cd lib/tdb && PYTHON=python2 " + samba_libs_configure_base + " --bundled-libraries=cmocka,NONE --disable-python", "text/plain"), + ("tdb-make", "cd lib/tdb && PYTHON=python2 make", "text/plain"), + ("tdb-install", "cd lib/tdb && PYTHON=python2 make install", "text/plain"), + + ("tevent-configure", "cd lib/tevent && PYTHON=python2 " + samba_libs_configure_base + " --bundled-libraries=cmocka,NONE --disable-python", "text/plain"), + ("tevent-make", "cd lib/tevent && PYTHON=python2 make", "text/plain"), + ("tevent-install", "cd lib/tevent && PYTHON=python2 make install", "text/plain"), + + ("ldb-configure", "cd lib/ldb && PYTHON=python2 " + samba_libs_configure_base + " --bundled-libraries=cmocka,NONE --disable-python", "text/plain"), + ("ldb-make", "cd lib/ldb && PYTHON=python2 make", "text/plain"), + ("ldb-install", "cd lib/ldb && PYTHON=python2 make install", "text/plain"), + + # retry against installed library packages + ("libs-configure", "PYTHON=python2 " + samba_libs_configure_base + samba_libs_configure_bundled_libs + " --disable-python --without-ad-dc", "text/plain"), + ("libs-make", "PYTHON=python2 make -j", "text/plain"), + ("libs-install", "PYTHON=python2 make install", "text/plain"), + ("libs-check-clean-tree", "script/clean-source-tree.sh", "text/plain"), + ("libs-clean", "PYTHON=python2 make clean", "text/plain") + ], "ldb": [ ("random-sleep", "../../script/random-sleep.sh 60 600", "text/plain"), @@ -403,13 +434,6 @@ tasks = { ("check-clean-tree", "../script/clean-source-tree.sh", "text/plain"), ("clean", "make clean", "text/plain")], - "samba-buildpy2-only": [("random-sleep", "script/random-sleep.sh 60 600", "text/plain"), - ("configure", "PYTHON='python' ./configure.developer --with-selftest-prefix=./bin/ab " + samba_configure_params, "text/plain"), - ("make", "PYTHON='python' make -j", "text/plain"), - ("install", "PYTHON='python' make install", "text/plain"), - ("check-clean-tree", "script/clean-source-tree.sh", "text/plain"), - ("clean", "PYTHON='python' make clean", "text/plain")], - # these are useful for debugging autobuild 'pass': [("pass", 'echo passing && /bin/true', "text/plain")], -- cgit v1.2.1