From 47fd02fe687c9ed19f82baf6322ef0b3ff8455c2 Mon Sep 17 00:00:00 2001
From: Philipp Haller <hallerp@gmail.com>
Date: Wed, 31 Jan 2007 16:50:32 +0000
Subject: scala.actors: fixed build on JDK 1.4

---
 build.xml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'build.xml')

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 -->
-- 
cgit v1.2.3