Mercurial > hg > truffle
changeset 15577:406a94c03ffa
truffle distrubtion: move dsl processor in a separated jar, such that it can be a build-time only dependency
| author | Bernhard Urban <bernhard.urban@jku.at> |
|---|---|
| date | Fri, 09 May 2014 16:11:01 +0200 |
| parents | 0c0b479903bb |
| children | 24aa5dbcf92d |
| files | mx/mx_graal.py mx/projects mxtool/mx.py |
| diffstat | 3 files changed, 13 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/mx/mx_graal.py Fri May 09 13:56:10 2014 +0200 +++ b/mx/mx_graal.py Fri May 09 16:11:01 2014 +0200 @@ -1527,7 +1527,7 @@ if not mx.library(name, fatalIfMissing=False): mx.log('Skipping ' + groupId + '.' + artifactId + '.jar as ' + name + ' cannot be resolved') return - d = mx.Distribution(graalSuite, name=artifactId, path=path, sourcesPath=path, deps=deps, excludedLibs=[]) + d = mx.Distribution(graalSuite, name=artifactId, path=path, sourcesPath=path, deps=deps, excludedDependencies=[]) d.make_archive() cmd = ['mvn', 'install:install-file', '-DgroupId=' + groupId, '-DartifactId=' + artifactId, '-Dversion=1.0-SNAPSHOT', '-Dpackaging=jar', '-Dfile=' + d.path]
--- a/mx/projects Fri May 09 13:56:10 2014 +0200 +++ b/mx/projects Fri May 09 16:11:01 2014 +0200 @@ -76,11 +76,16 @@ com.oracle.graal.hotspot.sparc,\ com.oracle.graal.hotspot,\ com.oracle.graal.hotspot.hsail -distribution@GRAAL@excludeLibs=FINDBUGS +distribution@GRAAL@exclude=FINDBUGS distribution@TRUFFLE@path=truffle.jar distribution@TRUFFLE@dependencies=\ +com.oracle.truffle.api.dsl + +distribution@TRUFFLE-DSL-PROCESSOR@path=truffle-dsl-processor.jar +distribution@TRUFFLE-DSL-PROCESSOR@dependencies=\ com.oracle.truffle.dsl.processor +distribution@TRUFFLE-DSL-PROCESSOR@exclude=com.oracle.truffle.api.dsl,com.oracle.truffle.api # graal.api.collections project@com.oracle.graal.api.collections@subDir=graal
--- a/mxtool/mx.py Fri May 09 13:56:10 2014 +0200 +++ b/mxtool/mx.py Fri May 09 16:11:01 2014 +0200 @@ -62,7 +62,7 @@ A distribution is a jar or zip file containing the output from one or more Java projects. """ class Distribution: - def __init__(self, suite, name, path, sourcesPath, deps, excludedLibs): + def __init__(self, suite, name, path, sourcesPath, deps, excludedDependencies): self.suite = suite self.name = name self.path = path.replace('/', os.sep) @@ -70,13 +70,13 @@ self.sourcesPath = _make_absolute(sourcesPath.replace('/', os.sep), suite.dir) if sourcesPath else None self.deps = deps self.update_listeners = set() - self.excludedLibs = excludedLibs + self.excludedDependencies = excludedDependencies def sorted_deps(self, includeLibs=False): try: - excl = [library(d) for d in self.excludedLibs] + excl = [dependency(d) for d in self.excludedDependencies] except SystemExit as e: - abort('invalid excluded library for {} distribution: {}'.format(self.name, e)) + abort('invalid excluded dependency for {} distribution: {}'.format(self.name, e)) return [d for d in sorted_deps(self.deps, includeLibs=includeLibs) if d not in excl] def __str__(self): @@ -748,8 +748,8 @@ path = attrs.pop('path') sourcesPath = attrs.pop('sourcesPath', None) deps = pop_list(attrs, 'dependencies') - exclLibs = pop_list(attrs, 'excludeLibs') - d = Distribution(self, name, path, sourcesPath, deps, exclLibs) + exclDeps = pop_list(attrs, 'exclude') + d = Distribution(self, name, path, sourcesPath, deps, exclDeps) d.__dict__.update(attrs) self.dists.append(d)