truffle: mxtool/mx.py comparison

comparison mxtool/mx.py @ 14763:a6c1c3eb20c4

transition to JDK8 - introduce support for more than one JDK in mx - update version in annotiationprocessors - update project definitions (truffle api is not part of the transition) - fix style errors

author	Doug Simon <doug.simon@oracle.com>
date	Wed, 26 Mar 2014 14:34:08 +0100
parents	65b005b58825
children	5823c399e28f

comparison

equal deleted inserted replaced

-:c6f4b780fa88
+:a6c1c3eb20c4
 _suites = dict()
 _annotationProcessors = None
 _primary_suite_path = None
 _primary_suite = None
 _opts = None
-_java = None
+_java_homes = None
 _warn = False
 """
 A distribution is a jar or zip file containing the output from one or more Java projects.
 """
 self.checkstyleProj = name
 self.javaCompliance = JavaCompliance(javaCompliance) if javaCompliance is not None else None
 self.native = False
 self.workingSets = workingSets
 self.dir = d
+# Verify that a JDK exists for this project if its compliance level is
+# less than the compliance level of the default JDK
+jdk = java(self.javaCompliance)
+if jdk is None and self.javaCompliance < java().javaCompliance:
+abort('Cannot find ' + str(self.javaCompliance) + ' JDK required by ' + name + '. ' +
+'Specify it with --extra-java-homes option or EXTRA_JAVA_HOMES environment variable.')
 # Create directories for projects that don't yet exist
 if not exists(d):
 os.mkdir(d)
 for s in self.source_dirs():
 self.add_argument('--cp-sfx', dest='cp_suffix', help='class path suffix', metavar='<arg>')
 self.add_argument('--J', dest='java_args', help='Java VM arguments (e.g. --J @-dsa)', metavar='@<args>')
 self.add_argument('--Jp', action='append', dest='java_args_pfx', help='prefix Java VM arguments (e.g. --Jp @-dsa)', metavar='@<args>', default=[])
 self.add_argument('--Ja', action='append', dest='java_args_sfx', help='suffix Java VM arguments (e.g. --Ja @-dsa)', metavar='@<args>', default=[])
 self.add_argument('--user-home', help='users home directory', metavar='<path>', default=os.path.expanduser('~'))
-self.add_argument('--java-home', help='bootstrap JDK installation directory (must be JDK 6 or later)', metavar='<path>')
+self.add_argument('--java-home', help='primary JDK directory (must be JDK 7 or later)', metavar='<path>')
+self.add_argument('--extra-java-homes', help='secondary JDK directories separated by "' + os.pathsep + '"', metavar='<path>')
 self.add_argument('--ignore-project', action='append', dest='ignored_projects', help='name of project to ignore', metavar='<name>', default=[])
 self.add_argument('--kill-with-sigquit', action='store_true', dest='killwithsigquit', help='send sigquit first before killing child processes')
 if get_os() != 'windows':
 # Time outs are (currently) implemented with Unix specific functionality
 self.add_argument('--timeout', help='timeout (in seconds) for command', type=int, default=0, metavar='<secs>')
 if opts.very_verbose:
 opts.verbose = True
 if opts.java_home is None:
 opts.java_home = os.environ.get('JAVA_HOME')
+if opts.extra_java_homes is None:
+opts.extra_java_homes = os.environ.get('EXTRA_JAVA_HOMES')
 if opts.java_home is None or opts.java_home == '':
 opts.java_home = _handle_missing_java_home()
 if opts.user_home is None or opts.user_home == '':
 if doc is None:
 doc = ''
 msg += ' {0:<20} {1}\n'.format(cmd, doc.split('\n', 1)[0])
 return msg + '\n'
