diff options
| author | Christian Mauderer <oss@c-mauderer.de> | 2017-08-11 07:27:13 +0200 |
|---|---|---|
| committer | Chris Johns <chrisj@rtems.org> | 2017-08-20 08:35:10 +1000 |
| commit | 8d2dbd37b6cb743c40248b3118f4259ee2c6202e (patch) | |
| tree | 1ed43a11c2bba6661beba3836caba60564d5a6a7 | |
| parent | waf_generator: Copy headers if necessary. (diff) | |
| download | rtems-libbsd-8d2dbd37b6cb743c40248b3118f4259ee2c6202e.tar.bz2 | |
waf: Move glob operator ** to builder.py
This allows a finer decision which headers should be installed.
| -rwxr-xr-x | builder.py | 26 | ||||
| -rw-r--r-- | libbsd_waf.py | 30 | ||||
| -rwxr-xr-x | waf_generator.py | 4 |
3 files changed, 30 insertions, 30 deletions
@@ -220,20 +220,20 @@ def headerPaths(): normal installation path. """ # local path wildcard dest path - return [('rtemsbsd/include', '*.h', ''), + return [('rtemsbsd/include', '**/*.h', ''), ('rtemsbsd/mghttpd', 'mongoose.h', 'mghttpd'), - ('freebsd/include', '*.h', ''), - ('freebsd/sys/bsm', '*.h', 'bsm'), - ('freebsd/sys/cam', '*.h', 'cam'), - ('freebsd/sys/net', '*.h', 'net'), - ('freebsd/sys/net80211', '*.h', 'net80211'), - ('freebsd/sys/netinet', '*.h', 'netinet'), - ('freebsd/sys/netinet6', '*.h', 'netinet6'), - ('freebsd/sys/netipsec', '*.h', 'netipsec'), - ('freebsd/sys/rpc', '*.h', 'rpc'), - ('freebsd/sys/sys', '*.h', 'sys'), - ('freebsd/sys/vm', '*.h', 'vm'), - ('freebsd/sys/dev/mii', '*.h', 'dev/mii'), + ('freebsd/include', '**/*.h', ''), + ('freebsd/sys/bsm', '**/*.h', 'bsm'), + ('freebsd/sys/cam', '**/*.h', 'cam'), + ('freebsd/sys/net', '**/*.h', 'net'), + ('freebsd/sys/net80211', '**/*.h', 'net80211'), + ('freebsd/sys/netinet', '**/*.h', 'netinet'), + ('freebsd/sys/netinet6', '**/*.h', 'netinet6'), + ('freebsd/sys/netipsec', '**/*.h', 'netipsec'), + ('freebsd/sys/rpc', '**/*.h', 'rpc'), + ('freebsd/sys/sys', '**/*.h', 'sys'), + ('freebsd/sys/vm', '**/*.h', 'vm'), + ('freebsd/sys/dev/mii', '**/*.h', 'dev/mii'), ('mDNSResponder/mDNSCore', 'mDNSDebug.h', ''), ('mDNSResponder/mDNSCore', 'mDNSEmbeddedAPI.h', ''), ('mDNSResponder/mDNSShared', 'dns_sd.h', ''), diff --git a/libbsd_waf.py b/libbsd_waf.py index 8bc2b348..b681d7f9 100644 --- a/libbsd_waf.py +++ b/libbsd_waf.py @@ -130,7 +130,7 @@ def build(bld): for headers in header_build_copy_paths: target = os.path.join("build-include", headers[2]) start_dir = bld.path.find_dir(headers[0]) - for header in start_dir.ant_glob(os.path.join("**/", headers[1])): + for header in start_dir.ant_glob(headers[1]): relsourcepath = header.path_from(start_dir) targetheader = os.path.join(target, relsourcepath) bld(features = 'subst', @@ -1481,20 +1481,20 @@ def build(bld): # Installs. bld.install_files("${PREFIX}/" + rtems.arch_bsp_lib_path(bld.env.RTEMS_VERSION, bld.env.RTEMS_ARCH_BSP), ["libbsd.a"]) - header_paths = [('rtemsbsd/include', '*.h', ''), + header_paths = [('rtemsbsd/include', '**/*.h', ''), ('rtemsbsd/mghttpd', 'mongoose.h', 'mghttpd'), - ('freebsd/include', '*.h', ''), - ('freebsd/sys/bsm', '*.h', 'bsm'), - ('freebsd/sys/cam', '*.h', 'cam'), - ('freebsd/sys/net', '*.h', 'net'), - ('freebsd/sys/net80211', '*.h', 'net80211'), - ('freebsd/sys/netinet', '*.h', 'netinet'), - ('freebsd/sys/netinet6', '*.h', 'netinet6'), - ('freebsd/sys/netipsec', '*.h', 'netipsec'), - ('freebsd/sys/rpc', '*.h', 'rpc'), - ('freebsd/sys/sys', '*.h', 'sys'), - ('freebsd/sys/vm', '*.h', 'vm'), - ('freebsd/sys/dev/mii', '*.h', 'dev/mii'), + ('freebsd/include', '**/*.h', ''), + ('freebsd/sys/bsm', '**/*.h', 'bsm'), + ('freebsd/sys/cam', '**/*.h', 'cam'), + ('freebsd/sys/net', '**/*.h', 'net'), + ('freebsd/sys/net80211', '**/*.h', 'net80211'), + ('freebsd/sys/netinet', '**/*.h', 'netinet'), + ('freebsd/sys/netinet6', '**/*.h', 'netinet6'), + ('freebsd/sys/netipsec', '**/*.h', 'netipsec'), + ('freebsd/sys/rpc', '**/*.h', 'rpc'), + ('freebsd/sys/sys', '**/*.h', 'sys'), + ('freebsd/sys/vm', '**/*.h', 'vm'), + ('freebsd/sys/dev/mii', '**/*.h', 'dev/mii'), ('mDNSResponder/mDNSCore', 'mDNSDebug.h', ''), ('mDNSResponder/mDNSCore', 'mDNSEmbeddedAPI.h', ''), ('mDNSResponder/mDNSShared', 'dns_sd.h', ''), @@ -1503,7 +1503,7 @@ def build(bld): ipath = os.path.join(rtems.arch_bsp_include_path(bld.env.RTEMS_VERSION, bld.env.RTEMS_ARCH_BSP), headers[2]) start_dir = bld.path.find_dir(headers[0]) bld.install_files("${PREFIX}/" + ipath, - start_dir.ant_glob("**/" + headers[1]), + start_dir.ant_glob(headers[1]), cwd = start_dir, relative_trick = True) diff --git a/waf_generator.py b/waf_generator.py index fdc2210f..8aa2e290 100755 --- a/waf_generator.py +++ b/waf_generator.py @@ -457,7 +457,7 @@ class ModuleManager(builder.ModuleManager): self.add(' for headers in header_build_copy_paths:') self.add(' target = os.path.join("%s", headers[2])' % (builder.buildInclude())) self.add(' start_dir = bld.path.find_dir(headers[0])') - self.add(' for header in start_dir.ant_glob(os.path.join("**/", headers[1])):') + self.add(' for header in start_dir.ant_glob(headers[1]):') self.add(' relsourcepath = header.path_from(start_dir)') self.add(' targetheader = os.path.join(target, relsourcepath)') self.add(' bld(features = \'subst\',') @@ -648,7 +648,7 @@ class ModuleManager(builder.ModuleManager): self.add(' ipath = os.path.join(rtems.arch_bsp_include_path(bld.env.RTEMS_VERSION, bld.env.RTEMS_ARCH_BSP), headers[2])') self.add(' start_dir = bld.path.find_dir(headers[0])') self.add(' bld.install_files("${PREFIX}/" + ipath,') - self.add(' start_dir.ant_glob("**/" + headers[1]),') + self.add(' start_dir.ant_glob(headers[1]),') self.add(' cwd = start_dir,') self.add(' relative_trick = True)') self.add('') |