Changeset 80389 in webkit

Timestamp:

Mar 4, 2011 4:16:45 PM (13 years ago)

Author:

abarth@webkit.org

Message:

2011-03-04 Adam Barth <​abarth@webkit.org>

Reviewed by Dimitri Glazkov.

Remove unneeded round-trips through ../Source in the Chromium GYP build
​https://bugs.webkit.org/show_bug.cgi?id=55795

• JavaScriptCore.gyp/JavaScriptCore.gyp:

2011-03-04 Adam Barth <​abarth@webkit.org>

Reviewed by Dimitri Glazkov.

Remove unneeded round-trips through ../Source in the Chromium GYP build
​https://bugs.webkit.org/show_bug.cgi?id=55795

• WebKit.gyp:

2011-03-04 Adam Barth <​abarth@webkit.org>

Reviewed by Dimitri Glazkov.

Remove unneeded round-trips through ../Source in the Chromium GYP build
​https://bugs.webkit.org/show_bug.cgi?id=55795

This is just cleanup work, but it was bugging me.

• WebCore.gyp/WebCore.gyp:

Location:

trunk/Source

Files:

• JavaScriptCore/ChangeLog (modified) (1 diff)
• JavaScriptCore/JavaScriptCore.gyp/JavaScriptCore.gyp (modified) (2 diffs)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/WebCore.gyp/WebCore.gyp (modified) (5 diffs)
• WebKit/chromium/ChangeLog (modified) (1 diff)
• WebKit/chromium/WebKit.gyp (modified) (16 diffs)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2011-03-04  Adam Barth  <abarth@webkit.org>
+
+        Reviewed by Dimitri Glazkov.
+
+        Remove unneeded round-trips through ../Source in the Chromium GYP build
+        https://bugs.webkit.org/show_bug.cgi?id=55795
+
+        * JavaScriptCore.gyp/JavaScriptCore.gyp:
+
 2011-03-04  Adam Barth  <abarth@webkit.org>
 

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

@@ -33 +33 @@
     # FIXME: Sense whether upstream or downstream build, and
     # include the right features.gypi
-    '../../../Source/WebKit/chromium/features.gypi',
+    '../../WebKit/chromium/features.gypi',
     '../JavaScriptCore.gypi',
   ],
@@ -41 +41 @@
       ['inside_chromium_build==0', {
         # Webkit is being built outside of the full chromium project.
-        'chromium_src_dir': '../../../Source/WebKit/chromium',
+        'chromium_src_dir': '../../WebKit/chromium',
       },{
         # WebKit is checked out in src/chromium/third_party/WebKit

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-03-04  Adam Barth  <abarth@webkit.org>
+
+        Reviewed by Dimitri Glazkov.
+
+        Remove unneeded round-trips through ../Source in the Chromium GYP build
+        https://bugs.webkit.org/show_bug.cgi?id=55795
+
+        This is just cleanup work, but it was bugging me.
+
+        * WebCore.gyp/WebCore.gyp:
+
 2011-03-04  Mike Reed  <reed@google.com>
 

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

@@ -33 +33 @@
     # FIXME: Sense whether upstream or downstream build, and
     # include the right features.gypi
-    '../../../Source/WebKit/chromium/features.gypi',
+    '../../WebKit/chromium/features.gypi',
     '../WebCore.gypi',
   ],
@@ -41 +41 @@
       # Webkit is being built outside of the full chromium project.
       'variables': {
-        'chromium_src_dir': '../../../Source/WebKit/chromium',
+        'chromium_src_dir': '../../WebKit/chromium',
         'libjpeg_gyp_path': '<(chromium_src_dir)/third_party/libjpeg_turbo/libjpeg.gyp',
       },
@@ -1165 +1165 @@
 
         # For WebCoreSystemInterface, Mac-only.
-        '../../../Source/WebKit/mac/WebCoreSupport/WebSystemInterface.mm',
+        '../../WebKit/mac/WebCoreSupport/WebSystemInterface.mm',
       ],
       'sources/': [
@@ -1277 +1277 @@
             ['include', 'platform/Theme\\.cpp$'],
 
-            ['include', 'Source/WebKit/mac/WebCoreSupport/WebSystemInterface\\.mm$'],
+            ['include', 'WebKit/mac/WebCoreSupport/WebSystemInterface\\.mm$'],
 
             # Chromium Mac does not use skia.
@@ -1603 +1603 @@
             'include_dirs': [
               '../../../WebKitLibraries',
-              '../../../Source/WebKit/mac/WebCoreSupport',
+              '../../WebKit/mac/WebCoreSupport',
             ],
           },

trunk/Source/WebKit/chromium/ChangeLog

@@ +1 @@
+2011-03-04  Adam Barth  <abarth@webkit.org>
+
+        Reviewed by Dimitri Glazkov.
+
+        Remove unneeded round-trips through ../Source in the Chromium GYP build
+        https://bugs.webkit.org/show_bug.cgi?id=55795
+
+        * WebKit.gyp:
+
 2011-03-03  John Abd-El-Malek  <jam@chromium.org>
 

trunk/Source/WebKit/chromium/WebKit.gyp

