Changeset 95035 in webkit

Timestamp:

Sep 13, 2011 11:25:26 AM (13 years ago)

Author:

mihaip@chromium.org

Message:

[Chromium] Remove javascript_engine from WebCore.gyp
​https://bugs.webkit.org/show_bug.cgi?id=68001

Reviewed by Tony Chang.

Remove javascript_engine GYP variable (similar to the removal done on
the Chromium side with ​http://crrev.com/100692)

• WebCore.gyp/WebCore.gyp:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• WebCore.gyp/WebCore.gyp (modified) (11 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-09-13  Mihai Parparita  <mihaip@chromium.org>
+
+        [Chromium] Remove javascript_engine from WebCore.gyp
+        https://bugs.webkit.org/show_bug.cgi?id=68001
+
+        Reviewed by Tony Chang.
+
+        Remove javascript_engine GYP variable (similar to the removal done on
+        the Chromium side with http://crrev.com/100692)
+
+        * WebCore.gyp/WebCore.gyp:
+
 2011-09-12  Ryosuke Niwa  <rniwa@webkit.org>
 

trunk/Source/WebCore/WebCore.gyp/WebCore.gyp

@@ -131 +131 @@
     # binary and increasing the speed of gdb.
     'enable_svg%': 1,
-
-    # Use v8 as default JavaScript engine. This makes sure that javascript_engine variable
-    # is set for both inside_chromium_build 0 and 1 cases.
-    'javascript_engine%': 'v8',
 
     'webcore_include_dirs': [
@@ -957 +953 @@
         '<(chromium_src_dir)/third_party/npapi/npapi.gyp:npapi',
         '<(chromium_src_dir)/third_party/sqlite/sqlite.gyp:sqlite',
+        '<(chromium_src_dir)/v8/tools/gyp/v8.gyp:v8',
         '<(libjpeg_gyp_path):libjpeg',
       ],
@@ -1011 +1008 @@
       ],
       'conditions': [
-        ['javascript_engine=="v8"', {
-          'dependencies': [
-            '<(chromium_src_dir)/v8/tools/gyp/v8.gyp:v8',
-          ],
-          'conditions': [
-            ['inside_chromium_build==1 and OS=="win" and component=="shared_library"', {
-              'defines': [
-                'USING_V8_SHARED',
-              ],
-            }],
+        ['inside_chromium_build==1 and OS=="win" and component=="shared_library"', {
+          'defines': [
+            'USING_V8_SHARED',
           ],
         }],
@@ -1081 +1071 @@
         '<(chromium_src_dir)/third_party/sqlite/sqlite.gyp:sqlite',
         '<(chromium_src_dir)/third_party/angle/src/build_angle.gyp:translator_common',
+        '<(chromium_src_dir)/v8/tools/gyp/v8.gyp:v8',
         '<(libjpeg_gyp_path):libjpeg',
       ],
@@ -1097 +1088 @@
         '<(chromium_src_dir)/third_party/sqlite/sqlite.gyp:sqlite',
         '<(chromium_src_dir)/third_party/angle/src/build_angle.gyp:translator_common',
+        '<(chromium_src_dir)/v8/tools/gyp/v8.gyp:v8',
         '<(libjpeg_gyp_path):libjpeg',
       ],
@@ -1129 +1121 @@
       },
       'conditions': [
-        ['javascript_engine=="v8"', {
-          'dependencies': [
-            '<(chromium_src_dir)/v8/tools/gyp/v8.gyp:v8',
-          ],
-          'export_dependent_settings': [
-            '<(chromium_src_dir)/v8/tools/gyp/v8.gyp:v8',
-          ],
-          'conditions': [
-            ['inside_chromium_build==1 and OS=="win" and component=="shared_library"', {
-              'direct_dependent_settings': {
-                'defines': [
-                  'USING_V8_SHARED',
-                ],
-              },
-            }],
-          ],
+        ['inside_chromium_build==1 and OS=="win" and component=="shared_library"', {
+          'direct_dependent_settings': {
+            'defines': [
+               'USING_V8_SHARED',
+            ],
+          },
         }],
         ['use_accelerated_compositing==1', {
@@ -1656 +1638 @@
       'dependencies': [
         'webcore_prerequisites',
+        '<(chromium_src_dir)/third_party/v8-i18n/build/all.gyp:v8-i18n',
       ],
       # This is needed for mac because of webkit_system_interface. It'd be nice
@@ -1780 +1763 @@
           ],
         }],
-        ['javascript_engine=="v8"', {
-          'dependencies': [
-            '<(chromium_src_dir)/third_party/v8-i18n/build/all.gyp:v8-i18n',
-          ],
-        }],
       ],
     },
@@ -1803 +1781 @@
         '<(chromium_src_dir)/skia/skia.gyp:skia',
         '<(chromium_src_dir)/third_party/npapi/npapi.gyp:npapi',
+        '<(chromium_src_dir)/v8/tools/gyp/v8.gyp:v8',
       ],
       'export_dependent_settings': [
@@ -1810 +1789 @@
         '<(chromium_src_dir)/skia/skia.gyp:skia',
         '<(chromium_src_dir)/third_party/npapi/npapi.gyp:npapi',
+        '<(chromium_src_dir)/v8/tools/gyp/v8.gyp:v8',
       ],
       'direct_dependent_settings': {
@@ -1827 +1807 @@
       },
       'conditions': [
-        ['javascript_engine=="v8"', {
-          'dependencies': [
-            '<(chromium_src_dir)/v8/tools/gyp/v8.gyp:v8',
-          ],
-          'export_dependent_settings': [
-            '<(chromium_src_dir)/v8/tools/gyp/v8.gyp:v8',
-          ],
-        }],
         ['OS=="mac"', {
           'direct_dependent_settings': {