Skip to content

Commit e791a92

Browse files
committed
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.
1 parent 70a24f9 commit e791a92

File tree

1 file changed

+6
-1
lines changed

1 file changed

+6
-1
lines changed

build.xml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2672,7 +2672,12 @@ DISTRIBUTION
26722672
<target name="dist.base" depends="dist.start">
26732673
<mkdir dir="${dist.dir}/lib"/>
26742674
<copy toDir="${dist.dir}/lib">
2675-
<fileset dir="${build-pack.dir}/lib"/>
2675+
<fileset dir="${build-pack.dir}/lib">
2676+
<include name="jline.jar"/>
2677+
<include name="scalacheck.jar"/>
2678+
<include name="scala-partest.jar"/>
2679+
<include name="scalap.jar"/>
2680+
</fileset>
26762681
</copy>
26772682
<mkdir dir="${dist.dir}/bin"/>
26782683
<!-- TODO - Stop being inefficient and don't copy OSGi bundles overtop other jars. -->

0 commit comments

Comments
 (0)