truffle: mxtool/mx.py comparison

comparison mxtool/mx.py @ 12521:ef0de9485627

Merge

author	Mick Jordan <mick.jordan@oracle.com>
date	Tue, 22 Oct 2013 08:35:26 -0700
parents	8ee3a8dd762e 8c64f10f86b7
children	5ccee20550ea

comparison

equal deleted inserted replaced

-:8ee3a8dd762e
+:ef0de9485627
 """
 Encapsulates access to Mercurial (hg)
 """
 def __init__(self):
 self.missing = 'no hg executable found'
-try:
+self.has_hg = None
-subprocess.check_output(['hg'])
-self.has_hg = True
+def check(self, abortOnFail=True):
-except OSError:
+if self.has_hg is None:
-self.has_hg = False
+try:
-warn(self.missing)
+subprocess.check_output(['hg'])
+self.has_hg = True
-def _check(self, abortOnFail=True):
+except OSError:
+self.has_hg = False
+warn(self.missing)
 if not self.has_hg:
 if abortOnFail:
 abort(self.missing)
 else:
 warn(self.missing)
-return self.has_hg
+def tip(self, s, abortOnError=True):
-def _tip(self, s, abortOnError=True):
-if not self.has_hg:
-return None
 try:
 version = subprocess.check_output(['hg', 'tip', '-R', s.dir, '--template', '{node}'])
 if s.version is not None and s.version != version:
 abort('version of suite ' + s.name +' has changed during run')
 return version
+except OSError:
+warn(self.missing)
 except subprocess.CalledProcessError:
 if abortOnError:
 abort('failed to get tip revision id')
 else:
 return None
-def _canpush(self, s, strict=True):
+def can_push(self, s, strict=True):
 try:
 output = subprocess.check_output(['hg', '-R', s.dir, 'status'])
 # super strict
 return output == ''
+except OSError:
+warn(self.missing)
 except subprocess.CalledProcessError:
 return False
-def _default_push(self, sdir):
+def default_push(self, sdir):
 with open(join(sdir, '.hg', 'hgrc')) as f:
 for line in f:
 line = line.rstrip()
 if line.startswith('default = '):
 return line[len('default = '):]
 self.dists = []
 self.imports = []
 self.commands = None
 self.primary = primary
 self.name = _suitename(mxDir)  # validated in _load_projects
-self.version = None  # _hg._tip checks current version if not None
+self.version = None  # _hg.tip checks current version if not None
-self.version = _hg._tip(self, False)
+# TODO this forces hg to be run every time mx is run
+#self.version = _hg.tip(self, False)
 if load:
 # load suites bottom up to make sure command overriding works properly
 self._load_imports()
 self._load_env()
 self._load_commands()
 out.element('name', data=buildCommand)
 out.element('arguments', data='')
 out.close('buildCommand')
 if _isAnnotationProcessorDependency(p):
-_genEclipseBuilder(out, p, 'Jar.launch', 'archive ' + p.name, refresh=False, async=False, xmlIndent='', xmlStandalone='no')
+_genEclipseBuilder(out, p, 'Jar', 'archive ' + p.name, refresh=False, async=False, xmlIndent='', xmlStandalone='no')
-_genEclipseBuilder(out, p, 'Refresh.launch', '', refresh=True, async=True)
+_genEclipseBuilder(out, p, 'Refresh', '', refresh=True, async=True)
 if projToDist.has_key(p.name):
 dist, distDeps = projToDist[p.name]
-_genEclipseBuilder(out, p, 'Create' + dist.name + 'Dist.launch', 'archive @' + dist.name, refresh=False, async=True)
+_genEclipseBuilder(out, p, 'Create' + dist.name + 'Dist', 'archive @' + dist.name, logToFile=True, refresh=False, async=True)
 out.close('buildSpec')
 out.open('natures')
 out.element('nature', data='org.eclipse.jdt.core.javanature')
 if exists(csConfig):
 """
 Determines if a given project is part of an annotation processor.
 """
 return p in sorted_deps(annotation_processors())
