[SCM] WebKit Debian packaging branch, debian/experimental, updated. debian/1.3.8-1-1049-g2e11a8e

[mrobinson at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 84196467967ba8dfd5d8e93c1d899e0b06e2f6d0
Author: mrobinson at webkit.org <mrobinson at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Dec 27 19:07:45 2010 +0000

    2010-12-26  Martin Robinson  <mrobinson at igalia.com>
    
            Reviewed by Daniel Bates.
    
            [GTK] Add support for build-jsc
            https://bugs.webkit.org/show_bug.cgi?id=51625
    
            Add GTK+ support to build-jsc now that building the jsc executable as
            a standalone target is easy.
    
            * Scripts/build-jsc: Call buildGtkProject for the GTK+ case now.
            * Scripts/build-webkit: Pass in the proper target name to buildGtkProject.
            * Scripts/webkitdirs.pm: Actually process the project parameter in buildGtkProject
            and pass it along to buildAutotoolsProject.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@74689 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index d50caba..f3c898c 100644
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,18 @@
+2010-12-26  Martin Robinson  <mrobinson at igalia.com>
+
+        Reviewed by Daniel Bates.
+
+        [GTK] Add support for build-jsc
+        https://bugs.webkit.org/show_bug.cgi?id=51625
+
+        Add GTK+ support to build-jsc now that building the jsc executable as
+        a standalone target is easy.
+
+        * Scripts/build-jsc: Call buildGtkProject for the GTK+ case now.
+        * Scripts/build-webkit: Pass in the proper target name to buildGtkProject.
+        * Scripts/webkitdirs.pm: Actually process the project parameter in buildGtkProject
+        and pass it along to buildAutotoolsProject.
+
 2010-12-27  David Levin  <levin at chromium.org>
 
         Reviewed by Eric Seidel.
diff --git a/Tools/Scripts/build-jsc b/Tools/Scripts/build-jsc
index 0316349..2c857c8 100755
--- a/Tools/Scripts/build-jsc
+++ b/Tools/Scripts/build-jsc
@@ -67,8 +67,10 @@ if (isAppleMacWebKit()) {
     $result = system "sh", "-c", 'xcodebuild -project JavaScriptCore.xcodeproj "$@" | grep -v setenv && exit ${PIPESTATUS[0]}', "xcodebuild",  @options, @ARGV, @coverageSupportOptions;
 } elsif (isAppleWinWebKit()) {
     $result = buildVisualStudioProject("JavaScriptCore.vcproj/JavaScriptCore.sln");
-} elsif (isQt() or isGtk() or isWx()) {
-    # Qt and Gtk build everything in one-shot. No need to build anything here.
+} elsif (isGtk()) {
+    $result = buildGtkProject("JavaScriptCore");
+} elsif (isQt() or isWx()) {
+    # Qt builds everything in one-shot. No need to build anything here.
     $result = 0;
 } else {
     die "Building not defined for this platform!\n";
diff --git a/Tools/Scripts/build-webkit b/Tools/Scripts/build-webkit
index cbc8eba..a8f6aa8 100755
--- a/Tools/Scripts/build-webkit
+++ b/Tools/Scripts/build-webkit
@@ -517,8 +517,7 @@ for my $dir (@projects) {
 
     my $project = basename($dir);
     if (isGtk()) {
-        #FIXME: $dir should probably be $project.
-        $result = buildGtkProject($dir, $clean,  @options);
+        $result = buildGtkProject($project, $clean,  @options);
     } elsif (isQt()) {
         #FIXME: $dir should probably be $project.
         $result = buildQMakeQtProject($dir, $clean, @options);
diff --git a/Tools/Scripts/webkitdirs.pm b/Tools/Scripts/webkitdirs.pm
index ac40ec6..68b17e5 100644
--- a/Tools/Scripts/webkitdirs.pm
+++ b/Tools/Scripts/webkitdirs.pm
@@ -1337,7 +1337,7 @@ sub autogenArgumentsHaveChanged($@)
 
 sub buildAutotoolsProject($@)
 {
-    my ($clean, @buildParams) = @_;
+    my ($project, $clean, @buildParams) = @_;
 
     my $make = 'make';
     my $dir = productDir();
@@ -1363,6 +1363,11 @@ sub buildAutotoolsProject($@)
         $makeArgs = "-j" . numberOfCPUs();
     }
 
+    # WebKit is the default target, so we don't need to specify anything.
+    if ($project eq "JavaScriptCore") {
+        $makeArgs .= " jsc";
+    }
+
     $prefix = $ENV{"WebKitInstallationPrefix"} if !defined($prefix);
     push @buildArgs, "--prefix=" . $prefix if defined($prefix);
 
@@ -1622,15 +1627,15 @@ sub buildQMakeQtProject($$@)
     return buildQMakeProject($clean, @buildArgs);
 }
 
-sub buildGtkProject($$@)
+sub buildGtkProject
 {
     my ($project, $clean, @buildArgs) = @_;
 
-    if ($project ne "WebKit") {
-        die "The Gtk port builds JavaScriptCore, WebCore and WebKit in one shot! Only call it for 'WebKit'.\n";
+    if ($project ne "WebKit" and $project ne "JavaScriptCore") {
+        die "Unsupported project: $project. Supported projects: WebKit, JavaScriptCore\n";
     }
 
-    return buildAutotoolsProject($clean, @buildArgs);
+    return buildAutotoolsProject($project, $clean, @buildArgs);
 }
 
 sub buildChromiumMakefile($$)

-- 
WebKit Debian packaging