Changeset 143381 in webkit

Timestamp:

Feb 19, 2013 1:53:57 PM (11 years ago)

Author:

Martin Robinson

Message:

[GTK] Improve gyp build JavaScriptCore code generation
​https://bugs.webkit.org/show_bug.cgi?id=109969

Reviewed by Dirk Pranke.

Switch away from using DerivedSources.make when building JavaScriptCore generated
sources. This bring a couple advantages, such as building the sources in parallel,
but requires us to list the generated sources more than once.

• JavaScriptCore.gyp/JavaScriptCoreGTK.gyp: Add rules for generating JavaScriptCore sources.
• JavaScriptCore.gyp/generate-derived-sources.sh: Added.
• JavaScriptCore.gyp/redirect-stdout.sh: Added.

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• JavaScriptCore.gyp/JavaScriptCoreGTK.gyp (modified) (3 diffs)
• JavaScriptCore.gyp/generate-derived-sources.sh (deleted)
• JavaScriptCore.gyp/redirect-stdout.sh (added)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2013-02-15  Martin Robinson  <mrobinson@igalia.com>
+
+        [GTK] Improve gyp build JavaScriptCore code generation
+        https://bugs.webkit.org/show_bug.cgi?id=109969
+
+        Reviewed by Dirk Pranke.
+
+        Switch away from using DerivedSources.make when building JavaScriptCore generated
+        sources. This bring a couple advantages, such as building the sources in parallel,
+        but requires us to list the generated sources more than once.
+
+        * JavaScriptCore.gyp/JavaScriptCoreGTK.gyp: Add rules for generating JavaScriptCore sources.
+        * JavaScriptCore.gyp/generate-derived-sources.sh: Added.
+        * JavaScriptCore.gyp/redirect-stdout.sh: Added.
+
 2013-02-19  Sheriff Bot  <webkit.review.bot@gmail.com>
 

trunk/Source/JavaScriptCore/JavaScriptCore.gyp/JavaScriptCoreGTK.gyp

@@ -71 +71 @@
     },
     {
+      'target_name': 'GenerateLUTs',
+      'type': 'none',
+      'sources': [
+          '../runtime/ArrayConstructor.cpp',
+          '../runtime/ArrayPrototype.cpp',
+          '../runtime/BooleanPrototype.cpp',
+          '../runtime/DateConstructor.cpp',
+          '../runtime/DatePrototype.cpp',
+          '../runtime/ErrorPrototype.cpp',
+          '../runtime/JSONObject.cpp',
+          '../runtime/JSGlobalObject.cpp',
+          '../runtime/MathObject.cpp',
+          '../runtime/NamePrototype.cpp',
+          '../runtime/NumberConstructor.cpp',
+          '../runtime/NumberPrototype.cpp',
+          '../runtime/ObjectConstructor.cpp',
+          '../runtime/ObjectPrototype.cpp',
+          '../runtime/RegExpConstructor.cpp',
+          '../runtime/RegExpPrototype.cpp',
+          '../runtime/RegExpObject.cpp',
+          '../runtime/StringConstructor.cpp',
+          '../runtime/StringPrototype.cpp',
+      ],
+      'rules' : [
+        {
+          'rule_name': 'GenerateLUT',
+          'extension': 'cpp',
+          'inputs': [ '<(JavaScriptCore)/create_hash_table', ],
+          'outputs': [
+            '<(PRODUCT_DIR)/DerivedSources/JavaScriptCore/<(RULE_INPUT_ROOT).lut.h',
+          ],
+          'action': [
+            './redirect-stdout.sh',
+            '<(PRODUCT_DIR)/DerivedSources/JavaScriptCore/<(RULE_INPUT_ROOT).lut.h',
+            'perl', '<@(_inputs)', '<(RULE_INPUT_PATH)', '-i',
+          ],
+        }
+      ],
+      'actions': [
+        {
+          'action_name': 'GenerateLexerLUT',
+          'inputs': [
+              '<(JavaScriptCore)/create_hash_table',
+              '<(JavaScriptCore)/parser/Keywords.table',
+           ],
+          'outputs': [ '<(PRODUCT_DIR)/DerivedSources/JavaScriptCore/Lexer.lut.h', ],
+          'action': [
+            './redirect-stdout.sh',
+            '<(PRODUCT_DIR)/DerivedSources/JavaScriptCore/Lexer.lut.h',
+            'perl', '<@(_inputs)',
+          ],
+        },
+      ],
+    },
+    {
       'target_name': 'libjavascriptcoregtk',
         'type': 'shared_library',
         'dependencies': [
-          '<(Source)/WTF/WTF.gyp/WTFGTK.gyp:wtf',
-          'LLIntOffsetExtractor',
           '<(Dependencies):glib',
           '<(Dependencies):icu',
+          '<(Source)/WTF/WTF.gyp/WTFGTK.gyp:wtf',
+          'GenerateLUTs',
+          'LLIntOffsetExtractor',
         ],
         'product_extension': 'so.<@(javascriptcore_soname_version)',
@@ -95 +151 @@
       'actions': [
         {
-          'action_name': 'Generate Derived Sources',
-          'inputs': [
-            '<(JavaScriptCore)/DerivedSources.make',
-            'generate-derived-sources.sh',
-          ],
-          'outputs': [
-            '<@(javascriptcore_derived_source_files)',
-          ],
-          'action': ['sh', 'generate-derived-sources.sh', '<@(project_dir)', '<(PRODUCT_DIR)/DerivedSources/JavaScriptCore'],
-        },
-        {
           'action_name': 'llintassembly_header_generation',
           'inputs': [
@@ -116 +161 @@
           ],
           'action': ['ruby', '<@(_inputs)', '<@(_outputs)'],
+        },
+        {
+          'action_name': 'GenerateRegExpJitTables',
+          'inputs': [ '<(JavaScriptCore)/create_regex_tables', ],
+          'outputs': [ '<(PRODUCT_DIR)/DerivedSources/JavaScriptCore/RegExpJitTables.h', ],
+          'action': [
+            './redirect-stdout.sh',
+            '<(PRODUCT_DIR)/DerivedSources/JavaScriptCore/RegExpJitTables.h',
+            'python', '<@(_inputs)'
+          ],
+        },
+        {
+          'action_name': 'GenerateKeywordLookup',
+          'inputs': [
+            '<(JavaScriptCore)/KeywordLookupGenerator.py',
+            '<(JavaScriptCore)/parser/Keywords.table',
+          ],
+          'outputs': [ '<(PRODUCT_DIR)/DerivedSources/JavaScriptCore/KeywordLookup.h', ],
+          'action': [
+            './redirect-stdout.sh',
+            '<(PRODUCT_DIR)/DerivedSources/JavaScriptCore/KeywordLookup.h',
+            'python', '<@(_inputs)'
+          ],
         },
       ],