<!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>[171845] 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/171845">171845</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2014-07-31 01:41:33 -0700 (Thu, 31 Jul 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[GTK] Do not include files that are not in git in the tarball
https://bugs.webkit.org/show_bug.cgi?id=134804
Reviewed by Philippe Normand.
Skip all files in the source tree that are not under version control
except for files added from the build dir like the documentation.
* gtk/make-dist.py:
(Directory.__init__): Initialize the list of files under control version.
(Directory.list_cms_files): Helper function to list all files
under the control version for the current source root.
(Directory.should_skip_file): Return True for files that are not
under control version only when the source root is also under
control version.
(Directory.get_files): Filter the files also using should_skip_file().</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsgtkmakedistpy">trunk/Tools/gtk/make-dist.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (171844 => 171845)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2014-07-31 07:36:44 UTC (rev 171844)
+++ trunk/Tools/ChangeLog 2014-07-31 08:41:33 UTC (rev 171845)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2014-07-31 Carlos Garcia Campos <cgarcia@igalia.com>
+
+ [GTK] Do not include files that are not in git in the tarball
+ https://bugs.webkit.org/show_bug.cgi?id=134804
+
+ Reviewed by Philippe Normand.
+
+ Skip all files in the source tree that are not under version control
+ except for files added from the build dir like the documentation.
+
+ * gtk/make-dist.py:
+ (Directory.__init__): Initialize the list of files under control version.
+ (Directory.list_cms_files): Helper function to list all files
+ under the control version for the current source root.
+ (Directory.should_skip_file): Return True for files that are not
+ under control version only when the source root is also under
+ control version.
+ (Directory.get_files): Filter the files also using should_skip_file().
+
</ins><span class="cx"> 2014-07-29 David Farler <dfarler@apple.com>
</span><span class="cx">
</span><span class="cx"> iOS Simulator LayoutTestRelay
</span></span></pre></div>
<a id="trunkToolsgtkmakedistpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/gtk/make-dist.py (171844 => 171845)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/gtk/make-dist.py 2014-07-31 07:36:44 UTC (rev 171844)
+++ trunk/Tools/gtk/make-dist.py 2014-07-31 08:41:33 UTC (rev 171845)
</span><span class="lines">@@ -81,6 +81,10 @@
</span><span class="cx"> self.source_root = source_root
</span><span class="cx"> self.tarball_root = tarball_root
</span><span class="cx">
</span><ins>+ def should_skip_file(self, path):
+ # Do not skip files explicitly added from the manifest.
+ return False
+
</ins><span class="cx"> def get_files(self):
</span><span class="cx"> yield (self.source_root, self.tarball_root)
</span><span class="cx">
</span><span class="lines">@@ -91,12 +95,25 @@
</span><span class="cx"> self.tarball_root = tarball_root
</span><span class="cx"> self.rules = Ruleset()
</span><span class="cx">
</span><ins>+ self.files_in_version_control = self.list_files_in_version_control()
+
</ins><span class="cx"> def add_rule(self, rule):
</span><span class="cx"> self.rules.add_rule(rule)
</span><span class="cx">
</span><span class="cx"> def get_tarball_path(self, filename):
</span><span class="cx"> return filename.replace(self.source_root, self.tarball_root, 1)
</span><span class="cx">
</span><ins>+ def list_files_in_version_control(self):
+ # FIXME: Only git is supported for now.
+ p = subprocess.Popen(['git', 'ls-tree', '-r', '--name-only', 'HEAD', self.source_root], stdout=subprocess.PIPE)
+ out = p.communicate()[0]
+ if not out:
+ return []
+ return out.rstrip('\n').split('\n')
+
+ def should_skip_file(self, path):
+ return path not in self.files_in_version_control
+
</ins><span class="cx"> def get_files(self):
</span><span class="cx"> for root, dirs, files in os.walk(self.source_root):
</span><span class="cx">
</span><span class="lines">@@ -189,9 +206,18 @@
</span><span class="cx"> elif parts[0] == "include" and len(parts) > 1:
</span><span class="cx"> self.add_rule(Rule(Rule.Result.INCLUDE, self.resolve_variables(parts[1])))
</span><span class="cx">
</span><ins>+ def should_skip_file(self, directory, filename):
+ # Only allow files that are not in version control when they are explicitly included in the manifest from the build dir.
+ if filename.startswith(self.build_root):
+ return False
+
+ return directory.should_skip_file(filename)
+
</ins><span class="cx"> def get_files(self):
</span><span class="cx"> for directory in self.directories:
</span><span class="cx"> for file_tuple in directory.get_files():
</span><ins>+ if self.should_skip_file(directory, file_tuple[0]):
+ continue
</ins><span class="cx"> yield file_tuple
</span><span class="cx">
</span><span class="cx"> def create_tarfile(self, output):
</span></span></pre>
</div>
</div>
</body>
</html>