From 18ec14226c56764cbacbd127c39b859ad75bba09 Mon Sep 17 00:00:00 2001
From: Paul Brossier <piem@piem.org>
Date: Tue, 3 Oct 2017 16:05:40 +0200
Subject: [PATCH] waf_gensyms.py: move to own file

---
 src/wscript_build | 41 +----------------------------------------
 waf_gensyms.py    | 40 ++++++++++++++++++++++++++++++++++++++++
 wscript           |  2 ++
 3 files changed, 43 insertions(+), 40 deletions(-)
 create mode 100644 waf_gensyms.py

diff --git a/src/wscript_build b/src/wscript_build
index b01bb30c..895c191f 100644
--- a/src/wscript_build
+++ b/src/wscript_build
@@ -37,46 +37,7 @@ else:
 
 # also install static lib
 from waflib.Tools.c import cstlib
-from waflib.Tools.fc import fcstlib
-fcstlib.inst_to = cstlib.inst_to = '${LIBDIR}'
-
-import re
-from waflib import TaskGen, Task
-from waflib.Context import STDOUT
-from waflib.Utils import O644
-
-class gen_sym_file(Task.Task):
-    color = 'BLUE'
-    inst_to = '${LIBDIR}'
-    def run(self):
-        syms = {}
-        reg = getattr(self.generator, 'export_symbols_regex','.+?')
-        if 'msvc' in self.env.CC_NAME:
-            outputs = [x.abspath() for x in self.generator.link_task.outputs]
-            binary_path = list(filter(lambda x: x.endswith('lib'), outputs))[0]
-            reg_compiled = re.compile(r'External\s+\|\s+(?P<symbol>%s)\b' % reg)
-            cmd =(self.env.LINK_CC) + ['/dump', '/symbols', binary_path]
-        else: # using gcc? assume we have nm
-            binary_path = self.generator.link_task.outputs[0].abspath()
-            reg_compiled = re.compile(r'(T|D)\s+_(?P<symbol>%s)\b'%reg)
-            cmd = (self.env.NM or ['nm']) + ['-g', binary_path]
-        dump_output = self.generator.bld.cmd_and_log(cmd, quiet=STDOUT)
-        syms = set([])
-        for m in reg_compiled.finditer(dump_output):
-            syms.add(m.group('symbol'))
-        syms = list(syms)
-        syms.sort()
-        self.outputs[0].write('EXPORTS\n'+'\n'.join(syms))
-
-@TaskGen.feature('gensyms')
-@TaskGen.after_method('process_source','process_use','apply_link','process_uselib_local','propagate_uselib_vars')
-def gen_symbols(self):
-    #sym_file = self.path.find_or_declare(self.target + '.def')
-    sym_file_name = os.path.splitext(self.link_task.outputs[0].abspath())[0] + '.def'
-    sym_file = self.path.find_or_declare(sym_file_name)
-    symtask = self.create_task('gen_sym_file', self.link_task.outputs, sym_file)
-    self.add_install_files(install_to=self.link_task.inst_to, install_from=sym_file,
-        chmod=O644, task=self.link_task)
+cstlib.inst_to = '${LIBDIR}'
 
 for target in build_features:
     ctx(features = 'c ' + target,
diff --git a/waf_gensyms.py b/waf_gensyms.py
new file mode 100644
index 00000000..f9ddd707
--- /dev/null
+++ b/waf_gensyms.py
@@ -0,0 +1,40 @@
+import re
+import os.path
+from waflib import TaskGen, Task
+from waflib.Context import STDOUT
+from waflib.Utils import O644
+
+class gen_sym_file(Task.Task):
+    color = 'BLUE'
+    inst_to = '${LIBDIR}'
+    def run(self):
+        syms = {}
+        reg = getattr(self.generator, 'export_symbols_regex','.+?')
+        if 'msvc' in self.env.CC_NAME:
+            outputs = [x.abspath() for x in self.generator.link_task.outputs]
+            binary_path = list(filter(lambda x: x.endswith('lib'), outputs))[0]
+            reg_compiled = re.compile(r'External\s+\|\s+(?P<symbol>%s)\b' % reg)
+            cmd =(self.env.LINK_CC) + ['/dump', '/symbols', binary_path]
+        else: # using gcc? assume we have nm
+            outputs = [x.abspath() for x in self.generator.link_task.outputs]
+            binary_path = list(filter(lambda x: x.endswith('dll'), outputs))[0]
+            reg_compiled = re.compile(r'(T|D)\s+_(?P<symbol>%s)\b'%reg)
+            cmd = (self.env.NM or ['nm']) + ['-g', binary_path]
+        dump_output = self.generator.bld.cmd_and_log(cmd, quiet=STDOUT)
+        syms = set([])
+        for m in reg_compiled.finditer(dump_output):
+            syms.add(m.group('symbol'))
+        syms = list(syms)
+        syms.sort()
+        self.outputs[0].write('EXPORTS\n'+'\n'.join(syms))
+
+@TaskGen.feature('gensyms')
+@TaskGen.after_method('process_source','process_use','apply_link','process_uselib_local','propagate_uselib_vars')
+def gen_symbols(self):
+    #sym_file = self.path.find_or_declare(self.target + '.def')
+    sym_file_name = os.path.splitext(self.link_task.outputs[0].abspath())[0] + '.def'
+    sym_file = self.path.find_or_declare(sym_file_name)
+    symtask = self.create_task('gen_sym_file', self.link_task.outputs, sym_file)
+    self.add_install_files(install_to=self.link_task.inst_to, install_from=sym_file,
+        chmod=O644, task=self.link_task)
+
diff --git a/wscript b/wscript
index 8f0509ff..c40a864c 100644
--- a/wscript
+++ b/wscript
@@ -103,6 +103,7 @@ def options(ctx):
     ctx.load('compiler_c')
     ctx.load('waf_unit_test')
     ctx.load('gnu_dirs')
+    ctx.load('waf_gensyms', tooldir='.')
 
 def configure(ctx):
     target_platform = sys.platform
@@ -118,6 +119,7 @@ def configure(ctx):
 
     ctx.load('waf_unit_test')
     ctx.load('gnu_dirs')
+    ctx.load('waf_gensyms', tooldir='.')
 
     # check for common headers
     ctx.check(header_name='stdlib.h')
-- 
2.11.0