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

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

This makes core match the build file layout in the rest of Blink.

Scripts previously living in core/core.gyp/scripts are now alongside
core/scripts/, which seems fine given that all of these scripts are for
build-time activities.

This is part one of a two-stage patch: core_tmp.gyp will be renamed to
core.gyp in a followup patch to keep the trybots happy.

R=abarth@chromium.org

Committed: https://src.chromium.org/viewvc/blink?view=rev&revision=151856

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

LGTM

https://codereview.chromium.org/16357021/diff/1/Source/core/core.gyp
File Source/core/core.gyp (right):

https://codereview.chromium.org/16357021/diff/1/Source/core/core.gyp#newcode210
Source/core/core.gyp:210: 'derived_sources.gyp:make_derived_sources',
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.

[abarth-chromium, 2013-06-04 21:18:14]

I should say that the issue will occur at GYP-type when using the Xcode
generator.

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

https://codereview.chromium.org/16357021/diff/1/Source/core/core.gyp
File Source/core/core.gyp (right):

https://codereview.chromium.org/16357021/diff/1/Source/core/core.gyp#newcode210
Source/core/core.gyp:210: 'derived_sources.gyp:make_derived_sources',
On 2013/06/04 21:15:35, abarth wrote:
> 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.

Ah, thanks for the explanation; renamed back to core_derived_sources

[commit-bot: I haz the power, 2013-06-05 16:46:19]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/adamk@chromium.org/16357021/16001

[commit-bot: I haz the power, 2013-06-05 16:46:26]

Failed to apply patch for Source/core/core.gyp:
While running svn copy Source/core/core.gyp/core.gyp Source/core/core.gyp
--config-dir /b/commit-queue/subversion_config --non-interactive --username
commit-bot@chromium.org;
  svn: Path 'Source/core/core.gyp/core.gyp' already exists

Patch:   NR  Source/core/core.gyp/core.gyp->Source/core/core.gyp
Index: Source/core/core.gyp
diff --git a/Source/core/core.gyp/core.gyp b/Source/core/core.gyp
similarity index 95%
rename from Source/core/core.gyp/core.gyp
rename to Source/core/core.gyp
index
b46ece6b54d7c61ec945e68c26a379a6a8c0d421..6896c9304786115f6a99fe5c7e4df2c5a501f3b0
100644
--- a/Source/core/core.gyp/core.gyp
+++ b/Source/core/core.gyp
@@ -30,19 +30,19 @@
 
 {
   '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',
     ],
@@ -74,11 +74,11 @@
           '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',
@@ -94,8 +94,8 @@
           },
           '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',
           ],
@@ -113,9 +113,9 @@
           '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',
@@ -123,8 +123,8 @@
           ],
           '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',
           ],
@@ -140,8 +140,8 @@
          {
           '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',
@@ -152,7 +152,7 @@
           },
           'action': [
             'python',
-            '../inspector/generate-inspector-protocol-version',
+            'inspector/generate-inspector-protocol-version',
             '-o',
             '<@(_outputs)',
             '<@(_inputs)'
@@ -165,7 +165,7 @@
       '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',
       },
@@ -175,7 +175,7 @@
       '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',
       },
@@ -185,7 +185,7 @@
       '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',
       },
@@ -214,7 +214,7 @@
         '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',
@@ -241,14 +241,14 @@
         # 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
@@ -346,10 +346,10 @@
         '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',
+        '../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',
@@ -369,8 +369,8 @@
         '<(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',
@@ -407,7 +407,7 @@
           # 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': [
@@ -494,7 +494,7 @@
                      
'TCMInterposing|ScrollAnimatorChromiumMacExt|WebCoreTheme',
                 },
                 'action': [
-                  'mac/check_objc_rename.sh',
+                  'scripts/check_objc_rename.sh',
                   '<(class_whitelist_regex)',
                   '<(category_whitelist_regex)',
                 ],
@@ -557,8 +557,8 @@
         '<@(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.
@@ -682,7 +682,7 @@
             '<(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
@@ -1017,7 +1017,7 @@
         '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',
@@ -1025,7 +1025,7 @@
         '<(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',
@@ -1047,7 +1047,7 @@
         ['OS=="mac"', {
           'direct_dependent_settings': {
             'include_dirs': [
-              '../../WebKit/mac/WebCoreSupport',
+              '../WebKit/mac/WebCoreSupport',
             ],
           },
         }],
@@ -1076,7 +1076,7 @@
       'target_name': 'web…
(message too large)

[adamk, 2013-06-05 16:48:30]

Hmm, it's going to be tricky to land this if the trybots can't handle the move
from

core.gyp/core.gyp -> core.gyp

[(unused - use chromium), 2013-06-05 16:54:30]

Maybe you can move to core_tmp.gyp first and then rename that to core.gyp
in a second change.


On Wed, Jun 5, 2013 at 9:48 AM, <adamk@chromium.org> wrote:

> Hmm, it's going to be tricky to land this if the trybots can't handle the
> move
> from
>
> core.gyp/core.gyp -> core.gyp
>
>
https://chromiumcodereview.**appspot.com/16357021/<https://chromiumcodereview...
>

[adamk, 2013-06-05 17:04:14]

Sounds like a plan.

On 2013/06/05 16:54:30, thakis wrote:
> Maybe you can move to core_tmp.gyp first and then rename that to core.gyp
> in a second change.
> 
> 
> On Wed, Jun 5, 2013 at 9:48 AM, <mailto:adamk@chromium.org> wrote:
> 
> > Hmm, it's going to be tricky to land this if the trybots can't handle the
> > move
> > from
> >
> > core.gyp/core.gyp -> core.gyp
> >
> >
>
https://chromiumcodereview.**appspot.com/16357021/%3Chttps://chromiumcoderevi...>
> >

[commit-bot: I haz the power, 2013-06-05 17:08:46]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/adamk@chromium.org/16357021/23001

[commit-bot: I haz the power, 2013-06-05 18:14:27]

Retried try job too often on linux_layout_rel for step(s) webkit_tests
http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=linux_layo...

[adamk, 2013-06-05 18:17:38]

Committed patchset #5 manually as r151856 (presubmit successful).