2007-10-24 Sven Herzberg <sven@imendio.com>

        Reviewed by Mark Rowe.

        Fixes http://bugs.webkit.org/show_bug.cgi?id=15614
        Bug 15614: [GTK] qmake based backends don't build on OS X

        * Scripts/build-webkit: set QMAKESPEC correctly if building the QT or
        GTK backend on a Mac
        * Scripts/webkitdirs.pm: extracted the darwin-test from isOSX() into
        isDarwin() to make it reusable in other places (like the workaround-
        for-prebuilt-qmake in build-webkit)

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

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 85eb15e58477865807bf4f57e0c8a2de39fb3f1a..db9e36b7210e0b2a3aa697e787521891ff9aef7e 100644 (file)
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,16 @@
+2007-10-24  Sven Herzberg  <sven@imendio.com>
+
+        Reviewed by Mark Rowe.
+
+        Fixes http://bugs.webkit.org/show_bug.cgi?id=15614
+        Bug 15614: [GTK] qmake based backends don't build on OS X
+
+        * Scripts/build-webkit: set QMAKESPEC correctly if building the QT or
+        GTK backend on a Mac
+        * Scripts/webkitdirs.pm: extracted the darwin-test from isOSX() into
+        isDarwin() to make it reusable in other places (like the workaround-
+        for-prebuilt-qmake in build-webkit)
+
 2007-10-24  David Kilzer  <ddkilzer@webkit.org>
 
         Refurbish update-webkit script.

diff --git a/WebKitTools/Scripts/build-webkit b/WebKitTools/Scripts/build-webkit
index 80529662d58bae92459212201f71601978a6de14..4bae571dd8ff763552b19e09967f7b4cf03d5e4e 100755 (executable)
--- a/WebKitTools/Scripts/build-webkit
+++ b/WebKitTools/Scripts/build-webkit
@@ -136,6 +136,12 @@ if (isOSX()) {
     }
 }
 
+if ((isGtk() || isQt()) && isDarwin() && !$ENV{QMAKESPEC}) {
+    # The qmake from Trolltech's binary "QT for Mac" distribution tries to
+    # create xcode projects, not Makefiles
+    $ENV{QMAKESPEC} = "macx-g++";
+}
+
 if (isCygwin()) {
     # Copy WebKitSupportLibrary to the correct location in WebKitLibraries so it can be found.
     # Will fail if WebKitSupportLibrary.zip is not in source root.

diff --git a/WebKitTools/Scripts/webkitdirs.pm b/WebKitTools/Scripts/webkitdirs.pm
index dadb4fc358eb71774c012df668512e8f179bab79..6ca77c11f43f3843b051494a8649ade2311b04c3 100644 (file)
--- a/WebKitTools/Scripts/webkitdirs.pm
+++ b/WebKitTools/Scripts/webkitdirs.pm
@@ -477,9 +477,14 @@ sub isCygwin()
     return ($^O eq "cygwin");
 }
 
+sub isDarwin()
+{
+    return ($^O eq "darwin");
+}
+
 sub isOSX()
 {
-    return ($^O eq "darwin") unless (isQt() or isGtk());
+    return isDarwin() unless (isQt() or isGtk());
     return 0;
 }