<!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>[213395] 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/213395">213395</a></dd>
<dt>Author</dt> <dd>dino@apple.com</dd>
<dt>Date</dt> <dd>2017-03-03 16:48:35 -0800 (Fri, 03 Mar 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add a script to synchronize FeatureDefines.xcconfig files
https://bugs.webkit.org/show_bug.cgi?id=169151
<rdar://problem/30841856>
Reviewed by Simon Fraser.
I got sick of manually copying the FeatureDefines.xcconfig
files, so I added a script to do it. As long as you
run this after you've edited one, it will take the most
recently updated and copy it to all the others.
* Scripts/sync-feature-defines: Added.
* Scripts/webkitpy/style/checkers/featuredefines.py:
(FeatureDefinesChecker.check): Export the list of files,
and give a suggestion to use the sync script.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsScriptswebkitpystylecheckersfeaturedefinespy">trunk/Tools/Scripts/webkitpy/style/checkers/featuredefines.py</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkToolsScriptssyncfeaturedefines">trunk/Tools/Scripts/sync-feature-defines</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (213394 => 213395)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2017-03-04 00:34:46 UTC (rev 213394)
+++ trunk/Tools/ChangeLog 2017-03-04 00:48:35 UTC (rev 213395)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2017-03-03 Dean Jackson <dino@apple.com>
+
+ Add a script to synchronize FeatureDefines.xcconfig files
+ https://bugs.webkit.org/show_bug.cgi?id=169151
+ <rdar://problem/30841856>
+
+ Reviewed by Simon Fraser.
+
+ I got sick of manually copying the FeatureDefines.xcconfig
+ files, so I added a script to do it. As long as you
+ run this after you've edited one, it will take the most
+ recently updated and copy it to all the others.
+
+ * Scripts/sync-feature-defines: Added.
+ * Scripts/webkitpy/style/checkers/featuredefines.py:
+ (FeatureDefinesChecker.check): Export the list of files,
+ and give a suggestion to use the sync script.
+
</ins><span class="cx"> 2017-03-03 Alex Christensen <achristensen@webkit.org>
</span><span class="cx">
</span><span class="cx"> [URLParser] Fix file: as a relative file URL
</span></span></pre></div>
<a id="trunkToolsScriptssyncfeaturedefines"></a>
<div class="addfile"><h4>Added: trunk/Tools/Scripts/sync-feature-defines (0 => 213395)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/sync-feature-defines (rev 0)
+++ trunk/Tools/Scripts/sync-feature-defines 2017-03-04 00:48:35 UTC (rev 213395)
</span><span class="lines">@@ -0,0 +1,45 @@
</span><ins>+#!/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.
+#
+# THIS SOFTWARE IS PROVIDED BY APPLE INC. ``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 INC. OR
+# 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.
+
+"Copies the most recently updated FeatureDefines.xcconfig file to all the others."
+
+import os
+import shutil
+from webkitpy.style.checkers.featuredefines import FEATURE_DEFINE_FILES
+
+newest_file = max(FEATURE_DEFINE_FILES, key=os.path.getctime)
+remaining_files = FEATURE_DEFINE_FILES
+remaining_files.remove(newest_file)
+
+print "Copy %s to each of: %s " % (newest_file, ", ".join(remaining_files))
+response = raw_input("Continue [Y/n]: ")
+
+if not response:
+ response = 'y'
+
+if response.lower() == 'y':
+ for destination in remaining_files:
+ shutil.copyfile(newest_file, destination)
+
</ins><span class="cx">Property changes on: trunk/Tools/Scripts/sync-feature-defines
</span><span class="cx">___________________________________________________________________
</span></span></pre></div>
<a id="svnexecutable"></a>
<div class="addfile"><h4>Added: svn:executable</h4></div>
<ins>+*
</ins><span class="cx">\ No newline at end of property
</span><a id="trunkToolsScriptswebkitpystylecheckersfeaturedefinespy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/style/checkers/featuredefines.py (213394 => 213395)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/style/checkers/featuredefines.py 2017-03-04 00:34:46 UTC (rev 213394)
+++ trunk/Tools/Scripts/webkitpy/style/checkers/featuredefines.py 2017-03-04 00:48:35 UTC (rev 213395)
</span><span class="lines">@@ -28,6 +28,14 @@
</span><span class="cx">
</span><span class="cx"> from webkitpy.common.system.systemhost import SystemHost
</span><span class="cx">
</span><ins>+FEATURE_DEFINE_FILES = [
+ "Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig",
+ "Source/WebCore/Configurations/FeatureDefines.xcconfig",
+ "Source/WebCore/PAL/Configurations/FeatureDefines.xcconfig",
+ "Source/WebKit/mac/Configurations/FeatureDefines.xcconfig",
+ "Source/WebKit2/Configurations/FeatureDefines.xcconfig",
+ "Tools/TestWebKitAPI/Configurations/FeatureDefines.xcconfig",
+]
</ins><span class="cx">
</span><span class="cx"> class FeatureDefinesChecker(object):
</span><span class="cx"> categories = set(['featuredefines/new', 'featuredefines/equality'])
</span><span class="lines">@@ -40,16 +48,7 @@
</span><span class="cx"> self._fs = self._host.filesystem
</span><span class="cx">
</span><span class="cx"> def check(self, inline=None):
</span><del>- feature_defines_files = [
- "Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig",
- "Source/WebCore/Configurations/FeatureDefines.xcconfig",
- "Source/WebCore/PAL/Configurations/FeatureDefines.xcconfig",
- "Source/WebKit/mac/Configurations/FeatureDefines.xcconfig",
- "Source/WebKit2/Configurations/FeatureDefines.xcconfig",
- "Tools/TestWebKitAPI/Configurations/FeatureDefines.xcconfig",
- ]
-
- if self._file_path not in feature_defines_files:
</del><ins>+ if self._file_path not in FEATURE_DEFINE_FILES:
</ins><span class="cx"> self._handle_style_error(0, 'featuredefines/new', 5, "Patch introduces a new FeatureDefines.xcconfig, which check-webkit-style doesn't know about. Please add it to the list in featuredefines.py.")
</span><span class="cx"> return
</span><span class="cx">
</span><span class="lines">@@ -56,7 +55,7 @@
</span><span class="cx"> with self._fs.open_binary_file_for_reading(self._file_path) as filehandle:
</span><span class="cx"> baseline_content = filehandle.read()
</span><span class="cx">
</span><del>- other_feature_defines_files = feature_defines_files
</del><ins>+ other_feature_defines_files = FEATURE_DEFINE_FILES
</ins><span class="cx"> other_feature_defines_files.remove(self._file_path)
</span><span class="cx">
</span><span class="cx"> for path in other_feature_defines_files:
</span><span class="lines">@@ -63,4 +62,4 @@
</span><span class="cx"> with self._fs.open_binary_file_for_reading(path) as filehandle:
</span><span class="cx"> test_content = filehandle.read()
</span><span class="cx"> if baseline_content != test_content:
</span><del>- self._handle_style_error(0, 'featuredefines/equality', 5, "Any changes made to FeatureDefines should be made to all of them (changed file does not match {0}).".format(path))
</del><ins>+ self._handle_style_error(0, 'featuredefines/equality', 5, "Any changes made to FeatureDefines should be made to all of them (changed file does not match {0}). Use sync-feature-defines if possible.".format(path))
</ins></span></pre>
</div>
</div>
</body>
</html>