Mercurial > hg > graal-compiler

comparison mx.graal/mx_graal_makefile.py @ 22232:4a500b3783fb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author Tom Rodriguez <tom.rodriguez@oracle.com>
date Wed, 15 Jul 2015 10:16:28 -0700
parents 751a0882cb7e
children
comparison
equal deleted inserted replaced
22231:a85ef0434dba 22232:4a500b3783fb
53 opts = parser.parse_args(args) 53 opts = parser.parse_args(args)
54 54
55 if opts.selectedDists == None or len(opts.selectedDists) == 0: 55 if opts.selectedDists == None or len(opts.selectedDists) == 0:
56 opts.selectedDists = [d.name for d in mx_graal._jdkDeployedDists if d.partOfHotSpot] 56 opts.selectedDists = [d.name for d in mx_graal._jdkDeployedDists if d.partOfHotSpot]
57 mf = Makefile() 57 mf = Makefile()
58 commandline = " ".join(["mx.sh", "makefile"] + args) 58 if do_build_makefile(mf, opts.selectedDists):
59 if do_build_makefile(mf, opts.selectedDists, commandline):
60 contents = mf.generate() 59 contents = mf.generate()
61 if opts.output == None: 60 if opts.output == None:
62 print contents 61 print contents
63 else: 62 else:
64 if mx.update_file(opts.output, contents, showDiff=True): 63 if mx.update_file(opts.output, contents, showDiff=True):
151 """.format(**props)) 150 """.format(**props))
152 return 151 return
153 152
154 153
155 154
156 def do_build_makefile(mf, selectedDists, commandline): 155 def do_build_makefile(mf, selectedDists):
157 java = mx.java() 156 java = mx.java()
158 bootClassPath = java.bootclasspath() 157 bootClassPath = java.bootclasspath()
159 bootClassPath = bootClassPath.replace(os.path.realpath(java.jdk), "$(ABS_BOOTDIR)") 158 bootClassPath = bootClassPath.replace(os.path.realpath(java.jdk), "$(ABS_BOOTDIR)")
160 jdkBootClassPathVariableName = "JDK_BOOTCLASSPATH" 159 jdkBootClassPathVariableName = "JDK_BOOTCLASSPATH"
161 160