Mercurial > hg > truffle
comparison mx/commands.py @ 5870:d84a26dc32f5
Make 'db' directory from JDK optional since it does not exists in all OpenJDK-based JDKs (cf. Icedtea)
author | Gilles Duboscq <duboscq@ssw.jku.at> |
---|---|
date | Fri, 20 Jul 2012 14:40:17 +0200 |
parents | a10e72af4dc5 |
children | 576460f7e740 |
comparison
equal
deleted
inserted
replaced
5869:246d27834017 | 5870:d84a26dc32f5 |
---|---|
306 def _jdk(build='product', create=False): | 306 def _jdk(build='product', create=False): |
307 """ | 307 """ |
308 Get the JDK into which Graal is installed, creating it first if necessary. | 308 Get the JDK into which Graal is installed, creating it first if necessary. |
309 """ | 309 """ |
310 jdk = join(_graal_home, 'jdk' + mx.java().version, build) | 310 jdk = join(_graal_home, 'jdk' + mx.java().version, build) |
311 jdkContents = ['bin', 'db', 'include', 'jre', 'lib'] | 311 jdkContents = ['bin', 'include', 'jre', 'lib'] |
312 if (exists(join(jdk, 'db'))): | |
313 jdkContents.append('db') | |
312 if mx.get_os() != 'windows': | 314 if mx.get_os() != 'windows': |
313 jdkContents.append('man') | 315 jdkContents.append('man') |
314 if create: | 316 if create: |
315 if not exists(jdk): | 317 if not exists(jdk): |
316 srcJdk = mx.java().jdk | 318 srcJdk = mx.java().jdk |