From 3c7879dea0a7f8d4928087a1e8434d8c23bf6a64 Mon Sep 17 00:00:00 2001
From: Gilles Dubochet <gilles.dubochet@epfl.ch>
Date: Tue, 13 Dec 2005 17:42:57 +0000
Subject: - NSC ant task updated to compile with NSC

- Build script now compiles it with NSC
---
 build.xml                             |  1 -
 sources/scala/tools/nsc/ant/NSC.scala | 44 +++++++++++++++++------------------
 2 files changed, 22 insertions(+), 23 deletions(-)

diff --git a/build.xml b/build.xml
index 0d70c18e57..761ee0d324 100644
--- a/build.xml
+++ b/build.xml
@@ -262,7 +262,6 @@
                 <pathelement location="${ant.jar}"/>
             </classpath>
             <include name="scala/tools/nsc/**/*.scala"/>
-            <exclude name="scala/tools/nsc/ant/*.scala"/>
         </nsc>
     </target>
 
diff --git a/sources/scala/tools/nsc/ant/NSC.scala b/sources/scala/tools/nsc/ant/NSC.scala
index 2b788df9fa..e1b88160a5 100644
--- a/sources/scala/tools/nsc/ant/NSC.scala
+++ b/sources/scala/tools/nsc/ant/NSC.scala
@@ -6,29 +6,29 @@
 
 // $Id$
 
-import java.io.File;
-import java.net.URL;
-import java.net.URLClassLoader;
-import java.util.ArrayList;
-import java.util.Vector;
-
-import org.apache.tools.ant.AntClassLoader;
-import org.apache.tools.ant.BuildException;
-import org.apache.tools.ant.DirectoryScanner;
-import org.apache.tools.ant.Project;
-import org.apache.tools.ant.taskdefs.MatchingTask;
-import org.apache.tools.ant.types.Path;
-import org.apache.tools.ant.util.FileUtils;
-import org.apache.tools.ant.util.GlobPatternMapper;
-import org.apache.tools.ant.util.SourceFileScanner;
-import org.apache.tools.ant.types.EnumeratedAttribute;
-import org.apache.tools.ant.types.Reference;
-
-import scala.tools.nsc.reporters.{Reporter,ConsoleReporter};
-
 
 package scala.tools.nsc.ant {
 
+    import java.io.File;
+    import java.net.URL;
+    import java.net.URLClassLoader;
+    import java.util.ArrayList;
+    import java.util.Vector;
+
+    import org.apache.tools.ant.AntClassLoader;
+    import org.apache.tools.ant.BuildException;
+    import org.apache.tools.ant.DirectoryScanner;
+    import org.apache.tools.ant.Project;
+    import org.apache.tools.ant.taskdefs.MatchingTask;
+    import org.apache.tools.ant.types.Path;
+    import org.apache.tools.ant.util.FileUtils;
+    import org.apache.tools.ant.util.GlobPatternMapper;
+    import org.apache.tools.ant.util.SourceFileScanner;
+    import org.apache.tools.ant.types.EnumeratedAttribute;
+    import org.apache.tools.ant.types.Reference;
+
+    import scala.tools.nsc.reporters.{Reporter,ConsoleReporter};
+
     /**
      * An Ant task to compile with the new Scala compiler (NSC).
      * This task can take the following parameters as attributes:<ul>
@@ -536,14 +536,14 @@ package scala.tools.nsc.ant {
         private def getClassLoaderClasspath(classLoader: ClassLoader): List[File] = {
             val parentClassLoader = classLoader.getParent();
             val classloaderName = classLoader.getClass().getName();
-            (if (parentClassLoader != null && parentClassLoader != classLoader)
+            ((if (parentClassLoader != null && parentClassLoader != classLoader)
                 getClassLoaderClasspath(parentClassLoader)
             else Nil) :::
             (if (classloaderName.endsWith("URLClassLoader"))
                 List.fromArray((classLoader.asInstanceOf[URLClassLoader]).getURLs()).map(url:URL=>new File(url.getFile()))
             else if (classloaderName.endsWith("AntClassLoader2") || classloaderName.endsWith("AntClassLoader"))
                 List.fromArray(( classLoader.asInstanceOf[AntClassLoader]).getClasspath().split(File.pathSeparator)).map(nameToFile(f:File=>f))
-            else Nil)
+            else Nil))
         }
 
         /**
-- 
cgit v1.2.3