diff options
| author | Paul Phillips <paulp@improving.org> | 2012-12-19 12:52:01 -0800 |
|---|---|---|
| committer | Paul Phillips <paulp@improving.org> | 2012-12-19 12:52:01 -0800 |
| commit | 886df5b7b66f0ec818f630142c77abf9a867e496 (patch) | |
| tree | b2bbd49652ea3d67279ec1d27c5068e43a069ae1 /build.xml | |
| parent | fc82bc69f1553f0b8def4a50240052366b37b411 (diff) | |
| parent | 18481cef9b219c48b3497c4605b793b22a7faf79 (diff) | |
| download | scala-886df5b7b66f0ec818f630142c77abf9a867e496.tar.gz scala-886df5b7b66f0ec818f630142c77abf9a867e496.tar.bz2 scala-886df5b7b66f0ec818f630142c77abf9a867e496.zip | |
Merge remote-tracking branch 'origin/2.10.0-wip' into 2.10.0-wip-merge
# 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
@@ -2719,7 +2719,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. --> |