[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.22-985-g3c00f00

[ossy at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit 0dd088f1a320947795f60a1fede8b33c41288b7e
Author: ossy at webkit.org <ossy at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Mar 4 12:46:44 2010 +0000

    Enable to use built-product-archive on Qt platform.
    
    Patch by Gabor Rapcsanyi <rgabor at inf.u-szeged.hu> on 2010-03-04
    Reviewed by Kenneth Rohde Christiansen.
    
    * BuildSlaveSupport/built-product-archive:
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@55519 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/BuildSlaveSupport/built-product-archive b/WebKitTools/BuildSlaveSupport/built-product-archive
index ca43dad..b27cf77 100644
--- a/WebKitTools/BuildSlaveSupport/built-product-archive
+++ b/WebKitTools/BuildSlaveSupport/built-product-archive
@@ -48,7 +48,7 @@ def main():
 
 
 def archiveBuiltProduct(configuration, platform):
-    assert platform in ('mac', 'win')
+    assert platform in ('mac', 'win','qt')
 
     archiveFile = os.path.join(buildDirectory, configuration + ".zip")
 
@@ -81,8 +81,30 @@ def archiveBuiltProduct(configuration, platform):
 
         shutil.rmtree(thinDirectory)
 
+    elif platform == 'qt':
+        configurationBuildDirectory = os.path.join(buildDirectory, configuration.title())
+        thinDirectory = os.path.join(configurationBuildDirectory, "thin")
+
+        if os.path.isdir(thinDirectory):
+            shutil.rmtree(thinDirectory)
+        os.mkdir(thinDirectory)
+
+        for dirname in ["bin", "lib", "JavaScriptCore"]:
+            fromDir = os.path.join(configurationBuildDirectory, dirname)
+            toDir = os.path.join(thinDirectory, dirname)
+            if subprocess.call(["cp", "-R", fromDir, toDir]):
+                return 1
+
+        for root, dirs, files in os.walk(thinDirectory, topdown=False):
+            for name in files:
+                if name.endswith(".o"):
+                    os.remove(os.path.join(root, name))
+
+        if subprocess.call(["zip", "-y", "-r", archiveFile, "."], cwd=thinDirectory):
+            return 1
+
 def extractBuiltProduct(configuration, platform):
-    assert platform in ('mac', 'win')
+    assert platform in ('mac', 'win','qt')
 
     archiveFile = os.path.join(buildDirectory, configuration + ".zip")
 
@@ -112,7 +134,15 @@ def extractBuiltProduct(configuration, platform):
         if subprocess.call(["unzip", "-o", archiveFile], cwd=buildDirectory):
             return 1
 
-        
+    elif platform == 'qt':
+        configurationBuildDirectory = os.path.join(buildDirectory, configuration.title())
+
+        if os.path.isdir(configurationBuildDirectory):
+            shutil.rmtree(configurationBuildDirectory)
+
+        if subprocess.call(["unzip", "-o", archiveFile, "-d", configurationBuildDirectory], cwd=buildDirectory):
+            return 1
+        os.unlink(archiveFile)
 
 if __name__ == '__main__':
     sys.exit(main())
diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index c797856..812fc54 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,11 @@
+2010-03-04  Gabor Rapcsanyi  <rgabor at inf.u-szeged.hu>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        Enable to use built-product-archive on Qt platform.
+
+        * BuildSlaveSupport/built-product-archive:
+
 2010-03-03  Jesus Sanchez-Palencia  <jesus.palencia at openbossa.org>
 
         Reviewed by Simon Hausmann.

-- 
WebKit Debian packaging