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

Unified Diff: build/android/gyp/java_cpp_enum.py

Issue 1428173002: GN: Remove "outputs" parameter for java_cpp_enum() (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 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 | « base/BUILD.gn ('k') | build/android/gyp/java_cpp_enum_tests.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/android/gyp/java_cpp_enum.py
diff --git a/build/android/gyp/java_cpp_enum.py b/build/android/gyp/java_cpp_enum.py
index 73c6de88c82f68f7714906a82d5f00ce1c73b9b0..a0c9a8fa04b19824580906d49582c6ab8639030f 100755
--- a/build/android/gyp/java_cpp_enum.py
+++ b/build/android/gyp/java_cpp_enum.py
@@ -11,6 +11,7 @@ import optparse
import os
from string import Template
import sys
+import zipfile
from util import build_utils
@@ -233,8 +234,7 @@ def GetScriptName():
return os.sep.join(script_components[build_index:])
-def DoGenerate(output_dir, source_paths, print_output_only=False):
- output_paths = []
+def DoGenerate(source_paths):
for source_path in source_paths:
enum_definitions = DoParseHeaderFile(source_path)
if not enum_definitions:
@@ -245,12 +245,9 @@ def DoGenerate(output_dir, source_paths, print_output_only=False):
for enum_definition in enum_definitions:
package_path = enum_definition.enum_package.replace('.', os.path.sep)
file_name = enum_definition.class_name + '.java'
- output_path = os.path.join(output_dir, package_path, file_name)
- output_paths.append(output_path)
- if not print_output_only:
- build_utils.MakeDirectory(os.path.dirname(output_path))
- DoWriteOutput(source_path, output_path, enum_definition)
- return output_paths
+ output_path = os.path.join(package_path, file_name)
+ output = GenerateOutput(source_path, enum_definition)
+ yield output_path, output
def DoParseHeaderFile(path):
@@ -297,10 +294,6 @@ ${ENUM_ENTRIES}
return template.substitute(values)
-def DoWriteOutput(source_path, output_path, enum_definition):
- with open(output_path, 'w') as out_file:
- out_file.write(GenerateOutput(source_path, enum_definition))
-
def AssertFilesList(output_paths, assert_files_list):
actual = set(output_paths)
expected = set(assert_files_list)
@@ -311,32 +304,57 @@ def AssertFilesList(output_paths, assert_files_list):
'add %s and remove %s.' % (need_to_add, need_to_remove))
def DoMain(argv):
- usage = 'usage: %prog [options] output_dir input_file(s)...'
+ usage = 'usage: %prog [options] [output_dir] input_file(s)...'
parser = optparse.OptionParser(usage=usage)
parser.add_option('--assert_file', action="append", default=[],
dest="assert_files_list", help='Assert that the given '
'file is an output. There can be multiple occurrences of '
'this flag.')
+ parser.add_option('--srcjar',
+ help='When specified, a .srcjar at the given path is '
+ 'created instead of individual .java files.')
parser.add_option('--print_output_only', help='Only print output paths.',
action='store_true')
parser.add_option('--verbose', help='Print more information.',
action='store_true')
options, args = parser.parse_args(argv)
- if len(args) < 2:
- parser.error('Need to specify output directory and at least one input file')
- output_paths = DoGenerate(args[0], args[1:],
- print_output_only=options.print_output_only)
-
- if options.assert_files_list:
- AssertFilesList(output_paths, options.assert_files_list)
-
- if options.verbose:
- print 'Output paths:'
- print '\n'.join(output_paths)
+ if options.srcjar:
+ if options.print_output_only:
+ parser.error('--print_output_only does not work with --srcjar')
+ if options.assert_files_list:
+ parser.error('--assert_file does not work with --srcjar')
+
+ with zipfile.ZipFile(options.srcjar, 'w', zipfile.ZIP_STORED) as srcjar:
+ for output_path, data in DoGenerate(args):
+ srcjar.writestr(build_utils.CreateHermeticZipInfo(output_path), data)
+ else:
+ # TODO(agrieve): Delete this non-srcjar branch once GYP is gone.
+ if len(args) < 2:
+ parser.error(
+ 'Need to specify output directory and at least one input file')
+
+ output_dir = args[0]
+ output_paths = []
+ for output_path, data in DoGenerate(args[1:]):
+ full_path = os.path.join(output_dir, output_path)
+ output_paths.append(full_path)
+ if not options.print_output_only:
+ build_utils.MakeDirectory(os.path.dirname(full_path))
+ with open(full_path, 'w') as out_file:
+ out_file.write(data)
+
+ if options.assert_files_list:
+ AssertFilesList(output_paths, options.assert_files_list)
+
+ if options.verbose:
+ print 'Output paths:'
+ print '\n'.join(output_paths)
+
+ # Used by GYP.
+ return ' '.join(output_paths)
- return ' '.join(output_paths)
if __name__ == '__main__':
DoMain(sys.argv[1:])
« no previous file with comments | « base/BUILD.gn ('k') | build/android/gyp/java_cpp_enum_tests.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698