Mercurial > hg > truffle
changeset 4257:32b8274f52ad
Made 'mx ideinit' resolve library dependencies eagerly as well as put absolute paths into the generated Eclipse project configurations.
author | Doug Simon <doug.simon@oracle.com> |
---|---|
date | Tue, 10 Jan 2012 23:49:13 +0100 |
parents | 81dc77ed0695 |
children | 8d2c14f722ac |
files | mx/commands.py mxtool/mx.py |
diffstat | 2 files changed, 5 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/mx/commands.py Tue Jan 10 09:35:00 2012 -0800 +++ b/mx/commands.py Tue Jan 10 23:49:13 2012 +0100 @@ -377,10 +377,11 @@ else: path = dep.path if dep.mustExist: + dep.get_path(resolve=True) if isabs(path): println(out, '\t<classpathentry exported="true" kind="lib" path="' + path + '"/>') else: - println(out, '\t<classpathentry exported="true" kind="lib" path="/' + path + '"/>') + println(out, '\t<classpathentry exported="true" kind="lib" path="' + join(_graal_home, path) + '"/>') else: println(out, '\t<classpathentry combineaccessrules="false" exported="true" kind="src" path="/' + dep.name + '"/>')
--- a/mxtool/mx.py Tue Jan 10 09:35:00 2012 -0800 +++ b/mxtool/mx.py Tue Jan 10 23:49:13 2012 +0100 @@ -646,6 +646,9 @@ self.javac = exe_suffix(join(self.jdk, 'bin', 'javac')) self.javap = exe_suffix(join(self.jdk, 'bin', 'javap')) + if not exists(self.java): + abort('Java launcher derived from JAVA_HOME does not exist: ' + self.java) + def delAtAndSplit(s): return shlex.split(s.lstrip('@'))