Changeset 33d82be1 in rtems-libbsd

Timestamp:

06/27/17 06:34:53 (6 years ago)

Author:

Sebastian Huber <sebastian.huber@…>

Branches:

5, 5-freebsd-12, 6-freebsd-12, master

Children:

9cc419f

Parents:

e846288

git-author:

Sebastian Huber <sebastian.huber@…> (06/27/17 06:34:53)

git-committer:

Sebastian Huber <sebastian.huber@…> (10/23/17 07:24:06)

Message:

waf: Install arch-specific header files

Files:

• builder.py (modified) (1 diff)
• libbsd_waf.py (modified) (2 diffs)
• waf_generator.py (modified) (2 diffs)

builder.py

@@ -224 +224 @@
     #         local path                      wildcard             dest path
     return [('rtemsbsd/include',              '**/*.h',            ''),
+            ('rtemsbsd/\' + bld.env.RTEMS_ARCH + \'/include', '**/*.h', ''),
             ('rtemsbsd/mghttpd',              'mongoose.h',        'mghttpd'),
             ('freebsd/include',               '**/*.h',            ''),

libbsd_waf.py

@@ -2346 +2346 @@
     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', ''),
+                     ('rtemsbsd/' + bld.env.RTEMS_ARCH + '/include', '**/*.h', ''),
                      ('rtemsbsd/mghttpd', 'mongoose.h', 'mghttpd'),
                      ('freebsd/include', '**/*.h', ''),
@@ -2426 +2427 @@
         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]),
-                          cwd = start_dir,
-                          relative_trick = True)
+        if start_dir != None:
+            bld.install_files("${PREFIX}/" + ipath,
+                              start_dir.ant_glob(headers[1]),
+                              cwd = start_dir,
+                              relative_trick = True)
 
     # Tests

waf_generator.py

@@ -181 +181 @@
             d['includes'] = self.includes
         return ['yacc', path, ('default', None)], d
+
+def headerPathSpec(headerPath):
+    return '(\'%s\', \'%s\', \'%s\')' % (headerPath[0], headerPath[1], headerPath[2])
 
 # Module Manager - Collection of Modules
@@ -645 +648 @@
         self.add('    bld.install_files("${PREFIX}/" + rtems.arch_bsp_lib_path(bld.env.RTEMS_VERSION, bld.env.RTEMS_ARCH_BSP), ["libbsd.a"])')
         headerPaths = builder.headerPaths()
-        self.add('    header_paths = [%s,' % (str(headerPaths[0])))
+        self.add('    header_paths = [%s,' % (headerPathSpec(headerPaths[0])))
         for hp in headerPaths[1:-1]:
-            self.add('                     %s,' % (str(hp)))
-        self.add('                     %s]' % (str(headerPaths[-1])))
+            self.add('                     %s,' % (headerPathSpec(hp)))
+        self.add('                     %s]' % (headerPathSpec(headerPaths[-1])))
         self.add('    for headers in header_paths:')
         self.add('        ipath = os.path.join(rtems.arch_bsp_include_path(bld.env.RTEMS_VERSION, bld.env.RTEMS_ARCH_BSP), headers[2])')