Permalink
Browse files

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.
  • Loading branch information...
1 parent 70a24f9 commit e791a92667653071e34c53071dc7ebc74532f1b8 @jsuereth jsuereth committed Dec 5, 2012
Showing with 6 additions and 1 deletion.
  1. +6 −1 build.xml
View
@@ -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. -->

0 comments on commit e791a92

Please sign in to comment.