summaryrefslogtreecommitdiff
path: root/build.xml
diff options
context:
space:
mode:
authorGilles Dubochet <gilles.dubochet@epfl.ch>2005-10-10 19:20:02 +0000
committerGilles Dubochet <gilles.dubochet@epfl.ch>2005-10-10 19:20:02 +0000
commitecd89b556f04f0013bc0beeb5d9a6bbfd33c6ea0 (patch)
tree762b417cd0f1ecde2da33fb675109310dfa498cb /build.xml
parentdd918cc2b87c9443e29f0cd4105148ad13e5c3c0 (diff)
downloadscala-ecd89b556f04f0013bc0beeb5d9a6bbfd33c6ea0.tar.gz
scala-ecd89b556f04f0013bc0beeb5d9a6bbfd33c6ea0.tar.bz2
scala-ecd89b556f04f0013bc0beeb5d9a6bbfd33c6ea0.zip
Auto-detect files in newsources so as not to co...
Auto-detect files in newsources so as not to compile their java version.
Diffstat (limited to 'build.xml')
-rw-r--r--build.xml16
1 files changed, 12 insertions, 4 deletions
diff --git a/build.xml b/build.xml
index 493e4c246b..d377662b7b 100644
--- a/build.xml
+++ b/build.xml
@@ -93,11 +93,19 @@
<include name="scala/runtime/**/*.java"/>
<include name="scala/tools/util/*.java"/>
<include name="scala/*.java"/>
- <exclude name="scala/ScalaObject.java"/>
- <exclude name="scala/Array.java"/>
+ <not>
+ <present targetdir="${newsources.dir}" present="both">
+ <mapper type="glob" from="*.scala" to="*.java"/>
+ </present>
+ </not>
</pico>
- <delete file="${build.nslib.dir}/scala/ScalaObject.class"/>
- <delete file="${build.nslib.dir}/scala/Array.class"/>
+ <delete>
+ <fileset dir="${build.nslib.dir}">
+ <present targetdir="${newsources.dir}" present="both">
+ <mapper type="glob" from="*.class" to="*.scala"/>
+ </present>
+ </fileset>
+ </delete>
</target>
<target name="build.osc.nstools" depends="init.osc" description="Builds the new Scala compiler.">