rtems/rtems-libbsd
1
0
Fork 0
mirror of https://git.rtems.org/rtems-libbsd/ synced 2025-05-13 15:29:17 +08:00
Code Issues Packages Projects Releases Wiki Activity

Update rtems_waf module

Browse Source
This commit is contained in:
Sebastian Huber 2015-11-13 10:58:45 +01:00
parent e18bac8a55
commit 5aa22c60af
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
rtems_waf

@ -1 +1 @@
Subproject commit 7bcf72b72ec42f2feedac5f5cc5f2f57d50b5d2b Subproject commit b548c77d81e390a40d4afba8afc35c8175191f0b

4
waf_generator.py
View File

@ -549,14 +549,14 @@ class ModuleManager(builder.ModuleManager):
# Head file collector. # Head file collector.
# #
self.add(' # Installs. ') self.add(' # Installs. ')
self.add(' bld.install_files("${PREFIX}/" + rtems.arch_bsp_lib_path(bld.env.RTEMS_ARCH_BSP), ["libbsd.a"])') self.add(' bld.install_files("${PREFIX}/" + rtems.arch_bsp_lib_path(bld.env.RTEMS_VERSION, bld.env.RTEMS_ARCH_BSP), ["libbsd.a"])')
header_paths = builder.header_paths() header_paths = builder.header_paths()
self.add(' header_paths = [%s,' % (str(header_paths[0]))) self.add(' header_paths = [%s,' % (str(header_paths[0])))
for hp in header_paths[1:-1]: for hp in header_paths[1:-1]:
self.add(' %s,' % (str(hp))) self.add(' %s,' % (str(hp)))
self.add(' %s]' % (str(header_paths[-1]))) self.add(' %s]' % (str(header_paths[-1])))
self.add(' for headers in header_paths:') self.add(' for headers in header_paths:')
self.add(' ipath = os.path.join(rtems.arch_bsp_include_path(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]),')

4
wscript
View File

@ -1127,7 +1127,7 @@ def build(bld):
use = libbsd_use) use = libbsd_use)
# Installs. # Installs.
bld.install_files("${PREFIX}/" + rtems.arch_bsp_lib_path(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', ''),
@ -1148,7 +1148,7 @@ def build(bld):
('mDNSResponder/mDNSShared', 'dns_sd.h', ''), ('mDNSResponder/mDNSShared', 'dns_sd.h', ''),
('mDNSResponder/mDNSPosix', 'mDNSPosix.h', '')] ('mDNSResponder/mDNSPosix', 'mDNSPosix.h', '')]
for headers in header_paths: for headers in header_paths:
ipath = os.path.join(rtems.arch_bsp_include_path(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]),