[chromium] move Tools.gyp, switch build-webkit --chromium to All.gyp

https://bugs.webkit.org/show_bug.cgi?id=76505

Reviewed by Tony Chang.

.:

Update with newly-generated files.

* .gitignore:

Source/WebKit/chromium:

Update path to Tools/DumpRenderTree/DumpRenderTree.gyp/DumpRenderTree.gyp.

* All.gyp:
* gyp_webkit:
- change to using All.gyp
- change build_webkit_exes_from_webkit_gyp to 0

Tools:

Update chromium build script to use All.gyp instead of WebKit.gyp

* DumpRenderTree/DumpRenderTree.gyp/DumpRenderTree.gyp: Renamed from Source/WebKit/chromium/Tools.gyp.
* Scripts/webkitdirs.pm:

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

diff --git a/.gitignore b/.gitignore
index 68ba793..5d54134 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -58,8 +58,13 @@ Source/Platform/Platform.gyp/*.Makefile
 Source/Platform/Platform.gyp/*.mk
 Source/Platform/Platform.gyp/*.sln
 Source/Platform/Platform.gyp/*.vcproj*
-Tools/Tools.xcodeproj
-Tools/DumpRenderTree/DumpRenderTree.gyp/DumpRenderTree.xcodeproj
+Source/Platform/Platform.gyp/*.xcodeproj*
+Tools/DumpRenderTree/DumpRenderTree.gyp/*.Makefile
+Tools/DumpRenderTree/DumpRenderTree.gyp/*.mk
+Tools/DumpRenderTree/DumpRenderTree.gyp/*.ninja
+Tools/DumpRenderTree/DumpRenderTree.gyp/*.sln
+Tools/DumpRenderTree/DumpRenderTree.gyp/*.vcproj*
+Tools/DumpRenderTree/DumpRenderTree.gyp/*.xcodeproj*
 
 # Ignore status files that manage Chromium dependencies.
 Source/WebKit/chromium/.gclient

diff --git a/ChangeLog b/ChangeLog
index e9bbee1..172345c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2012-01-18  Dirk Pranke  <dpranke@chromium.org>
+
+        [chromium] move Tools.gyp, switch build-webkit --chromium to All.gyp
+        https://bugs.webkit.org/show_bug.cgi?id=76505
+
+        Reviewed by Tony Chang.
+
+        Update with newly-generated files.
+
+        * .gitignore:
+
 2012-01-18  Eric Carlson  <eric.carlson@apple.com>
 
         Provide access to user's list of preferred languages

diff --git a/Source/WebKit/chromium/All.gyp b/Source/WebKit/chromium/All.gyp
index 7e9f006..91ec97b 100644 (file)
--- a/Source/WebKit/chromium/All.gyp
+++ b/Source/WebKit/chromium/All.gyp
@@ -41,7 +41,7 @@
             'type': 'none',
             'dependencies': [
                 'WebKitUnitTests.gyp:webkit_unit_tests',
-                'Tools.gyp:DumpRenderTree',
+                '../../../Tools/DumpRenderTree/DumpRenderTree.gyp/DumpRenderTree.gyp:DumpRenderTree',
             ],
         }
     ],

diff --git a/Source/WebKit/chromium/ChangeLog b/Source/WebKit/chromium/ChangeLog
index 4ae03b3..5b21299 100644 (file)
--- a/Source/WebKit/chromium/ChangeLog
+++ b/Source/WebKit/chromium/ChangeLog
@@ -1,3 +1,17 @@
+2012-01-18  Dirk Pranke  <dpranke@chromium.org>
+
+        [chromium] move Tools.gyp, switch build-webkit --chromium to All.gyp
+        https://bugs.webkit.org/show_bug.cgi?id=76505
+
+        Reviewed by Tony Chang.
+
+        Update path to Tools/DumpRenderTree/DumpRenderTree.gyp/DumpRenderTree.gyp.
+
+        * All.gyp:
+        * gyp_webkit:
+        - change to using All.gyp
+        - change build_webkit_exes_from_webkit_gyp to 0
+
 2012-01-18  David Grogan  <dgrogan@chromium.org>
 
         IndexedDB: Check for permission before using IndexedDB from a worker.

diff --git a/Source/WebKit/chromium/gyp_webkit b/Source/WebKit/chromium/gyp_webkit
index 0178c6b..6336ee3 100755 (executable)
--- a/Source/WebKit/chromium/gyp_webkit
+++ b/Source/WebKit/chromium/gyp_webkit
@@ -119,7 +119,7 @@ if __name__ == '__main__':
                '-Dinside_chromium_build=0',
                '-Dv8_use_snapshot=false',
                '-Dmsvs_use_common_release=0',
-               '-Dbuild_webkit_exes_from_webkit_gyp=1',
+               '-Dbuild_webkit_exes_from_webkit_gyp=0',
 
                # WebKit doesn't use the chromium style checker.
                '-Dmake_clang_dir=Source/WebKit/chromium/third_party/llvm-build/Release+Asserts',
@@ -129,7 +129,7 @@ if __name__ == '__main__':
                '--depth=./',
 
                # gyp file to execute.
-               'WebKit.gyp'])
+               'All.gyp'])
 
   print 'Updating webkit projects from gyp files...'
   sys.stdout.flush()

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index 3403ca6..3a66177 100644 (file)
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,15 @@
+2012-01-18  Dirk Pranke  <dpranke@chromium.org>
+
+        [chromium] move Tools.gyp, switch build-webkit --chromium to All.gyp
+        https://bugs.webkit.org/show_bug.cgi?id=76505
+
+        Reviewed by Tony Chang.
+
+        Update chromium build script to use All.gyp instead of WebKit.gyp
+
+        * DumpRenderTree/DumpRenderTree.gyp/DumpRenderTree.gyp: Renamed from Source/WebKit/chromium/Tools.gyp.
+        * Scripts/webkitdirs.pm:
+
 2012-01-18  Sam Weinig  <sam@webkit.org>
 
         Don’t hardcode the path to ‘make‘.

diff --git a/Source/WebKit/chromium/Tools.gyp b/Tools/DumpRenderTree/DumpRenderTree.gyp/DumpRenderTree.gyp
similarity index 98%
rename from Source/WebKit/chromium/Tools.gyp
rename to Tools/DumpRenderTree/DumpRenderTree.gyp/DumpRenderTree.gyp
index 9e2d5bc..a600054 100644 (file)
--- a/Source/WebKit/chromium/Tools.gyp
+++ b/Tools/DumpRenderTree/DumpRenderTree.gyp/DumpRenderTree.gyp
@@ -30,8 +30,8 @@
 
 {
     'variables': {
-        'tools_dir': '../../../Tools',
-        'source_dir': '../..',
+        'tools_dir': '../..',
+        'source_dir': '../../../Source',
     },
      # FIXME: Remove this conditional check once chromium's
     # build/common.gypi is setting this flag to 0 by default. See
@@ -39,8 +39,8 @@
    'conditions': [
          ['build_webkit_exes_from_webkit_gyp==0', {
             'includes': [
-                '../../../Tools/DumpRenderTree/DumpRenderTree.gypi',
-                'features.gypi',
+                '../DumpRenderTree.gypi',
+                '../../../Source/WebKit/chromium/features.gypi',
             ],
             'variables': {
                 'conditions': [
@@ -52,7 +52,7 @@
                         'chromium_src_dir': '<(source_dir)/WebKit/chromium',
                     },{
                         # WebKit is checked out in src/chromium/third_party/WebKit
-                        'chromium_src_dir': '../../../..',
+                        'chromium_src_dir': '<(tools_dir)/../..',
                     }],
                 ],
                 'ahem_path': '<(tools_dir)/DumpRenderTree/qt/fonts/AHEM____.TTF',

diff --git a/Tools/Scripts/webkitdirs.pm b/Tools/Scripts/webkitdirs.pm
index b2cabd4..a8a1a8f 100755 (executable)
--- a/Tools/Scripts/webkitdirs.pm
+++ b/Tools/Scripts/webkitdirs.pm
@@ -2258,10 +2258,10 @@ sub buildChromium($@)
     my $result = 1;
     if (isDarwin() && !isChromiumAndroid() && !isChromiumMacMake()) {
         # Mac build - builds the root xcode project.
-        $result = buildXCodeProject("Source/WebKit/chromium/WebKit", $clean, "-configuration", configuration(), @options);
+        $result = buildXCodeProject("Source/WebKit/chromium/All", $clean, "-configuration", configuration(), @options);
     } elsif (isCygwin() || isWindows()) {
         # Windows build - builds the root visual studio solution.
-        $result = buildChromiumVisualStudioProject("Source/WebKit/chromium/WebKit.sln", $clean);
+        $result = buildChromiumVisualStudioProject("Source/WebKit/chromium/All.sln", $clean);
     } elsif (isLinux() || isChromiumAndroid() || isChromiumMacMake()) {
         # Linux build - build using make.
         $result = buildChromiumMakefile("all", $clean, @options);