Mercurial > hg > graal-compiler
changeset 17076:f0b55d0c5d2d
use absolute paths in generated NetBeans project configurations
| author | Doug Simon <doug.simon@oracle.com> |
|---|---|
| date | Tue, 09 Sep 2014 13:58:24 +0200 |
| parents | c24ea91c30ba |
| children | 0a210ccd3bd3 |
| files | mxtool/mx.py |
| diffstat | 1 files changed, 13 insertions(+), 20 deletions(-) [+] |
line wrap: on
line diff
--- a/mxtool/mx.py Tue Sep 09 13:32:08 2014 +0200 +++ b/mxtool/mx.py Tue Sep 09 13:58:24 2014 +0200 @@ -4100,13 +4100,11 @@ srcDir = join(p.dir, src) if not exists(srcDir): os.mkdir(srcDir) - ref = 'file.reference.' + p.name + '-' + src - print >> out, ref + '=' + src if mainSrc: - print >> out, 'src.dir=${' + ref + '}' + print >> out, 'src.dir=' + srcDir mainSrc = False else: - print >> out, 'src.' + src + '.dir=${' + ref + '}' + print >> out, 'src.' + src + '.dir=' + srcDir javacClasspath = [] @@ -4127,24 +4125,19 @@ if dep.isLibrary(): path = dep.get_path(resolve=True) - if path: - if os.sep == '\\': - path = path.replace('\\', '\\\\') - ref = 'file.reference.' + dep.name + '-bin' - print >> out, ref + '=' + path - libFiles.append(path) + libFiles.append(path) elif dep.isProject(): - n = dep.name.replace('.', '_') - relDepPath = os.path.relpath(dep.dir, p.dir).replace(os.sep, '/') - ref = 'reference.' + n + '.jar' - print >> out, 'project.' + n + '=' + relDepPath - print >> out, ref + '=${project.' + n + '}/dist/' + dep.name + '.jar' - - if not dep in annotationProcessorOnlyDeps: - javacClasspath.append('${' + ref + '}') - else: - annotationProcessorReferences.append('${' + ref + '}') + path = join(dep.dir, 'dist', dep.name + '.jar') + + if path: + if os.sep == '\\': + path = path.replace('\\', '\\\\') + + if not dep in annotationProcessorOnlyDeps: + javacClasspath.append(path) + else: + annotationProcessorReferences.append(path) print >> out, 'javac.classpath=\\\n ' + (os.pathsep + '\\\n ').join(javacClasspath) print >> out, 'javac.processorpath=' + (os.pathsep + '\\\n ').join(['${javac.classpath}'] + annotationProcessorReferences)