Mercurial > hg > graal-compiler
changeset 11620:60e3fe0fe939
mxtool: fix eclipseinit to use project suite dir for included suites
author | Mick Jordan <mick.jordan@oracle.com> |
---|---|
date | Thu, 12 Sep 2013 19:43:05 -0700 |
parents | aba82698c86d |
children | 46e708738717 |
files | mxtool/mx.py |
diffstat | 1 files changed, 3 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/mxtool/mx.py Thu Sep 12 18:06:18 2013 -0400 +++ b/mxtool/mx.py Thu Sep 12 19:43:05 2013 -0700 @@ -2414,7 +2414,7 @@ # Relative paths for "lib" class path entries have various semantics depending on the Eclipse # version being used (e.g. see https://bugs.eclipse.org/bugs/show_bug.cgi?id=274737) so it's # safest to simply use absolute paths. - path = join(suite.dir, path) + path = join(p.suite.dir, path) attributes = {'exported' : 'true', 'kind' : 'lib', 'path' : path} @@ -2506,7 +2506,7 @@ if not exists(settingsDir): os.mkdir(settingsDir) - eclipseSettingsDir = join(suite.mxDir, 'eclipse-settings') + eclipseSettingsDir = join(p.suite.mxDir, 'eclipse-settings') if exists(eclipseSettingsDir): for name in os.listdir(eclipseSettingsDir): if name == "org.eclipse.jdt.apt.core.prefs" and not len(p.annotation_processors()) > 0: @@ -2534,7 +2534,7 @@ # Relative paths for "lib" class path entries have various semantics depending on the Eclipse # version being used (e.g. see https://bugs.eclipse.org/bugs/show_bug.cgi?id=274737) so it's # safest to simply use absolute paths. - path = join(suite.dir, path) + path = join(p.suite.dir, path) out.element('factorypathentry', {'kind' : 'EXTJAR', 'id' : path, 'enabled' : 'true', 'runInBatchMode' : 'false'}) else: out.element('factorypathentry', {'kind' : 'WKSPJAR', 'id' : '/' + dep.name + '/' + dep.name + '.jar', 'enabled' : 'true', 'runInBatchMode' : 'false'})