Remove Chromium-specific changes to script built-product-archive
authordbates@webkit.org <dbates@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 24 Sep 2015 18:29:22 +0000 (18:29 +0000)
committerdbates@webkit.org <dbates@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 24 Sep 2015 18:29:22 +0000 (18:29 +0000)
https://bugs.webkit.org/show_bug.cgi?id=149530

Rubber-stamped by Csaba Osztrogon√°c.

Reverts changes made in r113074 and r113067 to support Chromium testers. The
Chromium code has long since been removed from the OpenSource WebKit Project.

* BuildSlaveSupport/built-product-archive:
(createZipManually):
(createZip):
(archiveBuiltProduct):

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

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

index 027c1fc..0e39b2b 100644 (file)
@@ -89,7 +89,7 @@ def createZipManually(directoryToZip, archiveFile):
     archiveZip.close()
 
 
-def createZip(directoryToZip, configuration, archiveConfigurationOnMac=False):
+def createZip(directoryToZip, configuration):
     archiveDir = os.path.abspath(os.path.join(os.path.dirname(__file__), "..", "..", "WebKitBuild"))
     archiveFile = os.path.join(archiveDir, configuration + ".zip")
 
@@ -100,9 +100,7 @@ def createZip(directoryToZip, configuration, archiveConfigurationOnMac=False):
             raise
 
     if sys.platform == 'darwin':
-        if archiveConfigurationOnMac:
-            return subprocess.call(["ditto", "-c", "-k", "--keepParent", "--sequesterRsrc", directoryToZip, archiveFile])
-        return subprocess.call(["ditto", "-c", "-k", "--sequesterRsrc", directoryToZip, archiveFile])
+        return subprocess.call(["ditto", "-c", "-k", "--keepParent", "--sequesterRsrc", directoryToZip, archiveFile])
     elif sys.platform == 'cygwin':
         return subprocess.call(["zip", "-r", archiveFile, "bin32"], cwd=directoryToZip)
     elif sys.platform == 'win32':
@@ -118,7 +116,7 @@ def archiveBuiltProduct(configuration, platform, fullPlatform):
     configurationBuildDirectory = os.path.join(_buildDirectory, configuration.title())
 
     if platform == 'mac':
-        return createZip(configurationBuildDirectory, configuration, archiveConfigurationOnMac=True)
+        return createZip(configurationBuildDirectory, configuration)
     elif platform == 'win':
         binDirectory = os.path.join(configurationBuildDirectory, "bin32")
         thinDirectory = os.path.join(configurationBuildDirectory, "thin")
index d75fde4..651b541 100644 (file)
@@ -1,3 +1,18 @@
+2015-09-24  Daniel Bates  <dabates@apple.com>
+
+        Remove Chromium-specific changes to script built-product-archive
+        https://bugs.webkit.org/show_bug.cgi?id=149530
+
+        Rubber-stamped by Csaba Osztrogon√°c.
+
+        Reverts changes made in r113074 and r113067 to support Chromium testers. The
+        Chromium code has long since been removed from the OpenSource WebKit Project.
+
+        * BuildSlaveSupport/built-product-archive:
+        (createZipManually):
+        (createZip):
+        (archiveBuiltProduct):
+
 2015-09-24  Dan Bernstein  <mitz@apple.com>
 
         Build fix.