-def _genEclipseBuilder(dotProjectDoc, p, name, mxCommand, refresh=True, async=False, logToConsole=False, xmlIndent='\t', xmlStandalone=None):
+def _genEclipseBuilder(dotProjectDoc, p, name, mxCommand, refresh=True, async=False, logToConsole=False, logToFile=False, appendToLogFile=True, xmlIndent='\t', xmlStandalone=None):
+externalToolDir = join(p.dir, '.externalToolBuilders')
 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'})
 if refresh:
 launchOut.element('stringAttribute', {'key' : 'org.eclipse.debug.core.ATTR_REFRESH_SCOPE', 'value': '${project}'})
 launchOut.element('booleanAttribute', {'key' : 'org.eclipse.debug.ui.ATTR_CONSOLE_OUTPUT_ON', 'value': consoleOn})
 launchOut.element('booleanAttribute', {'key' : 'org.eclipse.debug.ui.ATTR_LAUNCH_IN_BACKGROUND', 'value': 'true' if async else 'false'})
+if logToFile:
+logFile = join(externalToolDir, name + '.log')
+launchOut.element('booleanAttribute', {'key' : 'org.eclipse.debug.ui.ATTR_CAPTURE_IN_FILE', 'value': logFile})
+launchOut.element('booleanAttribute', {'key' : 'org.eclipse.debug.ui.ATTR_APPEND_TO_FILE', 'value': 'true' if appendToLogFile else 'false'})
 # expect to find the OS command to invoke mx in the same directory
 baseDir = dirname(os.path.abspath(__file__))
 cmd = 'mx.sh'
 launchOut.element('stringAttribute', {'key' : 'org.eclipse.ui.externaltools.ATTR_WORKING_DIRECTORY', 'value': p.suite.dir})
 launchOut.close('launchConfiguration')
-externalToolDir = join(p.dir, '.externalToolBuilders')
 if not exists(externalToolDir):
 os.makedirs(externalToolDir)
-update_file(join(externalToolDir, name), launchOut.xml(indent=xmlIndent, standalone=xmlStandalone, newl='\n'))
+update_file(join(externalToolDir, name + '.launch'), launchOut.xml(indent=xmlIndent, standalone=xmlStandalone, newl='\n'))
 dotProjectDoc.open('buildCommand')
 dotProjectDoc.element('name', data='org.eclipse.ui.externaltools.ExternalToolBuilder')
 dotProjectDoc.element('triggers', data='auto,full,incremental,')
 dotProjectDoc.open('arguments')
 dotProjectDoc.open('dictionary')
 dotProjectDoc.element('key', data='LaunchConfigHandle')
-dotProjectDoc.element('value', data='<project>/.externalToolBuilders/' + name)
+dotProjectDoc.element('value', data='<project>/.externalToolBuilders/' + name + '.launch')
 dotProjectDoc.close('dictionary')
 dotProjectDoc.open('dictionary')
 dotProjectDoc.element('key', data='incclean')
 dotProjectDoc.element('value', data='true')
 dotProjectDoc.close('dictionary')
 return kwargs.pop(0)
 return None
 def sclone(args):
 """clone a suite repository, and its imported suites"""
-_hg._check(True)
+_hg.check(True)
 parser = ArgumentParser(prog='mx sclone')
 parser.add_argument('--source', help='url/path of repo containing suite', metavar='<url>')
 parser.add_argument('--dest', help='destination directory (default basename of source)', metavar='<path>')
 parser.add_argument("--no-imports", action='store_true', help='do not clone imported suites')
 parser.add_argument('nonKWArgs', nargs=REMAINDER, metavar='source [dest]...')
 _sclone(importee_source, importee_dest, suite_import.version, False)
 # _clone handles the recursive visit of the new imports
 def scloneimports(args):
 """clone the imports of an existing suite"""
