Mercurial > hg > graal-compiler
changeset 9940:2194b25ff111
only copy graal.options if it exists
author | Doug Simon <doug.simon@oracle.com> |
---|---|
date | Sat, 08 Jun 2013 00:54:17 +0200 |
parents | e2068bbf4c0d |
children | b4325bc087c4 |
files | make/build-graal.xml mx/commands.py |
diffstat | 2 files changed, 11 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/make/build-graal.xml Sat Jun 08 00:25:49 2013 +0200 +++ b/make/build-graal.xml Sat Jun 08 00:54:17 2013 +0200 @@ -28,7 +28,7 @@ <property name="classes.dir" value="${shared.dir}/graal"/> <property name="jar.dir" value="${shared.dir}"/> <property name="jar.file" value="${jar.dir}/graal.jar"/> - <target depends="jar,options" name="main"/> + <target depends="options,jar" name="main"/> <target depends="cleanclasses" name="compile"> <mkdir dir="${classes.dir}"/> <javac debug="on" destdir="${classes.dir}" includeantruntime="false"> @@ -101,11 +101,14 @@ <target name="cleanclasses"> <delete dir="${classes.dir}"/> </target> - <target name="options"> + <target if="graal.options.exists" name="options"> <copy todir="${jar.dir}"> <filelist dir="${gamma.dir}" files="graal.options"/> </copy> </target> + <target name="check-graal-options-exists"> + <available file="${gamma.dir}/graal.options" property="graal.options.exists"/> + </target> <target depends="cleanclasses" name="clean"> <delete file="${jar.file}"/> </target>
--- a/mx/commands.py Sat Jun 08 00:25:49 2013 +0200 +++ b/mx/commands.py Sat Jun 08 00:54:17 2013 +0200 @@ -464,7 +464,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,options'}) + out.element('target', {'name' : 'main', 'depends' : 'options,jar'}) serviceMap = {}; def addService(service, provider): @@ -519,12 +519,16 @@ out.element('delete', {'dir' : '${classes.dir}'}) out.close('target') - out.open('target', {'name' : 'options'}) + out.open('target', {'name' : 'options', 'if' : 'graal.options.exists'}) 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' : 'check-graal-options-exists'}) + out.element('available', {'property' : 'graal.options.exists', 'file' : '${gamma.dir}/graal.options'}) + out.close('target') + out.open('target', {'name' : 'clean', 'depends' : 'cleanclasses'}) out.element('delete', {'file' : '${jar.file}'}) out.close('target')