rtems/rtems-libbsd
1
0
Fork 0
mirror of https://git.rtems.org/rtems-libbsd/ synced 2025-07-27 10:19:01 +08:00
Code Issues Packages Projects Releases Wiki Activity

waf: Move glob operator ** to builder.py

Browse Source 
This allows a finer decision which headers should be installed.
This commit is contained in:
Christian Mauderer 2017-08-11 07:27:13 +02:00 committed by Chris Johns
parent 307b324a42
commit 8d2dbd37b6
3 changed files with 30 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
builder.py
View File

@ -220,20 +220,20 @@ def headerPaths():
normal installation path. """ normal installation path. """
# local path wildcard dest path # local path wildcard dest path
return [('rtemsbsd/include', '*.h', ''), return [('rtemsbsd/include', '**/*.h', ''),
('rtemsbsd/mghttpd', 'mongoose.h', 'mghttpd'), ('rtemsbsd/mghttpd', 'mongoose.h', 'mghttpd'),
('freebsd/include', '*.h', ''), ('freebsd/include', '**/*.h', ''),
('freebsd/sys/bsm', '*.h', 'bsm'), ('freebsd/sys/bsm', '**/*.h', 'bsm'),
('freebsd/sys/cam', '*.h', 'cam'), ('freebsd/sys/cam', '**/*.h', 'cam'),
('freebsd/sys/net', '*.h', 'net'), ('freebsd/sys/net', '**/*.h', 'net'),
('freebsd/sys/net80211', '*.h', 'net80211'), ('freebsd/sys/net80211', '**/*.h', 'net80211'),
('freebsd/sys/netinet', '*.h', 'netinet'), ('freebsd/sys/netinet', '**/*.h', 'netinet'),
('freebsd/sys/netinet6', '*.h', 'netinet6'), ('freebsd/sys/netinet6', '**/*.h', 'netinet6'),
('freebsd/sys/netipsec', '*.h', 'netipsec'), ('freebsd/sys/netipsec', '**/*.h', 'netipsec'),
('freebsd/sys/rpc', '*.h', 'rpc'), ('freebsd/sys/rpc', '**/*.h', 'rpc'),
('freebsd/sys/sys', '*.h', 'sys'), ('freebsd/sys/sys', '**/*.h', 'sys'),
('freebsd/sys/vm', '*.h', 'vm'), ('freebsd/sys/vm', '**/*.h', 'vm'),
('freebsd/sys/dev/mii', '*.h', 'dev/mii'), ('freebsd/sys/dev/mii', '**/*.h', 'dev/mii'),
('mDNSResponder/mDNSCore', 'mDNSDebug.h', ''), ('mDNSResponder/mDNSCore', 'mDNSDebug.h', ''),
('mDNSResponder/mDNSCore', 'mDNSEmbeddedAPI.h', ''), ('mDNSResponder/mDNSCore', 'mDNSEmbeddedAPI.h', ''),
('mDNSResponder/mDNSShared', 'dns_sd.h', ''), ('mDNSResponder/mDNSShared', 'dns_sd.h', ''),

30
libbsd_waf.py
View File

@ -130,7 +130,7 @@ def build(bld):
for headers in header_build_copy_paths: for headers in header_build_copy_paths:
target = os.path.join("build-include", headers[2]) target = os.path.join("build-include", headers[2])
start_dir = bld.path.find_dir(headers[0]) 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) relsourcepath = header.path_from(start_dir)
targetheader = os.path.join(target, relsourcepath) targetheader = os.path.join(target, relsourcepath)
bld(features = 'subst', bld(features = 'subst',
@ -1481,20 +1481,20 @@ def build(bld):
# Installs. # Installs.
bld.install_files("${PREFIX}/" + rtems.arch_bsp_lib_path(bld.env.RTEMS_VERSION, bld.env.RTEMS_ARCH_BSP), ["libbsd.a"]) 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'), ('rtemsbsd/mghttpd', 'mongoose.h', 'mghttpd'),
('freebsd/include', '*.h', ''), ('freebsd/include', '**/*.h', ''),
('freebsd/sys/bsm', '*.h', 'bsm'), ('freebsd/sys/bsm', '**/*.h', 'bsm'),
('freebsd/sys/cam', '*.h', 'cam'), ('freebsd/sys/cam', '**/*.h', 'cam'),
('freebsd/sys/net', '*.h', 'net'), ('freebsd/sys/net', '**/*.h', 'net'),
('freebsd/sys/net80211', '*.h', 'net80211'), ('freebsd/sys/net80211', '**/*.h', 'net80211'),
('freebsd/sys/netinet', '*.h', 'netinet'), ('freebsd/sys/netinet', '**/*.h', 'netinet'),
('freebsd/sys/netinet6', '*.h', 'netinet6'), ('freebsd/sys/netinet6', '**/*.h', 'netinet6'),
('freebsd/sys/netipsec', '*.h', 'netipsec'), ('freebsd/sys/netipsec', '**/*.h', 'netipsec'),
('freebsd/sys/rpc', '*.h', 'rpc'), ('freebsd/sys/rpc', '**/*.h', 'rpc'),
('freebsd/sys/sys', '*.h', 'sys'), ('freebsd/sys/sys', '**/*.h', 'sys'),
('freebsd/sys/vm', '*.h', 'vm'), ('freebsd/sys/vm', '**/*.h', 'vm'),
('freebsd/sys/dev/mii', '*.h', 'dev/mii'), ('freebsd/sys/dev/mii', '**/*.h', 'dev/mii'),
('mDNSResponder/mDNSCore', 'mDNSDebug.h', ''), ('mDNSResponder/mDNSCore', 'mDNSDebug.h', ''),
('mDNSResponder/mDNSCore', 'mDNSEmbeddedAPI.h', ''), ('mDNSResponder/mDNSCore', 'mDNSEmbeddedAPI.h', ''),
('mDNSResponder/mDNSShared', 'dns_sd.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]) 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]) start_dir = bld.path.find_dir(headers[0])
bld.install_files("${PREFIX}/" + ipath, bld.install_files("${PREFIX}/" + ipath,
start_dir.ant_glob("**/" + headers[1]), start_dir.ant_glob(headers[1]),
cwd = start_dir, cwd = start_dir,
relative_trick = True) relative_trick = True)

4
waf_generator.py
View File

@ -457,7 +457,7 @@ class ModuleManager(builder.ModuleManager):
self.add(' for headers in header_build_copy_paths:') self.add(' for headers in header_build_copy_paths:')
self.add(' target = os.path.join("%s", headers[2])' % (builder.buildInclude())) self.add(' target = os.path.join("%s", headers[2])' % (builder.buildInclude()))
self.add(' start_dir = bld.path.find_dir(headers[0])') 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(' relsourcepath = header.path_from(start_dir)')
self.add(' targetheader = os.path.join(target, relsourcepath)') self.add(' targetheader = os.path.join(target, relsourcepath)')
self.add(' bld(features = \'subst\',') 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(' 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(' start_dir = bld.path.find_dir(headers[0])')
self.add(' bld.install_files("${PREFIX}/" + ipath,') 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(' cwd = start_dir,')
self.add(' relative_trick = True)') self.add(' relative_trick = True)')
self.add('') self.add('')