Mercurial > hg > truffle
changeset 8890:a33b6378cb76
delete build/linux/shared/graal before compile in build-graal.xml to handle stale class files left behind after refactoring in Eclipse
| author | Doug Simon <doug.simon@oracle.com> |
|---|---|
| date | Mon, 08 Apr 2013 11:20:19 +0200 |
| parents | c669e8e621a1 |
| children | ca82d06ec93a |
| files | make/build-graal.xml mx/commands.py |
| diffstat | 2 files changed, 11 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/make/build-graal.xml Sun Apr 07 22:27:16 2013 +0200 +++ b/make/build-graal.xml Mon Apr 08 11:20:19 2013 +0200 @@ -29,7 +29,7 @@ <property name="jar.dir" value="${shared.dir}"/> <property name="jar.file" value="${jar.dir}/graal.jar"/> <target depends="jar" name="main"/> - <target name="compile"> + <target depends="cleanclasses" name="compile"> <mkdir dir="${classes.dir}"/> <javac debug="on" destdir="${classes.dir}" includeantruntime="false"> <src path="${src.dir}/com.oracle.graal.api.meta"/> @@ -76,8 +76,10 @@ <mkdir dir="${jar.dir}"/> <jar basedir="${classes.dir}" destfile="${jar.file}"/> </target> - <target name="clean"> + <target name="cleanclasses"> <delete dir="${classes.dir}"/> - <delete file="${jar.filr}"/> + </target> + <target depends="cleanclasses" name="clean"> + <delete file="${jar.file}"/> </target> </project>
--- a/mx/commands.py Sun Apr 07 22:27:16 2013 +0200 +++ b/mx/commands.py Mon Apr 08 11:20:19 2013 +0200 @@ -485,7 +485,7 @@ out.element('target', {'name' : 'main', 'depends' : 'jar'}) - out.open('target', {'name' : 'compile'}) + out.open('target', {'name' : 'compile', 'depends' : 'cleanclasses'}) out.element('mkdir', {'dir' : '${classes.dir}'}) out.open('javac', {'destdir' : '${classes.dir}', 'debug' : 'on', 'includeantruntime' : 'false', }) for p in mx.sorted_deps(mx.distribution('GRAAL').deps): @@ -506,9 +506,12 @@ out.element('jar', {'destfile' : '${jar.file}', 'basedir' : '${classes.dir}'}) out.close('target') - out.open('target', {'name' : 'clean'}) + out.open('target', {'name' : 'cleanclasses'}) out.element('delete', {'dir' : '${classes.dir}'}) - out.element('delete', {'file' : '${jar.filr}'}) + out.close('target') + + out.open('target', {'name' : 'clean', 'depends' : 'cleanclasses'}) + out.element('delete', {'file' : '${jar.file}'}) out.close('target') out.close('project')