diff options
| author | Paul Phillips <paulp@improving.org> | 2012-12-11 10:01:20 -0800 |
|---|---|---|
| committer | Paul Phillips <paulp@improving.org> | 2012-12-11 10:01:20 -0800 |
| commit | 0fd2d80e0129c7fa7d2b081cc35b06ca5651c3a5 (patch) | |
| tree | 60a9ceaeea6f0b2e54177c6bd37ac8b7b0ed2f25 /build.xml | |
| parent | c9bca57781ffa64e0d081facf668775f6eaff2e8 (diff) | |
| parent | 18481cef9b219c48b3497c4605b793b22a7faf79 (diff) | |
| download | scala-0fd2d80e0129c7fa7d2b081cc35b06ca5651c3a5.tar.gz scala-0fd2d80e0129c7fa7d2b081cc35b06ca5651c3a5.tar.bz2 scala-0fd2d80e0129c7fa7d2b081cc35b06ca5651c3a5.zip | |
Merge remote-tracking branch 'origin/2.10.0-wip' into merge-wip-into-2.10.x
# By Eugene Burmako (1) and others
# Via Adriaan Moors (2) and others
* origin/2.10.0-wip:
Fixing OSGi distribution.
Fix for rangepos crasher.
SI-6685 fixes error handling in typedApply
Diffstat (limited to 'build.xml')
| -rw-r--r-- | build.xml | 7 |
1 files changed, 6 insertions, 1 deletions
@@ -2706,7 +2706,12 @@ DISTRIBUTION <target name="dist.base" depends="dist.start"> <mkdir dir="${dist.dir}/lib"/> <copy toDir="${dist.dir}/lib"> - <fileset dir="${build-pack.dir}/lib"/> + <fileset dir="${build-pack.dir}/lib"> + <include name="jline.jar"/> + <include name="scalacheck.jar"/> + <include name="scala-partest.jar"/> + <include name="scalap.jar"/> + </fileset> </copy> <mkdir dir="${dist.dir}/bin"/> <!-- TODO - Stop being inefficient and don't copy OSGi bundles overtop other jars. --> |