Mercurial > hg > graal-compiler
diff mx/mx_graal_makefile.py @ 21790:6db6070d30b9
Make jvmci.make stable; add header for building the jvmci.make; default to use the jvmci.make file when running mx.build
author | Stefan Anzinger <stefan.anzinger@oracle.com> |
---|---|
date | Fri, 05 Jun 2015 16:28:19 +0200 |
parents | 6c3c21d9b5ef |
children | 44bad469bec2 |
line wrap: on
line diff
--- a/mx/mx_graal_makefile.py Mon Jun 08 20:24:51 2015 +0200 +++ b/mx/mx_graal_makefile.py Fri Jun 05 16:28:19 2015 +0200 @@ -48,17 +48,18 @@ parser = ArgumentParser(prog='mx makefile') parser.add_argument('-o', action='store', dest='output', help='Write contents to this file.') parser.add_argument('selectedDists', help="Selected distribution names which are going to be built with make.", nargs=REMAINDER) - args = parser.parse_args(args) + opts = parser.parse_args(args) - if args.selectedDists == None or len(args.selectedDists) == 0: - args.selectedDists = [d.name for d in mx_graal._jdkDeployedDists if d.partOfHotSpot] + if opts.selectedDists == None or len(opts.selectedDists) == 0: + opts.selectedDists = [d.name for d in mx_graal._jdkDeployedDists if d.partOfHotSpot] mf = Makefile() - if do_build_makefile(mf, args.selectedDists): + commandline = " ".join(["mx.sh", "makefile"] + args) + if do_build_makefile(mf, opts.selectedDists, commandline): contents = mf.generate() - if args.output == None: + if opts.output == None: print contents else: - with open(args.output, "w") as f: + with open(opts.output, "w") as f: f.write(contents) @@ -72,13 +73,21 @@ def get_jdk_deployed_dists(): return [d.name for d in mx_graal._jdkDeployedDists] +def update_list(li, elements): + for e in elements: + if e not in li: + li.append(e) + def make_dist_rule(dist, mf, bootClassPath=None): def path_dist_relative(p): return os.path.relpath(p, dist.suite.dir) + def short_dist_name(name): + return name.replace("COM_ORACLE_", "") + shortName = short_dist_name(dist.name) jdkDeployedDists = get_jdk_deployed_dists() jarPath = path_dist_relative(dist.path) - sourcesVariableName = dist.name + "_SRC" - depJarVariableName = dist.name + "_DEP_JARS" + sourcesVariableName = shortName + "_SRC" + depJarVariableName = shortName + "_DEP_JARS" sources = [] resources = [] sortedDeps = dist.sorted_deps(True, transitive=False, includeAnnotationProcessors=True) @@ -86,17 +95,17 @@ targetPathPrefix = "$(TARGET)" + os.path.sep libraryDeps = [path_dist_relative(l.get_path(False)) for l in filter_projects(sortedDeps, mx.Library)] - annotationProcessorDeps = set() + annotationProcessorDeps = [] distDeps = dist.get_dist_deps(includeSelf=False, transitive=True) - distDepProjects = set() + distDepProjects = [] for d in distDeps: - distDepProjects.update(d.sorted_deps(includeLibs=False, transitive=True)) + update_list(distDepProjects, d.sorted_deps(includeLibs=False, transitive=True)) classPath = [targetPathPrefix + path_dist_relative(d.path) for d in distDeps] + libraryDeps \ + [path_dist_relative(mx.dependency(name).path) for name in dist.excludedDependencies] for p in projects: if p.definedAnnotationProcessors != None and p.definedAnnotationProcessorsDist != dist: - annotationProcessorDeps.add(p) + update_list(annotationProcessorDeps, [p]) for p in projects: projectDir = path_dist_relative(p.dir) if p not in distDepProjects and p not in annotationProcessorDeps: @@ -116,12 +125,12 @@ apDistVariableNames = [] for p in annotationProcessorDeps: apPaths.append(path_dist_relative(p.definedAnnotationProcessorsDist.path)) - name = p.definedAnnotationProcessorsDist.name + name = short_dist_name(p.definedAnnotationProcessorsDist.name) apDistNames.append(name) apDistVariableNames.append("$(" + name + "_JAR)") shouldExport = dist.name in jdkDeployedDists props = { - "name": dist.name, + "name": shortName, "jarPath": targetPathPrefix + jarPath, "depends": "", "depJarsVariableAccess": "$(" + depJarVariableName + ")" if len(classPath) > 0 else "", @@ -131,7 +140,7 @@ "annotationProcessors": " ".join(apDistVariableNames), "cpAnnotationProcessors": "-processorpath " + ":".join(apDistVariableNames) if len(apDistVariableNames) > 0 else "", "bootCp": ("-bootclasspath " + bootClassPath) if bootClassPath != None else "", - "cpDeps": ("-cp " + ":".join(classPath)) if len(classPath) > 0 else "", + "cpDeps": ("-cp $(shell echo $(" + depJarVariableName + ") | tr ' ' ':')") if len(classPath) > 0 else "", "jarDeps": " ".join(classPath), "copyResources": "cp -r {} $(TMP)".format(" ".join(resources)) if len(resources) > 0 else "", "targetPathPrefix": targetPathPrefix, @@ -154,33 +163,36 @@ -def do_build_makefile(mf, selectedDists): +def do_build_makefile(mf, selectedDists, commandline): java = mx.java() bootClassPath = java.bootclasspath() - bootClassPath = bootClassPath.replace(java.jdk, "$(JDK)") + bootClassPath = bootClassPath.replace(java.jdk, "$(ABS_BOOTDIR)") jdkBootClassPathVariableName = "JDK_BOOTCLASSPATH" - mf.add_definition("""VERBOSE= -TARGET=. -JDK= + mf.add_definition("""# This Makefile is generated automatically, do not edit +# This file was build with command: """ + commandline + """ -WGET=wget -JAVAC=$(JDK)/bin/javac -g -target """ + str(java.javaCompliance) + """ -JAR=$(JDK)/bin/jar +VERBOSE= +TARGET=. +# Bootstrap JDK to be used (for javac and jar) +ABS_BOOTDIR= + +JAVAC=$(ABS_BOOTDIR)/bin/javac -g -target """ + str(java.javaCompliance) + """ +JAR=$(ABS_BOOTDIR)/bin/jar EXPORT_DIR=export EXPORTED_FILES_ADDITIONAL=$(TARGET)/options $(TARGET)/services HS_COMMON_SRC=. -# where all other stuff built by mx (graal.jar) resides -MX_TARGET=. + +# Directories, where the generated property-files reside within the JAR files PROVIDERS_INF=/META-INF/providers/ SERVICES_INF=/META-INF/services/ OPTIONS_INF=/META-INF/options/ -ifeq ($(JDK),) - $(error Variable JDK must be set to a JDK installation.) - endif - ifneq ($(VERBOSE),) +ifeq ($(ABS_BOOTDIR),) + $(error Variable ABS_BOOTDIR must be set to a JDK installation.) +endif +ifneq ($(VERBOSE),) SHELL=sh -x endif @@ -216,20 +228,20 @@ """) s = mx.suite("graal") - dists = set() - ap = set() - projects = set() + dists = [] + ap = [] + projects = [] for d in s.dists: if d.name in selectedDists: - dists.update(d.get_dist_deps(True, True)) - projects.update(d.sorted_deps(includeLibs=False, transitive=True)) + update_list(dists, d.get_dist_deps(True, True)) + update_list(projects, d.sorted_deps(includeLibs=False, transitive=True)) for p in projects: deps = p.all_deps([], False, includeSelf=True, includeJreLibs=False, includeAnnotationProcessors=True) for d in deps: if d.definedAnnotationProcessorsDist != None: apd = d.definedAnnotationProcessorsDist - ap.add(apd) + update_list(ap, [apd]) if len(dists) > 0: mf.add_definition(jdkBootClassPathVariableName + " = " + bootClassPath)