<!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>[170706] 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/170706">170706</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2014-07-02 08:13:33 -0700 (Wed, 02 Jul 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[GTK] Make dist only works when run from the source directory
https://bugs.webkit.org/show_bug.cgi?id=134543
Reviewed by Martin Robinson.
Since the paths in the manifest are relative to the source dir,
and the script expects the current working directory to be the
source directory, resolve all passed in relative paths while
parsing the arguments and then change the current working
directory.
* gtk/make-dist.py:</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 (170705 => 170706)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2014-07-02 15:11:41 UTC (rev 170705)
+++ trunk/Tools/ChangeLog 2014-07-02 15:13:33 UTC (rev 170706)
</span><span class="lines">@@ -1,5 +1,20 @@
</span><span class="cx"> 2014-07-02 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><ins>+ [GTK] Make dist only works when run from the source directory
+ https://bugs.webkit.org/show_bug.cgi?id=134543
+
+ Reviewed by Martin Robinson.
+
+ Since the paths in the manifest are relative to the source dir,
+ and the script expects the current working directory to be the
+ source directory, resolve all passed in relative paths while
+ parsing the arguments and then change the current working
+ directory.
+
+ * gtk/make-dist.py:
+
+2014-07-02 Carlos Garcia Campos <cgarcia@igalia.com>
+
</ins><span class="cx"> [GTK] make dist is broken
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=134542
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsgtkmakedistpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/gtk/make-dist.py (170705 => 170706)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/gtk/make-dist.py 2014-07-02 15:11:41 UTC (rev 170705)
+++ trunk/Tools/gtk/make-dist.py 2014-07-02 15:13:33 UTC (rev 170706)
</span><span class="lines">@@ -116,8 +116,8 @@
</span><span class="cx"> self.current_directory = None
</span><span class="cx"> self.directories = []
</span><span class="cx"> self.tarball_root = tarball_root
</span><del>- self.source_root = os.path.abspath(source_root)
- self.build_root = os.path.abspath(build_root)
</del><ins>+ self.source_root = source_root
+ self.build_root = build_root
</ins><span class="cx">
</span><span class="cx"> # Normalize the tarball root so that it starts and ends with a slash.
</span><span class="cx"> if not self.tarball_root.endswith('/'):
</span><span class="lines">@@ -204,20 +204,29 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> if __name__ == "__main__":
</span><ins>+ class FilePathAction(argparse.Action):
+ def __call__(self, parser, namespace, values, option_string=None):
+ setattr(namespace, self.dest, os.path.abspath(values))
+
</ins><span class="cx"> parser = argparse.ArgumentParser(description='Build a distribution bundle.')
</span><del>- parser.add_argument('-s', '--source-dir', type=str, default=os.getcwd(),
</del><ins>+ parser.add_argument('-s', '--source-dir', type=str, action=FilePathAction, default=os.getcwd(),
</ins><span class="cx"> help='The top-level directory of the source distribution. ' + \
</span><span class="cx"> 'Directory for relative paths. Defaults to current directory.')
</span><span class="cx"> parser.add_argument('--tarball-root', type=str, default='/',
</span><span class="cx"> help='The top-level path of the tarball. By default files are added to the root of the tarball.')
</span><del>- parser.add_argument('-b', '--build-dir', type=str, default=None,
</del><ins>+ parser.add_argument('-b', '--build-dir', type=str, action=FilePathAction, default=None,
</ins><span class="cx"> help='The top-level path of directory of the build root. ' + \
</span><span class="cx"> 'By default there is no build root.')
</span><del>- parser.add_argument('-o', type=str, default='out.tar', dest="output_filename",
</del><ins>+ parser.add_argument('-o', type=str, action=FilePathAction, default='out.tar', dest="output_filename",
</ins><span class="cx"> help='The tarfile to produce. By default this is "out.tar"')
</span><del>- parser.add_argument('manifest_filename', metavar="manifest", type=str, help='The path to the manifest file.')
</del><ins>+ parser.add_argument('manifest_filename', metavar="manifest", type=str, action=FilePathAction, help='The path to the manifest file.')
</ins><span class="cx">
</span><span class="cx"> arguments = parser.parse_args()
</span><span class="cx">
</span><ins>+ # Paths in the manifest are relative to the source directory, and this script assumes that
+ # current working directory is the source directory, so change the current working directory
+ # to be the source directory.
+ os.chdir(arguments.source_dir)
+
</ins><span class="cx"> manifest = Manifest(arguments.manifest_filename, arguments.source_dir, arguments.build_dir, arguments.tarball_root)
</span><span class="cx"> manifest.create_tarfile(arguments.output_filename)
</span></span></pre>
</div>
</div>
</body>
</html>