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

Side by Side Diff: build/android/gyp/create_java_binary_script.py

Issue 1957023002: Add directory option for JUnit coverage files. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 7 months 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 unified diff | Download patch
« no previous file with comments | « no previous file | build/android/pylib/junit/test_runner.py » ('j') | build/android/test_runner.py » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 #!/usr/bin/env python 1 #!/usr/bin/env python
2 # 2 #
3 # Copyright 2014 The Chromium Authors. All rights reserved. 3 # Copyright 2014 The Chromium Authors. All rights reserved.
4 # Use of this source code is governed by a BSD-style license that can be 4 # Use of this source code is governed by a BSD-style license that can be
5 # found in the LICENSE file. 5 # found in the LICENSE file.
6 6
7 """Creates a simple script to run a java "binary". 7 """Creates a simple script to run a java "binary".
8 8
9 This creates a script that sets up the java command line for running a java 9 This creates a script that sets up the java command line for running a java
10 jar. This includes correctly setting the classpath and the main class. 10 jar. This includes correctly setting the classpath and the main class.
(...skipping 19 matching lines...) Expand all
30 30
31 self_dir = os.path.dirname(__file__) 31 self_dir = os.path.dirname(__file__)
32 classpath = [{classpath}] 32 classpath = [{classpath}]
33 bootclasspath = [{bootclasspath}] 33 bootclasspath = [{bootclasspath}]
34 extra_program_args = {extra_program_args} 34 extra_program_args = {extra_program_args}
35 if os.getcwd() != self_dir: 35 if os.getcwd() != self_dir:
36 offset = os.path.relpath(self_dir, os.getcwd()) 36 offset = os.path.relpath(self_dir, os.getcwd())
37 classpath = [os.path.join(offset, p) for p in classpath] 37 classpath = [os.path.join(offset, p) for p in classpath]
38 bootclasspath = [os.path.join(offset, p) for p in bootclasspath] 38 bootclasspath = [os.path.join(offset, p) for p in bootclasspath]
39 java_cmd = ["java"] 39 java_cmd = ["java"]
40 jvm_arguments = [ x for x in sys.argv[1:] if x.startswith('-D')]
BigBossZhiling 2016/05/07 01:12:01 '-D' I think is the conventional prefix of jvm arg
41 jar_arguments = [ x for x in sys.argv[1:] if not x.startswith('-D')]
42 java_cmd.extend(jvm_arguments)
jbudorick 2016/05/09 18:08:08 Why is this split necessary?
40 {noverify_flag} 43 {noverify_flag}
41 if bootclasspath: 44 if bootclasspath:
42 java_cmd.append("-Xbootclasspath/p:" + ":".join(bootclasspath)) 45 java_cmd.append("-Xbootclasspath/p:" + ":".join(bootclasspath))
43 java_cmd.extend( 46 java_cmd.extend(
44 ["-classpath", ":".join(classpath), "-enableassertions", \"{main_class}\"]) 47 ["-classpath", ":".join(classpath), "-enableassertions", \"{main_class}\"])
45 java_cmd.extend(extra_program_args) 48 java_cmd.extend(extra_program_args)
46 java_cmd.extend(sys.argv[1:]) 49 java_cmd.extend(jar_arguments)
47 os.execvp("java", java_cmd) 50 os.execvp("java", java_cmd)
48 """ 51 """
49 52
50 def main(argv): 53 def main(argv):
51 argv = build_utils.ExpandFileArgs(argv) 54 argv = build_utils.ExpandFileArgs(argv)
52 parser = optparse.OptionParser() 55 parser = optparse.OptionParser()
53 build_utils.AddDepfileOption(parser) 56 build_utils.AddDepfileOption(parser)
54 parser.add_option('--output', help='Output path for executable script.') 57 parser.add_option('--output', help='Output path for executable script.')
55 parser.add_option('--jar-path', help='Path to the main jar.') 58 parser.add_option('--jar-path', help='Path to the main jar.')
56 parser.add_option('--main-class', 59 parser.add_option('--main-class',
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
93 os.chmod(options.output, 0750) 96 os.chmod(options.output, 0750)
94 97
95 if options.depfile: 98 if options.depfile:
96 build_utils.WriteDepfile( 99 build_utils.WriteDepfile(
97 options.depfile, 100 options.depfile,
98 build_utils.GetPythonDependencies()) 101 build_utils.GetPythonDependencies())
99 102
100 103
101 if __name__ == '__main__': 104 if __name__ == '__main__':
102 sys.exit(main(sys.argv[1:])) 105 sys.exit(main(sys.argv[1:]))
OLDNEW
« no previous file with comments | « no previous file | build/android/pylib/junit/test_runner.py » ('j') | build/android/test_runner.py » ('J')

Powered by Google App Engine
This is Rietveld 408576698