[GTK] Remove scripts code only applicable to autotools
authormrobinson@webkit.org <mrobinson@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 31 Mar 2014 14:39:14 +0000 (14:39 +0000)
committermrobinson@webkit.org <mrobinson@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 31 Mar 2014 14:39:14 +0000 (14:39 +0000)
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.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@166500 268f45cc-cd09-0410-ab3c-d52691b4dbfc

ChangeLog
Source/cmake/WebKitPackaging.cmake
Tools/BuildSlaveSupport/build.webkit.org-config/wkbuild.py
Tools/ChangeLog
Tools/Scripts/webkitpy/common/config/watchlist
Tools/Scripts/webkitpy/style/checker.py
Tools/gtk/find-make-dist-errors [deleted file]
Tools/gtk/generate-feature-defines-files [deleted file]
Tools/gtk/manifest.txt

index 1bacfcc..5328210 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,14 @@
 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.
+
+        * Source/cmake/WebKitPackaging.cmake: No longer need to consider autotools files.
+
+2014-03-31  Martin Robinson  <mrobinson@igalia.com>
+
         [GTK] Use PROJECT_VERSION_* instead of WEBKIT_*_VERSION
         https://bugs.webkit.org/show_bug.cgi?id=130936
 
index 0422d6c..f191ed7 100644 (file)
@@ -45,14 +45,6 @@ if (NOT DEFINED CPACK_SOURCE_IGNORE_FILES)
         "\\\\.mk$"
         "\\\\.make$"
         "Makefile"
-        # - Autotools (GTK)
-        "/autotools/"
-        "/configure\\\\.ac"
-        "/autogen\\\\.sh"
-        "/autom4te\\\\.cache/"
-        "/aclocal\\\\.m4$"
-        "/GNUmakefile"
-        "/GNUmakefile"
         # - XCode (Mac)
         "\\\\.xcodeproj"
         "\\\\.xcconfig"
index b5bfbfc..441fa19 100644 (file)
@@ -88,7 +88,7 @@ def _should_file_trigger_build(target_platform, file):
         (r"\.(?:bkl|mk)$", []),
 
         # Patterns that should trigger builds on only some bots.
-        (r"(?:^|/)GNUmakefile\.am$", ["gtk"]),
+        (r"(?:^|/)PlatformGTK\.cmake$", ["gtk"]),
         (r"Mac\.(?:cpp|h|mm)$", ["mac"]),
         (r"\.(?:vcproj|vsprops|sln|vcxproj|props|filters)$", ["win"]),
         (r"\.exp(?:\.in)?$", ["mac"]),
index 652f384..309ae1a 100644 (file)
@@ -1,3 +1,18 @@
+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.
+
 2014-03-30  Andy Estes  <aestes@apple.com>
 
         Fix two failing layout tests on Mountain Lion after r166466.
index 0f0a4c9..608c090 100644 (file)
             "filename": r"PerformanceTests"
                         r"|Tools/Scripts/webkitpy/performance_tests",
         },
-        "GtkBuildSystem": {
-            "filename": r"configure.ac"
-                        r"|.*GNUmakefile.(am|features.am.in)",
-        },
         "ConsoleUsage": {
             "more": r"[Aa]ddConsoleMessage|reportException|logExceptionToConsole|addMessage|printErrorMessage"
         },
         "GraphicsLayer": [ "simon.fraser@apple.com", "kondapallykalyan@gmail.com", "sergio.correia@openbossa.org" ],
         "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" ],
         "GStreamerAudio": [ "pnormand@igalia.com", "dchris@gmail.com", "sergio.correia@openbossa.org", "calvaris@igalia.com", "vjaquez@igalia.com", "agomez@igalia.com" ],
-        "GtkBuildSystem": [ "zandobersek@gmail.com", "berto@igalia.com" ],
         "GtkWebKit2PublicAPI": [ "cgarcia@igalia.com", "gns@gnome.org", "mrobinson@webkit.org", "berto@igalia.com" ],
         "Harfbuzz": [ "dominik.rottsches@intel.com" ],
         "HTML": [ "esprehn+autocc@chromium.org", "gyuyoung.kim@webkit.org" ],
index 438bfc4..5e56984 100644 (file)
@@ -329,8 +329,6 @@ _SKIPPED_FILES_WITH_WARNING = [
 _SKIPPED_FILES_WITHOUT_WARNING = [
     "LayoutTests" + os.path.sep,
     "Source/ThirdParty/leveldb" + os.path.sep,
-    # Prevents this being recognized as a text file.
-    "Source/WebCore/GNUmakefile.features.am.in",
     ]
 
 # Extensions of files which are allowed to contain carriage returns.
diff --git a/Tools/gtk/find-make-dist-errors b/Tools/gtk/find-make-dist-errors
deleted file mode 100755 (executable)
index 880c780..0000000
+++ /dev/null
@@ -1,108 +0,0 @@
-#!/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))
diff --git a/Tools/gtk/generate-feature-defines-files b/Tools/gtk/generate-feature-defines-files
deleted file mode 100755 (executable)
index 17d52e6..0000000
+++ /dev/null
@@ -1,58 +0,0 @@
-#!/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:])
index 8c61df3..208de8e 100644 (file)
@@ -1,7 +1,6 @@
 # Global rules
 exclude #$
 exclude ChangeLog
-exclude GNUmakefile
 exclude Makefile
 exclude tags$
 exclude ~$
@@ -19,7 +18,7 @@ exclude \.o$
 exclude \.order$
 exclude \.pdf$
 exclude \.plist$
-exlucde \.pro\.user$
+exclude \.pro\.user$
 exclude \.project$
 exclude \.props$
 exclude \.pyc$