summaryrefslogtreecommitdiff
path: root/build.xml
diff options
context:
space:
mode:
authorPhilipp Haller <hallerp@gmail.com>2007-01-31 16:50:32 +0000
committerPhilipp Haller <hallerp@gmail.com>2007-01-31 16:50:32 +0000
commit47fd02fe687c9ed19f82baf6322ef0b3ff8455c2 (patch)
tree005272d4584e04bb0991e38d57181ee89fba022c /build.xml
parenta116937649f5a071f7030214f8aa1fafb430fee5 (diff)
downloadscala-47fd02fe687c9ed19f82baf6322ef0b3ff8455c2.tar.gz
scala-47fd02fe687c9ed19f82baf6322ef0b3ff8455c2.tar.bz2
scala-47fd02fe687c9ed19f82baf6322ef0b3ff8455c2.zip
scala.actors: fixed build on JDK 1.4
Diffstat (limited to 'build.xml')
-rw-r--r--build.xml5
1 files changed, 3 insertions, 2 deletions
diff --git a/build.xml b/build.xml
index 35e2f53f87..e174472ce8 100644
--- a/build.xml
+++ b/build.xml
@@ -134,7 +134,7 @@ INITIALISATION
<else><fail>System environment could not be determined</fail></else>
</if>
<!-- Setting flag for Java versions 1.4.x -->
- <condition property="java14" else="false">
+ <condition property="java14">
<contains string="${java.version}" substring="1.4"/>
</condition>
<!-- Finding out SVN revision -->
@@ -441,7 +441,7 @@ BUILD QUICK-TEST LAYER
<pathelement location="${quick.dir}/lib/actors"/>
</classpath>
<include name="scala/actors/**/*.scala"/>
- <exclude name="scala/actors/**/JDK5Scheduler.scala" if="java14"/>
+ <exclude name="scala/actors/ThreadPoolScheduler.scala" if="java14"/>
<excludesfile name="${nsc.excludes.file}" if="excludes.avail"/>
</locker>
<!-- Build compiler -->
@@ -587,6 +587,7 @@ TEST
<pathelement location="${strap.dir}/lib/actors"/>
</classpath>
<include name="scala/actors/**/*.scala"/>
+ <exclude name="scala/actors/ThreadPoolScheduler.scala" if="java14"/>
<excludesfile name="${nsc.excludes.file}" if="excludes.avail"/>
</quick>
<!-- Build compiler -->