@@ -31 +31 @@
 {
     'includes': [
-        '../../../Source/WebCore/WebCore.gypi',
+        '../../WebCore/WebCore.gypi',
         '../../../Tools/DumpRenderTree/DumpRenderTree.gypi',
         'WebKit.gypi',
@@ -43 +43 @@
                 # Webkit is being built outside of the full chromium project.
                 # e.g. via build-webkit --chromium
-                'chromium_src_dir': '../../../Source/WebKit/chromium',
+                'chromium_src_dir': '../../WebKit/chromium',
                 'webkit_target_type': 'static_library',
 
@@ -74 +74 @@
             'msvs_guid': '5ECEC9E5-8F23-47B6-93E0-C3B328B3BE65',
             'dependencies': [
-                '../../../Source/WebCore/WebCore.gyp/WebCore.gyp:webcore',
+                '../../WebCore/WebCore.gyp/WebCore.gyp:webcore',
                 '<(chromium_src_dir)/app/app.gyp:app_base', # For GLContext
                 '<(chromium_src_dir)/skia/skia.gyp:skia',
@@ -599 +599 @@
                             ],
                             'dependencies': [
-                                '../../../Source/WebCore/WebCore.gyp/WebCore.gyp:webcore_bindings',
+                                '../../WebCore/WebCore.gyp/WebCore.gyp:webcore_bindings',
                                 '<(chromium_src_dir)/base/base.gyp:test_support_base',
                                 '<(chromium_src_dir)/build/temp_gyp/googleurl.gyp:googleurl',
@@ -696 +696 @@
             'dependencies': [
                 'devtools_html',
-                '../../../Source/WebCore/WebCore.gyp/WebCore.gyp:inspector_protocol_sources',
+                '../../WebCore/WebCore.gyp/WebCore.gyp:inspector_protocol_sources',
             ],
             'conditions': [
@@ -737 +737 @@
                     # See issue 29695: WebKit.gypi is a source file for devtools.html.
                     'WebKit.gypi',
-                    '../../../Source/WebCore/inspector/front-end/inspector.html',
+                    '../../WebCore/inspector/front-end/inspector.html',
                 ],
                 'outputs': ['<(PRODUCT_DIR)/resources/inspector/devtools.html'],
@@ -748 +748 @@
             'dependencies': [
                 'devtools_html',
-                '../../../Source/WebCore/WebCore.gyp/WebCore.gyp:inspector_protocol_sources'
+                '../../WebCore/WebCore.gyp/WebCore.gyp:inspector_protocol_sources'
             ],
             'sources': ['<(PRODUCT_DIR)/resources/inspector/DevTools.js'],
@@ -754 +754 @@
                 'action_name': 'concatenate_devtools_js',
                 'script_name': 'scripts/concatenate_js_files.py',
-                'input_page': '../../../Source/WebCore/inspector/front-end/inspector.html',
+                'input_page': '../../WebCore/inspector/front-end/inspector.html',
                 'inputs': [
                     '<@(_script_name)',
@@ -763 +763 @@
                 ],
                 'search_path': [
-                    '../../../Source/WebCore/inspector/front-end',
+                    '../../WebCore/inspector/front-end',
                     'src/js',
                     '<(SHARED_INTERMEDIATE_DIR)/webcore',
@@ -781 +781 @@
                 'action_name': 'concatenate_devtools_css',
                 'script_name': 'scripts/concatenate_css_files.py',
-                'input_page': '../../../Source/WebCore/inspector/front-end/inspector.html',
+                'input_page': '../../WebCore/inspector/front-end/inspector.html',
                 'inputs': [
                     '<@(_script_name)',
@@ -789 +789 @@
                 ],
                 'search_path': [
-                    '../../../Source/WebCore/inspector/front-end',
+                    '../../WebCore/inspector/front-end',
                     'src/js',
                 ],
@@ -802 +802 @@
             'dependencies': [
                 'webkit',
-                '../../../Source/WebCore/WebCore.gyp/WebCore.gyp:webcore',
+                '../../WebCore/WebCore.gyp/WebCore.gyp:webcore',
                 '<(chromium_src_dir)/testing/gtest.gyp:gtest',
                 '<(chromium_src_dir)/base/base.gyp:base',
@@ -873 +873 @@
             'dependencies': [
                 'webkit',
-                '../../../Source/JavaScriptCore/JavaScriptCore.gyp/JavaScriptCore.gyp:wtf',
+                '../../JavaScriptCore/JavaScriptCore.gyp/JavaScriptCore.gyp:wtf',
                 '<(chromium_src_dir)/webkit/support/webkit_support.gyp:webkit_support',
             ],
             'include_dirs': [
-                '../../../Source/JavaScriptCore',
+                '../../JavaScriptCore',
                 '<(DEPTH)',
             ],
@@ -894 +894 @@
                 'copy_TestNetscapePlugIn',
                 'webkit',
-                '../../../Source/JavaScriptCore/JavaScriptCore.gyp/JavaScriptCore.gyp:wtf_config',
+                '../../JavaScriptCore/JavaScriptCore.gyp/JavaScriptCore.gyp:wtf_config',
                 '<(chromium_src_dir)/third_party/icu/icu.gyp:icuuc',
                 '<(chromium_src_dir)/third_party/mesa/mesa.gyp:osmesa',
@@ -903 +903 @@
                 '<(chromium_src_dir)',
                 'public',
-                '../../../Source/JavaScriptCore',
-                '../../../Source/JavaScriptCore/wtf', # wtf/text/*.h refers headers in wtf/ without wtf/.
+                '../../JavaScriptCore',
+                '../../JavaScriptCore/wtf', # wtf/text/*.h refers headers in wtf/ without wtf/.
                 '<(DEPTH)',
             ],
@@ -940 +940 @@
                             ],
                             'dependencies': [
-                                '../../../Source/JavaScriptCore/JavaScriptCore.gyp/JavaScriptCore.gyp:wtf',
+                                '../../JavaScriptCore/JavaScriptCore.gyp/JavaScriptCore.gyp:wtf',
                             ],
                         }],