2011-01-03 Koan-Sin Tan <koansin.tan@gmail.com>
authorcommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 3 Jan 2011 14:00:23 +0000 (14:00 +0000)
committercommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 3 Jan 2011 14:00:23 +0000 (14:00 +0000)
        Reviewed by Xan Lopez.

        "Tool/Scripts/run-launcher --gtk" stopped working after 74855
        https://bugs.webkit.org/show_bug.cgi?id=51806

        Originally, the $libraryName is 'JavaScriptCore'. When building release
        one, the $libraryDir was 'WebKitBuild/Release/JavaScriptCore/../.libs/'
        which doesn't exist anymore ('WebKitBuild/Release/JavaScriptCore'
        is 'WebKitBuild/Release/Source/JavaScriptCore' now), and
        'WebKitBuild/Release/Source/JavaScriptCore/../../.libs' looks weird,
        so make it 'WebKitBuild/Release/.libs'

        * Scripts/webkitdirs.pm:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@74889 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Tools/ChangeLog
Tools/Scripts/webkitdirs.pm

index db46588..dc1a195 100644 (file)
@@ -1,3 +1,19 @@
+2011-01-03  Koan-Sin Tan  <koansin.tan@gmail.com>
+
+        Reviewed by Xan Lopez.
+
+        "Tool/Scripts/run-launcher --gtk" stopped working after 74855
+        https://bugs.webkit.org/show_bug.cgi?id=51806
+
+        Originally, the $libraryName is 'JavaScriptCore'. When building release 
+        one, the $libraryDir was 'WebKitBuild/Release/JavaScriptCore/../.libs/'
+        which doesn't exist anymore ('WebKitBuild/Release/JavaScriptCore'
+        is 'WebKitBuild/Release/Source/JavaScriptCore' now), and 
+        'WebKitBuild/Release/Source/JavaScriptCore/../../.libs' looks weird,
+        so make it 'WebKitBuild/Release/.libs'
+
+        * Scripts/webkitdirs.pm: 
+
 2011-01-02  Patrick Gansterer  <paroga@webkit.org>
 
         Reviewed by Adam Barth.
index 3458f70..88d12fb 100644 (file)
@@ -600,7 +600,7 @@ sub builtDylibPathForName
         return "$configurationProductDir/libwxwebkit.dylib";
     }
     if (isGtk()) {
-        my $libraryDir = "$configurationProductDir/$libraryName/../.libs/";
+        my $libraryDir = "$configurationProductDir/.libs/";
         if (-e $libraryDir . "libwebkitgtk-3.0.so") {
             return $libraryDir . "libwebkitgtk-3.0.so";
         }