diff options
| author | Thomas Nagy <tnagy@waf.io> | 2015-11-19 01:36:47 +0100 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2015-11-24 05:00:27 +0100 |
| commit | cc4f7e393300d6a2ebcf19afbe0d9cb195320418 (patch) | |
| tree | 377c65646f555cf75909bdca1f5bb3a7823c04a9 /buildtools | |
| parent | 22386dc39673f66de2dd57596447acf3c6c00ef7 (diff) | |
| download | samba-cc4f7e393300d6a2ebcf19afbe0d9cb195320418.tar.gz | |
build:wafsamba: Specify whether node objects or flat lists in ant_glob
The changes enable the ant_glob declaration to be compatible with
more recent versions of Waf.
Signed-off-by: Thomas Nagy <tnagy@waf.io>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Michael Adam <obnox@samba.org>
Diffstat (limited to 'buildtools')
| -rw-r--r-- | buildtools/wafsamba/samba_abi.py | 2 | ||||
| -rw-r--r-- | buildtools/wafsamba/wafsamba.py | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/buildtools/wafsamba/samba_abi.py b/buildtools/wafsamba/samba_abi.py index 82205945ce0..196b468f5b3 100644 --- a/buildtools/wafsamba/samba_abi.py +++ b/buildtools/wafsamba/samba_abi.py @@ -225,7 +225,7 @@ def abi_build_vscript(task): def ABI_VSCRIPT(bld, libname, abi_directory, version, vscript, abi_match=None): '''generate a vscript file for our public libraries''' if abi_directory: - source = bld.path.ant_glob('%s/%s-[0-9]*.sigs' % (abi_directory, libname)) + source = bld.path.ant_glob('%s/%s-[0-9]*.sigs' % (abi_directory, libname), flat=True) def abi_file_key(path): return version_key(path[:-len(".sigs")].rsplit("-")[-1]) source = sorted(source.split(), key=abi_file_key) diff --git a/buildtools/wafsamba/wafsamba.py b/buildtools/wafsamba/wafsamba.py index a17b609f8a0..8af8455d242 100644 --- a/buildtools/wafsamba/wafsamba.py +++ b/buildtools/wafsamba/wafsamba.py @@ -727,7 +727,7 @@ def SAMBA_SCRIPT(bld, name, pattern, installdir, installname=None): '''used to copy scripts from the source tree into the build directory for use by selftest''' - source = bld.path.ant_glob(pattern) + source = bld.path.ant_glob(pattern, flat=True) bld.SET_BUILD_GROUP('build_source') for s in TO_LIST(source): @@ -856,7 +856,7 @@ Build.BuildContext.INSTALL_FILES = INSTALL_FILES def INSTALL_WILDCARD(bld, destdir, pattern, chmod=MODE_644, flat=False, python_fixup=False, exclude=None, trim_path=None): '''install a set of files matching a wildcard pattern''' - files=TO_LIST(bld.path.ant_glob(pattern)) + files=TO_LIST(bld.path.ant_glob(pattern, flat=True)) if trim_path: files2 = [] for f in files: |