Changeset 52906 in webkit


Ignore:
Timestamp:
Jan 7, 2010 12:36:52 AM (14 years ago)
Author:
eric@webkit.org
Message:

2010-01-07 Chris Jerdonek <​chris.jerdonek@gmail.com>

Reviewed by Eric Seidel.

Moved style-related modules to webkitpy.style sub-package.

​https://bugs.webkit.org/show_bug.cgi?id=32971

  • Scripts/check-webkit-style:
    • Updated import statement.
  • Scripts/test-webkitpy:
    • Updated import statements.
  • Scripts/webkitpy/cpp_style.py: Removed.
    • Moved to webkitpy/style.
  • Scripts/webkitpy/cpp_style_unittest.py: Removed.
    • Moved to webkitpy/style.
  • Scripts/webkitpy/style.py: Removed.
    • Moved to webkitpy/style/checker.py.
  • Scripts/webkitpy/style/init.py: Added.
    • Added containing webkitpy directory to package search path.
  • Scripts/webkitpy/style/checker.py: Copied from Scripts/webkitpy/style.py.
  • Scripts/webkitpy/style/checker_unittest.py: Copied from Scripts/webkitpy/style_unittest.py.
    • Updated import statement.
  • Scripts/webkitpy/style/cpp_style.py: Copied from Scripts/webkitpy/cpp_style.py.
  • Scripts/webkitpy/style/cpp_style_unittest.py: Copied from Scripts/webkitpy/cpp_style_unittest.py.
    • Update import statement.
  • Scripts/webkitpy/style/text_style.py: Copied from Scripts/webkitpy/text_style.py.
  • Scripts/webkitpy/style/text_style_unittest.py: Copied from Scripts/webkitpy/text_style_unittest.py.
  • Scripts/webkitpy/style_unittest.py: Removed.
    • Moved to webkitpy/style/checker_unittest.py.
  • Scripts/webkitpy/text_style.py: Removed.
    • Moved to webkitpy/style.
  • Scripts/webkitpy/text_style_unittest.py: Removed.
    • Moved to webkitpy/style.
Location:
trunk/WebKitTools
Files:
1 added
3 edited
6 moved

Legend:

