graal-compiler: mxtool/mx.py comparison

comparison mxtool/mx.py @ 11605:3676540f71cf

Allow mxtool suites to be in separate repositories (CR-1367)

author	Mick Jordan <mick.jordan@oracle.com>
date	Wed, 11 Sep 2013 21:04:24 +0200
parents	723796685546
children	60e3fe0fe939

comparison

equal deleted inserted replaced

-:943f1863e1c1
+:3676540f71cf
 The organizing principle of mx is a project suite. A suite is a directory
 containing one or more projects. It's not coincidental that this closely
 matches the layout of one or more projects in a Mercurial repository.
 The configuration information for a suite lives in an 'mx' sub-directory
-at the top level of the suite.
+at the top level of the suite. A suite is given a name by a 'suite=name'
+property in the 'mx/projects' file (if omitted the name is suite directory).
+An 'mx' subdirectory can be named as plain 'mx' or 'mxbasename', where
+'basename' is the os.path.basename of the suite directory.
+The latter is useful to avoid clashes in IDE project names.
 When launched, mx treats the current working directory as a suite.
 This is the primary suite. All other suites are called included suites.
 The configuration files (i.e. in the 'mx' sub-directory) of a suite are:
 by extension commands.
 Property values can use environment variables with Bash syntax (e.g. ${HOME}).
 """
-import sys, os, errno, time, subprocess, shlex, types, urllib2, contextlib, StringIO, zipfile, signal, xml.sax.saxutils, tempfile
+import sys, os, errno, time, subprocess, shlex, types, urllib2, contextlib, StringIO, zipfile, signal, xml.sax.saxutils, tempfile, fnmatch
 import textwrap
 import xml.parsers.expat
 import shutil, re, xml.dom.minidom
 from collections import Callable
 from threading import Thread
 self.sourceUrls = sourceUrls
 for url in urls:
 if url.endswith('/') != self.path.endswith(os.sep):
 abort('Path for dependency directory must have a URL ending with "/": path=' + self.path + ' url=' + url)
+def __eq__(self, other):
+if isinstance(other, Library):
+if len(self.urls) == 0:
+return self.path == other.path
+else:
+return self.urls == other.urls
+else:
+return NotImplemented
+def __ne__(self, other):
+result = self.__eq__(other)
+if result is NotImplemented:
+return result
+return not result
 def get_path(self, resolve):
 path = self.path
 if not isabs(path):
 path = join(self.suite.dir, path)
 if resolve and self.mustExist and not exists(path):
 return deps
 deps.append(self)
 return deps
 class Suite:
-def __init__(self, d, primary):
+def __init__(self, d, mxDir, primary):
 self.dir = d
+self.mxDir = mxDir
 self.projects = []
 self.libs = []
 self.dists = []
 self.includes = []
 self.commands = None
 self.primary = primary
-mxDir = join(d, 'mx')
 self._load_env(mxDir)
 self._load_commands(mxDir)
 self._load_includes(mxDir)
 self.name = d  # re-initialized in _load_projects
 if not hasattr(mod, 'mx_init'):
 abort(commandsPath + ' must define an mx_init(env) function')
 if hasattr(mod, 'mx_post_parse_cmd_line'):
 self.mx_post_parse_cmd_line = mod.mx_post_parse_cmd_line
-mod.mx_init()
+mod.mx_init(self)
 self.commands = mod
 def _load_includes(self, mxDir):
 includes = join(mxDir, 'includes')
 if exists(includes):
 with open(includes) as f:
 for line in f:
 include = expandvars_in_property(line.strip())
 self.includes.append(include)
-_loadSuite(include, False)
+_loadSuite(os.path.abspath(include), False)
 def _load_env(self, mxDir):
 e = join(mxDir, 'env')
 if exists(e):
 with open(e) as f:
 if not '=' in line:
 abort(e + ':' + str(lineNum) + ': line does not match pattern "key=value"')
 key, value = line.split('=', 1)
 os.environ[key.strip()] = expandvars_in_property(value.strip())
 def _post_init(self, opts):
-mxDir = join(self.dir, 'mx')
+self._load_projects(self.mxDir)
-self._load_projects(mxDir)
 for p in self.projects:
 existing = _projects.get(p.name)
 if existing is not None:
 abort('cannot override project  ' + p.name + ' in ' + p.dir + " with project of the same name in  " + existing.dir)
 if not p.name in _opts.ignored_projects:
 _projects[p.name] = p
 for l in self.libs:
 existing = _libs.get(l.name)
-if existing is not None:
+# Check that suites that define same library are consistent
-abort('cannot redefine library  ' + l.name)
+if existing is not None and existing != l:
+abort('inconsistent library redefinition of ' + l.name + ' in ' + existing.suite.dir + ' and ' + l.suite.dir)
 _libs[l.name] = l
 for d in self.dists:
 existing = _dists.get(d.name)
 if existing is not None:
 abort('cannot redefine distribution  ' + d.name)
 return 'windows'
 else:
 abort('Unknown operating system ' + sys.platform)
 def _loadSuite(d, primary=False):
-mxDir = join(d, 'mx')
+"""
-if not exists(mxDir) or not isdir(mxDir):
+Load a suite from the 'mx' or 'mxbbb' subdirectory of d, where 'bbb' is basename of d
+"""
+mxDefaultDir = join(d, 'mx')
+name = os.path.basename(d)
+mxTaggedDir = mxDefaultDir + name
+mxDir = None
+if exists(mxTaggedDir) and isdir(mxTaggedDir):
+mxDir = mxTaggedDir
+else:
+if exists(mxDefaultDir) and isdir(mxDefaultDir):
+mxDir = mxDefaultDir
+if mxDir is None:
 return None
 if len([s for s in _suites.itervalues() if s.dir == d]) == 0:
-s = Suite(d, primary)
+s = Suite(d, mxDir, primary)
-_suites[s.name] = s
+_suites[name] = s
 return s
 def suites():
 """
 Get the list of all loaded suites.
 are before the projects that depend on them. Unless 'includeLibs' is
 true, libraries are omitted from the result.
 """
 deps = []
 if projectNames is None:
-projects = _projects.values()
+projects = opt_limit_to_suite(_projects.values())
 else:
 projects = [project(name) for name in projectNames]
 for p in projects:
 p.all_deps(deps, includeLibs=includeLibs, includeAnnotationProcessors=includeAnnotationProcessors)
 return deps
+def opt_limit_to_suite(projects):
+if _opts.specific_suite is None:
+return projects
+else:
+result = []
+for p in projects:
+s = p.suite
+if s.name == _opts.specific_suite:
+result.append(p)
+return result
 def _handle_missing_java_home():
 if not sys.stdout.isatty():
 abort('Could not find bootstrap JDK. Use --java-home option or ensure JAVA_HOME environment variable is set.')
 return ArgumentParser.format_help(self) + _format_commands()
 def __init__(self):
 self.java_initialized = False
-ArgumentParser.__init__(self, prog='mx')
+# this doesn't resolve the right way, but can't figure out how to override _handle_conflict_resolve in _ActionsContainer
+ArgumentParser.__init__(self, prog='mx', conflict_handler='resolve')
 self.add_argument('-v', action='store_true', dest='verbose', help='enable verbose output')
 self.add_argument('-V', action='store_true', dest='very_verbose', help='enable very verbose output')
 self.add_argument('--dbg', type=int, dest='java_dbg_port', help='make Java processes wait on <port> for a debugger', metavar='<port>')
 self.add_argument('-d', action='store_const', const=8000, dest='java_dbg_port', help='alias for "-dbg 8000"')
 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('--ignore-project', action='append', dest='ignored_projects', help='name of project to ignore', metavar='<name>', default=[])
+self.add_argument('--suite', dest='specific_suite', help='limit command to given suite', default=None)
 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>')
 self.add_argument('--ptimeout', help='timeout (in seconds) for subprocesses', type=int, default=0, metavar='<secs>')
 opts.ignored_projects = opts.ignored_projects + os.environ.get('IGNORED_PROJECTS', '').split(',')
 commandAndArgs = opts.__dict__.pop('commandAndArgs')
 return opts, commandAndArgs
+def _handle_conflict_resolve(self, action, conflicting_actions):
+self._handle_conflict_error(action, conflicting_actions)
 def _format_commands():
 msg = '\navailable commands:\n\n'
 for cmd in sorted(_commands.iterkeys()):
 c, _ = _commands[cmd][:2]
 javafilelist += [join(root, name) for name in files if name.endswith('.java') and name != 'package-info.java']
 if len(javafilelist) == 0:
 logv('[no Java sources in {0} - skipping]'.format(sourceDir))
 continue
-timestampFile = join(p.suite.dir, 'mx', 'checkstyle-timestamps', sourceDir[len(p.suite.dir) + 1:].replace(os.sep, '_') + '.timestamp')
+timestampFile = join(p.suite.mxDir, 'checkstyle-timestamps', sourceDir[len(p.suite.dir) + 1:].replace(os.sep, '_') + '.timestamp')
 if not exists(dirname(timestampFile)):
 os.makedirs(dirname(timestampFile))
 mustCheck = False
 if not args.force and exists(timestampFile):
 timestamp = os.path.getmtime(timestampFile)
 if name == 'file':
 source[0] = attrs['name']
 elif name == 'error':
 errors.append('{}:{}: {}'.format(source[0], attrs['line'], attrs['message']))
-p = xml.parsers.expat.ParserCreate()
+xp = xml.parsers.expat.ParserCreate()
-p.StartElementHandler = start_element
+xp.StartElementHandler = start_element
 with open(auditfileName) as fp:
-p.ParseFile(fp)
+xp.ParseFile(fp)
 if len(errors) != 0:
 map(log, errors)
 totalErrors = totalErrors + len(errors)
 else:
 if exists(timestampFile):
 out.element('classpathentry', {'exported' : 'true', 'kind' : 'con', 'path' : getattr(dep, 'eclipse.container')})
 elif hasattr(dep, 'eclipse.project'):
 out.element('classpathentry', {'combineaccessrules' : 'false', 'exported' : 'true', 'kind' : 'src', 'path' : '/' + getattr(dep, 'eclipse.project')})
 else:
 path = dep.path
-if dep.mustExist:
+dep.get_path(resolve=True)
-dep.get_path(resolve=True)
+if not exists(path) and not dep.mustExist:
-if not isabs(path):
+continue
-# Relative paths for "lib" class path entries have various semantics depending on the Eclipse
-# version being used (e.g. see https://bugs.eclipse.org/bugs/show_bug.cgi?id=274737) so it's
+if not isabs(path):
-# safest to simply use absolute paths.
+# Relative paths for "lib" class path entries have various semantics depending on the Eclipse
-path = join(suite.dir, path)
+# version being used (e.g. see https://bugs.eclipse.org/bugs/show_bug.cgi?id=274737) so it's
+# safest to simply use absolute paths.
-attributes = {'exported' : 'true', 'kind' : 'lib', 'path' : path}
+path = join(suite.dir, path)
-sourcePath = dep.get_source_path(resolve=True)
+attributes = {'exported' : 'true', 'kind' : 'lib', 'path' : path}
-if sourcePath is not None:
-attributes['sourcepath'] = sourcePath
+sourcePath = dep.get_source_path(resolve=True)
-out.element('classpathentry', attributes)
+if sourcePath is not None:
+attributes['sourcepath'] = sourcePath
+out.element('classpathentry', attributes)
 else:
 out.element('classpathentry', {'combineaccessrules' : 'false', 'exported' : 'true', 'kind' : 'src', 'path' : '/' + dep.name})
 out.element('classpathentry', {'kind' : 'output', 'path' : getattr(p, 'eclipse.output', 'bin')})
 out.close('classpath')
 settingsDir = join(p.dir, ".settings")
 if not exists(settingsDir):
 os.mkdir(settingsDir)
-eclipseSettingsDir = join(suite.dir, 'mx', 'eclipse-settings')
+eclipseSettingsDir = join(suite.mxDir, 'eclipse-settings')
 if exists(eclipseSettingsDir):
 for name in os.listdir(eclipseSettingsDir):
 if name == "org.eclipse.jdt.apt.core.prefs" and not len(p.annotation_processors()) > 0:
 continue
 path = join(eclipseSettingsDir, name)
 if len(indicators) != 0:
 if not sys.stdout.isatty() or ask_yes_no(currentDir + ' looks like a removed project -- delete it', 'n'):
 shutil.rmtree(currentDir)
 log('Deleted ' + currentDir)
-def javadoc(args, parser=None, docDir='javadoc', includeDeps=True):
+def javadoc(args, parser=None, docDir='javadoc', includeDeps=True, stdDoclet=True):
 """generate javadoc for some/all Java projects"""
 parser = ArgumentParser(prog='mx javadoc') if parser is None else parser
 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')
 print >> fp, '<html><body>Documentation for the <code>' + p.name + '</code> project.</body></html>'
 delOverviewFile = True
 nowarnAPI = []
 if not args.warnAPI:
 nowarnAPI.append('-XDignore.symbol.file')
+# windowTitle onloy applies to the standard doclet processor
+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,
-'-windowtitle', p.name + ' javadoc',
 '-XDignore.symbol.file',
 '-classpath', cp,
 '-quiet',
 '-d', out,
 '-overview', overviewFile,
 '-sourcepath', sp] +
 links +
 extraArgs +
 nowarnAPI +
+windowTitle +
 list(pkgs))
 log('Generated {2} for {0} in {1}'.format(p.name, out, docDir))
 finally:
 if delOverviewFile:
 os.remove(overviewFile)
 """
 Define how a single command-line argument.
 """
 assert _argParser is not None
 _argParser.add_argument(*args, **kwargs)
+def update_commands(suite, new_commands):
+for key, value in new_commands.iteritems():
+if _commands.has_key(key) and not suite.primary:
+pass
+# print("WARNING: attempt to redefine command '" + key + "' in suite " + suite.dir)
+else:
+_commands[key] = value
 # Table of commands in alphabetical order.
 # Keys are command names, value are lists: [<function>, <usage msg>, <format args to doc string of function>...]
 # If any of the format args are instances of Callable, then they are called with an 'env' are before being
 # used in the call to str.format().
 _argParser = ArgParser()
 def _findPrimarySuite():
 def is_suite_dir(d):
-mxDir = join(d, 'mx')
+for f in os.listdir(d):
-if exists(mxDir) and isdir(mxDir) and exists(join(mxDir, 'projects')):
+if fnmatch.fnmatch(f, 'mx*'):
-return dirname(mxDir)
+mxDir = join(d, f)
+if exists(mxDir) and isdir(mxDir) and exists(join(mxDir, 'projects')):
+return dirname(mxDir)
 # try current working directory first
 if is_suite_dir(os.getcwd()):
 return os.getcwd()

Mercurial > hg > graal-compiler

comparison mxtool/mx.py @ 11605:3676540f71cf