summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdriaan Moors <adriaan.moors@typesafe.com>2012-12-05 07:04:09 -0800
committerAdriaan Moors <adriaan.moors@typesafe.com>2012-12-05 07:04:09 -0800
commite15d8fca905a193db3c963591129166710147319 (patch)
tree7399e3e4f650110882193d4c949f289f05623646
parent70a24f907b07ea030419ef686a56272233ddd3ee (diff)
parente791a92667653071e34c53071dc7ebc74532f1b8 (diff)
downloadscala-e15d8fca905a193db3c963591129166710147319.tar.gz
scala-e15d8fca905a193db3c963591129166710147319.tar.bz2
scala-e15d8fca905a193db3c963591129166710147319.zip
Merge pull request #1712 from jsuereth/fix/osgi-distv2.10.0-RC4
Fixing OSGi distribution.
-rw-r--r--build.xml7
1 files changed, 6 insertions, 1 deletions
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. -->