Mercurial > hg > graal-compiler
diff mx/mx_graal.py @ 21040:12e94cba3696
Graal Loader: load all jars matching lib/graal/graal*.jar
| author | Gilles Duboscq <gilles.m.duboscq@oracle.com> |
|---|---|
| date | Mon, 20 Apr 2015 17:56:38 +0200 |
| parents | 9507c925abe9 |
| children | 5ea65fe64368 |
line wrap: on
line diff
--- a/mx/mx_graal.py Wed Apr 15 20:05:51 2015 +0200 +++ b/mx/mx_graal.py Mon Apr 20 17:56:38 2015 +0200 @@ -614,14 +614,20 @@ if exists(jdks): for e in os.listdir(jdks): jreLibDir = join(jdks, e, 'jre', 'lib') - if deployableDist.isExtension: - jreLibDir = join(jreLibDir, 'ext') if exists(jreLibDir): - _copyToJdk(dist.path, jreLibDir) + if deployableDist.isExtension: + targetDir = join(jreLibDir, 'ext') + elif deployableDist.isGraalClassLoader: + targetDir = join(jreLibDir, 'graal') + else: + targetDir = jreLibDir + if not exists(targetDir): + os.makedirs(targetDir) + _copyToJdk(dist.path, targetDir) if dist.sourcesPath: _copyToJdk(dist.sourcesPath, join(jdks, e)) + # deploy service files if deployableDist.isGraalClassLoader: - assert not deployableDist.isExtension # deploy services files jreGraalServicesDir = join(jreLibDir, 'graal', 'services') if not exists(jreGraalServicesDir): @@ -801,6 +807,8 @@ defLine = 'EXPORT_LIST += $(EXPORT_JRE_LIB_DIR)/' + basename(dist.path) if jdkDist.isExtension: defLine = 'EXPORT_LIST += $(EXPORT_JRE_LIB_EXT_DIR)/' + basename(dist.path) + elif jdkDist.isGraalClassLoader: + defLine = 'EXPORT_LIST += $(EXPORT_JRE_LIB_GRAAL_DIR)/' + basename(dist.path) else: defLine = 'EXPORT_LIST += $(EXPORT_JRE_LIB_DIR)/' + basename(dist.path) if defLine not in defs: @@ -2574,7 +2582,6 @@ for jdkDist in _jdkDeployedDists: def _close(jdkDeployable): def _install(dist): - mx.log("install " + dist.name) assert dist.name == jdkDeployable.name, dist.name + "!=" + jdkDeployable.name _installDistInJdks(jdkDeployable) return _install