[SCM] WebKit Debian packaging branch, debian/experimental, updated. debian/1.3.8-1-1049-g2e11a8e
ossy at webkit.org
ossy at webkit.org
Fri Jan 21 14:51:23 UTC 2011
The following commit has been merged in the debian/experimental branch:
commit d7359440badc2f61937d602d59f2ad1126801ad4
Author: ossy at webkit.org <ossy at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Mon Jan 3 00:08:59 2011 +0000
[Qt] Unreviewed fix after r74855 and r74875.
* BuildSlaveSupport/built-product-archive:
- Create directories explicitly.
- Pass shell=True to subprocess.call().
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@74880 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/Tools/BuildSlaveSupport/built-product-archive b/Tools/BuildSlaveSupport/built-product-archive
index 6767ee6..1ccbdec 100644
--- a/Tools/BuildSlaveSupport/built-product-archive
+++ b/Tools/BuildSlaveSupport/built-product-archive
@@ -90,9 +90,10 @@ def archiveBuiltProduct(configuration, platform):
os.mkdir(thinDirectory)
for dirname in ["bin", "lib", "Source/JavaScriptCore"]:
- fromDir = os.path.join(configurationBuildDirectory, dirname)
+ fromDir = os.path.join(configurationBuildDirectory, dirname, "*")
toDir = os.path.join(thinDirectory, dirname)
- if subprocess.call(["cp", "-R", fromDir, toDir]):
+ os.makedirs(toDir)
+ if subprocess.call('cp -R %s %s' % (fromDir, toDir), shell=True):
return 1
for root, dirs, files in os.walk(thinDirectory, topdown=False):
diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index 0bdb0fa..2894f57 100644
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,5 +1,13 @@
2011-01-02 Csaba Osztrogonác <ossy at webkit.org>
+ [Qt] Unreviewed fix after r74855 and r74875.
+
+ * BuildSlaveSupport/built-product-archive:
+ - Create directories explicitly.
+ - Pass shell=True to subprocess.call().
+
+2011-01-02 Csaba Osztrogonác <ossy at webkit.org>
+
[Qt] Unreviewed fix after r74855.
Move JavaScriptCore to Source
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list