truffle: mxtool/mx.py comparison

comparison mxtool/mx.py @ 20965:05e1ab8c5c6a

relax expectations on JDK library locations

author	Doug Simon <doug.simon@oracle.com>
date	Wed, 15 Apr 2015 14:06:17 +0200
parents	8dec9eea3186
children	b99da6d86cfe

comparison

equal deleted inserted replaced

-:56a30cfcefaf
+:05e1ab8c5c6a
 def __cmp__(self, other):
 return cmp(self.parts, other.parts)
 def _filter_non_existant_paths(paths):
-return os.pathsep.join([path for path in _separatedCygpathW2U(paths).split(os.pathsep) if exists(path)])
+if paths:
+return os.pathsep.join([path for path in _separatedCygpathW2U(paths).split(os.pathsep) if exists(path)])
+return None
 """
 A JavaConfig object encapsulates info on how Java commands are run.
 """
 class JavaConfig:
 myDir = dirname(__file__)
 outDir = join(dirname(__file__), '.jdk' + str(self.version))
 if not exists(outDir):
 os.makedirs(outDir)
 javaSource = join(myDir, 'ClasspathDump.java')
-if not exists(join(outDir, 'ClasspathDump.class')):
+javaClass = join(outDir, 'ClasspathDump.class')
+if not exists(javaClass) or getmtime(javaClass) < getmtime(javaSource):
 subprocess.check_call([self.javac, '-d', _cygpathU2W(outDir), _cygpathU2W(javaSource)], stderr=subprocess.PIPE, stdout=subprocess.PIPE)
 self._bootclasspath, self._extdirs, self._endorseddirs = [x if x != 'null' else None for x in subprocess.check_output([self.java, '-cp', _cygpathU2W(outDir), 'ClasspathDump'], stderr=subprocess.PIPE).split('|')]
-if not self._bootclasspath or not self._extdirs or not self._endorseddirs:
+if self.javaCompliance <= JavaCompliance('1.8'):
-warn("Could not find all classpaths: boot='" + str(self._bootclasspath) + "' extdirs='" + str(self._extdirs) + "' endorseddirs='" + str(self._endorseddirs) + "'")
+# All 3 system properties accessed by ClasspathDump are expected to exist
+if not self._bootclasspath or not self._extdirs or not self._endorseddirs:
+warn("Could not find all classpaths: boot='" + str(self._bootclasspath) + "' extdirs='" + str(self._extdirs) + "' endorseddirs='" + str(self._endorseddirs) + "'")
 self._bootclasspath = _filter_non_existant_paths(self._bootclasspath)
 self._extdirs = _filter_non_existant_paths(self._extdirs)
 self._endorseddirs = _filter_non_existant_paths(self._endorseddirs)
 def __repr__(self):
 def endorseddirs(self):
 if self._endorseddirs is None:
 self._init_classpaths()
 return _separatedCygpathU2W(self._endorseddirs)
+"""
+Add javadoc style options for the library paths of this JDK.
+"""
+def javadocLibOptions(self, args):
+if args is None:
+args = []
+if self.bootclasspath():
+args.append('-bootclasspath')
+args.append(self.bootclasspath())
+if self.endorseddirs():
+args.append('-endorseddirs')
+args.append(self.endorseddirs())
+if self.extdirs():
+args.append('-extdirs')
+args.append(self.extdirs())
+return args
+"""
+Add javac style options for the library paths of this JDK.
+"""
+def javacLibOptions(self, args):
+args = self.javadocLibOptions(args)
+if self.endorseddirs():
+args.append('-endorseddirs')
+args.append(self.endorseddirs())
+return args
 def containsJar(self, jar):
 if self._bootclasspath is None:
 self._init_classpaths()
 if not self.jdtJar:
 mainJava = java()
 if not args.error_prone:
 javac = args.alt_javac if args.alt_javac else mainJava.javac
 self.logCompilation('javac' if not args.alt_javac else args.alt_javac)
-javacCmd = [javac, '-g', '-J-Xmx1g', '-source', compliance, '-target', compliance, '-classpath', cp, '-d', outputDir, '-bootclasspath', jdk.bootclasspath(), '-endorseddirs', jdk.endorseddirs(), '-extdirs', jdk.extdirs()]
+javacCmd = [javac, '-g', '-J-Xmx1g', '-source', compliance, '-target', compliance, '-classpath', cp, '-d', outputDir]
+jdk.javacLibOptions(javacCmd)
 if jdk.debug_port is not None:
 javacCmd += ['-J-Xdebug', '-J-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=' + str(jdk.debug_port)]
 javacCmd += processorArgs
 javacCmd += ['@' + _cygpathU2W(argfile.name)]
 javacCmd.append('-XDignore.symbol.file')
 run(javacCmd)
 else:
 self.logCompilation('javac (with error-prone)')
 javaArgs = ['-Xmx1g']
-javacArgs = ['-g', '-source', compliance, '-target', compliance, '-classpath', cp, '-d', outputDir, '-bootclasspath', jdk.bootclasspath(), '-endorseddirs', jdk.endorseddirs(), '-extdirs', jdk.extdirs()]
+javacArgs = ['-g', '-source', compliance, '-target', compliance, '-classpath', cp, '-d', outputDir]
+jdk.javacLibOptions(javacCmd)
 javacArgs += processorArgs
 javacArgs += ['@' + argfile.name]
 if not args.warnAPI:
 javacArgs.append('-XDignore.symbol.file')
 run_java(javaArgs + ['-cp', os.pathsep.join([mainJava.toolsjar, args.error_prone]), 'com.google.errorprone.ErrorProneCompiler'] + javacArgs)
 jdtVmArgs = ['-Xmx1g', '-jar', _cygpathU2W(self.jdtJar)]
 jdtArgs = ['-' + compliance,
 '-cp', cp, '-g', '-enableJavadoc',
-'-d', outputDir,
+'-d', outputDir]
-'-bootclasspath', jdk.bootclasspath(),
+jdk.javacLibOptions(jdtArgs)
-'-endorseddirs', jdk.endorseddirs(),
-'-extdirs', jdk.extdirs()]
 jdtArgs += processorArgs
 jdtProperties = join(self.proj.dir, '.settings', 'org.eclipse.jdt.core.prefs')
 rootJdtProperties = join(self.proj.suite.mxDir, 'eclipse-settings', 'org.eclipse.jdt.core.prefs')
 if not exists(jdtProperties) or os.path.getmtime(jdtProperties) < os.path.getmtime(rootJdtProperties):
 '-classpath', cp,
 '-quiet',
 '-d', out,
 '-overview', overviewFile,
 '-sourcepath', sp,
-'-source', str(projectJava.javaCompliance),
+'-source', str(projectJava.javaCompliance)] +
-'-bootclasspath', projectJava.bootclasspath(),
+projectJava.javadocLibOptions() +
-'-extdirs', projectJava.extdirs()] +
 ([] if projectJava.javaCompliance < JavaCompliance('1.8') else ['-Xdoclint:none']) +
 links +
 extraArgs +
 nowarnAPI +
 windowTitle +

Mercurial > hg > truffle

comparison mxtool/mx.py @ 20965:05e1ab8c5c6a