From ba2e6f61e86070e3acd2411a2e55cb21ff7612ed Mon Sep 17 00:00:00 2001
From: Gilles Dubochet <gilles.dubochet@epfl.ch>
Date: Fri, 28 Oct 2005 08:37:31 +0000
Subject: Corrected the classpath of the scala and scalac...

Corrected the classpath of the scala and scalac tools to use the old
library instead of the new one.
---
 build.xml | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

(limited to 'build.xml')

diff --git a/build.xml b/build.xml
index a19b432ad0..9283287b3e 100644
--- a/build.xml
+++ b/build.xml
@@ -279,8 +279,6 @@
     #####################################################################
     -->
 
-    
-
     <target name="distrib.init">
         <echo level="verbose">scala.dll=${scala.dll}</echo>
         <fail message="Required DLL library is missing; check the 'scala.dll' property in 'build.${user.name}.properties'.">
@@ -318,11 +316,11 @@
             <filterset>
                 <filter token="VERSION" value="${scala.version}"/>
                 <filter token="COPYRIGHT" value="${copyright.notice}"/>
-                <filter token="CPATH" value="$PREFIX/lib/fjbg.jar:$PREFIX/lib/msil.jar:$PREFIX/lib/${nslib.jar.name}:$PREFIX/lib/${osc-nstools.jar.name}"/>
+                <filter token="CPATH" value="$PREFIX/lib/fjbg.jar:$PREFIX/lib/msil.jar:$PREFIX/lib/scala.jar:$PREFIX/lib/tools.jar:$PREFIX/lib/${osc-nstools.jar.name}"/>
             </filterset>
         </copy>
         <chmod file="${distrib.unix.scala.dir}/bin/.nsc_wrapper" perm="ugo+rx"/>
-        <symlink resource="${distrib.unix.scala.dir}/.nsc_wrapper"
+        <symlink resource="${distrib.unix.scala.dir}/bin/.nsc_wrapper"
                  link="${distrib.unix.scala.dir}/bin/scala"/>
         <symlink resource="${distrib.unix.scala.dir}/bin/.nsc_wrapper"
                  link="${distrib.unix.scala.dir}/bin/scalac"/>
@@ -335,6 +333,8 @@
                 <include name="*.jar"/>
             </fileset>
         </copy>
+        <copy todir="${distrib.unix.scala.dir}/lib" file="${oslib.jar}"/>
+        <copy todir="${distrib.unix.scala.dir}/lib" file="${ostools.jar}"/>
         <copy todir="${distrib.unix.scala.dir}/lib" file="${fjbg.jar}"/>
         <copy todir="${distrib.unix.scala.dir}/lib" file="${msil.jar}"/>
         <copy todir="${distrib.unix.scala.dir}/lib" file="${scala.dll}"/>
@@ -357,7 +357,7 @@
                 <filter token="PRODUCT"   value="scala"/>
                 <filter token="VERSION"   value="${scala.version}"/>
                 <filter token="COPYRIGHT" value="${copyright.notice}"/>
-                <filter token="BOOTCPATH" value="&quot;%SCALA_HOME%&quot;\lib\${nslib.jar.name}"/>
+                <filter token="BOOTCPATH" value="%SCALA_HOME%&quot;\lib\scala.jar;%SCALA_HOME%&quot;\lib\tools.jar"/>
             </filterset>
         </copy>
         <copy file="${bin.dir}/.nsc_bat.tmpl"
@@ -367,7 +367,7 @@
                 <filter token="VERSION"   value="${scala.version}"/>
                 <filter token="COPYRIGHT" value="${copyright.notice}"/>
                 <filter token="MAIN"      value="scala.tools.nsc.Main"/>
-                <filter token="CPATH"     value="&quot;%SCALA_HOME%&quot;\lib\fjbg.jar;&quot;%SCALA_HOME%&quot;\lib\msil.jar;&quot;%SCALA_HOME%&quot;\lib\${nslib.jar.name};&quot;%SCALA_HOME%&quot;\lib\${osc-nstools.jar.name}"/>
+                <filter token="CPATH"     value="&quot;%SCALA_HOME%&quot;\lib\fjbg.jar;&quot;%SCALA_HOME%&quot;\lib\msil.jar;&quot;%SCALA_HOME%&quot;\lib\scala.jar;%SCALA_HOME%&quot;\lib\tools.jar;&quot;%SCALA_HOME%&quot;\lib\${osc-nstools.jar.name}"/>
             </filterset>
         </copy>
         <fixcrlf srcdir="${distrib.win.current.dir}/bin" eol="dos"/>
@@ -382,6 +382,8 @@
                 <include name="*.jar"/>
             </fileset>
         </copy>
+        <copy todir="${distrib.unix.scala.dir}/lib" file="${oslib.jar}"/>
+        <copy todir="${distrib.unix.scala.dir}/lib" file="${ostools.jar}"/>
         <copy todir="${distrib.win.current.dir}/lib" file="${fjbg.jar}"/>
         <copy todir="${distrib.win.current.dir}/lib" file="${msil.jar}"/>
         <copy todir="${distrib.win.current.dir}/lib" file="${scala.dll}"/>
-- 
cgit v1.2.3