<!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>[170965] 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/170965">170965</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2014-07-10 09:13:54 -0700 (Thu, 10 Jul 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[GTK][CMake] Add a 'distcheck' target
https://bugs.webkit.org/show_bug.cgi?id=130675
.:
Reviewed by Gustavo Noronha Silva.
* Source/PlatformGTK.cmake: Add distcheck target.
Tools:
Patch by Carlos Garcia Campos <cgarcia@igalia.com> and Martin Robinson <mrobinson@igalia.com> on 2014-07-10
Reviewed by Gustavo Noronha Silva.
Add --check option to make-dist script that builds and installs the tarball.
* gtk/make-dist.py:
(Distcheck.__init__):
(Distcheck.extract_tarball): Extratc the tarball.
(Distcheck.configure): Run cmake.
(Distcheck.configure.create_dir): Helper function to create a directory.
(Distcheck.build): Run make.
(Distcheck.install): Run make install.
(Distcheck.clean): Clean up the extracted tarball.
(Distcheck.check): Run all previous methods in order.
* gtk/manifest.txt: Add missing file.</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>
<li><a href="#trunkToolsgtkmanifesttxt">trunk/Tools/gtk/manifest.txt</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/ChangeLog (170964 => 170965)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/ChangeLog 2014-07-10 16:11:11 UTC (rev 170964)
+++ trunk/ChangeLog 2014-07-10 16:13:54 UTC (rev 170965)
</span><span class="lines">@@ -1,5 +1,14 @@
</span><span class="cx"> 2014-07-10 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><ins>+ [GTK][CMake] Add a 'distcheck' target
+ https://bugs.webkit.org/show_bug.cgi?id=130675
+
+ Reviewed by Gustavo Noronha Silva.
+
+ * Source/PlatformGTK.cmake: Add distcheck target.
+
+2014-07-10 Carlos Garcia Campos <cgarcia@igalia.com>
+
</ins><span class="cx"> [GTK] Use the same default options for production builds that previous stable releases
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=134589
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourcePlatformGTKcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/PlatformGTK.cmake (170964 => 170965)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/PlatformGTK.cmake 2014-07-10 16:11:11 UTC (rev 170964)
+++ trunk/Source/PlatformGTK.cmake 2014-07-10 16:13:54 UTC (rev 170965)
</span><span class="lines">@@ -71,4 +71,19 @@
</span><span class="cx"> add_custom_target(dist
</span><span class="cx"> DEPENDS ${CMAKE_BINARY_DIR}/webkitgtk-${PROJECT_VERSION}.tar.xz
</span><span class="cx"> )
</span><ins>+
+ add_custom_target(distcheck
+ DEPENDS ${TOOLS_DIR}/gtk/make-dist.py
+ DEPENDS ${TOOLS_DIR}/gtk/manifest.txt
+ DEPENDS WebKit2
+ DEPENDS gtkdoc
+ COMMAND ${TOOLS_DIR}/gtk/make-dist.py
+ --check
+ --source-dir=${CMAKE_SOURCE_DIR}
+ --build-dir=${CMAKE_BINARY_DIR}
+ --tarball-root=/webkitgtk-${PROJECT_VERSION}
+ -o ${CMAKE_BINARY_DIR}/webkitgtk-${PROJECT_VERSION}.tar
+ ${TOOLS_DIR}/gtk/manifest.txt
+ COMMAND xz -f ${CMAKE_BINARY_DIR}/webkitgtk-${PROJECT_VERSION}.tar
+ )
</ins><span class="cx"> endif ()
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (170964 => 170965)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2014-07-10 16:11:11 UTC (rev 170964)
+++ trunk/Tools/ChangeLog 2014-07-10 16:13:54 UTC (rev 170965)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2014-07-10 Carlos Garcia Campos <cgarcia@igalia.com> and Martin Robinson <mrobinson@igalia.com>
+
+ [GTK][CMake] Add a 'distcheck' target
+ https://bugs.webkit.org/show_bug.cgi?id=130675
+
+ Reviewed by Gustavo Noronha Silva.
+
+ Add --check option to make-dist script that builds and installs the tarball.
+
+ * gtk/make-dist.py:
+ (Distcheck.__init__):
+ (Distcheck.extract_tarball): Extratc the tarball.
+ (Distcheck.configure): Run cmake.
+ (Distcheck.configure.create_dir): Helper function to create a directory.
+ (Distcheck.build): Run make.
+ (Distcheck.install): Run make install.
+ (Distcheck.clean): Clean up the extracted tarball.
+ (Distcheck.check): Run all previous methods in order.
+ * gtk/manifest.txt: Add missing file.
+
</ins><span class="cx"> 2014-07-10 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><span class="cx"> [GTK] Use the same default options for production builds that previous stable releases
</span></span></pre></div>
<a id="trunkToolsgtkmakedistpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/gtk/make-dist.py (170964 => 170965)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/gtk/make-dist.py 2014-07-10 16:11:11 UTC (rev 170964)
+++ trunk/Tools/gtk/make-dist.py 2014-07-10 16:13:54 UTC (rev 170965)
</span><span class="lines">@@ -19,9 +19,12 @@
</span><span class="cx"> from contextlib import closing
</span><span class="cx">
</span><span class="cx"> import argparse
</span><ins>+import errno
+import multiprocessing
</ins><span class="cx"> import os
</span><span class="cx"> import re
</span><del>-import sys
</del><ins>+import shutil
+import subprocess
</ins><span class="cx"> import tarfile
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -203,12 +206,67 @@
</span><span class="cx"> print("Wrote {0}".format(output).ljust(40))
</span><span class="cx">
</span><span class="cx">
</span><ins>+class Distcheck(object):
+ BUILD_DIRECTORY_NAME = "_build"
+ INSTALL_DIRECTORY_NAME = "_install"
+
+ def __init__(self, source_root, build_root):
+ self.source_root = source_root
+ self.build_root = build_root
+
+ def extract_tarball(self, tarball_path):
+ with closing(tarfile.open(tarball_path, 'r')) as tarball:
+ tarball.extractall(self.build_root)
+
+ def configure(self, build_dir, install_dir):
+ def create_dir(directory, directory_type):
+ try:
+ os.mkdir(directory)
+ except OSError, e:
+ if e.errno != errno.EEXIST or not os.path.isdir(directory):
+ raise Exception("Could not create %s dir at %s: %s" % (directory_type, directory, str(e)))
+
+ create_dir(build_dir, "build")
+ create_dir(install_dir, "install")
+
+ command = ['cmake', '-DPORT=GTK', '-DCMAKE_INSTALL_PREFIX=%s' % install_dir, '-DCMAKE_BUILD_TYPE=Release', self.source_root]
+ subprocess.check_call(command, cwd=build_dir)
+
+ def build(self, build_dir):
+ command = ['make']
+ make_args = os.getenv('MAKE_ARGS')
+ if make_args:
+ command.extend(make_args.split(' '))
+ else:
+ command.append('-j%d' % multiprocessing.cpu_count())
+ subprocess.check_call(command, cwd=build_dir)
+
+ def install(self, build_dir):
+ subprocess.check_call(['make', 'install'], cwd=build_dir)
+
+ def clean(self, dist_dir):
+ shutil.rmtree(dist_dir)
+
+ def check(self, tarball):
+ tarball_name, ext = os.path.splitext(os.path.basename(tarball))
+ dist_dir = os.path.join(self.build_root, tarball_name)
+ build_dir = os.path.join(dist_dir, self.BUILD_DIRECTORY_NAME)
+ install_dir = os.path.join(dist_dir, self.INSTALL_DIRECTORY_NAME)
+
+ self.extract_tarball(tarball)
+ self.configure(build_dir, install_dir)
+ self.build(build_dir)
+ self.install(build_dir)
+ self.clean(dist_dir)
+
</ins><span class="cx"> if __name__ == "__main__":
</span><span class="cx"> class FilePathAction(argparse.Action):
</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><span class="cx"> parser = argparse.ArgumentParser(description='Build a distribution bundle.')
</span><ins>+ parser.add_argument('-c', '--check', action='store_true',
+ help='Check the tarball')
</ins><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><span class="lines">@@ -230,3 +288,6 @@
</span><span class="cx">
</span><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><ins>+
+ if arguments.check:
+ Distcheck(arguments.source_dir, arguments.build_dir).check(arguments.output_filename)
</ins></span></pre></div>
<a id="trunkToolsgtkmanifesttxt"></a>
<div class="modfile"><h4>Modified: trunk/Tools/gtk/manifest.txt (170964 => 170965)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/gtk/manifest.txt 2014-07-10 16:11:11 UTC (rev 170964)
+++ trunk/Tools/gtk/manifest.txt 2014-07-10 16:13:54 UTC (rev 170965)
</span><span class="lines">@@ -44,6 +44,8 @@
</span><span class="cx"> # We do want to include the NEWS, but we want it to be in the root of the archive.
</span><span class="cx"> file Source/WebKit2/gtk/NEWS NEWS
</span><span class="cx">
</span><ins>+file Source/WebCore/English.lproj/mediaControlsLocalizedStrings.js Source/WebCore/English.lproj/mediaControlsLocalizedStrings.js
+
</ins><span class="cx"> directory Tools/gtk
</span><span class="cx"> directory Tools/ImageDiff
</span><span class="cx"> directory Tools/MiniBrowser
</span></span></pre>
</div>
</div>
</body>
</html>