summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdriaan Moors <adriaan.moors@typesafe.com>2012-11-04 17:05:03 -0800
committerAdriaan Moors <adriaan.moors@typesafe.com>2012-11-04 17:05:03 -0800
commit8b598436f64ca4e980c8a38f642085b4d23e2327 (patch)
treea738c9ea489dd1f182ee2d051539842284150791
parent3b798b039a24229cf9edb5f396de4dd9fe5980ee (diff)
parente596d3189ec46bdac6ba4aa6a7d476b537a9a34d (diff)
downloadscala-2.10.0-RC2.tar.gz
scala-2.10.0-RC2.tar.bz2
scala-2.10.0-RC2.zip
Merge pull request #1569 from jsuereth/fix/osgi-manifestsv2.10.0-RC2
Fixing issue where OSGi bundles weren't getting used for distribution.
-rw-r--r--build.xml3
1 files changed, 2 insertions, 1 deletions
diff --git a/build.xml b/build.xml
index 41a4488a55..3cfbd454e2 100644
--- a/build.xml
+++ b/build.xml
@@ -2663,7 +2663,8 @@ DISTRIBUTION
<attribute name="name" />
<sequential>
<copy file="${build-osgi.dir}/org.scala-lang.plugins.@{name}.jar"
- tofile="${dist.dir}/misc/scala-devel/plugins/@{name}.jar"/>
+ tofile="${dist.dir}/misc/scala-devel/plugins/@{name}.jar"
+ overwrite="yes"/>
</sequential>
</macrodef>
</target>