graal-compiler: mxtool/mx.py comparison

comparison mxtool/mx.py @ 12639:50aca0c0dff4

Merge.

author	Christian Humer <christian.humer@gmail.com>
date	Wed, 30 Oct 2013 11:08:00 +0100
parents	2303d9e199e3
children	6860d5528902

comparison

equal deleted inserted replaced

-:02f844c76626
+:50aca0c0dff4
 if hasattr(p, 'annotationProcessorForDependents') and p.annotationProcessorForDependents.lower() == 'true':
 ap.add(p.name)
 self._annotationProcessors = list(ap)
 return self._annotationProcessors
+def update_current_annotation_processors_file(self):
+aps = self.annotation_processors()
+outOfDate = False
+currentApsFile = join(self.dir, '.currentAnnotationProcessors')
+if exists(currentApsFile):
+with open(currentApsFile) as fp:
+currentAps = [l.strip() for l in fp.readlines()]
+if currentAps != aps:
+outOfDate = True
+else:
+outOfDate = True
+if outOfDate:
+with open(currentApsFile, 'w') as fp:
+for ap in aps:
+print >> fp, ap
+return outOfDate
 class Library(Dependency):
 def __init__(self, suite, name, path, mustExist, urls, sourcePath, sourceUrls):
 Dependency.__init__(self, suite, name)
 self.path = path.replace('/', os.sep)
 self.urls = urls
 if self.name is None:
 abort('Missing "suite=<name>" in ' + projectsFile)
 def _commands_name(self):
-return 'mx_' + self.name.replace('-', '_')
+return 'mx_' + self.name.replace('-','_')
 def _find_commands(self, name):
 commandsPath = join(self.mxDir, name + '.py')
 if exists(commandsPath):
 return name
 if hasattr(mod, 'mx_post_parse_cmd_line'):
 self.mx_post_parse_cmd_line = mod.mx_post_parse_cmd_line
 mod.mx_init(self)
 self.commands = mod
+def _imports_file(self):
+return join(self.mxDir, 'imports')
+def import_timestamp(self):
+return TimeStampFile(self._imports_file())
 def visit_imports(self, visitor, **extra_args):
 """
 Visitor support for the imports file.
 For each line of the imports file that specifies an import, the visitor function is
 all imports are processed.
 N.B. There is no built-in support for avoiding visiting the same suite multiple times,
 as this function only visits the imports of a single suite. If a (recursive) visitor function
 wishes to visit a suite exactly once, it must manage that through extra_args.
 """
-importsFile = join(self.mxDir, 'imports')
+importsFile = self._imports_file()
 if exists(importsFile):
 update_versions = extra_args.has_key('update_versions') and extra_args['update_versions']
 out = StringIO.StringIO() if update_versions else None
 extra_args['updated_imports'] = out
 with open(importsFile) as f:
 sortedProjects = sorted_project_deps(projects, includeAnnotationProcessors=True)
 if args.java:
 ideinit([], refreshOnly=True, buildProcessorJars=False)
+def prepareOutputDirs(p, clean):
+outputDir = p.output_dir()
+if exists(outputDir):
+if clean:
+log('Cleaning {0}...'.format(outputDir))
+shutil.rmtree(outputDir)
+os.mkdir(outputDir)
+else:
+os.mkdir(outputDir)
+genDir = p.source_gen_dir()
+if genDir != '' and exists(genDir) and clean:
+log('Cleaning {0}...'.format(genDir))
+for f in os.listdir(genDir):
+shutil.rmtree(join(genDir, f))
+return outputDir
 for p in sortedProjects:
 if p.native:
 if args.native:
 log('Calling GNU make {0}...'.format(p.dir))
 # skip building this Java project if its Java compliance level is "higher" than the configured JDK
 if javaCompliance < p.javaCompliance:
 log('Excluding {0} from build (Java compliance level {1} required)'.format(p.name, p.javaCompliance))
 continue
-outputDir = p.output_dir()
+outputDir = prepareOutputDirs(p, args.clean)
-if exists(outputDir):
-if args.clean:
-log('Cleaning {0}...'.format(outputDir))
-shutil.rmtree(outputDir)
-os.mkdir(outputDir)
-else:
-os.mkdir(outputDir)
 cp = classpath(p.name, includeSelf=True)
 sourceDirs = p.source_dirs()
 mustBuild = args.force
 if not mustBuild:
 for dep in p.all_deps([], False):
 if dep.name in built:
 mustBuild = True
 jasminAvailable = None
 javafilelist = []
 for sourceDir in sourceDirs:
 for root, _, files in os.walk(sourceDir):
 if exists(dirname(dst)) and (not exists(dst) or os.path.getmtime(dst) < os.path.getmtime(src)):
 shutil.copyfile(src, dst)
 if not mustBuild:
 for javafile in javafiles:
-classfile = outputDir + javafile[len(sourceDir):-len('java')] + 'class'
+classfile = TimeStampFile(outputDir + javafile[len(sourceDir):-len('java')] + 'class')
-if not exists(classfile) or os.path.getmtime(javafile) > os.path.getmtime(classfile):
+if not classfile.exists() or classfile.isOlderThan(javafile):
 mustBuild = True
 break
