Mercurial > hg > graal-jvmci-8

comparison mx.jvmci/mx_jvmci.py @ 22181:ffdee9fe0ded

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fixed uses of dist.sorted_deps()
author Doug Simon <doug.simon@oracle.com>
date Tue, 21 Jul 2015 14:37:34 +0200
parents 04ecedece09a
children 9bbd878b17af
comparison
equal deleted inserted replaced
22180:04ecedece09a 22181:ffdee9fe0ded
1065 cpIndex, cp = mx.find_classpath_arg(vmArgs) 1065 cpIndex, cp = mx.find_classpath_arg(vmArgs)
1066 if cp: 1066 if cp:
1067 excluded = set() 1067 excluded = set()
1068 for jdkDist in jdkDeployedDists: 1068 for jdkDist in jdkDeployedDists:
1069 dist = mx.distribution(jdkDist.name) 1069 dist = mx.distribution(jdkDist.name)
1070 excluded.update([d.output_dir() for d in dist.sorted_deps()]) 1070 excluded.update([d.output_dir() for d in dist.archived_deps() if d.isJavaProject()])
1071 cp = os.pathsep.join([e for e in cp.split(os.pathsep) if e not in excluded]) 1071 cp = os.pathsep.join([e for e in cp.split(os.pathsep) if e not in excluded])
1072 vmArgs[cpIndex] = cp 1072 vmArgs[cpIndex] = cp
1073 1073
1074 # Run the VM in a mode where application/test classes can 1074 # Run the VM in a mode where application/test classes can
1075 # access JVMCI loaded classes. 1075 # access JVMCI loaded classes.
1587 1587
1588 def makejmhdep(artifactId, groupId, deps): 1588 def makejmhdep(artifactId, groupId, deps):
1589 path = artifactId + '.jar' 1589 path = artifactId + '.jar'
1590 allDeps = [] 1590 allDeps = []
1591 if args.permissive: 1591 if args.permissive:
1592 for name in deps: 1592 for name, dep in [(d, mx.dependency(d, fatalIfMissing=False)) for d in deps]:
1593 dist = mx.distribution(name, fatalIfMissing=False) 1593 if dep is None:
1594 if dist: 1594 mx.log('Skipping dependency ' + groupId + '.' + artifactId + ' as ' + name + ' cannot be resolved')
1595 allDeps = allDeps + [d.name for d in dist.sorted_deps(transitive=True)] 1595 return
1596 if dep.isDistribution():
1597 allDeps = allDeps + [d.name for d in dep.archived_deps() if d.isJavaProject()]
1596 else: 1598 else:
1597 if not mx.project(name, fatalIfMissing=False):
1598 if not mx.library(name, fatalIfMissing=False):
1599 mx.log('Skipping dependency ' + groupId + '.' + artifactId + ' as ' + name + ' cannot be resolved')
1600 return
1601 allDeps.append(name) 1599 allDeps.append(name)
1602 d = mx.Distribution(_suite, name=artifactId, subDir=_suite.dir, path=path, sourcesPath=path, deps=allDeps, mainClass=None, excludedDependencies=[], distDependencies=[], javaCompliance=None) 1600 d = mx.Distribution(_suite, name=artifactId, subDir=_suite.dir, path=path, sourcesPath=path, deps=allDeps, mainClass=None, excludedLibs=[], distDependencies=[], javaCompliance=None)
1603 d.make_archive() 1601 d.make_archive()
1604 env = os.environ.copy() 1602 env = os.environ.copy()
1605 env['JAVA_HOME'] = get_jdk(vmToCheck='server') 1603 env['JAVA_HOME'] = get_jdk(vmToCheck='server')
1606 env['MAVEN_OPTS'] = '-server -XX:-UseJVMCIClassLoader' 1604 env['MAVEN_OPTS'] = '-server -XX:-UseJVMCIClassLoader'
1607 cmd = ['mvn', 'install:install-file', '-DgroupId=' + groupId, '-DartifactId=' + artifactId, 1605 cmd = ['mvn', 'install:install-file', '-DgroupId=' + groupId, '-DartifactId=' + artifactId,