Title: [103234] trunk/Tools
- Revision
- 103234
- Author
- k...@profusion.mobi
- Date
- 2011-12-19 06:31:07 -0800 (Mon, 19 Dec 2011)
Log Message
[Efl] Fix path returned by builtDylibPathForName in webkitdirs.pm
https://bugs.webkit.org/show_bug.cgi?id=74854
Reviewed by Csaba Osztrogonác.
Since r101052, libewebkit.so is built in a different location, so we
need to adjust the path returned by builtDylibPathForName.
usesPerConfigurationBuildDirectory also needs to be fixed, as the Efl
port also respects Release/Debug configurations.
These changes should make run-launcher finally work correctly with
webkit-efl.
* Scripts/webkitdirs.pm:
(usesPerConfigurationBuildDirectory):
(builtDylibPathForName):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (103233 => 103234)
--- trunk/Tools/ChangeLog 2011-12-19 14:27:47 UTC (rev 103233)
+++ trunk/Tools/ChangeLog 2011-12-19 14:31:07 UTC (rev 103234)
@@ -1,3 +1,23 @@
+2011-12-19 Raphael Kubo da Costa <k...@profusion.mobi>
+
+ [Efl] Fix path returned by builtDylibPathForName in webkitdirs.pm
+ https://bugs.webkit.org/show_bug.cgi?id=74854
+
+ Reviewed by Csaba Osztrogonác.
+
+ Since r101052, libewebkit.so is built in a different location, so we
+ need to adjust the path returned by builtDylibPathForName.
+
+ usesPerConfigurationBuildDirectory also needs to be fixed, as the Efl
+ port also respects Release/Debug configurations.
+
+ These changes should make run-launcher finally work correctly with
+ webkit-efl.
+
+ * Scripts/webkitdirs.pm:
+ (usesPerConfigurationBuildDirectory):
+ (builtDylibPathForName):
+
2011-12-19 Simon Hausmann <simon.hausm...@nokia.com>
[Qt][WK2] Add support for modal event loop processing for WTR
Modified: trunk/Tools/Scripts/webkitdirs.pm (103233 => 103234)
--- trunk/Tools/Scripts/webkitdirs.pm 2011-12-19 14:27:47 UTC (rev 103233)
+++ trunk/Tools/Scripts/webkitdirs.pm 2011-12-19 14:31:07 UTC (rev 103234)
@@ -348,11 +348,11 @@
sub usesPerConfigurationBuildDirectory
{
- # [Gtk][Efl] We don't have Release/Debug configurations in straight
+ # [Gtk] We don't have Release/Debug configurations in straight
# autotool builds (non build-webkit). In this case and if
# WEBKITOUTPUTDIR exist, use that as our configuration dir. This will
# allows us to run run-webkit-tests without using build-webkit.
- return ($ENV{"WEBKITOUTPUTDIR"} && (isGtk() || isEfl())) || isAppleWinWebKit();
+ return ($ENV{"WEBKITOUTPUTDIR"} && isGtk()) || isAppleWinWebKit();
}
sub determineConfigurationProductDir
@@ -689,7 +689,7 @@
return "NotFound";
}
if (isEfl()) {
- return "$configurationProductDir/$libraryName/../WebKit/libewebkit.so";
+ return "$configurationProductDir/Source/WebKit/libewebkit.so";
}
if (isWinCE()) {
return "$configurationProductDir/$libraryName";
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