Unmodified
Added
Removed

  • trunk/WebKitTools/ChangeLog

    r52902 r52906  
     12010-01-07  Chris Jerdonek  <chris.jerdonek@gmail.com>
     2
     3        Reviewed by Eric Seidel.
     4
     5        Moved style-related modules to webkitpy.style sub-package.
     6
     7        https://bugs.webkit.org/show_bug.cgi?id=32971
     8
     9        * Scripts/check-webkit-style:
     10          - Updated import statement.
     11
     12        * Scripts/test-webkitpy:
     13          - Updated import statements.
     14
     15        * Scripts/webkitpy/cpp_style.py: Removed.
     16          - Moved to webkitpy/style.
     17
     18        * Scripts/webkitpy/cpp_style_unittest.py: Removed.
     19          - Moved to webkitpy/style.
     20
     21        * Scripts/webkitpy/style.py: Removed.
     22          - Moved to webkitpy/style/checker.py.
     23
     24        * Scripts/webkitpy/style/__init__.py: Added.
     25          - Added containing webkitpy directory to package search path.
     26
     27        * Scripts/webkitpy/style/checker.py: Copied from Scripts/webkitpy/style.py.
     28        * Scripts/webkitpy/style/checker_unittest.py: Copied from Scripts/webkitpy/style_unittest.py.
     29          - Updated import statement.
     30
     31        * Scripts/webkitpy/style/cpp_style.py: Copied from Scripts/webkitpy/cpp_style.py.
     32        * Scripts/webkitpy/style/cpp_style_unittest.py: Copied from Scripts/webkitpy/cpp_style_unittest.py.
     33          - Update import statement.
     34
     35        * Scripts/webkitpy/style/text_style.py: Copied from Scripts/webkitpy/text_style.py.
     36        * Scripts/webkitpy/style/text_style_unittest.py: Copied from Scripts/webkitpy/text_style_unittest.py.
     37        * Scripts/webkitpy/style_unittest.py: Removed.
     38          - Moved to webkitpy/style/checker_unittest.py.
     39
     40        * Scripts/webkitpy/text_style.py: Removed.
     41          - Moved to webkitpy/style.
     42
     43        * Scripts/webkitpy/text_style_unittest.py: Removed.
     44          - Moved to webkitpy/style.
     45
    1462010-01-06  Kinuko Yasuda  <kinuko@chromium.org>
    247

  • trunk/WebKitTools/Scripts/check-webkit-style

    r52849 r52906  
    4848import sys
    4949
    50 import webkitpy.style as style
     50import webkitpy.style.checker as checker
    5151from webkitpy.scm import detect_scm_system
    5252
    … …  
    6060                                           'replace')
    6161
    62     defaults = style.ArgumentDefaults(style.DEFAULT_OUTPUT_FORMAT,
    63                                       style.DEFAULT_VERBOSITY,
    64                                       style.WEBKIT_FILTER_RULES)
     62    defaults = checker.ArgumentDefaults(checker.DEFAULT_OUTPUT_FORMAT,
     63                                        checker.DEFAULT_VERBOSITY,
     64                                        checker.WEBKIT_FILTER_RULES)
    6565
    66     parser = style.ArgumentParser(defaults)
     66    parser = checker.ArgumentParser(defaults)
    6767    (files, options) = parser.parse(sys.argv[1:])
    6868
    6969    # FIXME: Eliminate the need to call this function.
    7070    #        Options should be passed into process_file instead.
    71     style.set_options(options)
     71    checker.set_options(options)
    7272
    7373    if files:
    7474        for filename in files:
    75             style.process_file(filename)
     75            checker.process_file(filename)
    7676
    7777    else:
    … …  
    8989        else:
    9090            patch = scm.create_patch()
    91         style.process_patch(patch)
     91        checker.process_patch(patch)
    9292
    93     sys.stderr.write('Total errors found: %d\n' % style.error_count())
    94     sys.exit(style.error_count() > 0)
     93    sys.stderr.write('Total errors found: %d\n' % checker.error_count())
     94    sys.exit(checker.error_count() > 0)
    9595
    9696

  • trunk/WebKitTools/Scripts/test-webkitpy

    r52714 r52906  
    4141from webkitpy.committers_unittest import *
    4242from webkitpy.credentials_unittest import *
    43 from webkitpy.cpp_style_unittest import *
     43from webkitpy.style.cpp_style_unittest import *
    4444from webkitpy.diff_parser_unittest import *
    4545from webkitpy.executive_unittest import *
    … …  
    4848from webkitpy.steps.steps_unittest import *
    4949from webkitpy.steps.updatechangelogswithreview_unittests import *
    50 from webkitpy.style_unittest import *
    51 from webkitpy.text_style_unittest import *
     50from webkitpy.style.checker_unittest import *
     51from webkitpy.style.text_style_unittest import *
    5252from webkitpy.webkit_logging_unittest import *
    5353from webkitpy.webkitport_unittest import *

  • trunk/WebKitTools/Scripts/webkitpy/style/checker_unittest.py

    r52905 r52906  
    3737import unittest
    3838
    39 import style
     39import checker as style
    4040
    4141

  • trunk/WebKitTools/Scripts/webkitpy/style/cpp_style_unittest.py

    r52905 r52906  
    4242import unittest
    4343import cpp_style
    44 # FIXME: Remove the need to import something from style. See the
     44# FIXME: Remove the need to import something from checker. See the
    4545#        FIXME notes near the STYLE_CATEGORIES definition for a
    4646#        suggestion on how to best do this.
    47 from style import STYLE_CATEGORIES
     47from checker import STYLE_CATEGORIES
    4848
    4949# This class works as an error collector and replaces cpp_style.Error
Note: See TracChangeset for help on using the changeset viewer.