sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-03 01:18:10 +03:00
Code

autobuild: Reduce duplication of task list in autobuild

Browse Source 
The defaulttasks or builddirs are often updated out of sync, which causes confusion until
it is resolved.

We simply choose "." as the builddir for the tasks that
are not in the default set.

Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Gary Lockyer <gary@catalyst.net.nz>
This commit is contained in:
Andrew Bartlett 2018-08-16 13:54:14 +12:00
parent ce53dd9cf4
commit 38784f2b37
1 changed files with 6 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
script/autobuild.py
View File

@ -39,7 +39,6 @@ builddirs = {
"samba-libs": ".",
"samba-libs-py3": ".",
"samba-static": ".",
"samba-test-only": ".",
"samba-none-env": ".",
"samba-none-env-py3": ".",
"samba-ad-dc": ".",
@ -53,38 +52,10 @@ builddirs = {
"talloc": "lib/talloc",
"replace": "lib/replace",
"tevent": "lib/tevent",
"pidl": "pidl",
"pass": ".",
"fail": ".",
"retry": "."
"pidl": "pidl"
}
defaulttasks = ["ctdb",
"samba",
"samba-py3",
"samba-nt4",
"samba-nt4-py3",
"samba-fileserver",
"samba-xc",
"samba-o3",
"samba-ctdb",
"samba-libs",
"samba-libs-py3",
"samba-static",
"samba-none-env",
"samba-none-env-py3",
"samba-ad-dc",
"samba-ad-dc-py3",
"samba-ad-dc-2",
"samba-ad-dc-2-py3",
"samba-systemkrb5",
"samba-nopython",
"ldb",
"tdb",
"talloc",
"replace",
"tevent",
"pidl"]
defaulttasks = builddirs.keys()
if os.environ.get("AUTOBUILD_SKIP_SAMBA_O3", "0") == "1":
defaulttasks.remove("samba-o3")
@ -432,7 +403,10 @@ class builder(object):
def __init__(self, name, sequence, cp=True, py3=False):
self.name = name
self.py3 = py3
if name in builddirs:
self.dir = builddirs[name]
else:
self.dir = "."
self.tag = self.name.replace('/', '_')
self.sequence = sequence