Title: [172022] trunk/Tools
- Revision
- 172022
- Author
- [email protected]
- Date
- 2014-08-04 19:51:50 -0700 (Mon, 04 Aug 2014)
Log Message
[GTK] run-launcher --gtk is broken
https://bugs.webkit.org/show_bug.cgi?id=135571
Patch by Michael Catanzaro <[email protected]> on 2014-08-04
Reviewed by Martin Robinson.
* Scripts/webkitdirs.pm:
(builtDylibPathForName): Search for libwebkit2gtk-4.0
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (172021 => 172022)
--- trunk/Tools/ChangeLog 2014-08-05 02:47:01 UTC (rev 172021)
+++ trunk/Tools/ChangeLog 2014-08-05 02:51:50 UTC (rev 172022)
@@ -1,3 +1,13 @@
+2014-08-04 Michael Catanzaro <[email protected]>
+
+ [GTK] run-launcher --gtk is broken
+ https://bugs.webkit.org/show_bug.cgi?id=135571
+
+ Reviewed by Martin Robinson.
+
+ * Scripts/webkitdirs.pm:
+ (builtDylibPathForName): Search for libwebkit2gtk-4.0
+
2014-08-04 Matt Baker <[email protected]>
lldb_webkit.py throws exception when generating summary of null StringImpl
Modified: trunk/Tools/Scripts/webkitdirs.pm (172021 => 172022)
--- trunk/Tools/Scripts/webkitdirs.pm 2014-08-05 02:47:01 UTC (rev 172021)
+++ trunk/Tools/Scripts/webkitdirs.pm 2014-08-05 02:51:50 UTC (rev 172022)
@@ -826,16 +826,7 @@
determineConfigurationProductDir();
if (isGtk()) {
- # WebKitGTK+ for GTK2, WebKitGTK+ for GTK3, and WebKit2 respectively.
- my @libraries = ("libwebkitgtk-1.0", "libwebkitgtk-3.0", "libwebkit2gtk-3.0");
- my $extension = isDarwin() ? ".dylib" : ".so";
- my $builtLibraryPath = "$configurationProductDir/lib/";
-
- foreach $libraryName (@libraries) {
- my $libraryPath = "$builtLibraryPath" . $libraryName . $extension;
- return $libraryPath if -e $libraryPath;
- }
- return "NotFound";
+ return "$configurationProductDir/lib/libwebkit2gtk-4.0" . isDarwin() ? ".dylib" : ".so";
}
if (isEfl()) {
return "$configurationProductDir/lib/libewebkit2.so";
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
