Commit 6acbb2d0 authored by ossy@webkit.org's avatar ossy@webkit.org
Browse files

[Qt] [Symbian] Move project files into Source

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

Patch by Laszlo Gombos <laszlo.1.gombos@nokia.com> on 2011-01-27
Reviewed by Csaba Osztrogonác.

Fix the Symbian build after the project files
are moved to Source directory. On Symbian qmake
needs to run in the same directory where the main
pro files (WebKit.pro, Tools.pro) are located.

* Scripts/webkitdirs.pm: Change to the directory where the pro file
is located before running qmake for Symbian. Qmake on Symbian
does not properly honor the "-o" option, work it around by setting
the name of the Makefile to bld.inf.



git-svn-id: http://svn.webkit.org/repository/webkit/trunk@76785 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 5b5311b7
2011-01-27 Laszlo Gombos <laszlo.1.gombos@nokia.com>
Reviewed by Csaba Osztrogonác.
[Qt] [Symbian] Move project files into Source
https://bugs.webkit.org/show_bug.cgi?id=52891
Fix the Symbian build after the project files
are moved to Source directory. On Symbian qmake
needs to run in the same directory where the main
pro files (WebKit.pro, Tools.pro) are located.
* Scripts/webkitdirs.pm: Change to the directory where the pro file
is located before running qmake for Symbian. Qmake on Symbian
does not properly honor the "-o" option, work it around by setting
the name of the Makefile to bld.inf.
2011-01-27 Zoltan Horvath <zoltan@webkit.org>
 
Reviewed by Andreas Kling.
......@@ -1571,6 +1571,13 @@ sub buildQMakeProject($@)
push @buildArgs, "INSTALL_HEADERS=" . $installHeaders if defined($installHeaders);
push @buildArgs, "INSTALL_LIBS=" . $installLibs if defined($installLibs);
my $dir = File::Spec->canonpath(productDir());
# On Symbian qmake needs to run in the same directory where the pro file is located.
if (isSymbian()) {
$dir = $sourceDir . "/Source";
}
File::Path::mkpath($dir);
chdir $dir or die "Failed to cd into " . $dir . "\n";
......@@ -1648,9 +1655,17 @@ sub buildQMakeProject($@)
}
$buildArgs[-1] = sourceDir() . "/Tools/Tools.pro";
print "Calling '$qmakebin @buildArgs -o Makefile.Tools' in " . $dir . "\n\n";
my $makefile = "Makefile.Tools";
# On Symbian qmake needs to run in the same directory where the pro file is located.
if (isSymbian()) {
$dir = $sourceDir . "/Tools";
chdir $dir or die "Failed to cd into " . $dir . "\n";
$makefile = "bld.inf";
}
$result = system "$qmakebin @buildArgs -o Makefile.Tools";
print "Calling '$qmakebin @buildArgs -o $makefile' in " . $dir . "\n\n";
$result = system "$qmakebin @buildArgs -o $makefile";
if ($result ne 0) {
die "Failed to setup build environment using $qmakebin!\n";
}
......@@ -1667,8 +1682,8 @@ sub buildQMakeProject($@)
my $makeTools = "echo No Makefile for Tools. Skipping make";
if (-e "$dir/Makefile.Tools") {
$makeTools = "$make $makeargs -f Makefile.Tools";
if (-e "$dir/$makefile") {
$makeTools = "$make $makeargs -f $makefile";
}
if ($clean) {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment