diff options
| author | Josh Suereth <joshua.suereth@gmail.com> | 2012-12-05 08:52:35 -0500 |
|---|---|---|
| committer | Josh Suereth <joshua.suereth@gmail.com> | 2012-12-05 10:00:09 -0500 |
| commit | e791a92667653071e34c53071dc7ebc74532f1b8 (patch) | |
| tree | 7399e3e4f650110882193d4c949f289f05623646 | |
| parent | 70a24f907b07ea030419ef686a56272233ddd3ee (diff) | |
| download | scala-e791a92667653071e34c53071dc7ebc74532f1b8.tar.gz scala-e791a92667653071e34c53071dc7ebc74532f1b8.tar.bz2 scala-e791a92667653071e34c53071dc7ebc74532f1b8.zip | |
Fixing OSGi distribution.
There was some kind of wierd filesystem issue where ANT would overwrite
jars or not, depending on timestamps. It was a non-repeatable failure.
Rather than overwrite JARs and rely on ANT, let's just spell out the
non-OSGI bundles. While I had hoped to avoid hard-coding these,
it's probably best we've done so.
| -rw-r--r-- | build.xml | 7 |
1 files changed, 6 insertions, 1 deletions
@@ -2672,7 +2672,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. --> |