Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-19 15:51:33 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1064316 - Rewrite check_spidermonkey_style.py to use os.walk instead of looking at the repo data. r=njn

Browse Source
This commit is contained in:
Jan de Mooij 2018-04-18 09:42:24 +02:00
parent 423880eafd
commit 98422b2e61
2 changed files with 37 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
config/check_spidermonkey_style.py
View File

@ -42,9 +42,6 @@ import os
import re
import sys
from mozversioncontrol import get_repository_from_env
# We don't bother checking files in these directories, because they're (a) auxiliary or (b)
# imported code that doesn't follow our coding style.
ignored_js_src_dirs = [
@ -258,23 +255,42 @@ def check_style(enable_fixup):
non_js_inclnames = set() # type: set(inclname)
js_names = dict() # type: dict(filename, inclname)
with get_repository_from_env() as repo:
# Select the appropriate files.
for filename in repo.get_files_in_working_directory():
for non_js_dir in non_js_dirnames:
if filename.startswith(non_js_dir) and filename.endswith('.h'):
inclname = 'mozilla/' + filename.split('/')[-1]
# Process files in js/src.
js_src_root = os.path.join('js', 'src')
for dirpath, dirnames, filenames in os.walk(js_src_root):
if dirpath == js_src_root:
# Skip any subdirectories that contain a config.status file
# (likely objdirs).
builddirs = []
for dirname in dirnames:
path = os.path.join(dirpath, dirname, 'config.status')
if os.path.isfile(path):
builddirs.append(dirname)
for dirname in builddirs:
dirnames.remove(dirname)
for filename in filenames:
filepath = os.path.join(dirpath, filename).replace('\\', '/')
if not filepath.startswith(tuple(ignored_js_src_dirs)) and \
filepath.endswith(('.c', '.cpp', '.h', '.tbl', '.msg')):
inclname = filepath[len('js/src/'):]
js_names[filepath] = inclname
# Look for header files in directories in non_js_dirnames.
for non_js_dir in non_js_dirnames:
for dirpath, dirnames, filenames in os.walk(non_js_dir):
for filename in filenames:
if filename.endswith('.h'):
inclname = 'mozilla/' + filename
non_js_inclnames.add(inclname)
if filename.startswith('js/public/') and filename.endswith('.h'):
inclname = 'js/' + filename[len('js/public/'):]
js_names[filename] = inclname
if filename.startswith('js/src/') and \
not filename.startswith(tuple(ignored_js_src_dirs)) and \
filename.endswith(('.c', '.cpp', '.h', '.tbl', '.msg')):
inclname = filename[len('js/src/'):]
js_names[filename] = inclname
# Look for header files in js/public.
js_public_root = os.path.join('js', 'public')
for dirpath, dirnames, filenames in os.walk(js_public_root):
for filename in filenames:
if filename.endswith('.h'):
filepath = os.path.join(dirpath, filename).replace('\\', '/')
inclname = 'js/' + filepath[len('js/public/'):]
js_names[filepath] = inclname
all_inclnames = non_js_inclnames | set(js_names.values())
@ -293,15 +309,12 @@ def check_style(enable_fixup):
file_kind == FileKind.H or file_kind == FileKind.INL_H:
included_h_inclnames = set() # type: set(inclname)
# This script is run in js/src/, so prepend '../../' to get to the root of the Mozilla
# source tree.
filepath = os.path.join(repo.path, filename)
with open(filepath) as f:
with open(filename) as f:
code = read_file(f)
if enable_fixup:
code = code.sorted(inclname)
with open(filepath, 'w') as f:
with open(filename, 'w') as f:
f.write(code.to_source())
check_file(filename, inclname, file_kind, code, all_inclnames, included_h_inclnames)

2
js/src/Makefile.in
View File

@ -50,7 +50,7 @@ endif
endif
check-style::
(cd $(srcdir) && $(PYTHON) $(topsrcdir)/config/check_spidermonkey_style.py);
(cd $(topsrcdir) && $(PYTHON) $(topsrcdir)/config/check_spidermonkey_style.py);
check-masm::
(cd $(srcdir) && $(PYTHON) $(topsrcdir)/config/check_macroassembler_style.py);