Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

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:


git-svn-id: http://svn.webkit.org/repository/webkit/trunk@80389 268f45cc-cd09-0410-ab3c-d52691b4dbfc
  • Loading branch information...
commit 8f2f287943a89a358fb06426ccecb9832f982e37 1 parent 06a653b
abarth@webkit.org authored
View
9 Source/JavaScriptCore/ChangeLog
@@ -2,6 +2,15 @@
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.
+
Use target_defaults to reduce boilerplate in GYP build system
https://bugs.webkit.org/show_bug.cgi?id=55790
View
4 Source/JavaScriptCore/JavaScriptCore.gyp/JavaScriptCore.gyp
@@ -32,7 +32,7 @@
'includes': [
# FIXME: Sense whether upstream or downstream build, and
# include the right features.gypi
- '../../../Source/WebKit/chromium/features.gypi',
+ '../../WebKit/chromium/features.gypi',
'../JavaScriptCore.gypi',
],
'variables': {
@@ -40,7 +40,7 @@
'conditions': [
['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
'chromium_src_dir': '../../../../..',
View
11 Source/WebCore/ChangeLog
@@ -1,3 +1,14 @@
+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>
Reviewed by James Robinson.
View
10 Source/WebCore/WebCore.gyp/WebCore.gyp
@@ -32,7 +32,7 @@
'includes': [
# FIXME: Sense whether upstream or downstream build, and
# include the right features.gypi
- '../../../Source/WebKit/chromium/features.gypi',
+ '../../WebKit/chromium/features.gypi',
'../WebCore.gypi',
],
# Location of the chromium src directory.
@@ -40,7 +40,7 @@
['inside_chromium_build==0', {
# 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',
},
},{
@@ -1164,7 +1164,7 @@
'<@(webcore_files)',
# For WebCoreSystemInterface, Mac-only.
- '../../../Source/WebKit/mac/WebCoreSupport/WebSystemInterface.mm',
+ '../../WebKit/mac/WebCoreSupport/WebSystemInterface.mm',
],
'sources/': [
# Start by excluding everything then include platform files only.
@@ -1276,7 +1276,7 @@
# Use USE_NEW_THEME on Mac.
['include', 'platform/Theme\\.cpp$'],
- ['include', 'Source/WebKit/mac/WebCoreSupport/WebSystemInterface\\.mm$'],
+ ['include', 'WebKit/mac/WebCoreSupport/WebSystemInterface\\.mm$'],
# Chromium Mac does not use skia.
['exclude', 'platform/graphics/skia/[^/]*Skia\\.(cpp|h)$'],
@@ -1602,7 +1602,7 @@
'direct_dependent_settings': {
'include_dirs': [
'../../../WebKitLibraries',
- '../../../Source/WebKit/mac/WebCoreSupport',
+ '../../WebKit/mac/WebCoreSupport',
],
},
}],
View
9 Source/WebKit/chromium/ChangeLog
@@ -1,3 +1,12 @@
+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>
Reviewed by Dimitri Glazkov.
View
36 Source/WebKit/chromium/WebKit.gyp
@@ -30,7 +30,7 @@
{
'includes': [
- '../../../Source/WebCore/WebCore.gypi',
+ '../../WebCore/WebCore.gypi',
'../../../Tools/DumpRenderTree/DumpRenderTree.gypi',
'WebKit.gypi',
'features.gypi',
@@ -42,7 +42,7 @@
['inside_chromium_build==0', {
# 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',
# List of DevTools source files, ordered by dependencies. It is used both
@@ -73,7 +73,7 @@
'target_name': 'webkit',
'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',
'<(chromium_src_dir)/third_party/npapi/npapi.gyp:npapi',
@@ -598,7 +598,7 @@
'WEBKIT_DLL',
],
'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',
'<(chromium_src_dir)/testing/gtest.gyp:gtest',
@@ -695,7 +695,7 @@
'type': 'none',
'dependencies': [
'devtools_html',
- '../../../Source/WebCore/WebCore.gyp/WebCore.gyp:inspector_protocol_sources',
+ '../../WebCore/WebCore.gyp/WebCore.gyp:inspector_protocol_sources',
],
'conditions': [
['debug_devtools==0', {
@@ -736,7 +736,7 @@
'scripts/generate_devtools_html.py',
# 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'],
'action': ['python', '<@(_inputs)', '<@(_outputs)', '<@(debug_devtools)', '<@(devtools_files)'],
@@ -747,13 +747,13 @@
'type': 'none',
'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'],
'actions': [{
'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)',
'<@(_input_page)',
@@ -762,7 +762,7 @@
'<(SHARED_INTERMEDIATE_DIR)/webcore/InspectorBackendStub.js'
],
'search_path': [
- '../../../Source/WebCore/inspector/front-end',
+ '../../WebCore/inspector/front-end',
'src/js',
'<(SHARED_INTERMEDIATE_DIR)/webcore',
],
@@ -780,7 +780,7 @@
'actions': [{
'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)',
'<@(_input_page)',
@@ -788,7 +788,7 @@
'<@(devtools_files)'
],
'search_path': [
- '../../../Source/WebCore/inspector/front-end',
+ '../../WebCore/inspector/front-end',
'src/js',
],
'outputs': ['<(PRODUCT_DIR)/resources/inspector/devTools.css'],
@@ -801,7 +801,7 @@
'msvs_guid': '7CEFE800-8403-418A-AD6A-2D52C6FC3EAD',
'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',
'<(chromium_src_dir)/base/base.gyp:base_i18n',
@@ -872,11 +872,11 @@
'type': 'executable',
'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)',
],
'sources': [
@@ -893,7 +893,7 @@
'TestNetscapePlugIn',
'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',
'<(chromium_src_dir)/webkit/support/webkit_support.gyp:blob',
@@ -902,8 +902,8 @@
'include_dirs': [
'<(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)',
],
'defines': [
@@ -939,7 +939,7 @@
'public',
],
'dependencies': [
- '../../../Source/JavaScriptCore/JavaScriptCore.gyp/JavaScriptCore.gyp:wtf',
+ '../../JavaScriptCore/JavaScriptCore.gyp/JavaScriptCore.gyp:wtf',
],
}],
['inside_chromium_build==1', {
Please sign in to comment.
Something went wrong with that request. Please try again.