Mercurial > hg > truffle
changeset 11602:73dbd282ad3a
Merge.
author | Doug Simon <doug.simon@oracle.com> |
---|---|
date | Wed, 11 Sep 2013 11:56:38 +0200 |
parents | ceecc37b44d7 (current diff) 723796685546 (diff) |
children | 152b4146f05b |
files | |
diffstat | 1 files changed, 3 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/mxtool/mx.py Wed Sep 11 09:37:39 2013 +0200 +++ b/mxtool/mx.py Wed Sep 11 11:56:38 2013 +0200 @@ -2558,12 +2558,14 @@ # identify the location where to look for workingsets.xml wsfilename = 'workingsets.xml' + wsloc = '.metadata/.plugins/org.eclipse.ui.workbench' wsroot = suite.dir if os.environ.has_key('WORKSPACE'): wsroot = os.environ['WORKSPACE'] - wsdir = join(wsroot, '.metadata/.plugins/org.eclipse.ui.workbench') + wsdir = join(wsroot, wsloc) if not exists(wsdir): wsdir = wsroot + log('Could not find Eclipse metadata directory. Please place ' + wsfilename + ' in ' + wsloc + ' manually.') wspath = join(wsdir, wsfilename) # gather working set info from project data