[SCM] WebKit Debian packaging branch, debian/experimental, updated. debian/1.3.8-1-1049-g2e11a8e

sfalken at apple.com sfalken at apple.com
Fri Jan 21 15:01:02 UTC 2011


The following commit has been merged in the debian/experimental branch:
commit 24e443d397ebeb54ba4a36a4154ee5cb7d8e263a
Author: sfalken at apple.com <sfalken at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Jan 6 07:00:26 2011 +0000

    Windows build fix.
    Include configuration name when unpacking a build archive.
    
    Needed, since we split Windows build results into configuration-specific directories
    under WebKitOutputDir.
    
    * BuildSlaveSupport/built-product-archive:
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@75142 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Tools/BuildSlaveSupport/built-product-archive b/Tools/BuildSlaveSupport/built-product-archive
index 1ccbdec..a641d01 100644
--- a/Tools/BuildSlaveSupport/built-product-archive
+++ b/Tools/BuildSlaveSupport/built-product-archive
@@ -120,7 +120,7 @@ def extractBuiltProduct(configuration, platform):
         os.unlink(archiveFile)
 
     elif platform == 'win':
-        binDirectory = os.path.join(buildDirectory, "bin")
+        binDirectory = os.path.join(buildDirectory, configuration.title(), "bin")
         if os.path.isdir(binDirectory):
             shutil.rmtree(binDirectory)
 
diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index dd569df..0c74f5c 100644
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,5 +1,15 @@
 2011-01-05  Steve Falkenburg  <sfalken at apple.com>
 
+        Windows build fix.
+        Include configuration name when unpacking a build archive.
+
+        Needed, since we split Windows build results into configuration-specific directories
+        under WebKitOutputDir.
+
+        * BuildSlaveSupport/built-product-archive:
+
+2011-01-05  Steve Falkenburg  <sfalken at apple.com>
+
         Reviewed by Darin Adler.
 
         Debug and Release builds on Windows clobber each other

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list