| OLD | NEW | 
|     1 # Copyright (c) 2009 The Chromium Authors. All rights reserved. |     1 # Copyright (c) 2009 The Chromium Authors. All rights reserved. | 
|     2 # Use of this source code is governed by a BSD-style license that can be |     2 # Use of this source code is governed by a BSD-style license that can be | 
|     3 # found in the LICENSE file. |     3 # found in the LICENSE file. | 
|     4  |     4  | 
|     5 { |     5 { | 
|     6   'variables': { |     6   'variables': { | 
|     7     'feature_defines': [ |     7     'feature_defines': [ | 
|     8       'ENABLE_CHANNEL_MESSAGING=1', |     8       'ENABLE_CHANNEL_MESSAGING=1', | 
|     9       'ENABLE_DATABASE=1', |     9       'ENABLE_DATABASE=1', | 
|    10       'ENABLE_DATAGRID=0', |    10       'ENABLE_DATAGRID=0', | 
| (...skipping 270 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|   281             '../third_party/WebKit/JavaScriptCore/bindings', |   281             '../third_party/WebKit/JavaScriptCore/bindings', | 
|   282             '../third_party/WebKit/JavaScriptCore/bindings/c', |   282             '../third_party/WebKit/JavaScriptCore/bindings/c', | 
|   283             '../third_party/WebKit/JavaScriptCore/bindings/jni', |   283             '../third_party/WebKit/JavaScriptCore/bindings/jni', | 
|   284             'pending', |   284             'pending', | 
|   285             'pending/wtf', |   285             'pending/wtf', | 
|   286           ], |   286           ], | 
|   287           'include_dirs!': [ |   287           'include_dirs!': [ | 
|   288             '<(SHARED_INTERMEDIATE_DIR)/webkit', |   288             '<(SHARED_INTERMEDIATE_DIR)/webkit', | 
|   289           ], |   289           ], | 
|   290         }], |   290         }], | 
|   291         ['OS=="linux"', { |   291         ['OS=="linux" or OS=="freebsd"', { | 
|   292           'defines': ['WTF_USE_PTHREADS=1'], |   292           'defines': ['WTF_USE_PTHREADS=1'], | 
|   293           'direct_dependent_settings': { |   293           'direct_dependent_settings': { | 
|   294             'defines': ['WTF_USE_PTHREADS=1'], |   294             'defines': ['WTF_USE_PTHREADS=1'], | 
|   295           }, |   295           }, | 
|   296         }], |   296         }], | 
|   297       ], |   297       ], | 
|   298     }, |   298     }, | 
|   299     { |   299     { | 
|   300       'target_name': 'pcre', |   300       'target_name': 'pcre', | 
|   301       'type': '<(library)', |   301       'type': '<(library)', | 
| (...skipping 466 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|   768       }, |   768       }, | 
|   769       'conditions': [ |   769       'conditions': [ | 
|   770         ['javascript_engine=="v8"', { |   770         ['javascript_engine=="v8"', { | 
|   771           'dependencies': [ |   771           'dependencies': [ | 
|   772             '../v8/tools/gyp/v8.gyp:v8', |   772             '../v8/tools/gyp/v8.gyp:v8', | 
|   773           ], |   773           ], | 
|   774           'export_dependent_settings': [ |   774           'export_dependent_settings': [ | 
|   775             '../v8/tools/gyp/v8.gyp:v8', |   775             '../v8/tools/gyp/v8.gyp:v8', | 
|   776           ], |   776           ], | 
|   777         }], |   777         }], | 
|   778         ['OS=="linux"', { |   778         ['OS=="linux" or OS=="freebsd"', { | 
|   779           'dependencies': [ |   779           'dependencies': [ | 
|   780             '../build/linux/system.gyp:fontconfig', |   780             '../build/linux/system.gyp:fontconfig', | 
|   781             '../build/linux/system.gyp:gtk', |   781             '../build/linux/system.gyp:gtk', | 
|   782           ], |   782           ], | 
|   783           'sources': [ |   783           'sources': [ | 
|   784             '../third_party/WebKit/WebCore/platform/graphics/chromium/VDMXParser
      .cpp', |   784             '../third_party/WebKit/WebCore/platform/graphics/chromium/VDMXParser
      .cpp', | 
|   785             '../third_party/WebKit/WebCore/platform/graphics/chromium/HarfbuzzSk
      ia.cpp', |   785             '../third_party/WebKit/WebCore/platform/graphics/chromium/HarfbuzzSk
      ia.cpp', | 
|   786           ], |   786           ], | 
|   787           'sources/': [ |   787           'sources/': [ | 
|   788             # Cherry-pick files excluded by the broader regular expressions abov
      e. |   788             # Cherry-pick files excluded by the broader regular expressions abov
      e. | 
| (...skipping 140 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|   929             '__PRETTY_FUNCTION__=__FUNCTION__', |   929             '__PRETTY_FUNCTION__=__FUNCTION__', | 
|   930             'DISABLE_ACTIVEX_TYPE_CONVERSION_MPLAYER2', |   930             'DISABLE_ACTIVEX_TYPE_CONVERSION_MPLAYER2', | 
|   931           ], |   931           ], | 
|   932           # This is needed because Event.h in this directory is blocked |   932           # This is needed because Event.h in this directory is blocked | 
|   933           # by a system header on windows. |   933           # by a system header on windows. | 
|   934           'include_dirs++': ['../third_party/WebKit/WebCore/dom'], |   934           'include_dirs++': ['../third_party/WebKit/WebCore/dom'], | 
|   935           'direct_dependent_settings': { |   935           'direct_dependent_settings': { | 
|   936             'include_dirs+++': ['../third_party/WebKit/WebCore/dom'], |   936             'include_dirs+++': ['../third_party/WebKit/WebCore/dom'], | 
|   937           }, |   937           }, | 
|   938         }], |   938         }], | 
|   939         ['OS!="linux"', {'sources/': [['exclude', '(Gtk|Linux)\\.cpp$']]}], |   939         ['OS!="linux" and OS!="freebsd"', {'sources/': [['exclude', '(Gtk|Linux)
      \\.cpp$']]}], | 
|   940         ['OS!="mac"', {'sources/': [['exclude', 'Mac\\.(cpp|mm?)$']]}], |   940         ['OS!="mac"', {'sources/': [['exclude', 'Mac\\.(cpp|mm?)$']]}], | 
|   941         ['OS!="win"', { |   941         ['OS!="win"', { | 
|   942           'sources/': [ |   942           'sources/': [ | 
|   943             ['exclude', 'Win\\.cpp$'], |   943             ['exclude', 'Win\\.cpp$'], | 
|   944             ['exclude', '/(Windows|Uniscribe)[^/]*\\.cpp$'] |   944             ['exclude', '/(Windows|Uniscribe)[^/]*\\.cpp$'] | 
|   945           ], |   945           ], | 
|   946         }], |   946         }], | 
|   947       ], |   947       ], | 
|   948     }, |   948     }, | 
|   949     { |   949     { | 
| (...skipping 152 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  1102         'api/src/WebURLRequestPrivate.h', |  1102         'api/src/WebURLRequestPrivate.h', | 
|  1103         'api/src/WebURLResponse.cpp', |  1103         'api/src/WebURLResponse.cpp', | 
|  1104         'api/src/WebURLResponsePrivate.h', |  1104         'api/src/WebURLResponsePrivate.h', | 
|  1105         'api/src/WebURLError.cpp', |  1105         'api/src/WebURLError.cpp', | 
|  1106         'api/src/WrappedResourceRequest.h', |  1106         'api/src/WrappedResourceRequest.h', | 
|  1107         'api/src/WrappedResourceResponse.h', |  1107         'api/src/WrappedResourceResponse.h', | 
|  1108         'api/src/win/WebInputEventFactory.cpp', |  1108         'api/src/win/WebInputEventFactory.cpp', | 
|  1109         'api/src/win/WebScreenInfoFactory.cpp', |  1109         'api/src/win/WebScreenInfoFactory.cpp', | 
|  1110       ], |  1110       ], | 
|  1111       'conditions': [ |  1111       'conditions': [ | 
|  1112         ['OS=="linux"', { |  1112         ['OS=="linux" or OS=="freebsd"', { | 
|  1113           'dependencies': [ |  1113           'dependencies': [ | 
|  1114             '../build/linux/system.gyp:x11', |  1114             '../build/linux/system.gyp:x11', | 
|  1115             '../build/linux/system.gyp:gtk', |  1115             '../build/linux/system.gyp:gtk', | 
|  1116           ], |  1116           ], | 
|  1117           'include_dirs': [ |  1117           'include_dirs': [ | 
|  1118             'api/public/x11', |  1118             'api/public/x11', | 
|  1119             'api/public/gtk', |  1119             'api/public/gtk', | 
|  1120             'api/public/linux', |  1120             'api/public/linux', | 
|  1121           ], |  1121           ], | 
|  1122         }, { # else: OS!="linux" |  1122         }, { # else: OS!="linux" and OS!="freebsd" | 
|  1123           'sources/': [ |  1123           'sources/': [ | 
|  1124             ['exclude', '/gtk/'], |  1124             ['exclude', '/gtk/'], | 
|  1125             ['exclude', '/x11/'], |  1125             ['exclude', '/x11/'], | 
|  1126             ['exclude', '/linux/'], |  1126             ['exclude', '/linux/'], | 
|  1127           ], |  1127           ], | 
|  1128         }], |  1128         }], | 
|  1129         ['OS=="mac"', { |  1129         ['OS=="mac"', { | 
|  1130           'include_dirs': [ |  1130           'include_dirs': [ | 
|  1131             'api/public/mac', |  1131             'api/public/mac', | 
|  1132           ], |  1132           ], | 
| (...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  1197         { |  1197         { | 
|  1198           'action_name': 'webkit_strings', |  1198           'action_name': 'webkit_strings', | 
|  1199           'variables': { |  1199           'variables': { | 
|  1200             'input_path': 'glue/webkit_strings.grd', |  1200             'input_path': 'glue/webkit_strings.grd', | 
|  1201           }, |  1201           }, | 
|  1202           'inputs': [ |  1202           'inputs': [ | 
|  1203             '<(input_path)', |  1203             '<(input_path)', | 
|  1204           ], |  1204           ], | 
|  1205           'outputs': [ |  1205           'outputs': [ | 
|  1206             '<(grit_out_dir)/grit/webkit_strings.h', |  1206             '<(grit_out_dir)/grit/webkit_strings.h', | 
 |  1207             # TODO(benl) Generate this list from a helper script, like | 
 |  1208             # repack_locales_cmd in chrome.gyp (see TODO(mmoss)) | 
 |  1209             '<(grit_out_dir)/webkit_strings_ar.pak', | 
|  1207             '<(grit_out_dir)/webkit_strings_da.pak', |  1210             '<(grit_out_dir)/webkit_strings_da.pak', | 
|  1208             '<(grit_out_dir)/webkit_strings_da.rc', |  1211             '<(grit_out_dir)/webkit_strings_da.rc', | 
|  1209             '<(grit_out_dir)/webkit_strings_en-US.pak', |  1212             '<(grit_out_dir)/webkit_strings_en-US.pak', | 
|  1210             '<(grit_out_dir)/webkit_strings_en-US.rc', |  1213             '<(grit_out_dir)/webkit_strings_en-US.rc', | 
|  1211             '<(grit_out_dir)/webkit_strings_he.pak', |  1214             '<(grit_out_dir)/webkit_strings_he.pak', | 
|  1212             '<(grit_out_dir)/webkit_strings_he.rc', |  1215             '<(grit_out_dir)/webkit_strings_he.rc', | 
|  1213             '<(grit_out_dir)/webkit_strings_zh-TW.pak', |  1216             '<(grit_out_dir)/webkit_strings_zh-TW.pak', | 
|  1214             '<(grit_out_dir)/webkit_strings_zh-TW.rc', |  1217             '<(grit_out_dir)/webkit_strings_zh-TW.rc', | 
|  1215           ], |  1218           ], | 
|  1216           'action': ['python', '<(grit_path)', '-i', '<(input_path)', 'build', '
      -o', '<(grit_out_dir)'], |  1219           'action': ['python', '<(grit_path)', '-i', '<(input_path)', 'build', '
      -o', '<(grit_out_dir)'], | 
| (...skipping 258 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  1475         'glue/window_open_disposition.cc', |  1478         'glue/window_open_disposition.cc', | 
|  1476       ], |  1479       ], | 
|  1477       # When glue is a dependency, it needs to be a hard dependency. |  1480       # When glue is a dependency, it needs to be a hard dependency. | 
|  1478       # Dependents may rely on files generated by this target or one of its |  1481       # Dependents may rely on files generated by this target or one of its | 
|  1479       # own hard dependencies. |  1482       # own hard dependencies. | 
|  1480       'hard_dependency': 1, |  1483       'hard_dependency': 1, | 
|  1481       'export_dependent_settings': [ |  1484       'export_dependent_settings': [ | 
|  1482         'webcore', |  1485         'webcore', | 
|  1483       ], |  1486       ], | 
|  1484       'conditions': [ |  1487       'conditions': [ | 
|  1485         ['OS=="linux"', { |  1488         ['OS=="linux" or OS=="freebsd"', { | 
|  1486           'dependencies': [ |  1489           'dependencies': [ | 
|  1487             '../build/linux/system.gyp:gtk', |  1490             '../build/linux/system.gyp:gtk', | 
|  1488             '../base/base.gyp:linux_versioninfo', |  1491             '../base/base.gyp:linux_versioninfo', | 
|  1489           ], |  1492           ], | 
|  1490           'export_dependent_settings': [ |  1493           'export_dependent_settings': [ | 
|  1491             # Users of webcursor.h need the GTK include path. |  1494             # Users of webcursor.h need the GTK include path. | 
|  1492             '../build/linux/system.gyp:gtk', |  1495             '../build/linux/system.gyp:gtk', | 
|  1493           ], |  1496           ], | 
|  1494           'sources!': [ |  1497           'sources!': [ | 
|  1495             'glue/plugins/plugin_stubs.cc', |  1498             'glue/plugins/plugin_stubs.cc', | 
|  1496           ], |  1499           ], | 
|  1497         }, { # else: OS!="linux" |  1500         }, { # else: OS!="linux" and OS!="freebsd" | 
|  1498           'sources/': [['exclude', '_(linux|gtk)(_data)?\\.cc$'], |  1501           'sources/': [['exclude', '_(linux|gtk)(_data)?\\.cc$'], | 
|  1499                        ['exclude', r'/gtk_']], |  1502                        ['exclude', r'/gtk_']], | 
|  1500         }], |  1503         }], | 
|  1501         ['OS!="mac"', { |  1504         ['OS!="mac"', { | 
|  1502           'sources/': [['exclude', '_mac\\.(cc|mm)$']] |  1505           'sources/': [['exclude', '_mac\\.(cc|mm)$']] | 
|  1503         }, { # else: OS=="mac" |  1506         }, { # else: OS=="mac" | 
|  1504           'sources!': [ |  1507           'sources!': [ | 
|  1505             # TODO(port): Unfork webplugin_delegate_impl_mac and this file. |  1508             # TODO(port): Unfork webplugin_delegate_impl_mac and this file. | 
|  1506             'glue/plugins/webplugin_delegate_impl.cc', |  1509             'glue/plugins/webplugin_delegate_impl.cc', | 
|  1507           ], |  1510           ], | 
| (...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  1575           'files': [ |  1578           'files': [ | 
|  1576  |  1579  | 
|  1577             '<@(webinspector_image_files)', |  1580             '<@(webinspector_image_files)', | 
|  1578  |  1581  | 
|  1579           ], |  1582           ], | 
|  1580         }, |  1583         }, | 
|  1581       ], |  1584       ], | 
|  1582     }, |  1585     }, | 
|  1583   ], |  1586   ], | 
|  1584 } |  1587 } | 
| OLD | NEW |