chromium: visual studio projects are busted when build_webkit_exes_from_webkit_gyp==0
authordpranke@chromium.org <dpranke@chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 9 Dec 2011 23:39:45 +0000 (23:39 +0000)
committerdpranke@chromium.org <dpranke@chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 9 Dec 2011 23:39:45 +0000 (23:39 +0000)
https://bugs.webkit.org/show_bug.cgi?id=74212

Reviewed by Tony Chang.

The change introduced in r102201 to split the executables out of
WebKit.gyp apparently doesn't work right on Windows, since
WebKit.gyp and Tools.gyp refer to dependent projects by
different relative paths (it appears gyp doesn't normalize the
paths). This change moves Tools.gyp to be in the same directory
as WebKit.gyp (and All.gyp), which should fix this and
conveniently will also solve the problem of how to add Tools.gyp
to the chromium DEPS file.

Source/WebKit/chromium:

* All.gyp:
* Tools.gyp: Renamed from ../../../Tools/Tools.gyp.

Tools:

* Tools.gyp: Renamed to ../Source/WebKit/chromium/Tools.gyp

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@102482 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebKit/chromium/All.gyp
Source/WebKit/chromium/ChangeLog
Source/WebKit/chromium/Tools.gyp [moved from Tools/Tools.gyp with 81% similarity]
Tools/ChangeLog

index a96accf..7e9f006 100644 (file)
@@ -41,7 +41,7 @@
             'type': 'none',
             'dependencies': [
                 'WebKitUnitTests.gyp:webkit_unit_tests',
-                '../../../Tools/Tools.gyp:DumpRenderTree',
+                'Tools.gyp:DumpRenderTree',
             ],
         }
     ],
index ed5ec66..5750c68 100644 (file)
@@ -1,3 +1,22 @@
+2011-12-09  Dirk Pranke  <dpranke@chromium.org>
+
+        chromium: visual studio projects are busted when build_webkit_exes_from_webkit_gyp==0
+        https://bugs.webkit.org/show_bug.cgi?id=74212
+
+        Reviewed by Tony Chang.
+
+        The change introduced in r102201 to split the executables out of
+        WebKit.gyp apparently doesn't work right on Windows, since
+        WebKit.gyp and Tools.gyp refer to dependent projects by
+        different relative paths (it appears gyp doesn't normalize the
+        paths). This change moves Tools.gyp to be in the same directory
+        as WebKit.gyp (and All.gyp), which should fix this and
+        conveniently will also solve the problem of how to add Tools.gyp
+        to the chromium DEPS file.
+
+        * All.gyp:
+        * Tools.gyp: Renamed from ../../../Tools/Tools.gyp.
+
 2011-12-09  Cary Clark  <caryclark@google.com>
 
         Chromium DEPS roll to pick up new use_skia=1 default on Chromium-Mac