-_hg._check(True)
+_hg.check(True)
 parser = ArgumentParser(prog='mx scloneimports')
 parser.add_argument('--source', help='url/path of repo containing suite', metavar='<url>')
 parser.add_argument('nonKWArgs', nargs=REMAINDER, metavar='source [dest]...')
 args = parser.parse_args(args)
 # check for non keyword args
 if not os.path.isdir(args.source):
 abort(args.source + ' is not a directory')
 s = _scloneimports_suitehelper(args.source)
-default_path = _hg._default_push(args.source)
+default_path = _hg.default_push(args.source)
 if default_path is None:
 abort('no default path in ' + join(args.source, '.hg', 'hgrc'))
 # We can now set the primary dir for the dst suitemodel
 dest = _dst_suitemodel._importee_dir(dest, suite_import.name)
 _spush(suite(suite_import.name), suite_import, dest, checks, clonemissing)
 def _spush_check_import_visitor(s, suite_import, **extra_args):
 """push check visitor for Suite._visit_imports"""
-currentTip = _hg._tip(suite(suite_import.name))
+currentTip = _hg.tip(suite(suite_import.name))
 if currentTip != suite_import.version:
 abort('import version of ' + suite_import.name + ' in suite ' + s.name + ' does not match tip')
 def _spush(s, suite_import, dest, checks, clonemissing):
 if checks:
-if not _hg._canpush(s):
+if not _hg.can_push(s):
 abort('working directory ' + s.dir + ' contains uncommitted changes, push aborted')
 # check imports first
 if checks:
 s._visit_imports(_spush_check_import_visitor)
 cmd.append(dest)
 run(cmd)
 def spush(args):
 """push primary suite and all its imports"""
-_hg._check(True)
+_hg.check(True)
 parser = ArgumentParser(prog='mx spush')
 parser.add_argument('--dest', help='url/path of repo to push to (default as per hg push)', metavar='<path>')
 parser.add_argument('--no-checks', action='store_true', help='checks on status, versions are disabled')
 parser.add_argument('--clonemissing', action='store_true', help='clone missing imported repos at destination (forces --no-checks)')
 parser.add_argument('nonKWArgs', nargs=REMAINDER, metavar='source [dest]...')
 run(['hg', '-R', s.dir, 'update'])
 def supdate(args):
 """update primary suite and all its imports"""
-_hg._check(True)
+_hg.check(True)
 s = _check_primary_suite()
 _supdate(s, None)
 def _scheck_imports_visitor(s, suite_import, update_versions, updated_imports):
 def _scheck_imports(s, suite_import, update_versions, updated_imports):
 # check imports recursively
 s._visit_imports(_scheck_imports_visitor, update_versions=update_versions)
-currentTip = _hg._tip(s)
+currentTip = _hg.tip(s)
 if currentTip != suite_import.version:
 print('import version of ' + s.name + ' does not match tip' + (': updating' if update_versions else ''))
 if update_versions:
 suite_import.version = currentTip
 def _spull_import_visitor(s, suite_import, update_versions, updated_imports):
 """pull visitor for Suite._visit_imports"""
 _spull(suite(suite_import.name), update_versions, updated_imports)
 def _spull(s, update_versions, updated_imports):
-_hg._check(True)
+_hg.check(True)
 # pull imports first
 s._visit_imports(_spull_import_visitor, update_versions=update_versions)
 run(['hg', '-R', s.dir, 'pull', '-u'])
 if update_versions and updated_imports is not None:
-tip = _hg._tip(s)
+tip = _hg.tip(s)
 updated_imports.write(SuiteImport._tostring(s.name, tip) + '\n')
 def spull(args):
 """pull primary suite and all its imports"""
-_hg._check(True)
+_hg.check(True)
 parser = ArgumentParser(prog='mx spull')
 parser.add_argument('--update-versions', action='store_true', help='update version ids of imported suites')
 args = parser.parse_args(args)
 _spull(_check_primary_suite(), args.update_versions, None)

Mercurial > hg > truffle

comparison mxtool/mx.py @ 12521:ef0de9485627