<!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>[166500] 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/166500">166500</a></dd>
<dt>Author</dt> <dd>mrobinson@webkit.org</dd>
<dt>Date</dt> <dd>2014-03-31 07:39:14 -0700 (Mon, 31 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[GTK] Remove scripts code only applicable to autotools
https://bugs.webkit.org/show_bug.cgi?id=130841
Reviewed by Anders Carlsson.
.:
* Source/cmake/WebKitPackaging.cmake: No longer need to consider autotools files.
Tools:
* BuildSlaveSupport/build.webkit.org-config/wkbuild.py:
(_should_file_trigger_build): Update file list to reflect GTK+ CMake port.
* Scripts/webkitpy/common/config/watchlist: Remove the GTK+ build watchlist.
* Scripts/webkitpy/style/checker.py: The GNUmakefile doesn't exist any longer.
* gtk/find-make-dist-errors: Removed.
* gtk/generate-feature-defines-files: Removed.
* gtk/manifest.txt: No longer need to consider autotools files.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkChangeLog">trunk/ChangeLog</a></li>
<li><a href="#trunkSourcecmakeWebKitPackagingcmake">trunk/Source/cmake/WebKitPackaging.cmake</a></li>
<li><a href="#trunkToolsBuildSlaveSupportbuildwebkitorgconfigwkbuildpy">trunk/Tools/BuildSlaveSupport/build.webkit.org-config/wkbuild.py</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsScriptswebkitpycommonconfigwatchlist">trunk/Tools/Scripts/webkitpy/common/config/watchlist</a></li>
<li><a href="#trunkToolsScriptswebkitpystylecheckerpy">trunk/Tools/Scripts/webkitpy/style/checker.py</a></li>
<li><a href="#trunkToolsgtkmanifesttxt">trunk/Tools/gtk/manifest.txt</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkToolsgtkfindmakedisterrors">trunk/Tools/gtk/find-make-dist-errors</a></li>
<li><a href="#trunkToolsgtkgeneratefeaturedefinesfiles">trunk/Tools/gtk/generate-feature-defines-files</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/ChangeLog (166499 => 166500)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/ChangeLog 2014-03-31 14:38:39 UTC (rev 166499)
+++ trunk/ChangeLog 2014-03-31 14:39:14 UTC (rev 166500)
</span><span class="lines">@@ -1,5 +1,14 @@
</span><span class="cx"> 2014-03-31 Martin Robinson <mrobinson@igalia.com>
</span><span class="cx">
</span><ins>+ [GTK] Remove scripts code only applicable to autotools
+ https://bugs.webkit.org/show_bug.cgi?id=130841
+
+ Reviewed by Anders Carlsson.
+
+ * Source/cmake/WebKitPackaging.cmake: No longer need to consider autotools files.
+
+2014-03-31 Martin Robinson <mrobinson@igalia.com>
+
</ins><span class="cx"> [GTK] Use PROJECT_VERSION_* instead of WEBKIT_*_VERSION
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=130936
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourcecmakeWebKitPackagingcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/cmake/WebKitPackaging.cmake (166499 => 166500)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/cmake/WebKitPackaging.cmake 2014-03-31 14:38:39 UTC (rev 166499)
+++ trunk/Source/cmake/WebKitPackaging.cmake 2014-03-31 14:39:14 UTC (rev 166500)
</span><span class="lines">@@ -45,14 +45,6 @@
</span><span class="cx"> "\\\\.mk$"
</span><span class="cx"> "\\\\.make$"
</span><span class="cx"> "Makefile"
</span><del>- # - Autotools (GTK)
- "/autotools/"
- "/configure\\\\.ac"
- "/autogen\\\\.sh"
- "/autom4te\\\\.cache/"
- "/aclocal\\\\.m4$"
- "/GNUmakefile"
- "/GNUmakefile"
</del><span class="cx"> # - XCode (Mac)
</span><span class="cx"> "\\\\.xcodeproj"
</span><span class="cx"> "\\\\.xcconfig"
</span></span></pre></div>
<a id="trunkToolsBuildSlaveSupportbuildwebkitorgconfigwkbuildpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/wkbuild.py (166499 => 166500)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/wkbuild.py 2014-03-31 14:38:39 UTC (rev 166499)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/wkbuild.py 2014-03-31 14:39:14 UTC (rev 166500)
</span><span class="lines">@@ -88,7 +88,7 @@
</span><span class="cx"> (r"\.(?:bkl|mk)$", []),
</span><span class="cx">
</span><span class="cx"> # Patterns that should trigger builds on only some bots.
</span><del>- (r"(?:^|/)GNUmakefile\.am$", ["gtk"]),
</del><ins>+ (r"(?:^|/)PlatformGTK\.cmake$", ["gtk"]),
</ins><span class="cx"> (r"Mac\.(?:cpp|h|mm)$", ["mac"]),
</span><span class="cx"> (r"\.(?:vcproj|vsprops|sln|vcxproj|props|filters)$", ["win"]),
</span><span class="cx"> (r"\.exp(?:\.in)?$", ["mac"]),
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (166499 => 166500)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2014-03-31 14:38:39 UTC (rev 166499)
+++ trunk/Tools/ChangeLog 2014-03-31 14:39:14 UTC (rev 166500)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2014-03-31 Martin Robinson <mrobinson@igalia.com>
+
+ [GTK] Remove scripts code only applicable to autotools
+ https://bugs.webkit.org/show_bug.cgi?id=130841
+
+ Reviewed by Anders Carlsson.
+
+ * BuildSlaveSupport/build.webkit.org-config/wkbuild.py:
+ (_should_file_trigger_build): Update file list to reflect GTK+ CMake port.
+ * Scripts/webkitpy/common/config/watchlist: Remove the GTK+ build watchlist.
+ * Scripts/webkitpy/style/checker.py: The GNUmakefile doesn't exist any longer.
+ * gtk/find-make-dist-errors: Removed.
+ * gtk/generate-feature-defines-files: Removed.
+ * gtk/manifest.txt: No longer need to consider autotools files.
+
</ins><span class="cx"> 2014-03-30 Andy Estes <aestes@apple.com>
</span><span class="cx">
</span><span class="cx"> Fix two failing layout tests on Mountain Lion after r166466.
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpycommonconfigwatchlist"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/common/config/watchlist (166499 => 166500)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/common/config/watchlist 2014-03-31 14:38:39 UTC (rev 166499)
+++ trunk/Tools/Scripts/webkitpy/common/config/watchlist 2014-03-31 14:39:14 UTC (rev 166500)
</span><span class="lines">@@ -228,10 +228,6 @@
</span><span class="cx"> "filename": r"PerformanceTests"
</span><span class="cx"> r"|Tools/Scripts/webkitpy/performance_tests",
</span><span class="cx"> },
</span><del>- "GtkBuildSystem": {
- "filename": r"configure.ac"
- r"|.*GNUmakefile.(am|features.am.in)",
- },
</del><span class="cx"> "ConsoleUsage": {
</span><span class="cx"> "more": r"[Aa]ddConsoleMessage|reportException|logExceptionToConsole|addMessage|printErrorMessage"
</span><span class="cx"> },
</span><span class="lines">@@ -322,7 +318,6 @@
</span><span class="cx"> "GraphicsLayer": [ "simon.fraser@apple.com", "kondapallykalyan@gmail.com", "sergio.correia@openbossa.org" ],
</span><span class="cx"> "GStreamerGraphics": [ "alexis@webkit.org", "pnormand@igalia.com", "gns@gnome.org", "mrobinson@webkit.org", "cgarcia@igalia.com", "calvaris@igalia.com", "vjaquez@igalia.com", "agomez@igalia.com" ],
</span><span class="cx"> "GStreamerAudio": [ "pnormand@igalia.com", "dchris@gmail.com", "sergio.correia@openbossa.org", "calvaris@igalia.com", "vjaquez@igalia.com", "agomez@igalia.com" ],
</span><del>- "GtkBuildSystem": [ "zandobersek@gmail.com", "berto@igalia.com" ],
</del><span class="cx"> "GtkWebKit2PublicAPI": [ "cgarcia@igalia.com", "gns@gnome.org", "mrobinson@webkit.org", "berto@igalia.com" ],
</span><span class="cx"> "Harfbuzz": [ "dominik.rottsches@intel.com" ],
</span><span class="cx"> "HTML": [ "esprehn+autocc@chromium.org", "gyuyoung.kim@webkit.org" ],
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpystylecheckerpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/style/checker.py (166499 => 166500)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/style/checker.py 2014-03-31 14:38:39 UTC (rev 166499)
+++ trunk/Tools/Scripts/webkitpy/style/checker.py 2014-03-31 14:39:14 UTC (rev 166500)
</span><span class="lines">@@ -329,8 +329,6 @@
</span><span class="cx"> _SKIPPED_FILES_WITHOUT_WARNING = [
</span><span class="cx"> "LayoutTests" + os.path.sep,
</span><span class="cx"> "Source/ThirdParty/leveldb" + os.path.sep,
</span><del>- # Prevents this being recognized as a text file.
- "Source/WebCore/GNUmakefile.features.am.in",
</del><span class="cx"> ]
</span><span class="cx">
</span><span class="cx"> # Extensions of files which are allowed to contain carriage returns.
</span></span></pre></div>
<a id="trunkToolsgtkfindmakedisterrors"></a>
<div class="delfile"><h4>Deleted: trunk/Tools/gtk/find-make-dist-errors (166499 => 166500)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/gtk/find-make-dist-errors 2014-03-31 14:38:39 UTC (rev 166499)
+++ trunk/Tools/gtk/find-make-dist-errors 2014-03-31 14:39:14 UTC (rev 166500)
</span><span class="lines">@@ -1,108 +0,0 @@
</span><del>-#!/usr/bin/python
-# Copyright (C) 2011 Igalia S.L.
-#
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 2 of the License, or (at your option) any later version.
-#
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-
-import common
-import os
-import subprocess
-import sys
-
-def is_source_file_listing(line):
- return line.strip().startswith('Source')
-
-def get_listed_makefile_headers():
- makefile_text = open(os.path.join(common.build_path('GNUmakefile'))).read()
-
- # Automake often places separate includes on the same line.
- makefile_text = makefile_text.replace(' ', '\n')
-
- headers = []
- for line in makefile_text.splitlines():
- # $(srcdir)/ is the same as an empty string in a source file listing.
- line = line.replace('$(srcdir)/', '')
-
- # If the line doesn't start with 'Source' it isn't listing for
- # a source file.
- if not is_source_file_listing(line):
- continue
-
- # Most source listings end with \ indicating that the listing
- # continues onto the next line.
- line = line.replace('\\', '')
-
- # We only care about header files. Source files result in build
- # breakage, so we will detect them without this script.
- line = line.strip()
- if not line.endswith('.h'):
- continue
-
- # If the line contains a makefile variable we do not care about it.
- if line.find('$') != -1:
- continue
-
- headers.append(line)
-
- return headers
-
-def scan_headers_from_dependency_files():
- process = subprocess.Popen(['find . -name *.Plo | xargs cat | grep .h:$'],
- cwd=common.build_path(),
- stdout=subprocess.PIPE,
- shell=True)
- sanitized_lines = set()
- for line in process.communicate()[0].splitlines():
- # Paths in Plo files are relative to the build directory so they might contain
- # ../.. if the build directory is something like WebKitBuild/Release.
- line = line.replace('../../', '')
- if not is_source_file_listing(line):
- continue
-
- # The lines we care about end with ':'.
- line = line.replace(':', '')
- line = line.strip()
- sanitized_lines.add(line)
- return sanitized_lines
-
-def get_unlisted_headers(listed_makefile_headers):
- unlisted = set()
- for header in scan_headers_from_dependency_files():
- if not header in listed_makefile_headers:
- unlisted.add(header)
- return unlisted
-
-def get_missing_headers(listed_makefile_headers):
- missing = set()
- for header in listed_makefile_headers:
- if not os.path.exists(common.top_level_path(header)):
- missing.add(header)
- return missing
-
-listed_makefile_headers = get_listed_makefile_headers()
-unlisted_headers = get_unlisted_headers(listed_makefile_headers)
-missing_headers = get_missing_headers(listed_makefile_headers)
-if unlisted_headers:
- print 'Headers not listed in the GNUmakefiles:'
- for header in sorted(unlisted_headers):
- print '\t%s' % header
- print
-
-if missing_headers:
- print 'Headers listed in the GNUmakefiles that do not exist:'
- for header in sorted(missing_headers):
- print '\t%s' % header
- print
-
-sys.exit(len(unlisted_headers) + len(missing_headers))
</del></span></pre></div>
<a id="trunkToolsgtkgeneratefeaturedefinesfiles"></a>
<div class="delfile"><h4>Deleted: trunk/Tools/gtk/generate-feature-defines-files (166499 => 166500)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/gtk/generate-feature-defines-files 2014-03-31 14:38:39 UTC (rev 166499)
+++ trunk/Tools/gtk/generate-feature-defines-files 2014-03-31 14:39:14 UTC (rev 166500)
</span><span class="lines">@@ -1,58 +0,0 @@
</span><del>-#!/usr/bin/env python
-from __future__ import with_statement
-import os
-import re
-import sys
-
-def read_feature_defines_override(feature_defines):
- feature_defines_overriding_file = 'WebKitFeatureOverrides.txt'
- if not os.path.exists(feature_defines_overriding_file):
- return
-
- print("The following feature defines were overriden:")
- with open(feature_defines_overriding_file) as f:
- match_iter = re.findall(r"((?:ENABLE_)\w+)=(0|1)", f.read())
-
- for match in match_iter:
- feature = match[0]
- value = int(match[1])
-
- if feature in feature_defines and value != feature_defines[feature]:
- print("\t{0}: {1} => {2}".format(feature, feature_defines[feature], value))
- feature_defines[feature] = value
-
-def write_file_if_contents_changed(filename, contents):
- if os.path.exists(filename):
- with open(filename, 'r') as f:
- old_contents = f.read()
- if old_contents == contents:
- return
- with open(filename, 'w') as f:
- f.write(contents)
-
-def write_feature_defines_header(feature_defines):
- contents = ''
- for (feature, value) in feature_defines.items():
- contents += '#define {0} {1}\n'.format(feature, value)
- write_file_if_contents_changed("WebKitFeatures.h", contents)
-
-def write_flattened_feature_defines_file(feature_defines):
- contents = ''
- for (feature, value) in feature_defines.items():
- contents += '{0}={1}\n'.format(feature, value)
- write_file_if_contents_changed("WebKitFeatures.txt", contents)
-
-def generate_feature_defines_files(default_features):
- build_dir = os.getcwd()
- feature_defines = {}
-
- for feature_define in default_features:
- (feature, value) = feature_define.split("=")
- feature_defines[feature] = int(value)
-
- read_feature_defines_override(feature_defines)
- write_feature_defines_header(feature_defines)
- write_flattened_feature_defines_file(feature_defines)
-
-if __name__=='__main__':
- generate_feature_defines_files(sys.argv[1:])
</del></span></pre></div>
<a id="trunkToolsgtkmanifesttxt"></a>
<div class="modfile"><h4>Modified: trunk/Tools/gtk/manifest.txt (166499 => 166500)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/gtk/manifest.txt 2014-03-31 14:38:39 UTC (rev 166499)
+++ trunk/Tools/gtk/manifest.txt 2014-03-31 14:39:14 UTC (rev 166500)
</span><span class="lines">@@ -1,7 +1,6 @@
</span><span class="cx"> # Global rules
</span><span class="cx"> exclude #$
</span><span class="cx"> exclude ChangeLog
</span><del>-exclude GNUmakefile
</del><span class="cx"> exclude Makefile
</span><span class="cx"> exclude tags$
</span><span class="cx"> exclude ~$
</span><span class="lines">@@ -19,7 +18,7 @@
</span><span class="cx"> exclude \.order$
</span><span class="cx"> exclude \.pdf$
</span><span class="cx"> exclude \.plist$
</span><del>-exlucde \.pro\.user$
</del><ins>+exclude \.pro\.user$
</ins><span class="cx"> exclude \.project$
</span><span class="cx"> exclude \.props$
</span><span class="cx"> exclude \.pyc$
</span></span></pre>
</div>
</div>
</body>
</html>