[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198

[ossy at webkit.org]

The following commit has been merged in the webkit-1.3 branch:
commit 504a6f79e276621a5977377b388fc2a0384675e4
Author: ossy at webkit.org <ossy at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Jan 24 11:22:49 2011 +0000

    Unreviewed fix after r76496
    
    [Qt] Move project files into Source
    https://bugs.webkit.org/show_bug.cgi?id=52891
    
    * BuildSlaveSupport/build.webkit.org-config/master.cfg: Remove unnecessary "Source" from the path.
    * BuildSlaveSupport/built-product-archive: Remove unnecessary "Source" from the path.
    * Scripts/webkitdirs.pm: Add the accidentally removed slash to the path.
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@76499 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg b/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg
index 1ce5b88..84ce4f6 100644
--- a/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg
+++ b/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg
@@ -319,7 +319,7 @@ class RunQtAPITests(shell.Test):
     descriptionDone = ["API tests"]
     command = ["python", "./Tools/Scripts/run-qtwebkit-tests",
                "--output-file=qt-unit-tests.html", "--do-not-open-results", "--timeout=30",
-               WithProperties("WebKitBuild/%(configuration_pretty)s/Source/WebKit/qt/tests/")]
+               WithProperties("WebKitBuild/%(configuration_pretty)s/WebKit/qt/tests/")]
 
     def start(self):
         self.setProperty("configuration_pretty", self.getProperty("configuration").title())
diff --git a/Tools/BuildSlaveSupport/built-product-archive b/Tools/BuildSlaveSupport/built-product-archive
index 611d006..9dee922 100644
--- a/Tools/BuildSlaveSupport/built-product-archive
+++ b/Tools/BuildSlaveSupport/built-product-archive
@@ -89,7 +89,7 @@ def archiveBuiltProduct(configuration, platform):
             shutil.rmtree(thinDirectory)
         os.mkdir(thinDirectory)
 
-        for dirname in ["bin", "lib", "Source/JavaScriptCore"]:
+        for dirname in ["bin", "lib", "JavaScriptCore"]:
             fromDir = os.path.join(configurationBuildDirectory, dirname, "*")
             toDir = os.path.join(thinDirectory, dirname)
             os.makedirs(toDir)
diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index 2ec6ead..f95d485 100644
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,14 @@
+2011-01-24  Csaba Osztrogonác  <ossy at webkit.org>
+
+        Unreviewed fix after r76496
+
+        [Qt] Move project files into Source
+        https://bugs.webkit.org/show_bug.cgi?id=52891
+
+        * BuildSlaveSupport/build.webkit.org-config/master.cfg: Remove unnecessary "Source" from the path.
+        * BuildSlaveSupport/built-product-archive: Remove unnecessary "Source" from the path.
+        * Scripts/webkitdirs.pm: Add the accidentally removed slash to the path.
+
 2011-01-24  Andras Becsi  <abecsi at webkit.org>
 
         Reviewed by Csaba Osztrogonác.
diff --git a/Tools/Scripts/webkitdirs.pm b/Tools/Scripts/webkitdirs.pm
index 9fc7c72..e7c57d6 100644
--- a/Tools/Scripts/webkitdirs.pm
+++ b/Tools/Scripts/webkitdirs.pm
@@ -356,7 +356,7 @@ sub productDir
 sub jscProductDir
 {
     my $productDir = productDir();
-    $productDir .= "JavaScriptCore" if isQt();
+    $productDir .= "/JavaScriptCore" if isQt();
     $productDir .= "/$configuration" if (isQt() && isWindows());
     $productDir .= "/Programs" if (isGtk() || isEfl());
 

-- 
WebKit Debian packaging