-def java():
+def java(requiredCompliance=None):
 """
 Get a JavaConfig object containing Java commands launch details.
-"""
+If requiredCompliance is None, the compliance level specified by --java-home/JAVA_HOME
-assert _java is not None
+is returned. Otherwise, the JavaConfig exactly matching requiredCompliance is returned
-return _java
+or None if there is no exact match.
+"""
+assert _java_homes
+if not requiredCompliance:
+return _java_homes[0]
+for java in _java_homes:
+if java.javaCompliance == requiredCompliance:
+return java
+return None
 def run_java(args, nonZeroIsFatal=True, out=None, err=None, cwd=None, addDefaultArgs=True):
 return run(java().format_cmd(args, addDefaultArgs), nonZeroIsFatal=nonZeroIsFatal, out=out, err=err, cwd=cwd)
 def _kill_process_group(pid, sig):
 """
 A JavaConfig object encapsulates info on how Java commands are run.
 """
 class JavaConfig:
-def __init__(self, opts):
+def __init__(self, java_home, java_dbg_port):
-self.jdk = opts.java_home
+self.jdk = java_home
-self.debug_port = opts.java_dbg_port
+self.debug_port = java_dbg_port
 self.jar = exe_suffix(join(self.jdk, 'bin', 'jar'))
 self.java = exe_suffix(join(self.jdk, 'bin', 'java'))
 self.javac = exe_suffix(join(self.jdk, 'bin', 'javac'))
 self.javap = exe_suffix(join(self.jdk, 'bin', 'javap'))
 self.javadoc = exe_suffix(join(self.jdk, 'bin', 'javadoc'))
 self._bootclasspath = None
 if not exists(self.java):
-abort('Java launcher derived from JAVA_HOME does not exist: ' + self.java)
+abort('Java launcher does not exist: ' + self.java)
 def delAtAndSplit(s):
 return shlex.split(s.lstrip('@'))
 self.java_args = delAtAndSplit(_opts.java_args) if _opts.java_args else []
 self.version = VersionSpec(output[2].strip('"'))
 self.javaCompliance = JavaCompliance(self.version.versionString)
 if self.debug_port is not None:
 self.java_args += ['-Xdebug', '-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=' + str(self.debug_port)]
+def __hash__(self):
+return hash(self.jdk)
+def __cmp__(self, other):
+if isinstance(other, JavaConfig):
+return cmp(self.javaCompliance, other.javaCompliance)
+raise TypeError()
 def format_cmd(self, args, addDefaultArgs):
 if addDefaultArgs:
 return [self.java] + self.processArgs(args)
 else:
 suppliedParser = parser is not None
 if not suppliedParser:
 parser = ArgumentParser(prog='mx build')
-javaCompliance = java().javaCompliance
 defaultEcjPath = get_env('JDT', join(_primary_suite.mxDir, 'ecj.jar'))
 parser = parser if parser is not None else ArgumentParser(prog='mx build')
 parser.add_argument('-f', action='store_true', dest='force', help='force build (disables timestamp checking)')
 parser.add_argument('-c', action='store_true', dest='clean', help='removes existing build output')
-parser.add_argument('--source', dest='compliance', help='Java compliance level for projects without an explicit one', default=str(javaCompliance))
+parser.add_argument('--source', dest='compliance', help='Java compliance level for projects without an explicit one')
 parser.add_argument('--Wapi', action='store_true', dest='warnAPI', help='show warnings about using internal APIs')
 parser.add_argument('--projects', action='store', help='comma separated projects to build (omit to build all projects)')
 parser.add_argument('--only', action='store', help='comma separated projects to build, without checking their dependencies (omit to build all projects)')
 parser.add_argument('--no-java', action='store_false', dest='java', help='do not build Java projects')
 parser.add_argument('--no-native', action='store_false', dest='native', help='do not build native projects')
 continue
 if exists(join(p.dir, 'plugin.xml')):  # eclipse plugin project
 continue
 # skip building this Java project if its Java compliance level is "higher" than the configured JDK
-if javaCompliance < p.javaCompliance:
+requiredCompliance = p.javaCompliance if p.javaCompliance else JavaCompliance(args.compliance) if args.compliance else None
-log('Excluding {0} from build (Java compliance level {1} required)'.format(p.name, p.javaCompliance))
+jdk = java(requiredCompliance)
+if not jdk:
+log('Excluding {0} from build (Java compliance level {1} required)'.format(p.name, requiredCompliance))
 continue
+compliance = str(jdk.javaCompliance)
 outputDir = prepareOutputDirs(p, args.clean)
 cp = classpath(p.name, includeSelf=True)
 sourceDirs = p.source_dirs()
 else:
 processorArgs += ['-proc:none']
 toBeDeleted = [argfileName]
 try:
-compliance = str(p.javaCompliance) if p.javaCompliance is not None else args.compliance
 if jdtJar is None:
 log('Compiling Java sources for {0} with javac...'.format(p.name))
+javacCmd = [jdk.javac, '-g', '-J-Xmx1g', '-source', compliance, '-target', compliance, '-classpath', cp, '-d', outputDir]
+if jdk.debug_port is not None:
-javacCmd = [java().javac, '-g', '-J-Xmx1g', '-source', compliance, '-target', compliance, '-classpath', cp, '-d', outputDir]
+javacCmd += ['-J-Xdebug', '-J-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=' + str(jdk.debug_port)]
-if java().debug_port is not None:
-javacCmd += ['-J-Xdebug', '-J-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=' + str(java().debug_port)]
 javacCmd += processorArgs
 javacCmd += ['@' + argfile.name]
 if not args.warnAPI:
 javacCmd.append('-XDignore.symbol.file')
 run(javacCmd)
 else:
 log('Compiling Java sources for {0} with JDT...'.format(p.name))
-jdtArgs = [java().java, '-Xmx1g']
+jdtArgs = [jdk.java, '-Xmx1g']
-if java().debug_port is not None:
+if jdk.debug_port is not None:
-jdtArgs += ['-Xdebug', '-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=' + str(java().debug_port)]
+jdtArgs += ['-Xdebug', '-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=' + str(jdk.debug_port)]
 jdtArgs += ['-jar', jdtJar,
 '-' + compliance,
 '-cp', cp, '-g', '-enableJavadoc',
 '-d', outputDir]
 projects = sorted_deps()
 if args.projects is not None:
 projects = [project(name) for name in args.projects.split(',')]
 class Batch:
-def __init__(self, settingsFile):
+def __init__(self, settingsFile, javaCompliance):
 self.path = settingsFile
+self.javaCompliance = javaCompliance
 self.javafiles = list()
 def settings(self):
 with open(self.path) as fp:
-return fp.read()
+return fp.read() + java(self.javaCompliance).java
 class FileInfo:
 def __init__(self, path):
 self.path = path
 with open(path) as fp:
 for p in projects:
 if p.native:
 continue
 sourceDirs = p.source_dirs()
-batch = Batch(join(p.dir, '.settings', 'org.eclipse.jdt.core.prefs'))
+batch = Batch(join(p.dir, '.settings', 'org.eclipse.jdt.core.prefs'), p.javaCompliance)
 if not exists(batch.path):
 if _opts.verbose:
 log('[no Eclipse Code Formatter preferences at {0} - skipping]'.format(batch.path))
 continue
 res = batches.setdefault(batch.settings(), batch)
 if res is not batch:
 res.javafiles = res.javafiles + batch.javafiles
+print "we have: " + str(len(batches)) + " batches"
 for batch in batches.itervalues():
-run([args.eclipse_exe, '-nosplash', '-application', 'org.eclipse.jdt.core.JavaCodeFormatter', '-config', batch.path] + [f.path for f in batch.javafiles])
+run([args.eclipse_exe,
+'-nosplash',
+'-application',
+'org.eclipse.jdt.core.JavaCodeFormatter',
+'-vm', java(batch.javaCompliance).java,
+'-config', batch.path]
++ [f.path for f in batch.javafiles])
 for fi in batch.javafiles:
 if fi.update():
 modified.append(fi)
 log('{0} files were modified'.format(len(modified)))
 overwriteCheck(zf, arcname, lpath + '!' + arcname)
 zf.writestr(arcname, lp.read(arcname))
 else:
 p = dep
 # skip a  Java project if its Java compliance level is "higher" than the configured JDK
-if java().javaCompliance < p.javaCompliance:
+jdk = java(p.javaCompliance)
+if not jdk:
 log('Excluding {0} from {2} (Java compliance level {1} required)'.format(p.name, p.javaCompliance, d.path))
 continue
 logv('[' + d.path + ': adding project ' + p.name + ']')
 outputDir = p.output_dir()
 if not exists(dotCheckstyle):
 abort('ERROR: .checkstyle for Project {0} is missing'.format(p.name))
 # skip checking this Java project if its Java compliance level is "higher" than the configured JDK
-if java().javaCompliance < p.javaCompliance:
+jdk = java(p.javaCompliance)
+if not jdk:
 log('Excluding {0} from checking (Java compliance level {1} required)'.format(p.name, p.javaCompliance))
 continue
 for sourceDir in sourceDirs:
 javafilelist = []
 for p in suite.projects:
 if p.native:
 continue
+if not java(p.javaCompliance):
+log('Excluding {0} (JDK with compliance level {1} not available)'.format(p.name, p.javaCompliance))
+continue
 if not exists(p.dir):
 os.makedirs(p.dir)
 out = XMLDoc()
 out.open('classpath')
 launchOut = XMLDoc()
 consoleOn = 'true' if logToConsole else 'false'
 launchOut.open('launchConfiguration', {'type' : 'org.eclipse.ui.externaltools.ProgramBuilderLaunchConfigurationType'})
 launchOut.element('booleanAttribute', {'key' : 'org.eclipse.debug.core.capture_output', 'value': consoleOn})
 launchOut.open('mapAttribute', {'key' : 'org.eclipse.debug.core.environmentVariables'})
-launchOut.element('mapEntry', {'key' : 'JAVA_HOME', 'value' : java().jdk})
+launchOut.element('mapEntry', {'key' : 'JAVA_HOME', 'value' : java(p.javaCompliance).jdk})
 launchOut.close('mapAttribute')
 if refresh:
 if refreshFile is None:
 refreshScope = '${project}'
 return
 updated = False
 files = []
 libFiles = []
+jdks = set()
 for p in suite.projects:
 if p.native:
 continue
 if exists(join(p.dir, 'plugin.xml')):  # eclipse plugin project
 continue
 if not exists(join(p.dir, 'nbproject')):
 os.makedirs(join(p.dir, 'nbproject'))
+jdk = java(p.javaCompliance)
+if not jdk:
+log('Excluding {0} (JDK with compliance level {1} not available)'.format(p.name, p.javaCompliance))
+continue
+jdks.add(jdk)
 out = XMLDoc()
 out.open('project', {'name' : p.name, 'default' : 'default', 'basedir' : '.'})
 out.element('description', data='Builds, tests, and runs the project ' + p.name + '.')
 out.element('import', {'file' : 'nbproject/build-impl.xml'})
 out.open('target', {'name' : '-post-compile'})
 out.open('exec', {'executable' : sys.executable})
-out.element('env', {'key' : 'JAVA_HOME', 'value' : java().jdk})
+out.element('env', {'key' : 'JAVA_HOME', 'value' : jdk.jdk})
 out.element('arg', {'value' : os.path.abspath(__file__)})
 out.element('arg', {'value' : 'archive'})
 out.element('arg', {'value' : '@GRAAL'})
 out.close('exec')
 out.close('target')
 out.close('project')
 updated = update_file(join(p.dir, 'nbproject', 'project.xml'), out.xml(indent='    ', newl='\n')) or updated
 files.append(join(p.dir, 'nbproject', 'project.xml'))
 out = StringIO.StringIO()
-jdkPlatform = 'JDK_' + str(java().version)
+jdkPlatform = 'JDK_' + str(jdk.version)
 annotationProcessorEnabled = "false"
 annotationProcessorReferences = ""
 annotationProcessorSrcFolder = ""
 if len(p.annotation_processors()) > 0:
 javadoc.windowtitle=
 main.class=
 manifest.file=manifest.mf
 meta.inf.dir=${src.dir}/META-INF
 mkdist.disabled=false
-platforms.""" + jdkPlatform + """.home=""" + java().jdk + """
+platforms.""" + jdkPlatform + """.home=""" + jdk.jdk + """
 platform.active=""" + jdkPlatform + """
 run.classpath=\\
 ${javac.classpath}:\\
 ${build.classes.dir}
 # Space-separated list of JVM arguments used when running the project
 out.close()
 files.append(join(p.dir, 'nbproject', 'project.properties'))
 if updated:
 log('If using NetBeans:')
-log('  1. Ensure that a platform named "JDK_' + str(java().version) + '" is defined (Tools -> Java Platforms)')
+log('  1. Ensure that the following platform(s) are defined (Tools -> Java Platforms):')
+for jdk in jdks:
+log('        JDK_' + str(jdk.version))
 log('  2. Open/create a Project Group for the directory containing the projects (File -> Project Group -> New Group... -> Folder of Projects)')
 _zip_files(files, suite.dir, configZip.path)
 _zip_files(libFiles, suite.dir, configLibsZip)
 windowTitle = []
 if stdDoclet:
 windowTitle = ['-windowtitle', p.name + ' javadoc']
 try:
 log('Generating {2} for {0} in {1}'.format(p.name, out, docDir))
-run([java().javadoc, memory,
+run([java(p.javaCompliance).javadoc, memory,
 '-XDignore.symbol.file',
 '-classpath', cp,
 '-quiet',
 '-d', out,
 '-overview', overviewFile,
 for p in projects:
 find_packages(p.source_dirs(), pkgs)
 sp += p.source_dirs()
 names.append(p.name)
-links = ['-link', 'http://docs.oracle.com/javase/' + str(_java.javaCompliance.value) + '/docs/api/']
+links = ['-link', 'http://docs.oracle.com/javase/' + str(java().javaCompliance.value) + '/docs/api/']
 out = join(_primary_suite.dir, docDir)
 if args.base is not None:
 out = join(args.base, docDir)
 cp = classpath()
 sp = os.pathsep.join(sp)
 else:
 abort('no primary suite found')
 opts, commandAndArgs = _argParser._parse_cmd_line()
-global _opts, _java
+global _opts, _java_homes
 _opts = opts
-_java = JavaConfig(opts)
+defaultJdk = JavaConfig(opts.java_home, opts.java_dbg_port)
+_java_homes = [defaultJdk]
+if opts.extra_java_homes:
+for java_home in opts.extra_java_homes.split(os.pathsep):
+extraJdk = JavaConfig(java_home, opts.java_dbg_port)
+if extraJdk > defaultJdk:
+abort('Secondary JDK ' + extraJdk.jdk + ' has higher compliance level than default JDK ' + defaultJdk.jdk)
+_java_homes.append(extraJdk)
 for s in suites():
 s._post_init(opts)
 if len(commandAndArgs) == 0:

Mercurial > hg > truffle

comparison mxtool/mx.py @ 14763:a6c1c3eb20c4