Skip to content

Commit 6ee7f41

Browse files
bisect-builds:add a README to the archive.
https://bugs.webkit.org/show_bug.cgi?id=177376 Reviewed by Alexey Proskuryakov & Jon Davis. * BuildSlaveSupport/built-product-archive: (addFilesToArchive): refactor function (was previously addLauncherToArchive) (createZip): Teach function to add the README (addLauncherToArchive): Deleted. (refactored to addFilesToArchive) * BuildSlaveSupport/run-webkit-archive: Deleted. (Moved to WebKitArchiveSupport) * WebKitArchiveSupport: Added. * WebKitArchiveSupport/README: Added. README which will be packaged up with the archive. * WebKitArchiveSupport/run-webkit-archive: Added. (Moved from BuildSlaveSupport) git-svn-id: http://svn.webkit.org/repository/webkit/trunk@222558 268f45cc-cd09-0410-ab3c-d52691b4dbfc
1 parent c4982d3 commit 6ee7f41

File tree

4 files changed

+25
-4
lines changed

4 files changed

+25
-4
lines changed

Tools/BuildSlaveSupport/built-product-archive

+5-4
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,8 @@ _configurationBuildDirectory = None
3636
_topLevelBuildDirectory = None
3737
_hostBuildDirectory = None
3838

39-
PATH_TO_LAUNCHER = './Tools/BuildSlaveSupport/run-webkit-archive'
39+
PATH_TO_LAUNCHER = './Tools/WebKitArchiveSupport/run-webkit-archive'
40+
PATH_TO_README = './Tools/WebKitArchiveSupport/README'
4041

4142
def main():
4243
parser = optparse.OptionParser("usage: %prog [options] [action]")
@@ -137,8 +138,8 @@ def createZipManually(directoryToZip, archiveFile):
137138

138139
archiveZip.close()
139140

140-
def addLauncherToArchive(archiveFile):
141-
command = ['/usr/bin/zip', '-j', archiveFile, PATH_TO_LAUNCHER]
141+
def addFilesToArchive(archiveFile, pathToLauncher, pathToReadme):
142+
command = ['/usr/bin/zip', '-j', archiveFile, pathToLauncher, pathToReadme]
142143
return subprocess.call(command)
143144

144145
def createZip(directoryToZip, configuration, embedParentDirectoryNameOnDarwin=False, minify=False):
@@ -158,7 +159,7 @@ def createZip(directoryToZip, configuration, embedParentDirectoryNameOnDarwin=Fa
158159
if embedParentDirectoryNameOnDarwin:
159160
command += ['--keepParent']
160161
command += [directoryToZip, archiveFile]
161-
return subprocess.call(command) or addLauncherToArchive(archiveFile)
162+
return subprocess.call(command) or addFilesToArchive(archiveFile, PATH_TO_LAUNCHER, PATH_TO_README)
162163
elif sys.platform == 'cygwin':
163164
return subprocess.call(["zip", "-r", archiveFile, "bin32"], cwd=directoryToZip)
164165
elif sys.platform == 'win32':

Tools/ChangeLog

+16
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,19 @@
1+
2017-09-27 Lucas Forschler <[email protected]>
2+
3+
bisect-builds:add a README to the archive.
4+
https://bugs.webkit.org/show_bug.cgi?id=177376
5+
6+
Reviewed by Alexey Proskuryakov & Jon Davis.
7+
8+
* BuildSlaveSupport/built-product-archive:
9+
(addFilesToArchive): refactor function (was previously addLauncherToArchive)
10+
(createZip): Teach function to add the README
11+
(addLauncherToArchive): Deleted. (refactored to addFilesToArchive)
12+
* BuildSlaveSupport/run-webkit-archive: Deleted. (Moved to WebKitArchiveSupport)
13+
* WebKitArchiveSupport: Added.
14+
* WebKitArchiveSupport/README: Added. README which will be packaged up with the archive.
15+
* WebKitArchiveSupport/run-webkit-archive: Added. (Moved from BuildSlaveSupport)
16+
117
2017-09-26 Tim Horton <[email protected]>
218

319
Mac CMake bot should provide verbose build output

Tools/WebKitArchiveSupport/README

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
WebKit nightly archives are not code signed. Please open run-webkit-archive
2+
using the context menu in Finder.
3+
4+
See https://support.apple.com/kb/PH25088 for more details.

0 commit comments

Comments
 (0)