Changeset 219289 in webkit for trunk/Source/JavaScriptCore/Scripts

Timestamp:

Jul 10, 2017, 6:19:55 AM (8 years ago)

Author:

Carlos Garcia Campos

Message:

Move make-js-file-arrays.py from WebCore to JavaScriptCore
​https://bugs.webkit.org/show_bug.cgi?id=174024

Reviewed by Michael Catanzaro.

.:

Make MAKE_JS_FILE_ARRAYS independent of WebCore and update it to use make-js-file-arrays.py from
JavaScriptCore. It's no longer needed to set PYTHON_PATH to find jsmin.py.

• Source/cmake/WebKitMacros.cmake:

Source/JavaScriptCore:

It's currently used only by WebCore, but it depends on other JavaScriptCore scripts and it's not WebCore
specific at all. I plan to use it to compile the JavaScript atoms used by the WebDriver implementation.
Added command line option to pass the namespace to use instead of using WebCore.

• JavaScriptCore.xcodeproj/project.pbxproj:
• Scripts/make-js-file-arrays.py: Renamed from Source/WebCore/Scripts/make-js-file-arrays.py.

(main):

Source/WebCore:

• CMakeLists.txt: Explicitly add files generated by MAKE_JS_FILE_ARRAYS to the build, since the macro no longer

does it.

• DerivedSources.make: Updated to use make-js-file-arrays.py from JavaScriptCore. It's no longer needed to set

PYTHON_PATH to find jsmin.py.

File:

• trunk/Source/JavaScriptCore/Scripts/make-js-file-arrays.py (moved) (moved from trunk/Source/WebCore/Scripts/make-js-file-arrays.py ) (4 diffs)

trunk/Source/JavaScriptCore/Scripts/make-js-file-arrays.py

@@ -42 +42 @@
 
 def main():
-    parser = OptionParser(usage="usage: %prog [--no-minify] header source [input [input...]]")
+    parser = OptionParser(usage="usage: %prog [options] header source [input [input...]]")
     parser.add_option('--no-minify', action='store_true', help='Do not run the input files through jsmin')
+    parser.add_option('-n', '--namespace', help='Namespace to use')
     (options, arguments) = parser.parse_args()
+    if not options.namespace:
+        print 'Error: must provide a namespace'
+        parser.print_usage()
+        exit(-1)
     if len(arguments) < 3:
         print 'Error: must provide at least 3 arguments'
@@ -50 +55 @@
         exit(-1)
 
+    namespace = options.namespace
     headerPath = arguments[0]
     sourcePath = arguments[1]
@@ -55 +61 @@
 
     headerFile = open(headerPath, 'w')
-    print >> headerFile, 'namespace WebCore {'
+    print >> headerFile, 'namespace {0:s} {{'.format(namespace)
 
     sourceFile = open(sourcePath, 'w')
     print >> sourceFile, '#include "{0:s}"'.format(os.path.basename(headerPath))
-    print >> sourceFile, 'namespace WebCore {'
+    print >> sourceFile, 'namespace {0:s} {{'.format(namespace)
 
     jsm = JavascriptMinify()
@@ -85 +91 @@
         print >> sourceFile, '};'
 
-    print >> headerFile, '}'
-    print >> sourceFile, '}'
+    print >> headerFile, '}} // namespace {0:s}'.format(namespace)
+    print >> sourceFile, '}} // namespace {0:s}'.format(namespace)
 
 if __name__ == '__main__':