Move core.gyp up one directory to Source/core/

Source/core/core.gyp

 #
 # Copyright (C) 2009 Google Inc. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are
 # met:
 #
 #     * Redistributions of source code must retain the above copyright
 # notice, this list of conditions and the following disclaimer.
 #     * Redistributions in binary form must reproduce the above
@@ skipping 12 matching lines @@
 # SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
 # LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
 # DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
 # THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
 
 {
   'includes': [
-    '../../WebKit/chromium/WinPrecompile.gypi',
-    '../features.gypi',
-    '../../modules/modules.gypi',
-    '../../bindings/bindings.gypi',
-    '../core.gypi',
+    '../WebKit/chromium/WinPrecompile.gypi',
+    'features.gypi',
+    '../modules/modules.gypi',
+    '../bindings/bindings.gypi',
+    'core.gypi',
   ],
 
   'variables': {
     'enable_wexit_time_destructors': 1,
 
     'webcore_include_dirs': [
-      '../../..',
       '../..',
+      '..',
       '<(SHARED_INTERMEDIATE_DIR)/webkit',
       '<(SHARED_INTERMEDIATE_DIR)/webkit/bindings',
     ],
 
     'conditions': [
       ['OS=="android" and use_openmax_dl_fft!=0', {
         'webcore_include_dirs': [
           '<(DEPTH)/third_party/openmax_dl'
         ]
       }],
@@ skipping 11 matching lines @@
       'target_name': 'inspector_protocol_sources',
       'type': 'none',
       'dependencies': [
         'generate_inspector_protocol_version'
       ],
       'actions': [
         {
           'action_name': 'generateInspectorProtocolBackendSources',
           'inputs': [
             # The python script in action below.
-            '../inspector/CodeGeneratorInspector.py',
+            'inspector/CodeGeneratorInspector.py',
             # The helper script imported by CodeGeneratorInspector.py.
-            '../inspector/CodeGeneratorInspectorStrings.py',
+            'inspector/CodeGeneratorInspectorStrings.py',
             # Input file for the script.
-            '../../devtools/protocol.json',
+            '../devtools/protocol.json',
           ],
           'outputs': [
             '<(SHARED_INTERMEDIATE_DIR)/webcore/InspectorBackendDispatcher.cpp',
             '<(SHARED_INTERMEDIATE_DIR)/webkit/InspectorBackendDispatcher.h',
             '<(SHARED_INTERMEDIATE_DIR)/webcore/InspectorFrontend.cpp',
             '<(SHARED_INTERMEDIATE_DIR)/webkit/InspectorFrontend.h',
             '<(SHARED_INTERMEDIATE_DIR)/webcore/InspectorTypeBuilder.cpp',
             '<(SHARED_INTERMEDIATE_DIR)/webkit/InspectorTypeBuilder.h',
           ],
           'variables': {
             'generator_include_dirs': [
             ],
           },
           'action': [
             'python',
-            '../inspector/CodeGeneratorInspector.py',
-            '../../devtools/protocol.json',
+            'inspector/CodeGeneratorInspector.py',
+            '../devtools/protocol.json',
             '--output_h_dir', '<(SHARED_INTERMEDIATE_DIR)/webkit',
             '--output_cpp_dir', '<(SHARED_INTERMEDIATE_DIR)/webcore',
           ],
           'message': 'Generating Inspector protocol backend sources from protocol.json',
           'msvs_cygwin_shell': 1,
         },
       ]
     },
     {
       'target_name': 'inspector_instrumentation_sources',
       'type': 'none',
       'dependencies': [],
       'actions': [
         {
           'action_name': 'generateInspectorInstrumentation',
           'inputs': [
             # The python script in action below.
-            '../inspector/CodeGeneratorInstrumentation.py',
+            'inspector/CodeGeneratorInstrumentation.py',
             # Input file for the script.
-            '../inspector/InspectorInstrumentation.idl',
+            'inspector/InspectorInstrumentation.idl',
           ],
           'outputs': [
             '<(SHARED_INTERMEDIATE_DIR)/webkit/InspectorInstrumentationInl.h',
             '<(SHARED_INTERMEDIATE_DIR)/webcore/InspectorInstrumentationImpl.cpp',
           ],
           'action': [
             'python',
-            '../inspector/CodeGeneratorInstrumentation.py',
-            '../inspector/InspectorInstrumentation.idl',
+            'inspector/CodeGeneratorInstrumentation.py',
+            'inspector/InspectorInstrumentation.idl',
             '--output_h_dir', '<(SHARED_INTERMEDIATE_DIR)/webkit',
             '--output_cpp_dir', '<(SHARED_INTERMEDIATE_DIR)/webcore',
           ],
           'message': 'Generating Inspector instrumentation code from InspectorInstrumentation.idl',
           'msvs_cygwin_shell': 1,
         }
       ]
     },
     {
       'target_name': 'generate_inspector_protocol_version',
       'type': 'none',
       'actions': [
          {
           'action_name': 'generateInspectorProtocolVersion',
           'inputs': [
-            '../inspector/generate-inspector-protocol-version',
-            '../../devtools/protocol.json',
+            'inspector/generate-inspector-protocol-version',
+            '../devtools/protocol.json',
           ],
           'outputs': [
             '<(SHARED_INTERMEDIATE_DIR)/webkit/InspectorProtocolVersion.h',
           ],
           'variables': {
             'generator_include_dirs': [
             ],
           },
           'action': [
             'python',
-            '../inspector/generate-inspector-protocol-version',
+            'inspector/generate-inspector-protocol-version',
             '-o',
             '<@(_outputs)',
             '<@(_inputs)'
           ],
           'message': 'Validate inspector protocol for backwards compatibility and generate version file',
         }
       ]
     },
     {
       'target_name': 'inspector_overlay_page',
       'type': 'none',
       'variables': {
-        'input_file_path': '../inspector/InspectorOverlayPage.html',
+        'input_file_path': 'inspector/InspectorOverlayPage.html',
         'output_file_path': '<(SHARED_INTERMEDIATE_DIR)/webkit/InspectorOverlayPage.h',
         'character_array_name': 'InspectorOverlayPage_html',
       },
       'includes': [ 'ConvertFileToHeaderWithCharacterArray.gypi' ],
     },
     {
       'target_name': 'injected_canvas_script_source',
       'type': 'none',
       'variables': {
-        'input_file_path': '../inspector/InjectedScriptCanvasModuleSource.js',
+        'input_file_path': 'inspector/InjectedScriptCanvasModuleSource.js',
         'output_file_path': '<(SHARED_INTERMEDIATE_DIR)/webkit/InjectedScriptCanvasModuleSource.h',
         'character_array_name': 'InjectedScriptCanvasModuleSource_js',
       },
       'includes': [ 'ConvertFileToHeaderWithCharacterArray.gypi' ],
     },
     {
       'target_name': 'injected_script_source',
       'type': 'none',
       'variables': {
-        'input_file_path': '../inspector/InjectedScriptSource.js',
+        'input_file_path': 'inspector/InjectedScriptSource.js',
         'output_file_path': '<(SHARED_INTERMEDIATE_DIR)/webkit/InjectedScriptSource.h',
         'character_array_name': 'InjectedScriptSource_js',
       },
       'includes': [ 'ConvertFileToHeaderWithCharacterArray.gypi' ],
     },
     {
       'target_name': 'debugger_script_source',
       'type': 'none',
       'variables': {
         'input_file_path': '<(bindings_dir)/v8/DebuggerScript.js',
         'output_file_path': '<(SHARED_INTERMEDIATE_DIR)/webkit/DebuggerScriptSource.h',
         'character_array_name': 'DebuggerScriptSource_js',
       },
       'includes': [ 'ConvertFileToHeaderWithCharacterArray.gypi' ],
     },
     {
       'target_name': 'webcore_derived',
       'type': 'static_library',
       'hard_dependency': 1,
       'dependencies': [
         'webcore_prerequisites',
-        'core_derived_sources.gyp:make_derived_sources',
+        'derived_sources.gyp:make_derived_sources',

[abarth-chromium, 2013/06/04 21:15:35]

You're going to get a problem on Mac when building PPAPI because you can't have
two GYP files with the same name (the other one is in bindings).  That's why I
called this core_derived_sources.  Feel free to pick another name.

[adamk, 2013/06/04 21:20:09]

Ah, thanks for the explanation; renamed back to core_derived_sources

         'inspector_overlay_page',
         'inspector_protocol_sources',
         'inspector_instrumentation_sources',
         'injected_canvas_script_source',
         'injected_script_source',
         'debugger_script_source',
-        '../../wtf/wtf.gyp:wtf',
+        '../wtf/wtf.gyp:wtf',
         '<(DEPTH)/build/temp_gyp/googleurl.gyp:googleurl',
         '<(DEPTH)/skia/skia.gyp:skia',
         '<(DEPTH)/third_party/iccjpeg/iccjpeg.gyp:iccjpeg',
         '<(DEPTH)/third_party/libpng/libpng.gyp:libpng',
         '<(DEPTH)/third_party/libxml/libxml.gyp:libxml',
         '<(DEPTH)/third_party/libxslt/libxslt.gyp:libxslt',
         '<(DEPTH)/third_party/libwebp/libwebp.gyp:libwebp',
         '<(DEPTH)/third_party/npapi/npapi.gyp:npapi',
         '<(DEPTH)/third_party/qcms/qcms.gyp:qcms',
         '<(DEPTH)/third_party/sqlite/sqlite.gyp:sqlite',
         '<(DEPTH)/third_party/v8-i18n/build/all.gyp:v8-i18n',
         '<(DEPTH)/v8/tools/gyp/v8.gyp:v8',
         '<(libjpeg_gyp_path):libjpeg',
       ],
       'include_dirs': [
         # FIXME:  Remove <(SHARED_INTERMEDIATE_DIR)/webcore when we
         # can entice gyp into letting us put both the .cpp and .h
         # files in the same output directory.
         '<(SHARED_INTERMEDIATE_DIR)/webcore',
         '<(SHARED_INTERMEDIATE_DIR)/webkit',
         '<(SHARED_INTERMEDIATE_DIR)/webkit/bindings',
         '<@(webcore_include_dirs)',
 
         # FIXME: Remove these once the bindings script generates qualified
         # includes for these correctly. (Sequences don't work yet.)
         '<(bindings_dir)/v8/custom',
-        '../../modules/mediastream',
-        '../../modules/speech',
-        '../dom',
-        '../html',
-        '../html/shadow',
-        '../inspector',
-        '../page',
-        '../svg',
+        '../modules/mediastream',
+        '../modules/speech',
+        'dom',
+        'html',
+        'html/shadow',
+        'inspector',
+        'page',
+        'svg',
       ],
       'sources': [
         # These files include all the .cpp files generated from the .idl files
         # in webcore_files.
         '<@(derived_sources_aggregate_files)',
         '<@(bindings_files)',
 
         # Additional .cpp files for HashTools.h
         '<(SHARED_INTERMEDIATE_DIR)/webkit/ColorData.cpp',
         '<(SHARED_INTERMEDIATE_DIR)/webkit/CSSPropertyNames.cpp',
@@ skipping 76 matching lines @@
       # webcore_prerequisites will be the 'base' target of every sub-target.
       'target_name': 'webcore_prerequisites',
       'type': 'none',
       'dependencies': [
         'debugger_script_source',
         'injected_canvas_script_source',
         'injected_script_source',
         'inspector_overlay_page',
         'inspector_protocol_sources',
         'inspector_instrumentation_sources',
-        'core_derived_sources.gyp:make_derived_sources',
-        '../../bindings/derived_sources.gyp:bindings_derived_sources',
-        '../../wtf/wtf.gyp:wtf',
-        '../../config.gyp:config',
-        '../../weborigin/weborigin.gyp:weborigin',
+        'derived_sources.gyp:make_derived_sources',
+        '../bindings/derived_sources.gyp:bindings_derived_sources',
+        '../wtf/wtf.gyp:wtf',
+        '../config.gyp:config',
+        '../weborigin/weborigin.gyp:weborigin',
         '<(DEPTH)/build/temp_gyp/googleurl.gyp:googleurl',
         '<(DEPTH)/gpu/gpu.gyp:gles2_c_lib',
         '<(DEPTH)/skia/skia.gyp:skia',
         '<(DEPTH)/third_party/iccjpeg/iccjpeg.gyp:iccjpeg',
         '<(DEPTH)/third_party/leveldatabase/leveldatabase.gyp:leveldatabase',
         '<(DEPTH)/third_party/libwebp/libwebp.gyp:libwebp',
         '<(DEPTH)/third_party/libpng/libpng.gyp:libpng',
         '<(DEPTH)/third_party/libxml/libxml.gyp:libxml',
         '<(DEPTH)/third_party/libxslt/libxslt.gyp:libxslt',
         '<(DEPTH)/third_party/npapi/npapi.gyp:npapi',
         '<(DEPTH)/third_party/ots/ots.gyp:ots',
         '<(DEPTH)/third_party/qcms/qcms.gyp:qcms',
         '<(DEPTH)/third_party/sqlite/sqlite.gyp:sqlite',
         '<(DEPTH)/third_party/angle/src/build_angle.gyp:translator_glsl',
         '<(DEPTH)/third_party/zlib/zlib.gyp:zlib',
         '<(DEPTH)/v8/tools/gyp/v8.gyp:v8',
         '<(libjpeg_gyp_path):libjpeg',
       ],
       'export_dependent_settings': [
-        '../../wtf/wtf.gyp:wtf',
-        '../../config.gyp:config',
+        '../wtf/wtf.gyp:wtf',
+        '../config.gyp:config',
         '<(DEPTH)/build/temp_gyp/googleurl.gyp:googleurl',
         '<(DEPTH)/gpu/gpu.gyp:gles2_c_lib',
         '<(DEPTH)/skia/skia.gyp:skia',
         '<(DEPTH)/third_party/iccjpeg/iccjpeg.gyp:iccjpeg',
         '<(DEPTH)/third_party/leveldatabase/leveldatabase.gyp:leveldatabase',
         '<(DEPTH)/third_party/libwebp/libwebp.gyp:libwebp',
         '<(DEPTH)/third_party/libpng/libpng.gyp:libpng',
         '<(DEPTH)/third_party/libxml/libxml.gyp:libxml',
         '<(DEPTH)/third_party/libxslt/libxslt.gyp:libxslt',
         '<(DEPTH)/third_party/npapi/npapi.gyp:npapi',
@@ skipping 16 matching lines @@
           '<(DEPTH)/third_party/angle/include/GLSLANG',
         ],
         'msvs_disabled_warnings': [
           4138, 4244, 4291, 4305, 4344, 4355, 4521, 4099,
         ],
         'scons_line_length' : 1,
         'xcode_settings': {
           # Some Mac-specific parts of WebKit won't compile without having this
           # prefix header injected.
           # FIXME: make this a first-class setting.
-          'GCC_PREFIX_HEADER': '../WebCorePrefixMac.h',
+          'GCC_PREFIX_HEADER': 'WebCorePrefixMac.h',
         },
       },
       'conditions': [
         ['OS=="win" and component=="shared_library"', {
           'direct_dependent_settings': {
             'defines': [
                'USING_V8_SHARED',
             ],
           },
         }],
@@ skipping 66 matching lines @@
                 # This step ensures that any Objective-C names that aren't
                 # redefined to be "safe" above will cause a build failure.
                 'postbuild_name': 'Check Objective-C Rename',
                 'variables': {
                   'class_whitelist_regex':
                       'ChromiumWebCoreObjC|TCMVisibleView|RTCMFlippedView',
                   'category_whitelist_regex':
                       'TCMInterposing|ScrollAnimatorChromiumMacExt|WebCoreTheme',
                 },
                 'action': [
-                  'mac/check_objc_rename.sh',
+                  'scripts/check_objc_rename.sh',
                   '<(class_whitelist_regex)',
                   '<(category_whitelist_regex)',
                 ],
               },
             ],
           },
         }],
         ['OS=="win"', {
           'direct_dependent_settings': {
             'defines': [
@@ skipping 42 matching lines @@
     {
       'target_name': 'webcore_dom',
       'type': 'static_library',
       'dependencies': [
         'webcore_prerequisites',
       ],
       'sources': [
         '<@(webcore_dom_files)',
       ],
       'sources!': [
-        '../dom/default/PlatformMessagePortChannel.cpp',
-        '../dom/default/PlatformMessagePortChannel.h',
+        'dom/default/PlatformMessagePortChannel.cpp',
+        'dom/default/PlatformMessagePortChannel.h',
       ],
       'sources/': [
         # FIXME: Figure out how to store these patterns in a variable.
         ['exclude', '(cf|cg|mac|opentype|svg|win)/'],
         ['exclude', '(?<!Chromium)(CF|CG|Mac|OpenType|Win)\\.(cpp|mm?)$'],
       ],
       # Disable c4267 warnings until we fix size_t to int truncations.
       'msvs_disabled_warnings': [ 4267, ],
     },
     {
@@ skipping 103 matching lines @@
         }, { # toolkit_uses_gtk==0
           'sources/': [
             ['exclude', 'Gtk\\.cpp$'],
           ],
         }],
         ['OS=="mac"', {
           'dependencies': [
             '<(DEPTH)/third_party/harfbuzz-ng/harfbuzz.gyp:harfbuzz-ng',
           ],
           'sources': [
-            '../editing/SmartReplaceCF.cpp',
+            'editing/SmartReplaceCF.cpp',
           ],
           'sources/': [
             # Additional files from the WebCore Mac build that are presently
             # used in the WebCore Chromium Mac build too.
 
             # The Mac build is USE(CF).
             ['include', 'CF\\.cpp$'],
 
             # Use native Mac font code from core.
             ['include', 'platform/(graphics/)?mac/[^/]*Font[^/]*\\.(cpp|mm?)$'],
@@ skipping 314 matching lines @@
       'dependencies': [
         'webcore_dom',
         'webcore_html',
         'webcore_platform',
         'webcore_platform_geometry',
         'webcore_remaining',
         'webcore_rendering',
         'webcore_svg',
         # Exported.
         'webcore_derived',
-        '../../wtf/wtf.gyp:wtf',
+        '../wtf/wtf.gyp:wtf',
         '<(DEPTH)/build/temp_gyp/googleurl.gyp:googleurl',
         '<(DEPTH)/skia/skia.gyp:skia',
         '<(DEPTH)/third_party/npapi/npapi.gyp:npapi',
         '<(DEPTH)/third_party/qcms/qcms.gyp:qcms',
         '<(DEPTH)/v8/tools/gyp/v8.gyp:v8',
       ],
       'export_dependent_settings': [
-        '../../wtf/wtf.gyp:wtf',
+        '../wtf/wtf.gyp:wtf',
         'webcore_derived',
         '<(DEPTH)/build/temp_gyp/googleurl.gyp:googleurl',
         '<(DEPTH)/skia/skia.gyp:skia',
         '<(DEPTH)/third_party/npapi/npapi.gyp:npapi',
         '<(DEPTH)/third_party/qcms/qcms.gyp:qcms',
         '<(DEPTH)/v8/tools/gyp/v8.gyp:v8',
       ],
       'direct_dependent_settings': {
         'include_dirs': [
           '<@(webcore_include_dirs)',
         ],
       },
       'conditions': [
         ['target_arch=="arm"', {
           'dependencies': [
             'webcore_arm_neon',
           ],
         }],
         ['OS=="mac"', {
           'direct_dependent_settings': {
             'include_dirs': [
-              '../../WebKit/mac/WebCoreSupport',
+              '../WebKit/mac/WebCoreSupport',
             ],
           },
         }],
         ['OS=="linux" and "WTF_USE_WEBAUDIO_IPP=1" in feature_defines', {
           'link_settings': {
             'ldflags': [
               '<!@(pkg-config --libs-only-L ipp)',
             ],
             'libraries': [
               '-lipps -lippcore',
             ],
           },
         }],
         # Use IPP static libraries for x86 Android.
         ['OS=="android" and "WTF_USE_WEBAUDIO_IPP=1" in feature_defines', {
           'link_settings': {
             'libraries': [
                '<!@(pkg-config --libs ipp|sed s/-L//)/libipps_l.a',
                '<!@(pkg-config --libs ipp|sed s/-L//)/libippcore_l.a',
             ]
           },
         }],
       ],
     },
     {
       'target_name': 'webcore_test_support',
       'type': 'static_library',
       'dependencies': [
-        '../../config.gyp:config',
+        '../config.gyp:config',
         'webcore',
       ],
       'defines': [
         'WEBKIT_IMPLEMENTATION=1',
       ],
       'include_dirs': [
         '<(bindings_dir)/v8',  # FIXME: Remove once http://crbug.com/236119 is fixed.
-        '../testing',
-        '../testing/v8',
+        'testing',
+        'testing/v8',
       ],
       'sources': [
         '<@(webcore_test_support_files)',
         '<(SHARED_INTERMEDIATE_DIR)/webcore/bindings/V8MallocStatistics.cpp',
         '<(SHARED_INTERMEDIATE_DIR)/webkit/bindings/V8MallocStatistics.h',
         '<(SHARED_INTERMEDIATE_DIR)/webcore/bindings/V8TypeConversions.cpp',
         '<(SHARED_INTERMEDIATE_DIR)/webkit/bindings/V8TypeConversions.h',
         '<(SHARED_INTERMEDIATE_DIR)/webcore/bindings/V8Internals.cpp',
         '<(SHARED_INTERMEDIATE_DIR)/webkit/bindings/V8Internals.h',
         '<(SHARED_INTERMEDIATE_DIR)/webcore/bindings/V8InternalSettings.cpp',
         '<(SHARED_INTERMEDIATE_DIR)/webkit/bindings/V8InternalSettings.h',
         '<(SHARED_INTERMEDIATE_DIR)/webcore/bindings/V8InternalSettingsGenerated.cpp',
         '<(SHARED_INTERMEDIATE_DIR)/webkit/bindings/V8InternalSettingsGenerated.h',
         '<(SHARED_INTERMEDIATE_DIR)/webcore/bindings/V8InternalRuntimeFlags.cpp',
         '<(SHARED_INTERMEDIATE_DIR)/webkit/bindings/V8InternalRuntimeFlags.h',
       ],
       'sources/': [
         ['exclude', 'testing/js'],
       ],
     },
   ],  # targets
 }