[Webkit-unassigned] [Bug 26224] [Qt, Gtk] Allows build-webkit script to receive an install prefix as parameter

[bugzilla-daemon at webkit.org]

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





--- Comment #21 from Rodrigo Belem <rclbelem at gmail.com>  2010-03-29 11:39:55 PST ---
Hi Pedralho,

(In reply to comment #20)
> (In reply to comment #17)
> > Created an attachment (id=51921)
 --> (https://bugs.webkit.org/attachment.cgi?id=51921) [details] [details]
> > Updated patch to match the webkit requirements as requested by Antonio Gomes.
> 
> Belem, as far as I could see your patch just sets the installation prefix in
> the build script, which is enough to install the GTK and EFL ports builds in
> the right place. However, some time ago it would not be enough to set it for
> the Qt port. In addition, you need to verify for all the ports if it is still
> working. (Those were the requirements Kenneth asked me once).

In this first block I added the support in the QtWebkit build system to change
the prefix.

diff --git a/WebCore/WebCore.pro b/WebCore/WebCore.pro
index 2c71ed4..994edc9 100644
--- a/WebCore/WebCore.pro
+++ b/WebCore/WebCore.pro
@@ -2837,8 +2837,13 @@ WEBKIT_INSTALL_HEADERS = $$WEBKIT_API_HEADERS
$$WEBKIT_CLASS_HEADERS

 !symbian {
     headers.files = $$WEBKIT_INSTALL_HEADERS
-    headers.path = $$[QT_INSTALL_HEADERS]/QtWebKit
-    target.path = $$[QT_INSTALL_LIBS]
+    !isEmpty(INSTALL_PREFIX) {
+        headers.path = $$INSTALL_PREFIX/include/qt4/QtWebKit
+    target.path = $$INSTALL_PREFIX/lib
+    } else {
+        headers.path = $$[QT_INSTALL_HEADERS]/QtWebKit
+        target.path = $$[QT_INSTALL_LIBS]
+    }

     INSTALLS += target headers
 } else {


And in this block I get the value from --prefix= and pass to the qmake args as
INSTALL_PREFIX=$prefix


+    my $prefix;
     for my $i (0 .. $#buildParams) {
         my $opt = $buildParams[$i];
         if ($opt =~ /^--qmake=(.*)/i ) {
@@ -1319,6 +1323,8 @@ sub buildQMakeProject($@)
             push @buildArgs, $1;
         } elsif ($opt =~ /^--makeargs=(.*)/i ) {
             $makeargs = $1;
+        } elsif ($opt =~ /^--prefix=(.*)/i ) {
+            $prefix = $1;
         } else {
             push @buildArgs, $opt;
         }
@@ -1326,7 +1332,8 @@ sub buildQMakeProject($@)

     my $make = qtMakeCommand($qmakebin);
     my $config = configuration();
-    my $prefix = $ENV{"WebKitInstallationPrefix"};
+    $prefix = $ENV{"WebKitInstallationPrefix"} if !defined($prefix);
+    push @buildArgs, "INSTALL_PREFIX=" . $prefix if defined($prefix);



Thanks for your comment.

-- 
Configure bugmail: https://bugs.webkit.org/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are the assignee for the bug.