Mercurial > hg > graal-jvmci-8
diff mx.jvmci/mx_jvmci_makefile.py @ 22287:5cce6c398d70
re-introduced partOfHotSpot to JarJDKDeployedDist to fix mx_jvmci_makefile.py
author | Doug Simon <doug.simon@oracle.com> |
---|---|
date | Thu, 23 Jul 2015 15:21:13 +0200 |
parents | c232a2ea1fd2 |
children | 26e2a05f8d95 |
line wrap: on
line diff
--- a/mx.jvmci/mx_jvmci_makefile.py Thu Jul 23 13:06:35 2015 +0200 +++ b/mx.jvmci/mx_jvmci_makefile.py Thu Jul 23 15:21:13 2015 +0200 @@ -53,7 +53,9 @@ opts = parser.parse_args(args) if not opts.selectedDists: - opts.selectedDists = [d.name for d in mx_jvmci.jdkDeployedDists if d.partOfHotSpot] + opts.selectedDists = [d.dist() for d in mx_jvmci.jdkDeployedDists if isinstance(d, mx_jvmci.JarJDKDeployedDist) and d.partOfHotSpot] + else: + opts.selectedDists = [mx.distribution(name) for name in opts.selectedDists] mf = Makefile() if do_build_makefile(mf, opts.selectedDists): contents = mf.generate() @@ -65,7 +67,7 @@ return 0 def get_jdk_deployed_dists(): - return [d.name for d in mx_jvmci.jdkDeployedDists] + return [d.dist() for d in mx_jvmci.jdkDeployedDists] def make_dist_rule(dist, mf): def path_dist_relative(p): @@ -102,7 +104,7 @@ apPaths.append(path_dist_relative(apd.path)) apDistNames.append(apd.name) apDistVariableNames.append("$(" + apd.name + "_JAR)") - shouldExport = dist.name in jdkDeployedDists + shouldExport = dist in jdkDeployedDists props = { "name": dist.name, "jarName": targetPathPrefix + jarName,