# HG changeset patch
# User Mick Jordan <mick.jordan@oracle.com>
# Date 1379040185 25200
# Node ID 60e3fe0fe939719d7f447c6a0ec100dd6a19feba
# Parent  aba82698c86de90fda427b00fe02eda7e7d950e2
mxtool: fix eclipseinit to use project suite dir for included suites

diff -r aba82698c86d -r 60e3fe0fe939 mxtool/mx.py
--- 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'})