Commit 83b38661 authored by tkent@chromium.org's avatar tkent@chromium.org

2010-08-29 Marc-Antoine Ruel <maruel@chromium.org>

        Reviewed by Kent Tamura.

        Rename webcore to 'webcore_remaining'.
        Create a meta-target webcore that inherits from every webcore_XXX targets. (Currently 1)
        Move direct_dependent_settings and export_dependent_settings from webcore_remaining to webcore

        Obviously, there will be other webcore_XXX targets. Keeping the change as small as possible.

        * WebCore.gyp/WebCore.gyp:

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@66360 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 64ee2fbe
2010-08-29 Marc-Antoine Ruel <maruel@chromium.org>
Reviewed by Kent Tamura.
Rename webcore to 'webcore_remaining'.
Create a meta-target webcore that inherits from every webcore_XXX targets. (Currently 1)
Move direct_dependent_settings and export_dependent_settings from webcore_remaining to webcore
Obviously, there will be other webcore_XXX targets. Keeping the change as small as possible.
* WebCore.gyp/WebCore.gyp:
2010-08-29 Jeremy Moskovich <jeremy@chromium.org>
Reviewed by Dimitri Glazkov.
......@@ -852,17 +852,13 @@
},
},
{
'target_name': 'webcore',
# TODO: To be the remaining, there must be other sibbling projects.
# Will be done in a separate change to keep the diff simpler.
'target_name': 'webcore_remaining',
'type': '<(library)',
'msvs_guid': '1C16337B-ACF3-4D03-AA90-851C5B5EADA6',
'dependencies': [
'webcore_prerequisites',
# Exported.
'webcore_bindings',
'../../JavaScriptCore/JavaScriptCore.gyp/JavaScriptCore.gyp:wtf',
'<(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',
],
'sources': [
'<@(webcore_files)',
......@@ -956,21 +952,6 @@
'../dom/default/PlatformMessagePortChannel.h',
],
'direct_dependent_settings': {
'include_dirs': [
'<@(webcore_include_dirs)',
],
'mac_framework_dirs': [
'$(SDKROOT)/System/Library/Frameworks/ApplicationServices.framework/Frameworks',
],
},
'export_dependent_settings': [
'webcore_bindings',
'../../JavaScriptCore/JavaScriptCore.gyp/JavaScriptCore.gyp:wtf',
'<(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',
],
'link_settings': {
'mac_bundle_resources': [
'../Resources/aliasCursor.png',
......@@ -1023,9 +1004,6 @@
'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"', {
'defines': [
......@@ -1236,12 +1214,6 @@
# Again, Skia is not used on Mac.
'../platform/chromium/DragImageChromiumSkia.cpp',
],
'direct_dependent_settings': {
'include_dirs': [
'../../WebKitLibraries',
'../../WebKit/mac/WebCoreSupport',
],
},
}],
['OS=="win"', {
'dependencies': [
......@@ -1261,9 +1233,6 @@
# This is needed because Event.h in this directory is blocked
# by a system header on windows.
'include_dirs++': ['../dom'],
'direct_dependent_settings': {
'include_dirs+++': ['../dom'],
},
}],
['OS!="linux" and OS!="freebsd"', {
'sources/': [['exclude', '(Gtk|Linux)\\.cpp$']]
......@@ -1286,5 +1255,56 @@
}],
],
},
{
'target_name': 'webcore',
'type': 'none',
'dependencies': [
'webcore_remaining',
# Exported.
'webcore_bindings',
'../../JavaScriptCore/JavaScriptCore.gyp/JavaScriptCore.gyp:wtf',
'<(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',
],
'export_dependent_settings': [
'webcore_bindings',
'../../JavaScriptCore/JavaScriptCore.gyp/JavaScriptCore.gyp:wtf',
'<(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',
],
'direct_dependent_settings': {
'include_dirs': [
'<@(webcore_include_dirs)',
],
'mac_framework_dirs': [
'$(SDKROOT)/System/Library/Frameworks/ApplicationServices.framework/Frameworks',
],
},
'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': [
'../../WebKitLibraries',
'../../WebKit/mac/WebCoreSupport',
],
},
}],
['OS=="win"', {
'direct_dependent_settings': {
'include_dirs+++': ['../dom'],
},
}],
],
},
], # targets
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment