Changeset 27015 in webkit

Timestamp:

Oct 24, 2007 10:01:13 PM (16 years ago)

Author:

mrowe@apple.com

Message:

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)

Location:

trunk/WebKitTools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/build-webkit (modified) (1 diff)
• Scripts/webkitdirs.pm (modified) (1 diff)

trunk/WebKitTools/ChangeLog

@@ +1 @@
+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>
 

trunk/WebKitTools/Scripts/build-webkit

@@ -137 +137 @@
 }
 
+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.

trunk/WebKitTools/Scripts/webkitdirs.pm

@@ -478 +478 @@
 }
 
+sub isDarwin()
+{
+    return ($^O eq "darwin");
+}
+
 sub isOSX()
 {
-    return ($^O eq "darwin") unless (isQt() or isGtk());
+    return isDarwin() unless (isQt() or isGtk());
     return 0;
 }