[GTK] Enable to use built-product-archive on GTK platform
authorrgabor@webkit.org <rgabor@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 19 Oct 2011 13:59:23 +0000 (13:59 +0000)
committerrgabor@webkit.org <rgabor@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 19 Oct 2011 13:59:23 +0000 (13:59 +0000)
https://bugs.webkit.org/show_bug.cgi?id=70319

Reviewed by Csaba Osztrogon√°c.

* BuildSlaveSupport/built-product-archive:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@97856 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Tools/BuildSlaveSupport/built-product-archive
Tools/ChangeLog

index 9dee922..a02f662 100644 (file)
@@ -48,7 +48,7 @@ def main():
 
 
 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 @@ def archiveBuiltProduct(configuration, platform):
 
         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", "JavaScriptCore"]:
+        if platform == 'qt':
+            neededDirectories = ["bin", "lib", "JavaScriptCore"]
+        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 @@ def archiveBuiltProduct(configuration, platform):
             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 @@ def extractBuiltProduct(configuration, platform):
         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)
 
index 385408c..a850b8d 100644 (file)
@@ -1,3 +1,12 @@
+2011-10-19  Gabor Rapcsanyi  <rgabor@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  <levin@chromium.org>
 
         watchlist: Should try to run if it can and not throw on mistakes.