[webkit-changes] [95035] trunk/Source/WebCore

Tue, 13 Sep 2011 11:24:27 -0700

Title: [95035] trunk/Source/WebCore
Revision
95035
Author
mih...@chromium.org
Date
2011-09-13 11:25:26 -0700 (Tue, 13 Sep 2011)

Log 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:

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (95034 => 95035)


--- trunk/Source/WebCore/ChangeLog	2011-09-13 17:58:02 UTC (rev 95034)
+++ trunk/Source/WebCore/ChangeLog	2011-09-13 18:25:26 UTC (rev 95035)
@@ -1,3 +1,15 @@
+2011-09-13  Mihai Parparita  <mih...@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  <rn...@webkit.org>
 
         [CSS3 Backgrounds and Borders] Add unprefixed border-image shorthand.

Modified: trunk/Source/WebCore/WebCore.gyp/WebCore.gyp (95034 => 95035)


--- trunk/Source/WebCore/WebCore.gyp/WebCore.gyp	2011-09-13 17:58:02 UTC (rev 95034)
+++ trunk/Source/WebCore/WebCore.gyp/WebCore.gyp	2011-09-13 18:25:26 UTC (rev 95035)
@@ -131,10 +131,6 @@
     # 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': [
       '../',
       '../..',
@@ -956,6 +952,7 @@
         '<(chromium_src_dir)/third_party/libwebp/libwebp.gyp:libwebp',
         '<(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',
       ],
       'include_dirs': [
@@ -1010,17 +1007,10 @@
         '<(SHARED_INTERMEDIATE_DIR)/webcore/InspectorBackendDispatcher.cpp',
       ],
       'conditions': [
-        ['_javascript__engine=="v8"', {
-          'dependencies': [
-            '<(chromium_src_dir)/v8/tools/gyp/v8.gyp:v8',
+        ['inside_chromium_build==1 and OS=="win" and component=="shared_library"', {
+          'defines': [
+            'USING_V8_SHARED',
           ],
-          'conditions': [
-            ['inside_chromium_build==1 and OS=="win" and component=="shared_library"', {
-              'defines': [
-                'USING_V8_SHARED',
-              ],
-            }],
-          ],
         }],
         # TODO(maruel): Move it in its own project or generate it anyway?
         ['enable_svg!=0', {
@@ -1080,6 +1070,7 @@
         '<(chromium_src_dir)/third_party/ots/ots.gyp:ots',
         '<(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',
       ],
       'export_dependent_settings': [
@@ -1096,6 +1087,7 @@
         '<(chromium_src_dir)/third_party/ots/ots.gyp:ots',
         '<(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',
       ],
       # This is needed for mac because of webkit_system_interface. It'd be nice
@@ -1128,22 +1120,12 @@
         },
       },
       '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', {
           'dependencies': [
@@ -1655,6 +1637,7 @@
       'type': 'static_library',
       '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
       # if this hard dependency could be split off the rest.
@@ -1779,11 +1762,6 @@
             ['exclude', '/(Windows|Uniscribe)[^/]*\\.cpp$']
           ],
         }],
-        ['_javascript__engine=="v8"', {
-          'dependencies': [
-            '<(chromium_src_dir)/third_party/v8-i18n/build/all.gyp:v8-i18n',
-          ],
-        }],
       ],
     },
     {
@@ -1802,6 +1780,7 @@
         '<(chromium_src_dir)/build/temp_gyp/googleurl.gyp:googleurl',
         '<(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': [
         'webcore_bindings',
@@ -1809,6 +1788,7 @@
         '<(chromium_src_dir)/build/temp_gyp/googleurl.gyp:googleurl',
         '<(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': {
         'include_dirs': [
@@ -1826,14 +1806,6 @@
         ],
       },
       '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': {
             'include_dirs': [

_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

Reply via email to