+aps = p.annotation_processors()
+apsOutOfDate = p.update_current_annotation_processors_file()
+if apsOutOfDate:
+logv('[annotation processors for {0} changed]'.format(p.name))
+mustBuild = True
 if not mustBuild:
 logv('[all class files for {0} are up to date - skipping]'.format(p.name))
 continue
 if len(javafilelist) == 0:
 logv('[no Java sources for {0} - skipping]'.format(p.name))
 continue
+# Ensure that the output directories are clean
+prepareOutputDirs(p, True)
 built.add(p.name)
 argfileName = join(p.dir, 'javafilelist.txt')
 argfile = open(argfileName, 'wb')
 argfile.write('\n'.join(javafilelist))
 argfile.close()
 processorArgs = []
-ap = p.annotation_processors()
+if len(aps) > 0:
-if len(ap) > 0:
+processorPath = classpath(aps, resolve=True)
-processorPath = classpath(ap, resolve=True)
 genDir = p.source_gen_dir()
 if exists(genDir):
 shutil.rmtree(genDir)
 os.mkdir(genDir)
 processorArgs += ['-processorpath', join(processorPath), '-s', genDir]
 log('Wrote backup of {0} modified files to {1}'.format(len(modified), backup))
 return 1
 return 0
 def processorjars():
+for s in suites(True):
+_processorjars_suite(s)
+def _processorjars_suite(s):
 projs = set()
-for p in sorted_deps():
+candidates = sorted_project_deps(s.projects)
+for p in candidates:
 if _isAnnotationProcessorDependency(p):
 projs.add(p)
-if len(projs) < 0:
+if len(projs) <= 0:
 return
 pnames = [p.name for p in projs]
 build(['--projects', ",".join(pnames)])
 archive(pnames)
 self.timestamp = os.path.getmtime(path) if exists(path) else None
 def isOlderThan(self, arg):
 if not self.timestamp:
 return True
-if isinstance(arg, types.ListType):
+if isinstance(arg, TimeStampFile):
+if arg.timestamp is None:
+return False
+else:
+return arg.timestamp > self.timestamp
+elif isinstance(arg, types.ListType):
 files = arg
 else:
 files = [arg]
 for f in files:
 if os.path.getmtime(f) > self.timestamp:
 fromIndex = fromIndex + 1
 igv.close('edges')
 igv.close('graph')
 igv.close('group')
 igv.close('graphDocument')
 if args.igv:
 s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
 s.connect(('127.0.0.1', 4444))
 s.send(igv.xml())
 else:
-print igv.xml(indent='  ', newl='\n');
+print igv.xml(indent='  ', newl='\n')
 return
 print 'digraph projects {'
 print 'rankdir=BT;'
 print 'node [shape=rect];'
 for p in projects():
 for dep in p.canonical_deps():
 for s in suites(True):
 _eclipseinit_suite(args, s, buildProcessorJars, refreshOnly)
 generate_eclipse_workingsets()
+def _check_ide_timestamp(suite, timestamp):
+"""return True if and only if the projects file, imports file, and mx itself are all older than timestamp"""
+projectsFile = join(suite.mxDir, 'projects')
+projectsFileOlder = not timestamp.isOlderThan(projectsFile)
+importsFileOlder = not timestamp.isOlderThan(suite.import_timestamp())
+# Assume that any mx change might imply changes to the generated IDE files
+mxOlder = not timestamp.isOlderThan(__file__)
+return projectsFileOlder and importsFileOlder and mxOlder
 def _eclipseinit_suite(args, suite, buildProcessorJars=True, refreshOnly=False):
-projectsFile = join(suite.mxDir, 'projects')
 timestamp = TimeStampFile(join(suite.mxDir, 'eclipseinit.timestamp'))
 if refreshOnly and not timestamp.exists():
 return
-if not timestamp.isOlderThan(projectsFile) and not TimeStampFile(projectsFile).isOlderThan(__file__):
+if _check_ide_timestamp(suite, timestamp):
 logv('[Eclipse configurations are up to date - skipping]')
 return
 if buildProcessorJars:
-# todo suite specific
+_processorjars_suite(suite)
-processorjars()
 projToDist = dict()
 for dist in _dists.values():
 distDeps = sorted_deps(dist.deps)
 for p in distDeps:
 for suite in suites(True):
 _netbeansinit_suite(args, suite, refreshOnly, buildProcessorJars)
 def _netbeansinit_suite(args, suite, refreshOnly=False, buildProcessorJars=True):
-projectsFile = join(suite.mxDir, 'projects')
 timestamp = TimeStampFile(join(suite.mxDir, 'netbeansinit.timestamp'))
 if refreshOnly and not timestamp.exists():
 return
-if not timestamp.isOlderThan(projectsFile) and not TimeStampFile(projectsFile).isOlderThan(__file__):
+if _check_ide_timestamp(suite, timestamp):
 logv('[NetBeans configurations are up to date - skipping]')
 return
 updated = False
 for p in suite.projects:

Mercurial > hg > graal-compiler

comparison mxtool/mx.py @ 12639:50aca0c0dff4