From 13f7432497774a2e53eecd157c4e1f2d5ad52fd7 Mon Sep 17 00:00:00 2001
From: Lukas Rytz <lukas.rytz@epfl.ch>
Date: Thu, 28 May 2009 09:39:08 +0000
Subject: fix for #1660.

---
 build.xml          | 3 ++-
 src/build/pack.xml | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/build.xml b/build.xml
index f309d7666d..0465768e1a 100644
--- a/build.xml
+++ b/build.xml
@@ -689,8 +689,8 @@ PACKED QUICK BUILD (PACK)
       <!-- filemode / dirmode: see trac ticket #1294 -->
       <zipfileset dirmode="755" filemode="644" src="${fjbg.jar}"/>
       <zipfileset dirmode="755" filemode="644" src="${msil.jar}"/>
-      <zipfileset dirmode="755" filemode="644" src="${jline.jar}"/>
     </jar>
+    <copy file="${jline.jar}" toDir="${build-pack.dir}/lib"/>
   </target>
   
   <target name="pack.pre-partest" depends="pack.comp">
@@ -734,6 +734,7 @@ PACKED QUICK BUILD (PACK)
       <classpath>
         <pathelement location="${build-pack.dir}/lib/scala-library.jar"/>
         <pathelement location="${build-pack.dir}/lib/scala-compiler.jar"/>
+        <pathelement location="${build-pack.dir}/lib/jline.jar"/>
       </classpath>
     </taskdef>
     <mkdir dir="${build-pack.dir}/bin"/>
diff --git a/src/build/pack.xml b/src/build/pack.xml
index d98029105d..141e57245a 100644
--- a/src/build/pack.xml
+++ b/src/build/pack.xml
@@ -97,7 +97,7 @@ MAIN DISTRIBUTION SBAZ
       <binset
           dir="${dist.dir}/bin"
           includes="scala,scala.bat,scalac,scalac.bat,scaladoc,scaladoc.bat,fsc,fsc.bat"/>
-      <libset dir="${dist.dir}/lib" includes="scala-compiler.jar"/>
+      <libset dir="${dist.dir}/lib" includes="scala-compiler.jar,jline.jar"/>
       <manset dir="${dist.dir}/man" includes="**"/>
       <srcset dir="${dist.dir}/src" includes="scala-compiler-src.jar"/>
     </sbaz>
-- 
cgit v1.2.3