From e791a92667653071e34c53071dc7ebc74532f1b8 Mon Sep 17 00:00:00 2001
From: Josh Suereth <joshua.suereth@gmail.com>
Date: Wed, 5 Dec 2012 08:52:35 -0500
Subject: 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.
---
 build.xml | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'build.xml')

diff --git a/build.xml b/build.xml
index 3cfbd454e2..a828d71a44 100644
--- a/build.xml
+++ b/build.xml
@@ -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. -->
-- 
cgit v1.2.3