tools: make js2c.py usable for other build systems

Author: zcbenz

test/tools/test_js2c.py

@@ -1,14 +1,27 @@
 import unittest
 import sys, os
-sys.path.append(os.path.abspath(os.path.join(os.path.dirname(__file__),
-                                             '..', '..', 'tools')))
+
+rootdir = os.path.abspath(os.path.join(os.path.dirname(__file__), '..', '..'))
+sys.path.append(os.path.join(rootdir, 'tools'))
+
 from js2c import NormalizeFileName
 
 class Js2ctest(unittest.TestCase):
     def testNormalizeFileName(self):
-        self.assertEqual(NormalizeFileName('dir/mod.js'), 'mod')
-        self.assertEqual(NormalizeFileName('deps/mod.js'), 'internal/deps/mod')
-        self.assertEqual(NormalizeFileName('mod.js'), 'mod')
+        self.assertEqual(NormalizeFileName(None, 'dir/mod.js'), 'mod')
+        self.assertEqual(NormalizeFileName(None, 'deps/mod.js'), 'internal/deps/mod')
+        self.assertEqual(NormalizeFileName(None, 'mod.js'), 'mod')
+
+    def testNormalizeFileNameWithRoot(self):
+        self.assertEqual(
+            NormalizeFileName(rootdir, os.path.join(rootdir, 'dir/mod.js')),
+            'mod')
+        self.assertEqual(
+            NormalizeFileName(rootdir, os.path.join(rootdir, 'deps/mod.js')),
+            'internal/deps/mod')
+        self.assertEqual(
+            NormalizeFileName(rootdir, os.path.join(rootdir, 'mod.js')),
+            'mod')
 
 if __name__ == '__main__':
     unittest.main()

tools/js2c.py

@@ -119,17 +119,19 @@ def GetDefinition(var, source, step=30):
   return definition, len(code_points)
 
 
-def AddModule(filename, definitions, initializers):
+def AddModule(root, filename, definitions, initializers):
   code = ReadFile(filename)
-  name = NormalizeFileName(filename)
+  name = NormalizeFileName(root, filename)
   slug = SLUGGER_RE.sub('_', name)
   var = slug + '_raw'
   definition, size = GetDefinition(var, code)
   initializer = INITIALIZER.format(name, var, size)
   definitions.append(definition)
   initializers.append(initializer)
 
-def NormalizeFileName(filename):
+def NormalizeFileName(root, filename):
+  if root:
+    filename = os.path.relpath(filename, root)
   split = filename.split('/')
   if split[0] == 'deps':
     split = ['internal'] + split
@@ -140,15 +142,15 @@ def NormalizeFileName(filename):
   return os.path.splitext(filename)[0]
 
 
-def JS2C(source_files, target):
+def JS2C(root, source_files, target):
   # Build source code lines
   definitions = []
   initializers = []
 
   for filename in source_files['.js']:
-    AddModule(filename, definitions, initializers)
+    AddModule(root, filename, definitions, initializers)
   for filename in source_files['.mjs']:
-    AddModule(filename, definitions, initializers)
+    AddModule(root, filename, definitions, initializers)
 
   config_def, config_size = handle_config_gypi(source_files['config.gypi'])
   definitions.append(config_def)
@@ -215,6 +217,10 @@ def main():
       '--directory',
       default=None,
       help='input file directory')
+  parser.add_argument(
+      '--root',
+      default=None,
+      help='root directory containing the sources')
   parser.add_argument('--verbose', action='store_true', help='output file')
   parser.add_argument('sources', nargs='*', help='input files')
   options = parser.parse_args()
@@ -231,9 +237,10 @@ def main():
   # Should have exactly 3 types: `.js`, `.mjs` and `.gypi`
   assert len(source_files) == 3
   # Currently config.gypi is the only `.gypi` file allowed
-  assert source_files['.gypi'] == ['config.gypi']
+  assert len(source_files['.gypi']) == 1
+  assert os.path.basename(source_files['.gypi'][0]) == 'config.gypi'
   source_files['config.gypi'] = source_files.pop('.gypi')[0]
-  JS2C(source_files, options.target)
+  JS2C(options.root, source_files, options.target)
 
 
 if __name__ == "__main__":