similarity index 81%
rename from Tools/Tools.gyp
rename to Source/WebKit/chromium/Tools.gyp
index 6715bba..9e2d5bc 100644 (file)
 #
 
 {
-    # FIXME: Remove this conditional check once chromium's
+    'variables': {
+        'tools_dir': '../../../Tools',
+        'source_dir': '../..',
+    },
+     # FIXME: Remove this conditional check once chromium's
     # build/common.gypi is setting this flag to 0 by default. See
     # https://bugs.webkit.org/show_bug.cgi?id=68463.
-    'conditions': [
+   'conditions': [
          ['build_webkit_exes_from_webkit_gyp==0', {
             'includes': [
-                'DumpRenderTree/DumpRenderTree.gypi',
-                '../Source/WebKit/chromium/features.gypi',
+                '../../../Tools/DumpRenderTree/DumpRenderTree.gypi',
+                'features.gypi',
             ],
             'variables': {
                 'conditions': [
                     ['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': '<(source_dir)/WebKit/chromium',
                     },{
                         # WebKit is checked out in src/chromium/third_party/WebKit
-                        'chromium_src_dir': '../../..',
+                        'chromium_src_dir': '../../../..',
                     }],
                 ],
-                'ahem_path': 'DumpRenderTree/qt/fonts/AHEM____.TTF',
+                'ahem_path': '<(tools_dir)/DumpRenderTree/qt/fonts/AHEM____.TTF',
             },
             'targets': [
                 {
                         '<(chromium_src_dir)/webkit/support/webkit_support.gyp:webkit_support_gfx',
                     ],
                     'include_dirs': [
-                        '../Source/JavaScriptCore',
+                        '<(source_dir)/JavaScriptCore',
                         '<(DEPTH)',
                     ],
                     'sources': [
-                        'DumpRenderTree/chromium/ImageDiff.cpp',
+                        '<(tools_dir)/DumpRenderTree/chromium/ImageDiff.cpp',
                     ],
                     'conditions': [
                         ['OS=="android"', {
@@ -78,9 +82,9 @@
                     'type': 'executable',
                     'mac_bundle': 1,
                     'dependencies': [
-                        '../Source/WebKit/chromium/WebKit.gyp:inspector_resources',
-                        '../Source/WebKit/chromium/WebKit.gyp:webkit',
-                        '../Source/JavaScriptCore/JavaScriptCore.gyp/JavaScriptCore.gyp:wtf_config',
+                        '<(source_dir)/WebKit/chromium/WebKit.gyp:inspector_resources',
+                        '<(source_dir)/WebKit/chromium/WebKit.gyp:webkit',
+                        '<(source_dir)/JavaScriptCore/JavaScriptCore.gyp/JavaScriptCore.gyp:wtf_config',
                         '<(chromium_src_dir)/build/temp_gyp/googleurl.gyp:googleurl',
                         '<(chromium_src_dir)/third_party/icu/icu.gyp:icuuc',
                         '<(chromium_src_dir)/v8/tools/gyp/v8.gyp:v8',
@@ -90,9 +94,9 @@
                     ],
                     'include_dirs': [
                         '<(chromium_src_dir)',
-                        '../Source/WebKit/chromium/public',
-                        '../Source/JavaScriptCore',
-                        '../Source/JavaScriptCore/wtf', # wtf/text/*.h refers headers in wtf/ without wtf/.
+                        '<(source_dir)/WebKit/chromium/public',
+                        '<(source_dir)/JavaScriptCore',
+                        '<(source_dir)/JavaScriptCore/wtf', # wtf/text/*.h refers headers in wtf/ without wtf/.
                         '<(DEPTH)',
                     ],
                     'defines': [
                         }],
                         ['OS=="mac"', {
                             'dependencies': [
-                                '../Source/WebKit/chromium/WebKit.gyp:copy_mesa',
+                                '<(source_dir)/WebKit/chromium/WebKit.gyp:copy_mesa',
                                 'LayoutTestHelper',
                             ],
                             'mac_bundle_resources': [
                                 '<(ahem_path)',
-                                'DumpRenderTree/fonts/WebKitWeightWatcher100.ttf',
-                                'DumpRenderTree/fonts/WebKitWeightWatcher200.ttf',
-                                'DumpRenderTree/fonts/WebKitWeightWatcher300.ttf',
-                                'DumpRenderTree/fonts/WebKitWeightWatcher400.ttf',
-                                'DumpRenderTree/fonts/WebKitWeightWatcher500.ttf',
-                                'DumpRenderTree/fonts/WebKitWeightWatcher600.ttf',
-                                'DumpRenderTree/fonts/WebKitWeightWatcher700.ttf',
-                                'DumpRenderTree/fonts/WebKitWeightWatcher800.ttf',
-                                'DumpRenderTree/fonts/WebKitWeightWatcher900.ttf',
+                                '<(tools_dir)/DumpRenderTree/fonts/WebKitWeightWatcher100.ttf',
+                                '<(tools_dir)/DumpRenderTree/fonts/WebKitWeightWatcher200.ttf',
+                                '<(tools_dir)/DumpRenderTree/fonts/WebKitWeightWatcher300.ttf',
+                                '<(tools_dir)/DumpRenderTree/fonts/WebKitWeightWatcher400.ttf',
+                                '<(tools_dir)/DumpRenderTree/fonts/WebKitWeightWatcher500.ttf',
+                                '<(tools_dir)/DumpRenderTree/fonts/WebKitWeightWatcher600.ttf',
+                                '<(tools_dir)/DumpRenderTree/fonts/WebKitWeightWatcher700.ttf',
+                                '<(tools_dir)/DumpRenderTree/fonts/WebKitWeightWatcher800.ttf',
+                                '<(tools_dir)/DumpRenderTree/fonts/WebKitWeightWatcher900.ttf',
                                 '<(SHARED_INTERMEDIATE_DIR)/webkit/textAreaResizeCorner.png',
                             ],
                         },{ # OS!="mac"
                                 'destination': '<(PRODUCT_DIR)',
                                 'files': [
                                     '<(ahem_path)',
-                                    'DumpRenderTree/chromium/fonts.conf',
+                                    '<(tools_dir)/DumpRenderTree/chromium/fonts.conf',
                                     '<(INTERMEDIATE_DIR)/repack/DumpRenderTree.pak',
                                 ]
                             }],
                                 '<(chromium_src_dir)/build/linux/system.gyp:gtk',
                             ],
                             'include_dirs': [
-                                '../Source/WebKit/chromium/public/gtk',
+                                '<(source_dir)/WebKit/chromium/public/gtk',
                             ],
                         },{ # toolkit_uses_gtk != 1
                             'sources/': [
                         }],
                         ['inside_chromium_build==1 and component=="shared_library"', {
                             'sources': [
-                                '../Source/WebKit/chromium/src/ChromiumCurrentTime.cpp',
-                                '../Source/WebKit/chromium/src/ChromiumThreading.cpp',
+                                '<(source_dir)/WebKit/chromium/src/ChromiumCurrentTime.cpp',
+                                '<(source_dir)/WebKit/chromium/src/ChromiumThreading.cpp',
                             ],
                             'include_dirs': [
-                                '../Source/WebKit/chromium/public',
+                                '<(source_dir)/WebKit/chromium/public',
                             ],
                             'dependencies': [
-                                '../Source/JavaScriptCore/JavaScriptCore.gyp/JavaScriptCore.gyp:wtf',
-                                '../Source/WTF/WTF.gyp/WTF.gyp:newwtf',
+                                '<(source_dir)/JavaScriptCore/JavaScriptCore.gyp/JavaScriptCore.gyp:wtf',
+                                '<(source_dir)/WTF/WTF.gyp/WTF.gyp:newwtf',
                             ],
                         }],
                         ['inside_chromium_build==0', {
                         }],
                         ['inside_chromium_build==0 or component!="shared_library"', {
                             'dependencies': [
-                                '../Source/WebCore/WebCore.gyp/WebCore.gyp:webcore_test_support',
+                                '<(source_dir)/WebCore/WebCore.gyp/WebCore.gyp:webcore_test_support',
                             ],
                             'include_dirs': [
                                 # WARNING: Do not view this particular case as a precedent for
                                 # including WebCore headers in DumpRenderTree project.
-                                '../Source/WebCore/testing/v8', # for WebCoreTestSupport.h, needed to link in window.internals code.
+                                '<(source_dir)/WebCore/testing/v8', # for WebCoreTestSupport.h, needed to link in window.internals code.
                             ],
                             'sources': [
-                                '../Source/WebKit/chromium/src/WebTestingSupport.cpp',
-                                '../Source/WebKit/chromium/public/WebTestingSupport.h',
+                                '<(source_dir)/WebKit/chromium/src/WebTestingSupport.cpp',
+                                '<(source_dir)/WebKit/chromium/public/WebTestingSupport.h',
                             ],
                         }],
                     ],
                     ],
                     'include_dirs': [
                         '<(chromium_src_dir)',
-                        'DumpRenderTree/TestNetscapePlugIn',
-                        'DumpRenderTree/chromium/TestNetscapePlugIn/ForwardingHeaders',
+                        '<(tools_dir)/DumpRenderTree/TestNetscapePlugIn',
+                        '<(tools_dir)/DumpRenderTree/chromium/TestNetscapePlugIn/ForwardingHeaders',
                     ],
                     'conditions': [
                         ['OS=="mac"', {
                             },
                             'xcode_settings': {
                                 'GCC_SYMBOLS_PRIVATE_EXTERN': 'NO',
-                                'INFOPLIST_FILE': 'DumpRenderTree/TestNetscapePlugIn/mac/Info.plist',
+                                'INFOPLIST_FILE': '<(tools_dir)/DumpRenderTree/TestNetscapePlugIn/mac/Info.plist',
                             },
                         }],
                         ['os_posix == 1 and OS != "mac"', {
                                 'snprintf=_snprintf',
                             ],
                             'sources': [
-                                'DumpRenderTree/TestNetscapePlugIn/win/TestNetscapePlugin.def',
-                                'DumpRenderTree/TestNetscapePlugIn/win/TestNetscapePlugin.rc',
+                                '<(tools_dir)/DumpRenderTree/TestNetscapePlugIn/win/TestNetscapePlugin.def',
+                                '<(tools_dir)/DumpRenderTree/TestNetscapePlugIn/win/TestNetscapePlugin.rc',
                             ],
                             # The .rc file requires that the name of the dll is npTestNetscapePlugin.dll.
                             'product_name': 'npTestNetscapePlugin',
                     'targets': [{
                         'target_name': 'LayoutTestHelper',
                         'type': 'executable',
-                        'sources': ['DumpRenderTree/chromium/LayoutTestHelperWin.cpp'],
+                        'sources': ['<(tools_dir)/DumpRenderTree/chromium/LayoutTestHelperWin.cpp'],
                     }],
                 }],
                 ['OS=="mac"', {
                     'targets': [{
                         'target_name': 'LayoutTestHelper',
                         'type': 'executable',
-                        'sources': ['DumpRenderTree/chromium/LayoutTestHelper.mm'],
+                        'sources': ['<(tools_dir)/DumpRenderTree/chromium/LayoutTestHelper.mm'],
                         'link_settings': {
                             'libraries': [
                                 '$(SDKROOT)/System/Library/Frameworks/AppKit.framework',
index bd1e81b..2f5e13a 100644 (file)
@@ -1,3 +1,21 @@
+2011-12-09  Dirk Pranke  <dpranke@chromium.org>
+
+        chromium: visual studio projects are busted when build_webkit_exes_from_webkit_gyp==0
+        https://bugs.webkit.org/show_bug.cgi?id=74212
+
+        Reviewed by Tony Chang.
+
+        The change introduced in r102201 to split the executables out of
+        WebKit.gyp apparently doesn't work right on Windows, since
+        WebKit.gyp and Tools.gyp refer to dependent projects by
+        different relative paths (it appears gyp doesn't normalize the
+        paths). This change moves Tools.gyp to be in the same directory
+        as WebKit.gyp (and All.gyp), which should fix this and
+        conveniently will also solve the problem of how to add Tools.gyp
+        to the chromium DEPS file.
+
+        * Tools.gyp: Renamed to ../Source/WebKit/chromium/Tools.gyp
+
 2011-12-09  Kentaro Hara  <haraken@chromium.org>
 
         [Refactoring] In prepare-ChangeLog, move top-level code to fetch a bug description from URL into a method