<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[190212] trunk/Tools</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/190212">190212</a></dd>
<dt>Author</dt> <dd>dbates@webkit.org</dd>
<dt>Date</dt> <dd>2015-09-24 11:36:27 -0700 (Thu, 24 Sep 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add support infrastructure for OpenSource iOS builders and testers
https://bugs.webkit.org/show_bug.cgi?id=149534
Reviewed by Darin Adler.
Towards setting up OpenSource iOS build bots, teach buildbot and its support
scripts about iOS.
* BuildSlaveSupport/build.webkit.org-config/master.cfg:
(appendCustomBuildFlags): Require the caller to pass parameter fullPlatform and append
--ios-simulator or --device for a builder/tester whose full platform name begins with
"ios-simulator" or "ios", respectively.
(RunJavaScriptCoreTests.start): Pass the full platform name to appendCustomBuildFlags().
* BuildSlaveSupport/built-product-archive:
(main): Pass the full platform name to determineWebKitBuildDirectory().
(determineWebKitBuildDirectory): Call script webkit-build-directory with the appropriate
command line flag when building for iOS.
(archiveBuiltProduct): Use the same logic for iOS as we do for Mac. Also, remove unused
parameter fullPlatform. This parameter was originally added in <a href="http://trac.webkit.org/projects/webkit/changeset/125066">r125066</a> to support the
Chromium Android port, which has since been removed from the OpenSource WebKit Project.
(extractBuiltProduct): Use the same logic for iOS as we do for Mac.
* BuildSlaveSupport/clean-build:
(main): Call script webkit-build-directory with the appropriate command line flag when
building for iOS.
* BuildSlaveSupport/delete-stale-build-files:
(main): Use the same logic for iOS as we do for Mac.
(webkitBuildDirectory): Call script webkit-build-directory with the appropriate command line
flag when building for iOS.
* BuildSlaveSupport/test-result-archive:
(archiveTestResults): Use the same logic for iOS as we do for Mac.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsBuildSlaveSupportbuildwebkitorgconfigmastercfg">trunk/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg</a></li>
<li><a href="#trunkToolsBuildSlaveSupportbuiltproductarchive">trunk/Tools/BuildSlaveSupport/built-product-archive</a></li>
<li><a href="#trunkToolsBuildSlaveSupportcleanbuild">trunk/Tools/BuildSlaveSupport/clean-build</a></li>
<li><a href="#trunkToolsBuildSlaveSupportdeletestalebuildfiles">trunk/Tools/BuildSlaveSupport/delete-stale-build-files</a></li>
<li><a href="#trunkToolsBuildSlaveSupporttestresultarchive">trunk/Tools/BuildSlaveSupport/test-result-archive</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsBuildSlaveSupportbuildwebkitorgconfigmastercfg"></a>
<div class="modfile"><h4>Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg (190211 => 190212)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg 2015-09-24 18:29:22 UTC (rev 190211)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg 2015-09-24 18:36:27 UTC (rev 190212)
</span><span class="lines">@@ -188,9 +188,14 @@
</span><span class="cx"> command = ["perl", "./Tools/Scripts/update-webkitgtk-libs"]
</span><span class="cx"> haltOnFailure = True
</span><span class="cx">
</span><del>-def appendCustomBuildFlags(step, platform, fullPlatform=""):
- if platform in ('efl', 'gtk', 'wincairo'):
- step.setCommand(step.command + ['--' + platform])
</del><ins>+def appendCustomBuildFlags(step, platform, fullPlatform):
+ if platform not in ('efl', 'gtk', 'wincairo', 'ios'):
+ return
+ if fullPlatform.startswith('ios-simulator'):
+ platform = 'ios-simulator'
+ elif platform == 'ios':
+ platform = 'device'
+ step.setCommand(step.command + ['--' + platform])
</ins><span class="cx">
</span><span class="cx"> class CompileWebKit(shell.Compile):
</span><span class="cx"> command = ["perl", "./Tools/Scripts/build-webkit", WithProperties("--%(configuration)s")]
</span><span class="lines">@@ -287,7 +292,7 @@
</span><span class="cx"> failedTestsFormatString = "%d JSC test%s failed"
</span><span class="cx">
</span><span class="cx"> def start(self):
</span><del>- appendCustomBuildFlags(self, self.getProperty('platform'))
</del><ins>+ appendCustomBuildFlags(self, self.getProperty('platform'), self.getProperty('fullPlatform'))
</ins><span class="cx"> return shell.Test.start(self)
</span><span class="cx">
</span><span class="cx"> def countFailures(self, cmd):
</span></span></pre></div>
<a id="trunkToolsBuildSlaveSupportbuiltproductarchive"></a>
<div class="modfile"><h4>Modified: trunk/Tools/BuildSlaveSupport/built-product-archive (190211 => 190212)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/BuildSlaveSupport/built-product-archive 2015-09-24 18:29:22 UTC (rev 190211)
+++ trunk/Tools/BuildSlaveSupport/built-product-archive 2015-09-24 18:36:27 UTC (rev 190212)
</span><span class="lines">@@ -52,7 +52,7 @@
</span><span class="cx"> return 1
</span><span class="cx">
</span><span class="cx"> genericPlatform = options.platform.split('-', 1)[0]
</span><del>- if not determineWebKitBuildDirectory(genericPlatform, options.configuration):
</del><ins>+ if not determineWebKitBuildDirectory(genericPlatform, options.platform, options.configuration):
</ins><span class="cx"> print >> sys.stderr, "Could not determine build directory"
</span><span class="cx"> return 1
</span><span class="cx">
</span><span class="lines">@@ -62,8 +62,12 @@
</span><span class="cx"> return extractBuiltProduct(options.configuration, genericPlatform)
</span><span class="cx">
</span><span class="cx">
</span><del>-def determineWebKitBuildDirectory(platform, configuration):
</del><ins>+def determineWebKitBuildDirectory(platform, fullPlatform, configuration):
</ins><span class="cx"> global _buildDirectory
</span><ins>+ if fullPlatform.startswith('ios-simulator'):
+ platform = 'ios-simulator'
+ elif platform == 'ios':
+ platform = 'device'
</ins><span class="cx"> _buildDirectory = subprocess.Popen(['perl', os.path.join(os.path.dirname(__file__), "..", "Scripts", "webkit-build-directory"),
</span><span class="cx"> "--" + platform, "--" + configuration, '--top-level'], stdout=subprocess.PIPE).communicate()[0].strip()
</span><span class="cx"> return _buildDirectory
</span><span class="lines">@@ -110,12 +114,12 @@
</span><span class="cx"> return subprocess.call(["zip", "-y", "-r", archiveFile, "."], cwd=directoryToZip)
</span><span class="cx">
</span><span class="cx">
</span><del>-def archiveBuiltProduct(configuration, platform, fullPlatform):
- assert platform in ('mac', 'win', 'gtk', 'efl')
</del><ins>+def archiveBuiltProduct(configuration, platform):
+ assert platform in ('mac', 'win', 'gtk', 'efl', 'ios')
</ins><span class="cx">
</span><span class="cx"> configurationBuildDirectory = os.path.join(_buildDirectory, configuration.title())
</span><span class="cx">
</span><del>- if platform == 'mac':
</del><ins>+ if platform in ('mac', 'ios'):
</ins><span class="cx"> return createZip(configurationBuildDirectory, configuration)
</span><span class="cx"> elif platform == 'win':
</span><span class="cx"> binDirectory = os.path.join(configurationBuildDirectory, "bin32")
</span><span class="lines">@@ -179,7 +183,7 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> def extractBuiltProduct(configuration, platform):
</span><del>- assert platform in ('mac', 'win', 'gtk', 'efl')
</del><ins>+ assert platform in ('mac', 'win', 'gtk', 'efl', 'ios')
</ins><span class="cx">
</span><span class="cx"> archiveFile = os.path.join(_buildDirectory, configuration + ".zip")
</span><span class="cx"> configurationBuildDirectory = os.path.join(_buildDirectory, configuration.title())
</span><span class="lines">@@ -187,7 +191,7 @@
</span><span class="cx"> removeDirectoryIfExists(configurationBuildDirectory)
</span><span class="cx"> os.makedirs(configurationBuildDirectory)
</span><span class="cx">
</span><del>- if platform == 'mac':
</del><ins>+ if platform in ('mac', 'ios'):
</ins><span class="cx"> return unzipArchive(_buildDirectory, configuration)
</span><span class="cx"> elif platform == 'win' or platform == 'gtk' or platform == 'efl':
</span><span class="cx"> print "Extracting", configurationBuildDirectory
</span></span></pre></div>
<a id="trunkToolsBuildSlaveSupportcleanbuild"></a>
<div class="modfile"><h4>Modified: trunk/Tools/BuildSlaveSupport/clean-build (190211 => 190212)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/BuildSlaveSupport/clean-build 2015-09-24 18:29:22 UTC (rev 190211)
+++ trunk/Tools/BuildSlaveSupport/clean-build 2015-09-24 18:36:27 UTC (rev 190212)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> #!/usr/bin/python
</span><del>-# Copyright (C) 2013 Apple Inc. All rights reserved.
</del><ins>+# Copyright (C) 2013, 2015 Apple Inc. All rights reserved.
</ins><span class="cx"> # Copyright (C) 2012 Google Inc. All rights reserved.
</span><span class="cx"> #
</span><span class="cx"> # Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -43,10 +43,15 @@
</span><span class="cx"> parser.error("Configuration is required")
</span><span class="cx"> return -2
</span><span class="cx">
</span><del>- generic_platform = options.platform.split('-', 1)[0]
</del><ins>+ if options.platform.startswith('ios-simulator'):
+ platform = 'ios-simulator'
+ elif options.platform.startswith('ios'):
+ platform = 'device'
+ else:
+ platform = options.platform.split('-', 1)[0]
</ins><span class="cx">
</span><span class="cx"> webkit_build_directory = subprocess.Popen(['perl', os.path.join(os.path.dirname(__file__), "..", "Scripts", "webkit-build-directory"),
</span><del>- "--" + generic_platform, "--" + options.configuration, '--top-level'], stdout=subprocess.PIPE).communicate()[0].strip()
</del><ins>+ "--" + platform, "--" + options.configuration, '--top-level'], stdout=subprocess.PIPE).communicate()[0].strip()
</ins><span class="cx">
</span><span class="cx"> shutil.rmtree(webkit_build_directory)
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsBuildSlaveSupportdeletestalebuildfiles"></a>
<div class="modfile"><h4>Modified: trunk/Tools/BuildSlaveSupport/delete-stale-build-files (190211 => 190212)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/BuildSlaveSupport/delete-stale-build-files 2015-09-24 18:29:22 UTC (rev 190211)
+++ trunk/Tools/BuildSlaveSupport/delete-stale-build-files 2015-09-24 18:36:27 UTC (rev 190212)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> #!/usr/bin/python
</span><del>-# Copyright (C) 2013 Apple Inc. All rights reserved.
</del><ins>+# Copyright (C) 2013, 2015 Apple Inc. All rights reserved.
</ins><span class="cx"> # Copyright (C) 2012 Google Inc. All rights reserved.
</span><span class="cx"> #
</span><span class="cx"> # Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -45,14 +45,14 @@
</span><span class="cx"> return -2
</span><span class="cx">
</span><span class="cx"> genericPlatform = options.platform.split('-', 1)[0]
</span><del>- if genericPlatform != 'mac':
</del><ins>+ if genericPlatform not in ('mac', 'ios'):
</ins><span class="cx"> print 'Exited without removing any files.'
</span><span class="cx"> return 0
</span><span class="cx">
</span><span class="cx"> if options.build_directory:
</span><span class="cx"> buildDirectory = options.build_directory
</span><span class="cx"> else:
</span><del>- buildDirectory = webkitBuildDirectory(genericPlatform, options.configuration)
</del><ins>+ buildDirectory = webkitBuildDirectory(genericPlatform, options.platform, options.configuration)
</ins><span class="cx">
</span><span class="cx"> exit_code = 0
</span><span class="cx">
</span><span class="lines">@@ -78,7 +78,11 @@
</span><span class="cx"> return exit_code
</span><span class="cx">
</span><span class="cx">
</span><del>-def webkitBuildDirectory(platform, configuration):
</del><ins>+def webkitBuildDirectory(platform, fullPlatform, configuration):
+ if fullPlatform.startswith('ios-simulator'):
+ platform = 'ios-simulator'
+ elif platform == 'ios':
+ platform = 'device'
</ins><span class="cx"> return subprocess.Popen(['perl', os.path.join(os.path.dirname(__file__), "..", "Scripts", "webkit-build-directory"),
</span><span class="cx"> "--" + platform, "--" + configuration, '--top-level'], stdout=subprocess.PIPE).communicate()[0].strip()
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsBuildSlaveSupporttestresultarchive"></a>
<div class="modfile"><h4>Modified: trunk/Tools/BuildSlaveSupport/test-result-archive (190211 => 190212)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/BuildSlaveSupport/test-result-archive 2015-09-24 18:29:22 UTC (rev 190211)
+++ trunk/Tools/BuildSlaveSupport/test-result-archive 2015-09-24 18:36:27 UTC (rev 190212)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><span class="cx"> #!/usr/bin/python
</span><span class="cx">
</span><del>-# Copyright (C) 2009 Apple Inc. All rights reserved.
</del><ins>+# Copyright (C) 2009, 2015 Apple Inc. All rights reserved.
</ins><span class="cx"> #
</span><span class="cx"> # Redistribution and use in source and binary forms, with or without
</span><span class="cx"> # modification, are permitted provided that the following conditions
</span><span class="lines">@@ -46,7 +46,7 @@
</span><span class="cx"> return archiveTestResults(options.configuration, options.platform, layoutTestResultsDir)
</span><span class="cx">
</span><span class="cx"> def archiveTestResults(configuration, platform, layoutTestResultsDir):
</span><del>- assert platform in ('mac', 'win', 'gtk', 'efl', 'wincairo')
</del><ins>+ assert platform in ('mac', 'win', 'gtk', 'efl', 'wincairo', 'ios')
</ins><span class="cx">
</span><span class="cx"> try:
</span><span class="cx"> os.unlink(archiveFile)
</span><span class="lines">@@ -63,7 +63,7 @@
</span><span class="cx">
</span><span class="cx"> open(os.path.join(layoutTestResultsDir, '.placeholder'), 'w').close()
</span><span class="cx">
</span><del>- if platform == 'mac':
</del><ins>+ if platform in ('mac', 'ios'):
</ins><span class="cx"> if subprocess.call(["ditto", "-c", "-k", "--sequesterRsrc", "--zlibCompressionLevel", "2", layoutTestResultsDir, archiveFile]):
</span><span class="cx"> return 1
</span><span class="cx"> elif platform in ('win', 'gtk', 'efl', 'wincairo'):
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (190211 => 190212)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2015-09-24 18:29:22 UTC (rev 190211)
+++ trunk/Tools/ChangeLog 2015-09-24 18:36:27 UTC (rev 190212)
</span><span class="lines">@@ -1,5 +1,38 @@
</span><span class="cx"> 2015-09-24 Daniel Bates <dabates@apple.com>
</span><span class="cx">
</span><ins>+ Add support infrastructure for OpenSource iOS builders and testers
+ https://bugs.webkit.org/show_bug.cgi?id=149534
+
+ Reviewed by Darin Adler.
+
+ Towards setting up OpenSource iOS build bots, teach buildbot and its support
+ scripts about iOS.
+
+ * BuildSlaveSupport/build.webkit.org-config/master.cfg:
+ (appendCustomBuildFlags): Require the caller to pass parameter fullPlatform and append
+ --ios-simulator or --device for a builder/tester whose full platform name begins with
+ "ios-simulator" or "ios", respectively.
+ (RunJavaScriptCoreTests.start): Pass the full platform name to appendCustomBuildFlags().
+ * BuildSlaveSupport/built-product-archive:
+ (main): Pass the full platform name to determineWebKitBuildDirectory().
+ (determineWebKitBuildDirectory): Call script webkit-build-directory with the appropriate
+ command line flag when building for iOS.
+ (archiveBuiltProduct): Use the same logic for iOS as we do for Mac. Also, remove unused
+ parameter fullPlatform. This parameter was originally added in r125066 to support the
+ Chromium Android port, which has since been removed from the OpenSource WebKit Project.
+ (extractBuiltProduct): Use the same logic for iOS as we do for Mac.
+ * BuildSlaveSupport/clean-build:
+ (main): Call script webkit-build-directory with the appropriate command line flag when
+ building for iOS.
+ * BuildSlaveSupport/delete-stale-build-files:
+ (main): Use the same logic for iOS as we do for Mac.
+ (webkitBuildDirectory): Call script webkit-build-directory with the appropriate command line
+ flag when building for iOS.
+ * BuildSlaveSupport/test-result-archive:
+ (archiveTestResults): Use the same logic for iOS as we do for Mac.
+
+2015-09-24 Daniel Bates <dabates@apple.com>
+
</ins><span class="cx"> Remove Chromium-specific changes to script built-product-archive
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=149530
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>