Modified: trunk/Tools/BuildSlaveSupport/built-product-archive (97855 => 97856)
--- trunk/Tools/BuildSlaveSupport/built-product-archive 2011-10-19 13:36:47 UTC (rev 97855)
+++ trunk/Tools/BuildSlaveSupport/built-product-archive 2011-10-19 13:59:23 UTC (rev 97856)
@@ -48,7 +48,7 @@
def archiveBuiltProduct(configuration, platform):
- assert platform in ('mac', 'win','qt')
+ assert platform in ('mac', 'win', 'qt', 'gtk')
archiveFile = os.path.join(buildDirectory, configuration + ".zip")
@@ -82,14 +82,19 @@
shutil.rmtree(thinDirectory)
- elif platform == 'qt':
+ elif platform == 'qt' or platform == 'gtk':
thinDirectory = os.path.join(configurationBuildDirectory, "thin")
if os.path.isdir(thinDirectory):
shutil.rmtree(thinDirectory)
os.mkdir(thinDirectory)
- for dirname in ["bin", "lib", "_javascript_Core"]:
+ if platform == 'qt':
+ neededDirectories = ["bin", "lib", "_javascript_Core"]
+ elif platform == 'gtk':
+ neededDirectories = ["Programs", ".libs"]
+
+ for dirname in neededDirectories:
fromDir = os.path.join(configurationBuildDirectory, dirname, "*")
toDir = os.path.join(thinDirectory, dirname)
os.makedirs(toDir)
@@ -105,7 +110,7 @@
return 1
def extractBuiltProduct(configuration, platform):
- assert platform in ('mac', 'win','qt')
+ assert platform in ('mac', 'win', 'qt', 'gtk')
archiveFile = os.path.join(buildDirectory, configuration + ".zip")
configurationBuildDirectory = os.path.join(buildDirectory, configuration.title())
@@ -134,7 +139,7 @@
if subprocess.call(["unzip", "-o", archiveFile], cwd=configurationBuildDirectory):
return 1
- elif platform == 'qt':
+ elif platform == 'qt' or platform == 'gtk':
if os.path.isdir(configurationBuildDirectory):
shutil.rmtree(configurationBuildDirectory)
Modified: trunk/Tools/ChangeLog (97855 => 97856)
--- trunk/Tools/ChangeLog 2011-10-19 13:36:47 UTC (rev 97855)
+++ trunk/Tools/ChangeLog 2011-10-19 13:59:23 UTC (rev 97856)
@@ -1,3 +1,12 @@
+2011-10-19 Gabor Rapcsanyi <rga...@webkit.org>
+
+ [GTK] Enable to use built-product-archive on GTK platform
+ https://bugs.webkit.org/show_bug.cgi?id=70319
+
+ Reviewed by Csaba Osztrogonác.
+
+ * BuildSlaveSupport/built-product-archive:
+
2011-10-18 David Levin <le...@chromium.org>
watchlist: Should try to run if it can and not throw on mistakes.
