Mercurial > hg > truffle
changeset 12641:851aa5341214
moved persistent annotation processor dependency files into mx/currentAnnotationProcessors directory
| author | Doug Simon <doug.simon@oracle.com> |
|---|---|
| date | Wed, 30 Oct 2013 15:29:42 +0100 |
| parents | 6860d5528902 |
| children | e9f23b348da2 |
| files | .hgignore mxtool/mx.py |
| diffstat | 2 files changed, 6 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgignore Wed Oct 30 13:14:41 2013 +0100 +++ b/.hgignore Wed Oct 30 15:29:42 2013 +0100 @@ -3,6 +3,7 @@ ^mx/eclipseinit.timestamp ^mx/netbeansinit.timestamp ^mx/eclipse-launches +^mx/currentAnnotationProcessors ^mx/ecj.jar ^mx/includes ^build/ @@ -16,7 +17,6 @@ \.checkstyle$ \.classpath \.factorypath -\.currentAnnotationProcessors \.externalToolBuilders \.project \.settings/
--- a/mxtool/mx.py Wed Oct 30 13:14:41 2013 +0100 +++ b/mxtool/mx.py Wed Oct 30 15:29:42 2013 +0100 @@ -329,7 +329,7 @@ def update_current_annotation_processors_file(self): aps = self.annotation_processors() outOfDate = False - currentApsFile = join(self.dir, '.currentAnnotationProcessors') + currentApsFile = join(self.suite.mxDir, 'currentAnnotationProcessors', self.name) if exists(currentApsFile): with open(currentApsFile) as fp: currentAps = [l.strip() for l in fp.readlines()] @@ -338,6 +338,8 @@ else: outOfDate = True if outOfDate: + if not exists(dirname(currentApsFile)): + os.mkdir(dirname(currentApsFile)) with open(currentApsFile, 'w') as fp: for ap in aps: print >> fp, ap @@ -787,7 +789,7 @@ 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') @@ -1989,7 +1991,7 @@ continue # Ensure that the output directories are clean - #prepareOutputDirs(p, True) + # prepareOutputDirs(p, True) built.add(p.name)