<!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>[171297] trunk</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/171297">171297</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2014-07-21 02:04:59 -0700 (Mon, 21 Jul 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[GTK] Simplify make-dist command line arguments
https://bugs.webkit.org/show_bug.cgi?id=134832
Reviewed by Martin Robinson.
.:
* Source/PlatformGTK.cmake: Use --version instead of
--tarball-root when running make-dist.py.
Tools:
Remove --tarball-root and -o command line options and add
--version, since the version can be used to build both, the
tarball root and the output filename. When the version it's not
provided, the pkg-config file is used to get the version. Also
change the default value of build-dir to the current directory,
since it's very common to call make-dist.py from the build dir.
* gtk/make-dist.py:
(get_tarball_root_and_output_filename_from_arguments):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkChangeLog">trunk/ChangeLog</a></li>
<li><a href="#trunkSourcePlatformGTKcmake">trunk/Source/PlatformGTK.cmake</a></li>
<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="trunkChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/ChangeLog (171296 => 171297)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/ChangeLog 2014-07-21 08:30:12 UTC (rev 171296)
+++ trunk/ChangeLog 2014-07-21 09:04:59 UTC (rev 171297)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2014-07-21 Carlos Garcia Campos <cgarcia@igalia.com>
+
+ [GTK] Simplify make-dist command line arguments
+ https://bugs.webkit.org/show_bug.cgi?id=134832
+
+ Reviewed by Martin Robinson.
+
+ * Source/PlatformGTK.cmake: Use --version instead of
+ --tarball-root when running make-dist.py.
+
</ins><span class="cx"> 2014-07-18 Jon Honeycutt <jhoneycutt@apple.com>
</span><span class="cx">
</span><span class="cx"> Add a manual test for r135044
</span></span></pre></div>
<a id="trunkSourcePlatformGTKcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/PlatformGTK.cmake (171296 => 171297)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/PlatformGTK.cmake 2014-07-21 08:30:12 UTC (rev 171296)
+++ trunk/Source/PlatformGTK.cmake 2014-07-21 09:04:59 UTC (rev 171297)
</span><span class="lines">@@ -57,8 +57,7 @@
</span><span class="cx"> COMMAND ${TOOLS_DIR}/gtk/make-dist.py
</span><span class="cx"> --source-dir=${CMAKE_SOURCE_DIR}
</span><span class="cx"> --build-dir=${CMAKE_BINARY_DIR}
</span><del>- --tarball-root=/webkitgtk-${PROJECT_VERSION}
- -o ${CMAKE_BINARY_DIR}/webkitgtk-${PROJECT_VERSION}.tar
</del><ins>+ --version=${PROJECT_VERSION}
</ins><span class="cx"> ${TOOLS_DIR}/gtk/manifest.txt
</span><span class="cx"> )
</span><span class="cx">
</span><span class="lines">@@ -81,8 +80,7 @@
</span><span class="cx"> --check
</span><span class="cx"> --source-dir=${CMAKE_SOURCE_DIR}
</span><span class="cx"> --build-dir=${CMAKE_BINARY_DIR}
</span><del>- --tarball-root=/webkitgtk-${PROJECT_VERSION}
- -o ${CMAKE_BINARY_DIR}/webkitgtk-${PROJECT_VERSION}.tar
</del><ins>+ --version=/webkitgtk-${PROJECT_VERSION}
</ins><span class="cx"> ${TOOLS_DIR}/gtk/manifest.txt
</span><span class="cx"> COMMAND xz -f ${CMAKE_BINARY_DIR}/webkitgtk-${PROJECT_VERSION}.tar
</span><span class="cx"> )
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (171296 => 171297)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2014-07-21 08:30:12 UTC (rev 171296)
+++ trunk/Tools/ChangeLog 2014-07-21 09:04:59 UTC (rev 171297)
</span><span class="lines">@@ -1,5 +1,22 @@
</span><span class="cx"> 2014-07-21 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><ins>+ [GTK] Simplify make-dist command line arguments
+ https://bugs.webkit.org/show_bug.cgi?id=134832
+
+ Reviewed by Martin Robinson.
+
+ Remove --tarball-root and -o command line options and add
+ --version, since the version can be used to build both, the
+ tarball root and the output filename. When the version it's not
+ provided, the pkg-config file is used to get the version. Also
+ change the default value of build-dir to the current directory,
+ since it's very common to call make-dist.py from the build dir.
+
+ * gtk/make-dist.py:
+ (get_tarball_root_and_output_filename_from_arguments):
+
+2014-07-21 Carlos Garcia Campos <cgarcia@igalia.com>
+
</ins><span class="cx"> [GTK] Reduce the size of the tarball generated by distcheck
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=134802
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsgtkmakedistpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/gtk/make-dist.py (171296 => 171297)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/gtk/make-dist.py 2014-07-21 08:30:12 UTC (rev 171296)
+++ trunk/Tools/gtk/make-dist.py 2014-07-21 09:04:59 UTC (rev 171297)
</span><span class="lines">@@ -264,19 +264,37 @@
</span><span class="cx"> def __call__(self, parser, namespace, values, option_string=None):
</span><span class="cx"> setattr(namespace, self.dest, os.path.abspath(values))
</span><span class="cx">
</span><ins>+ def ensure_version_if_possible(arguments):
+ if arguments.version is not None:
+ return
+
+ pkgconfig_file = os.path.join(arguments.build_dir, "Source/WebKit2/webkit2gtk-3.0.pc")
+ if os.path.isfile(pkgconfig_file):
+ p = subprocess.Popen(['pkg-config', '--modversion', pkgconfig_file], stdout=subprocess.PIPE)
+ version = p.communicate()[0]
+ if version:
+ arguments.version = version.rstrip('\n')
+
+
+ def get_tarball_root_and_output_filename_from_arguments(arguments):
+ tarball_root = "webkitgtk"
+ if arguments.version is not None:
+ tarball_root += '-' + arguments.version
+
+ output_filename = os.path.join(arguments.build_dir, tarball_root + ".tar")
+ return tarball_root, output_filename
+
</ins><span class="cx"> parser = argparse.ArgumentParser(description='Build a distribution bundle.')
</span><span class="cx"> parser.add_argument('-c', '--check', action='store_true',
</span><span class="cx"> help='Check the tarball')
</span><span class="cx"> parser.add_argument('-s', '--source-dir', type=str, action=FilePathAction, default=os.getcwd(),
</span><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><del>- parser.add_argument('--tarball-root', type=str, default='/',
- help='The top-level path of the tarball. By default files are added to the root of the tarball.')
- parser.add_argument('-b', '--build-dir', type=str, action=FilePathAction, default=None,
</del><ins>+ parser.add_argument('--version', type=str, default=None,
+ help='The version of the tarball to generate')
+ parser.add_argument('-b', '--build-dir', type=str, action=FilePathAction, default=os.getcwd(),
</ins><span class="cx"> help='The top-level path of directory of the build root. ' + \
</span><del>- 'By default there is no build root.')
- parser.add_argument('-o', type=str, action=FilePathAction, default='out.tar', dest="output_filename",
- help='The tarfile to produce. By default this is "out.tar"')
</del><ins>+ 'By default is the current directory.')
</ins><span class="cx"> parser.add_argument('manifest_filename', metavar="manifest", type=str, action=FilePathAction, help='The path to the manifest file.')
</span><span class="cx">
</span><span class="cx"> arguments = parser.parse_args()
</span><span class="lines">@@ -286,8 +304,11 @@
</span><span class="cx"> # to be the source directory.
</span><span class="cx"> os.chdir(arguments.source_dir)
</span><span class="cx">
</span><del>- manifest = Manifest(arguments.manifest_filename, arguments.source_dir, arguments.build_dir, arguments.tarball_root)
- manifest.create_tarfile(arguments.output_filename)
</del><ins>+ ensure_version_if_possible(arguments)
+ tarball_root, output_filename = get_tarball_root_and_output_filename_from_arguments(arguments)
</ins><span class="cx">
</span><ins>+ manifest = Manifest(arguments.manifest_filename, arguments.source_dir, arguments.build_dir, tarball_root)
+ manifest.create_tarfile(output_filename)
+
</ins><span class="cx"> if arguments.check:
</span><del>- Distcheck(arguments.source_dir, arguments.build_dir).check(arguments.output_filename)
</del><ins>+ Distcheck(arguments.source_dir, arguments.build_dir).check(output_filename)
</ins></span></pre>
</div>
</div>
</body>
</html>