Changeset 30789

Timestamp:

03/04/08 22:54:54 (9 months ago)

Author:

alp@webkit.org

Message:

2008-03-04 Alp Toker <alp@atoker.com>

Reviewed by Mark Rowe.

Switch the default GTK+ build system from qmake to autotools.

qmake can still be used by defining WEBKIT_BUILD_SYSTEM=qmake

• Scripts/build-webkit:
• Scripts/run-launcher:
• Scripts/run-webkit-tests:
• Scripts/webkitdirs.pm:

Location:

trunk/WebKitTools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/build-webkit (modified) (2 diffs)
• Scripts/run-launcher (modified) (1 diff)
• Scripts/run-webkit-tests (modified) (1 diff)
• Scripts/webkitdirs.pm (modified) (3 diffs)

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2008-03-04  Alp Toker  <alp@atoker.com>
+
+        Reviewed by Mark Rowe.
+
+        Switch the default GTK+ build system from qmake to autotools.
+
+        qmake can still be used by defining WEBKIT_BUILD_SYSTEM=qmake
+
+        * Scripts/build-webkit:
+        * Scripts/run-launcher:
+        * Scripts/run-webkit-tests:
+        * Scripts/webkitdirs.pm:
+
 2008-03-04  Sam Weinig  <sam@webkit.org>
 

trunk/WebKitTools/Scripts/build-webkit

@@ -207 +207 @@
 
 # enable autotool options accordingly
-if ($ENV{WEBKITAUTOTOOLS}) {
+if (isGtk() && !useQmake()) {
     push @options, autotoolsFlag($crossDocumentMessagingSupport, "cross-document-messaging");
     push @options, autotoolsFlag($databaseSupport, "database");
@@ -269 +269 @@
 }
 
-if (isGtk() && isDarwin() && !$ENV{WEBKITAUTOTOOLS} && !$ENV{QMAKESPEC}) {
+if (isGtk() && isDarwin() && useQmake() && !$ENV{QMAKESPEC}) {
     # The qmake from Trolltech's binary "QT for Mac" distribution tries to
     # create xcode projects, not Makefiles

trunk/WebKitTools/Scripts/run-launcher

@@ -46 +46 @@
 
 # Set paths according to the build system used
-if (!$ENV{WEBKITAUTOTOOLS}) {
+if (useQmake()) {
     my $libDir = catdir(productDir(), 'lib');
 

trunk/WebKitTools/Scripts/run-webkit-tests

@@ -267 +267 @@
 
 if (isGtk()) {
-    if ($ENV{WEBKITAUTOTOOLS}) {
+    if (useQmake()) {
+        $productDir .= "/WebKitTools/DumpRenderTree/gtk";
+    } else {
         $productDir .= "/Programs";
-    } else {
-        $productDir .= "/WebKitTools/DumpRenderTree/gtk";
     }
 }

trunk/WebKitTools/Scripts/webkitdirs.pm

@@ -391 +391 @@
 
     if (isGtk() and $path =~ /WebCore/) {
-        $path .= "/../lib/libWebKitGtk.so" if !$ENV{WEBKITAUTOTOOLS};
-        $path .= "/../.libs/libWebKitGtk.so" if $ENV{WEBKITAUTOTOOLS};
+        if (useQmake()) {
+            $path .= "/../lib/libWebKitGtk.so";
+        } else {
+            $path .= "/../.libs/webkit-1.0.so";
+        }
     }
 
@@ -465 +468 @@
     
     $isQt = defined($ENV{'QTDIR'});
+}
+
+sub useQmake()
+{
+    return 1 if isQt();
+    return 0 if !defined($ENV{WEBKIT_BUILD_SYSTEM});
+    return $ENV{WEBKIT_BUILD_SYSTEM} eq "qmake";
 }
 
@@ -853 +863 @@
     }
 
-    if ($ENV{WEBKITAUTOTOOLS}) {
-        return buildAutotoolsProject($clean, @buildArgs);
-    } else {
+    if (useQmake()) {
         my @buildArgs = ("CONFIG+=gtk-port", "CONFIG-=qt");
         return buildQMakeProject($clean, @buildArgs);
+    } else {
+        return buildAutotoolsProject($clean, @buildArgs);
     }
 }