diff options
| author | Lukas Rytz <lukas.rytz@epfl.ch> | 2009-05-28 09:42:32 +0000 |
|---|---|---|
| committer | Lukas Rytz <lukas.rytz@epfl.ch> | 2009-05-28 09:42:32 +0000 |
| commit | 7487070c4a8dcfee78b6f3647b477347a95f02b4 (patch) | |
| tree | 833560f29359c3cb116befd6b4ce0fe64ca7bc02 | |
| parent | 24a0461a952eab2b751d0e050e3f049549f0a1e6 (diff) | |
| download | scala-7487070c4a8dcfee78b6f3647b477347a95f02b4.tar.gz scala-7487070c4a8dcfee78b6f3647b477347a95f02b4.tar.bz2 scala-7487070c4a8dcfee78b6f3647b477347a95f02b4.zip | |
merged fix for #1660 to 2.7.x
| -rw-r--r-- | build.xml | 3 | ||||
| -rw-r--r-- | src/build/pack.xml | 2 |
2 files changed, 3 insertions, 2 deletions
@@ -627,8 +627,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"> @@ -657,6 +657,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 bed8d1e782..b1aa9acc68 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> |