Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(558)

Unified Diff: third_party/google_input_tools/builder.py

Issue 701603002: Update to google-input-tools version 1.0.5.0 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « third_party/google_input_tools/README.chromium ('k') | third_party/google_input_tools/inputview.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/google_input_tools/builder.py
diff --git a/third_party/google_input_tools/builder.py b/third_party/google_input_tools/builder.py
index 778738067d603b960367607e8ededf1174854bd3..0048012d3d22c80adfc699f437532ba3a07529a3 100755
--- a/third_party/google_input_tools/builder.py
+++ b/third_party/google_input_tools/builder.py
@@ -13,6 +13,11 @@ _BASE_REGEX_STRING = '^\s*goog\.%s\(\s*[\'"](.+)[\'"]\s*\)'
require_regex = re.compile(_BASE_REGEX_STRING % 'require')
provide_regex = re.compile(_BASE_REGEX_STRING % 'provide')
+base = os.path.join('third_party',
+ 'closure_library',
+ 'closure',
+ 'goog',
+ 'base.js')
def ProcessFile(filename):
"""Extracts provided and required namespaces.
@@ -94,8 +99,9 @@ def Export(target_file, source_filename, providers, requirements, processed):
if dependency:
Export(target_file, dependency, providers, requirements, processed)
- # Export file
processed.add(source_filename)
+
+ # Export file
for name in providers:
if providers[name] == source_filename:
target_file.write('// %s%s' % (name, os.linesep))
@@ -103,9 +109,8 @@ def Export(target_file, source_filename, providers, requirements, processed):
try:
comment_block = False
for line in source_file:
- # Skip require and provide statements.
- if (not re.match(require_regex, line) and not
- re.match(provide_regex, line)):
+ # Skip require statements.
+ if (not re.match(require_regex, line)):
formatted = line.rstrip()
if comment_block:
# Scan for trailing */ in multi-line comment.
@@ -115,10 +120,9 @@ def Export(target_file, source_filename, providers, requirements, processed):
comment_block = False
else:
formatted = ''
- # Remove // style comments.
- index = formatted.find('//')
- if index >= 0:
- formatted = formatted[:index]
+ # Remove full-line // style comments.
+ if formatted.lstrip().startswith('//'):
+ formatted = '';
# Remove /* */ style comments.
start_comment = formatted.find('/*')
end_comment = formatted.find('*/')
@@ -190,7 +194,12 @@ def main():
ExtractDependencies(file, providers, requirements)
with open(options.target[0], 'w') as target_file:
+ target_file.write('var CLOSURE_NO_DEPS=true;%s' % os.linesep)
processed = set()
+ base_path = base
+ if options.path:
+ base_path = os.path.join(options.path, base_path)
+ Export(target_file, base_path, providers, requirements, processed)
for source_filename in sources:
Export(target_file, source_filename, providers, requirements, processed)
« no previous file with comments | « third_party/google_input_tools/README.chromium ('k') | third_party/google_input_tools/inputview.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698