comparison mxtool/mx.py @ 12684:ec224fef3012

integrated auto-formatting changes
author Doug Simon <doug.simon@oracle.com>
date Tue, 05 Nov 2013 19:42:44 +0100
parents c6cc96cc6a1f
children 697ef4cf18c0
comparison
equal deleted inserted replaced
12683:5c5b02a165d4 12684:ec224fef3012
2981 out.close('buildCommand') 2981 out.close('buildCommand')
2982 2982
2983 # The path should always be p.name/dir. independent of where the workspace actually is. 2983 # The path should always be p.name/dir. independent of where the workspace actually is.
2984 # So we use the parent folder of the project, whatever that is, to generate such a relative path. 2984 # So we use the parent folder of the project, whatever that is, to generate such a relative path.
2985 logicalWorkspaceRoot = os.path.dirname(p.dir) 2985 logicalWorkspaceRoot = os.path.dirname(p.dir)
2986 binFolder = os.path.relpath(p.output_dir(), logicalWorkspaceRoot) 2986 binFolder = os.path.relpath(p.output_dir(), logicalWorkspaceRoot)
2987 2987
2988 if _isAnnotationProcessorDependency(p): 2988 if _isAnnotationProcessorDependency(p):
2989 refreshFile = os.path.relpath(join(p.dir, p.name + '.jar'), logicalWorkspaceRoot) 2989 refreshFile = os.path.relpath(join(p.dir, p.name + '.jar'), logicalWorkspaceRoot)
2990 _genEclipseBuilder(out, p, 'Jar', 'archive ' + p.name, refresh=True, refreshFile=refreshFile, relevantResources=[binFolder], async=True, xmlIndent='', xmlStandalone='no') 2990 _genEclipseBuilder(out, p, 'Jar', 'archive ' + p.name, refresh=True, refreshFile=refreshFile, relevantResources=[binFolder], async=True, xmlIndent='', xmlStandalone='no')
2991 2991
2992 if projToDist.has_key(p.name): 2992 if projToDist.has_key(p.name):
2993 dist, distDeps = projToDist[p.name] 2993 dist, distDeps = projToDist[p.name]
2994 _genEclipseBuilder(out, p, 'Create' + dist.name + 'Dist', 'archive @' + dist.name, relevantResources=[binFolder], logToFile=True, refresh=False, async=True) 2994 _genEclipseBuilder(out, p, 'Create' + dist.name + 'Dist', 'archive @' + dist.name, relevantResources=[binFolder], logToFile=True, refresh=False, async=True)
3066 if refresh: 3066 if refresh:
3067 if refreshFile is None: 3067 if refreshFile is None:
3068 refreshScope = '${project}' 3068 refreshScope = '${project}'
3069 else: 3069 else:
3070 refreshScope = '${working_set:<?xml version="1.0" encoding="UTF-8"?><resources><item path="' + refreshFile + '" type="1"/></resources>}' 3070 refreshScope = '${working_set:<?xml version="1.0" encoding="UTF-8"?><resources><item path="' + refreshFile + '" type="1"/></resources>}'
3071 3071
3072 launchOut.element('booleanAttribute', {'key' : 'org.eclipse.debug.core.ATTR_REFRESH_RECURSIVE', 'value': 'false'}) 3072 launchOut.element('booleanAttribute', {'key' : 'org.eclipse.debug.core.ATTR_REFRESH_RECURSIVE', 'value': 'false'})
3073 launchOut.element('stringAttribute', {'key' : 'org.eclipse.debug.core.ATTR_REFRESH_SCOPE', 'value': refreshScope}) 3073 launchOut.element('stringAttribute', {'key' : 'org.eclipse.debug.core.ATTR_REFRESH_SCOPE', 'value': refreshScope})
3074 3074
3075 if relevantResources is not None: 3075 if relevantResources is not None:
3076 resources = '${working_set:<?xml version="1.0" encoding="UTF-8"?><resources>' 3076 resources = '${working_set:<?xml version="1.0" encoding="UTF-8"?><resources>'
3077 for relevantResource in relevantResources: 3077 for relevantResource in relevantResources:
3078 resources += '<item path="' + relevantResource +'" type="2" />' 3078 resources += '<item path="' + relevantResource + '" type="2" />'
3079 resources += '</resources>}' 3079 resources += '</resources>}'
3080 launchOut.element('stringAttribute', {'key' : 'org.eclipse.ui.externaltools.ATTR_BUILD_SCOPE', 'value': resources}) 3080 launchOut.element('stringAttribute', {'key' : 'org.eclipse.ui.externaltools.ATTR_BUILD_SCOPE', 'value': resources})
3081 3081
3082 3082
3083 launchOut.element('booleanAttribute', {'key' : 'org.eclipse.debug.ui.ATTR_CONSOLE_OUTPUT_ON', 'value': consoleOn}) 3083 launchOut.element('booleanAttribute', {'key' : 'org.eclipse.debug.ui.ATTR_CONSOLE_OUTPUT_ON', 'value': consoleOn})
3084 launchOut.element('booleanAttribute', {'key' : 'org.eclipse.debug.ui.ATTR_LAUNCH_IN_BACKGROUND', 'value': 'true' if async else 'false'}) 3084 launchOut.element('booleanAttribute', {'key' : 'org.eclipse.debug.ui.ATTR_LAUNCH_IN_BACKGROUND', 'value': 'true' if async else 'false'})
3085 if logToFile: 3085 if logToFile:
3086 logFile = join(externalToolDir, name + '.log') 3086 logFile = join(externalToolDir, name + '.log')
3087 launchOut.element('stringAttribute', {'key' : 'org.eclipse.debug.ui.ATTR_CAPTURE_IN_FILE', 'value': logFile}) 3087 launchOut.element('stringAttribute', {'key' : 'org.eclipse.debug.ui.ATTR_CAPTURE_IN_FILE', 'value': logFile})