# HG changeset patch # User Doug Simon # Date 1382516993 -7200 # Node ID 2583afcd26ee55ef84158deb6603d318d3c9f739 # Parent fe02f4113a695da784533ae5cf017677bc5556cc fixed bug in creation of CreateGRAALDist.launch files diff -r fe02f4113a69 -r 2583afcd26ee mxtool/mx.py --- a/mxtool/mx.py Tue Oct 22 15:49:05 2013 -0700 +++ b/mxtool/mx.py Wed Oct 23 10:29:53 2013 +0200 @@ -2484,7 +2484,7 @@ self.path = path self.timestamp = os.path.getmtime(path) if exists(path) else None - def outOfDate(self, arg): + def isOlderThan(self, arg): if not self.timestamp: return True if isinstance(arg, types.ListType): @@ -2544,7 +2544,7 @@ timestamp = TimeStampFile(join(p.suite.mxDir, 'checkstyle-timestamps', sourceDir[len(p.suite.dir) + 1:].replace(os.sep, '_') + '.timestamp')) mustCheck = False if not args.force and timestamp.exists(): - mustCheck = timestamp.outOfDate(javafilelist) + mustCheck = timestamp.isOlderThan(javafilelist) else: mustCheck = True @@ -2855,7 +2855,7 @@ if refreshOnly and not timestamp.exists(): return - if not timestamp.outOfDate(projectsFile): + if not timestamp.isOlderThan(projectsFile) and not TimeStampFile(projectsFile).isOlderThan(__file__): logv('[Eclipse configurations are up to date - skipping]') return @@ -3069,7 +3069,7 @@ 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('stringAttribute', {'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 @@ -3265,7 +3265,7 @@ if refreshOnly and not timestamp.exists(): return - if not timestamp.outOfDate(projectsFile): + if not timestamp.isOlderThan(projectsFile) and not TimeStampFile(projectsFile).isOlderThan(__file__): logv('[NetBeans configurations are up to date - skipping]') return