Title: [151064] trunk/Tools
- Revision
- 151064
- Author
- [email protected]
- Date
- 2013-05-31 20:34:35 -0700 (Fri, 31 May 2013)
Log Message
Unreviewed. Windows build fix. One more time!
* BuildSlaveSupport/built-product-archive:
(archiveBuiltProduct):
(extractBuiltProduct):
Modified Paths
Diff
Modified: trunk/Tools/BuildSlaveSupport/built-product-archive (151063 => 151064)
--- trunk/Tools/BuildSlaveSupport/built-product-archive 2013-06-01 03:04:24 UTC (rev 151063)
+++ trunk/Tools/BuildSlaveSupport/built-product-archive 2013-06-01 03:34:35 UTC (rev 151064)
@@ -120,9 +120,9 @@
if platform == 'mac':
return createZip(configurationBuildDirectory, configuration, archiveConfigurationOnMac=True)
elif platform == 'win':
- binDirectory = os.path.join(configurationBuildDirectory, "bin")
+ binDirectory = os.path.join(configurationBuildDirectory, "bin32")
thinDirectory = os.path.join(configurationBuildDirectory, "thin")
- thinBinDirectory = os.path.join(thinDirectory, "bin")
+ thinBinDirectory = os.path.join(thinDirectory, "bin32")
removeDirectoryIfExists(thinDirectory)
copyBuildFiles(binDirectory, thinBinDirectory, ['*.ilk'])
@@ -188,7 +188,7 @@
if platform == 'mac':
return unzipArchive(_buildDirectory, configuration)
elif platform == 'win':
- binDirectory = os.path.join(configurationBuildDirectory, "bin")
+ binDirectory = os.path.join(configurationBuildDirectory, "bin32")
os.makedirs(binDirectory)
safariPath = subprocess.Popen('cygpath -w "$PROGRAMFILES"/Safari',
Modified: trunk/Tools/ChangeLog (151063 => 151064)
--- trunk/Tools/ChangeLog 2013-06-01 03:04:24 UTC (rev 151063)
+++ trunk/Tools/ChangeLog 2013-06-01 03:34:35 UTC (rev 151064)
@@ -1,5 +1,13 @@
2013-05-31 Roger Fong <[email protected]>
+ Unreviewed. Windows build fix. One more time!
+
+ * BuildSlaveSupport/built-product-archive:
+ (archiveBuiltProduct):
+ (extractBuiltProduct):
+
+2013-05-31 Roger Fong <[email protected]>
+
Unreviewed. Windows build fix.
* Scripts/build-webkit:
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
