Changeset 48853 in webkit

Timestamp:

Sep 28, 2009 9:01:09 PM (15 years ago)

Author:

ddkilzer@apple.com

Message:

2009-09-28 Yaar Schnitman <​yaar@chromium.org>

Reviewed by David Kilzer.

Integrated chromium port building into webkit tools update-webkit and
build-webkit.

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

• Scripts/build-webkit: When --chromium is specified, will build the chromium port (currently only Mac is supported).
• Scripts/update-webkit: When --chromium is specified, delegates to update-webkit-chromium.
• Scripts/webkitdirs.pm: Added chromium specific defs.
• Scripts/update-webkit-chromium: Uses gclient and gyp to fetch chromium port's dependencies and update its project files.

Location:

trunk/WebKitTools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/build-webkit (modified) (5 diffs)
• Scripts/update-webkit (modified) (4 diffs)
• Scripts/update-webkit-chromium (added)
• Scripts/webkitdirs.pm (modified) (3 diffs)

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2009-09-28  Yaar Schnitman  <yaar@chromium.org>
+
+        Reviewed by David Kilzer.
+
+        Integrated chromium port building into webkit tools update-webkit and
+        build-webkit.
+
+        https://bugs.webkit.org/show_bug.cgi?id=29749
+
+        * Scripts/build-webkit: When --chromium is specified, will build
+          the chromium port (currently only Mac is supported).
+        * Scripts/update-webkit: When --chromium is specified, delegates to
+          update-webkit-chromium.
+        * Scripts/webkitdirs.pm: Added chromium specific defs.
+        * Scripts/update-webkit-chromium: Uses gclient and gyp to fetch
+          chromium port's dependencies and update its project files.
+
 2009-09-28  Fumitoshi Ukai  <ukai@chromium.org>
 

trunk/WebKitTools/Scripts/build-webkit

@@ -1 +1 @@
 #!/usr/bin/perl -w
 
-# Copyright (C) 2005, 2006 Apple Computer, Inc.  All rights reserved.
+# Copyright (C) 2005, 2006 Apple Inc. All rights reserved.
+# Copyright (C) 2009 Google Inc. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -39 +40 @@
 
 sub formatBuildTime($);
+sub writeCongrats();
 
 my $originalWorkingDirectory = getcwd();
@@ -316 +318 @@
 }
 
+if (isChromium()) {
+    # Chromium doesn't build by project directories.
+    @projects = ();
+    my $result = buildChromium($clean, @options);
+    exit $result if $result;
+}
+
 # Build, and abort if the build fails.
 for my $dir (@projects) {
@@ -366 +375 @@
 
 # Write out congratulations message.
-
-my $launcherPath = launcherPath();
-my $launcherName = launcherName();
-my $endTime = time();
-my $buildTime = formatBuildTime($endTime - $startTime);
-
-print "\n";
-print "===========================================================\n";
-print " WebKit is now built ($buildTime). \n";
-print " To run $launcherName with this newly-built code, use the\n";
-print " \"$launcherPath\" script.\n";
-print "===========================================================\n";
+writeCongrats();
 
 exit 0;
@@ -394 +392 @@
     return sprintf("%02dm:%02ds", $buildMins, $buildSecs);
 }
+
+sub writeCongrats()
+{
+    my $launcherPath = launcherPath();
+    my $launcherName = launcherName();
+    my $endTime = time();
+    my $buildTime = formatBuildTime($endTime - @_);
+
+    print "\n";
+    print "===========================================================\n";
+    print " WebKit is now built ($buildTime). \n";
+    if (!isChromium()) {
+        print " To run $launcherName with this newly-built code, use the\n";
+        print " \"$launcherPath\" script.\n";
+    }
+    print "===========================================================\n";
+}

trunk/WebKitTools/Scripts/update-webkit

@@ -2 +2 @@
 
 # Copyright (C) 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.
+# Copyright (C) 2009 Google Inc. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -45 +46 @@
 my $showHelp;
 
+determineIsChromium();
+
 my $getOptionsResult = GetOptions(
     'h|help'  => \$showHelp,
@@ -53 +56 @@
     print STDERR <<__END__;
 Usage: @{[ basename($0) ]} [options]
+  --chromium  also update dependencies of the chromium port
   -h|--help   show the help message
   -q|--quiet  pass -q to svn update for quiet updates
@@ -73 +77 @@
     print "Updating Internal\n" unless $quiet;
     runSvnUpdate();
+} elsif (isChromium()) {
+    system("perl", "WebKitTools/Scripts/update-webkit-chromium") == 0 or die;
 } elsif (isAppleWinWebKit()) {
     system("perl", "WebKitTools/Scripts/update-webkit-auxiliary-libs") == 0 or die;

trunk/WebKitTools/Scripts/webkitdirs.pm

@@ -1 +1 @@
 # Copyright (C) 2005, 2006, 2007 Apple Inc. All rights reserved.
+# Copyright (C) 2009 Google Inc. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -996 +997 @@
             print "*************************************************************\n";
         }
-    } elsif (isGtk() or isQt() or isWx()) {
+    } elsif (isGtk() or isQt() or isWx() or isChromium()) {
         my @cmds = qw(flex bison gperf);
         my @missing = ();
@@ -1357 +1358 @@
 }
 
+sub buildChromium($@)
+{
+    my ($clean, @options) = @_;
+
+    my $result = 1;
+    if (isDarwin()) {
+        # Mac build - builds the root xcode project.
+        $result = buildXCodeProject("WebKit/chromium/webkit", $clean, (@options));
+    } elsif (isCygwin()) {
+        # Windows build
+        # FIXME support windows.
+        print STDERR "Windows build is not supported. Yet.";
+    } elsif (isLinux()) {
+        # Linux build
+        # FIXME support linux.
+        print STDERR "Linux build is not supported. Yet.";
+    } else {
+        print STDERR "This platform is not supported by chromium.";
+    }
+    return $result;
+}
+
 sub setPathForRunningWebKitApp
 {