Diff
Modified: trunk/Tools/BuildSlaveSupport/built-product-archive (222557 => 222558)
--- trunk/Tools/BuildSlaveSupport/built-product-archive 2017-09-27 17:08:58 UTC (rev 222557)
+++ trunk/Tools/BuildSlaveSupport/built-product-archive 2017-09-27 17:12:03 UTC (rev 222558)
@@ -36,7 +36,8 @@
_topLevelBuildDirectory = None
_hostBuildDirectory = None
-PATH_TO_LAUNCHER = './Tools/BuildSlaveSupport/run-webkit-archive'
+PATH_TO_LAUNCHER = './Tools/WebKitArchiveSupport/run-webkit-archive'
+PATH_TO_README = './Tools/WebKitArchiveSupport/README'
def main():
parser = optparse.OptionParser("usage: %prog [options] [action]")
@@ -137,8 +138,8 @@
archiveZip.close()
-def addLauncherToArchive(archiveFile):
- command = ['/usr/bin/zip', '-j', archiveFile, PATH_TO_LAUNCHER]
+def addFilesToArchive(archiveFile, pathToLauncher, pathToReadme):
+ command = ['/usr/bin/zip', '-j', archiveFile, pathToLauncher, pathToReadme]
return subprocess.call(command)
def createZip(directoryToZip, configuration, embedParentDirectoryNameOnDarwin=False, minify=False):
@@ -158,7 +159,7 @@
if embedParentDirectoryNameOnDarwin:
command += ['--keepParent']
command += [directoryToZip, archiveFile]
- return subprocess.call(command) or addLauncherToArchive(archiveFile)
+ return subprocess.call(command) or addFilesToArchive(archiveFile, PATH_TO_LAUNCHER, PATH_TO_README)
elif sys.platform == 'cygwin':
return subprocess.call(["zip", "-r", archiveFile, "bin32"], cwd=directoryToZip)
elif sys.platform == 'win32':
Deleted: trunk/Tools/BuildSlaveSupport/run-webkit-archive (222557 => 222558)
--- trunk/Tools/BuildSlaveSupport/run-webkit-archive 2017-09-27 17:08:58 UTC (rev 222557)
+++ trunk/Tools/BuildSlaveSupport/run-webkit-archive 2017-09-27 17:12:03 UTC (rev 222558)
@@ -1,69 +0,0 @@
-#!/usr/bin/env python
-
-# Copyright (C) 2017 Apple Inc. All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-# 1. Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-# notice, this list of conditions and the following disclaimer in the
-# documentation and/or other materials provided with the distribution.
-# 3. Neither the name of Apple Inc. ("Apple") nor the names of
-# its contributors may be used to endorse or promote products derived
-# from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
-# EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-# DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
-# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-import os, platform, subprocess
-
-SAFARI_FOR_WEBKIT_DEVELOPMENT='/Applications/Safari.app/Contents/MacOS/SafariForWebKitDevelopment'
-
-def check_for_valid_platform():
- if 'Darwin' not in platform.system():
- print('Unsupported OS, exiting.')
- exit(1)
-
-def find_dyld_framework_path(script_path):
- current_directory = os.path.dirname(script_path)
- sub_directories = [name for name in os.listdir(current_directory) if os.path.isdir(name)]
- if 'Debug' in sub_directories:
- return current_directory + '/Debug'
- elif 'Release' in sub_directories:
- return current_directory + '/Release'
- else:
- print('No Release or Debug framework directories found in the current folder, exiting.')
- exit(1)
-
-def run_safari_for_webkit_development():
- subprocess.call(SAFARI_FOR_WEBKIT_DEVELOPMENT)
-
-def set_dyld_framework_path(script_path):
- dyld_path = find_dyld_framework_path(script_path)
- print('Setting DYLD FRAMEWORK and LIBRARY paths to {}'.format(dyld_path))
- os.environ['DYLD_FRAMEWORK_PATH'] = dyld_path
- os.environ['DYLD_LIBRARY_PATH'] = dyld_path
-
-def main():
- check_for_valid_platform()
- script_path = os.path.abspath(__file__)
- os.chdir(os.path.dirname(script_path))
- set_dyld_framework_path(script_path)
- run_safari_for_webkit_development()
-
-if __name__ == '__main__':
- try:
- main()
- except KeyboardInterrupt:
- exit("Aborting.")
\ No newline at end of file
Modified: trunk/Tools/ChangeLog (222557 => 222558)
--- trunk/Tools/ChangeLog 2017-09-27 17:08:58 UTC (rev 222557)
+++ trunk/Tools/ChangeLog 2017-09-27 17:12:03 UTC (rev 222558)
@@ -1,3 +1,19 @@
+2017-09-27 Lucas Forschler <[email protected]>
+
+ 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)
+
2017-09-26 Tim Horton <[email protected]>
Mac CMake bot should provide verbose build output
Added: trunk/Tools/WebKitArchiveSupport/README (0 => 222558)
--- trunk/Tools/WebKitArchiveSupport/README (rev 0)
+++ trunk/Tools/WebKitArchiveSupport/README 2017-09-27 17:12:03 UTC (rev 222558)
@@ -0,0 +1,4 @@
+WebKit nightly archives are not code signed. Please open run-webkit-archive
+using the context menu in Finder.
+
+See https://support.apple.com/kb/PH25088 for more details.
Added: trunk/Tools/WebKitArchiveSupport/run-webkit-archive (0 => 222558)
--- trunk/Tools/WebKitArchiveSupport/run-webkit-archive (rev 0)
+++ trunk/Tools/WebKitArchiveSupport/run-webkit-archive 2017-09-27 17:12:03 UTC (rev 222558)
@@ -0,0 +1,69 @@
+#!/usr/bin/env python
+
+# Copyright (C) 2017 Apple Inc. All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# 1. Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the distribution.
+# 3. Neither the name of Apple Inc. ("Apple") nor the names of
+# its contributors may be used to endorse or promote products derived
+# from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
+# EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+# DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
+# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+import os, platform, subprocess
+
+SAFARI_FOR_WEBKIT_DEVELOPMENT='/Applications/Safari.app/Contents/MacOS/SafariForWebKitDevelopment'
+
+def check_for_valid_platform():
+ if 'Darwin' not in platform.system():
+ print('Unsupported OS, exiting.')
+ exit(1)
+
+def find_dyld_framework_path(script_path):
+ current_directory = os.path.dirname(script_path)
+ sub_directories = [name for name in os.listdir(current_directory) if os.path.isdir(name)]
+ if 'Debug' in sub_directories:
+ return current_directory + '/Debug'
+ elif 'Release' in sub_directories:
+ return current_directory + '/Release'
+ else:
+ print('No Release or Debug framework directories found in the current folder, exiting.')
+ exit(1)
+
+def run_safari_for_webkit_development():
+ subprocess.call(SAFARI_FOR_WEBKIT_DEVELOPMENT)
+
+def set_dyld_framework_path(script_path):
+ dyld_path = find_dyld_framework_path(script_path)
+ print('Setting DYLD FRAMEWORK and LIBRARY paths to {}'.format(dyld_path))
+ os.environ['DYLD_FRAMEWORK_PATH'] = dyld_path
+ os.environ['DYLD_LIBRARY_PATH'] = dyld_path
+
+def main():
+ check_for_valid_platform()
+ script_path = os.path.abspath(__file__)
+ os.chdir(os.path.dirname(script_path))
+ set_dyld_framework_path(script_path)
+ run_safari_for_webkit_development()
+
+if __name__ == '__main__':
+ try:
+ main()
+ except KeyboardInterrupt:
+ exit("Aborting.")
\ No newline at end of file
Property changes on: trunk/Tools/WebKitArchiveSupport/run-webkit-archive
___________________________________________________________________
Added: svn:executable
+*
\ No newline at end of property
