Mercurial > hg > graal-jvmci-8
diff mx/commands.py @ 9935:2a091d2987bd
added graal.options mechanism for being able to override default option values
author | Doug Simon <doug.simon@oracle.com> |
---|---|
date | Fri, 07 Jun 2013 15:59:09 +0200 |
parents | 6fa4b4933892 |
children | e2068bbf4c0d |
line wrap: on
line diff
--- a/mx/commands.py Fri Jun 07 10:52:48 2013 +0200 +++ b/mx/commands.py Fri Jun 07 15:59:09 2013 +0200 @@ -343,6 +343,7 @@ def _installGraalJarInJdks(graalDist): graalJar = graalDist.path + graalOptions = join(_graal_home, 'graal.options') jdks = join(_graal_home, 'jdk' + str(mx.java().version)) if exists(jdks): for e in os.listdir(jdks): @@ -353,6 +354,9 @@ shutil.copyfile(graalJar, tmp) os.close(fd) shutil.move(tmp, join(jreLibDir, 'graal.jar')) + + if exists(graalOptions): + shutil.copy(graalOptions, join(jreLibDir, 'graal.options')) # run a command in the windows SDK Debug Shell def _runInDebugShell(cmd, workingDir, logFile=None, findInOutput=None, respondTo={}): @@ -458,7 +462,7 @@ out.element('property', {'name' : 'jar.dir', 'value' : '${shared.dir}'}) out.element('property', {'name' : 'jar.file', 'value' : '${jar.dir}/graal.jar'}) - out.element('target', {'name' : 'main', 'depends' : 'jar'}) + out.element('target', {'name' : 'main', 'depends' : 'jar,options'}) serviceMap = {}; def addService(service, provider): @@ -513,6 +517,12 @@ out.element('delete', {'dir' : '${classes.dir}'}) out.close('target') + out.open('target', {'name' : 'options'}) + out.open('copy', {'todir' : '${jar.dir}'}) + out.element('filelist', {'dir' : '${gamma.dir}', 'files' : 'graal.options'}) + out.close('copy') + out.close('target') + out.open('target', {'name' : 'clean', 'depends' : 'cleanclasses'}) out.element('delete', {'file' : '${jar.file}'}) out.close('target')