truffle: mxtool/mx.py comparison

comparison mxtool/mx.py @ 5699:e9f7d16194a8

added --base argument to javadoc command

author	Doug Simon <doug.simon@oracle.com>
date	Wed, 27 Jun 2012 01:02:43 +0200
parents	9911227e6dd3
children	d0a6e25de770

comparison

equal deleted inserted replaced

-:62f1b4b8de5c
+:e9f7d16194a8
 for n,d in distances.iteritems():
 assert d > 0 or n == self.name
 if d == 1:
 result.add(n)
 if len(result) == len(self.deps) and frozenset(self.deps) == result:
 return self.deps
 return result;
+def max_depth(self):
+"""
+Get the maximum canonical distance between this project and its most distant dependency.
+"""
+distances = dict()
+self._compute_max_dep_distances(self.name, distances, 0)
+return max(distances.values())
 def source_dirs(self):
 """
 Get the directories in which the sources of this project are found.
 """
 print 'node [shape=rect];'
 for p in projects():
 for dep in p.canonical_deps():
 print '"' + p.name + '"->"' + dep + '"'
 print '}'
 def _source_locator_memento(deps):
 slm = XMLDoc()
 slm.open('sourceLookupDirector')
 slm.open('sourceContainers', {'duplicates' : 'false'})
 def javadoc(args):
 """generate javadoc for some/all Java projects"""
 parser = ArgumentParser(prog='mx javadoc')
+parser.add_argument('-d', '--base', action='store', help='base directory for output')
 parser.add_argument('--unified', action='store_true', help='put javadoc in a single directory instead of one per project')
 parser.add_argument('--force', action='store_true', help='(re)generate javadoc even if package-list file exists')
 parser.add_argument('--projects', action='store', help='comma separated projects to process (omit to process all projects)')
 parser.add_argument('--argfile', action='store', help='name of file containing extra javadoc options')
+parser.add_argument('--arg', action='append', dest='extra_args', help='extra Javadoc arguments (e.g. --arg @-use)', metavar='@<arg>', default=[])
 parser.add_argument('-m', '--memory', action='store', help='-Xmx value to pass to underlying JVM')
 parser.add_argument('--wiki', action='store_true', help='generate Confluence Wiki format for package-info.java files')
 parser.add_argument('--packages', action='store', help='comma separated packages to process (omit to process all packages)')
 args = parser.parse_args(args)
 project_list = ','.join(p.name for p in sorted_deps())
 docletArgs = ['-docletpath', dp, '-doclet', 'com.oracle.max.tools.javadoc.wiki.WikiDoclet', '-projects', project_list]
 else:
 docDir = 'javadoc'
+def outDir(p):
+if args.base is None:
+return join(p.dir, docDir)
+return join(args.base, p.name, docDir)
 def check_package_list(p):
 if args.wiki:
 return True
 else:
-return not exists(join(p.dir, docDir, 'package-list'))
+return not exists(join(outDir(p), 'package-list'))
 def assess_candidate(p, projects):
 if p in projects:
 return False
 if args.force or args.unified or check_package_list(p):
 pkg = root[len(sourceDir) + 1:].replace('/','.')
 if (len(packages) == 0) | (pkg in packages):
 pkgs.add(pkg)
 return pkgs
-extraArgs = []
+extraArgs = [a.lstrip('@') for a in args.extra_args]
 if args.argfile is not None:
 extraArgs += ['@' + args.argfile]
 memory = '2g'
 if args.memory is not None:
 memory = args.memory
 if not args.unified:
 for p in projects:
 pkgs = find_packages(p.source_dirs(), set())
 deps = p.all_deps([], includeLibs=False, includeSelf=False)
 links = ['-link', 'http://docs.oracle.com/javase/' + str(p.javaCompliance.value) + '/docs/api/']
-out = join(p.dir, docDir)
+out = outDir(p)
 for d in deps:
-depOut = join(d.dir, docDir)
+depOut = outDir(d)
 links.append('-link')
 links.append(os.path.relpath(depOut, out))
 cp = classpath(p.name, includeSelf=True)
 sp = os.pathsep.join(p.source_dirs())
 log('Generating {2} for {0} in {1}'.format(p.name, out, docDir))
 sp += p.source_dirs()
 names.append(p.name)
 links = ['-link', 'http://docs.oracle.com/javase/' + str(_java.javaCompliance.value) + '/docs/api/']
 out = join(_mainSuite.dir, docDir)
+if args.base is not None:
+out = join(args.base, docDir)
 cp = classpath()
 sp = os.pathsep.join(sp)
 log('Generating {2} for {0} in {1}'.format(', '.join(names), out, docDir))
 run([java().javadoc, memory, '-classpath', cp, '-quiet', '-d', out, '-sourcepath', sp] + docletArgs + links + extraArgs + list(pkgs))
 log('Generated {2} for {0} in {1}'.format(', '.join(names), out, docDir))
 'projects': [show_projects, ''],
 }
 _argParser = ArgParser()
+def _findPrimarySuite():
+# try current working directory first
+mxDir = join(os.getcwd(), 'mx')
+if exists(mxDir) and isdir(mxDir):
+return dirname(mxDir)
+# now search path of my executable
+me = sys.argv[0]
+parent = dirname(me)
+while parent:
+mxDir = join(parent, 'mx')
+if exists(mxDir) and isdir(mxDir):
+return parent
+parent = dirname(parent)
+return None
 def main():
-cwdMxDir = join(os.getcwd(), 'mx')
+primarySuiteDir = _findPrimarySuite()
-if exists(cwdMxDir) and isdir(cwdMxDir):
+if primarySuiteDir:
 global _mainSuite
-_mainSuite = _loadSuite(os.getcwd(), True)
+_mainSuite = _loadSuite(primarySuiteDir, True)
 opts, commandAndArgs = _argParser._parse_cmd_line()
 global _opts, _java
 _opts = opts

Mercurial > hg > truffle

comparison mxtool/mx.py @ 5699:e9f7d16194a8