Changeset 57702 in webkit

Timestamp:

Apr 15, 2010 6:13:22 PM (14 years ago)

Author:

tony@chromium.org

Message:

2010-04-15 Tony Chang <​tony@chromium.org>

Reviewed by Dimitri Glazkov.

build DRT on chromium mac
​https://bugs.webkit.org/show_bug.cgi?id=37639

• gyp_webkit: generate build files for DRT on mac

2010-04-15 Tony Chang <​tony@chromium.org>

Reviewed by Dimitri Glazkov.

build DRT on chromium mac
​https://bugs.webkit.org/show_bug.cgi?id=37639

• DumpRenderTree/DumpRenderTree.gyp/DumpRenderTree.gyp:
• Scripts/build-dumprendertree: enable build-dumprendertree --chromium

Location:

trunk

Files:

• WebKit/chromium/ChangeLog (modified) (1 diff)
• WebKit/chromium/gyp_webkit (modified) (2 diffs)
• WebKitTools/ChangeLog (modified) (1 diff)
• WebKitTools/DumpRenderTree/DumpRenderTree.gyp/DumpRenderTree.gyp (modified) (3 diffs)
• WebKitTools/Scripts/build-dumprendertree (modified) (2 diffs)

trunk/WebKit/chromium/ChangeLog

@@ +1 @@
+2010-04-15  Tony Chang  <tony@chromium.org>
+
+        Reviewed by Dimitri Glazkov.
+
+        build DRT on chromium mac
+        https://bugs.webkit.org/show_bug.cgi?id=37639
+
+        * gyp_webkit: generate build files for DRT on mac
+
 2010-04-15  Yury Semikhatsky  <yurys@google.com>
 

trunk/WebKit/chromium/gyp_webkit

@@ -79 +79 @@
 
   # On linux, we want gyp to output a makefile (default is scons).
-  if (platform.system() == 'Linux'):
+  if platform.system() == 'Linux':
     args.extend(['-fmake'])
 
@@ -95 +95 @@
                'WebKit.gyp'])
 
+  # Generate DRT build files on the platforms that support it.
+  if platform.system() == 'Darwin':
+    args.append('../../WebKitTools/DumpRenderTree/DumpRenderTree.gyp/DumpRenderTree.gyp')
+
   print 'Updating webkit projects from gyp files...'
   sys.stdout.flush()

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2010-04-15  Tony Chang  <tony@chromium.org>
+
+        Reviewed by Dimitri Glazkov.
+
+        build DRT on chromium mac
+        https://bugs.webkit.org/show_bug.cgi?id=37639
+
+        * DumpRenderTree/DumpRenderTree.gyp/DumpRenderTree.gyp:
+        * Scripts/build-dumprendertree: enable build-dumprendertree --chromium
+
 2010-04-15  Kent Tamura  <tkent@chromium.org>
 

trunk/WebKitTools/DumpRenderTree/DumpRenderTree.gyp/DumpRenderTree.gyp

@@ -49 +49 @@
         ],
     },
+    'target_defaults': {
+        'target_conditions': [
+            ['OS!="linux" and OS!="freebsd" and OS!="openbsd"', {
+                'sources/': [
+                    ['exclude', '(Gtk|Linux)\\.cpp$']
+                ]
+            }],
+            ['OS!="win"', {
+                'sources/': [
+                    ['exclude', 'Win\\.cpp$'],
+                ]
+            }],
+            ['OS!="mac"', {
+                'sources/': [
+                    # .mm is already excluded by common.gypi
+                    ['exclude', 'Mac\\.cpp$'],
+                ]
+            }],
+        ],
+    },
     'targets': [
         {
@@ -59 +79 @@
                 '<(chromium_src_dir)/third_party/npapi/npapi.gyp:npapi',
                 '<(chromium_src_dir)/skia/skia.gyp:skia',
-                '<(chromium_src_dir)/webkit/webkit.gyp:webkit_support',
+                '<(chromium_src_dir)/webkit/support/webkit_support.gyp:webkit_support',
             ],
             'include_dirs': [
@@ -93 +113 @@
                 '../chromium/TestShell.cpp',
                 '../chromium/TestShell.h',
+                '../chromium/TestShellMac.mm',
+                '../chromium/TestShellWin.cpp',
                 '../chromium/TextInputController.cpp',
                 '../chromium/TextInputController.h',
                 '../chromium/WebViewHost.cpp',
                 '../chromium/WebViewHost.h',
-            ],
-            'conditions': [
-                ['OS=="win"', {
-                    'sources': [
-                        '../chromium/TestShellWin.cpp',
-                    ],
-                }],
-                ['OS=="mac"', {
-                    'sources': [
-                        '../chromium/TestShellMac.mm',
-                    ],
-                }],
             ],
             'mac_bundle_resources': [

trunk/WebKitTools/Scripts/build-dumprendertree

@@ -46 +46 @@
   --qt          Build the Qt port
   --wx          Build the wxWindows port
+  --chromium    Build the Chromium port
 EOF
 
@@ -73 +74 @@
     # Qt, Gtk and wxWindows build everything in one shot. No need to build anything here.
     $result = 0;
+} elsif (isChromium()) {
+    if (isDarwin()) {
+        $result = buildXCodeProject("DumpRenderTree.gyp/DumpRenderTree", $clean, @ARGV);
+    } else {
+        die "Building not defined for this platform!\n";
+    }
 } else {
     die "Building not defined for this platform!\n";