Mercurial > hg > truffle

diff mx/commands.py @ 5870:d84a26dc32f5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
line wrap: on
line diff
--- a/mx/commands.py	Fri Jul 20 14:38:23 2012 +0200
+++ b/mx/commands.py	Fri Jul 20 14:40:17 2012 +0200
@@ -308,7 +308,9 @@
     Get the JDK into which Graal is installed, creating it first if necessary.
     """
     jdk = join(_graal_home, 'jdk' + mx.java().version, build)
-    jdkContents = ['bin', 'db', 'include', 'jre', 'lib']
+    jdkContents = ['bin', 'include', 'jre', 'lib']
+    if (exists(join(jdk, 'db'))):
+        jdkContents.append('db')
     if mx.get_os() != 'windows':
         jdkContents.append('man')
     if create: