diff options
| author | Adriaan Moors <adriaan.moors@typesafe.com> | 2013-03-24 22:25:37 -0700 |
|---|---|---|
| committer | Adriaan Moors <adriaan.moors@typesafe.com> | 2013-03-25 09:48:13 -0700 |
| commit | facda019c0a45cc519c1199c4fa757dd6fb523f3 (patch) | |
| tree | 6abd6c809a72b8dda51c309205dc643ba6e5f17f /src | |
| parent | 5f324591a4c4af53f27a64932b843ba1423c37cd (diff) | |
| parent | fbecd5d3e2364ff59cbfee5a3921384722f9cd36 (diff) | |
| download | scala-facda019c0a45cc519c1199c4fa757dd6fb523f3.tar.gz scala-facda019c0a45cc519c1199c4fa757dd6fb523f3.tar.bz2 scala-facda019c0a45cc519c1199c4fa757dd6fb523f3.zip | |
Merge 2.10.x into master
Merges the relevant part of #2295 (build.xml cleanup),
with the relevant differences in build.xml carried forward,
as well as a fix in interactive/RangePositions for the sbt interface.
Diffstat (limited to 'src')
| -rw-r--r-- | src/build/pack.xml | 18 | ||||
| -rw-r--r-- | src/interactive/scala/tools/nsc/interactive/RangePositions.scala | 5 |
2 files changed, 12 insertions, 11 deletions
diff --git a/src/build/pack.xml b/src/build/pack.xml index 79611b55a2..381d3f1931 100644 --- a/src/build/pack.xml +++ b/src/build/pack.xml @@ -179,41 +179,41 @@ MAIN DISTRIBUTION PACKAGING <target name="pack-maven.srcs" depends="pack-maven.libs"> <!-- Add missing src jars. --> - <jar destfile="${dists.dir}/maven/${version.number}/jline/jline-src.jar" + <jar whenmanifestonly="fail" destfile="${dists.dir}/maven/${version.number}/jline/jline-src.jar" basedir="${src.dir}/jline/src/main/java"> <include name="**/*"/> </jar> <!-- Continuations plugin --> - <jar destfile="${dists.dir}/maven/${version.number}/plugins/continuations/continuations-src.jar" + <jar whenmanifestonly="fail" destfile="${dists.dir}/maven/${version.number}/plugins/continuations/continuations-src.jar" basedir="${src.dir}/continuations/plugin"> <include name="**/*"/> </jar> </target> <target name="pack-maven.docs" depends="pack-maven.libs, pack-maven.plugins"> - <jar destfile="${dists.dir}/maven/${version.number}/jline/jline-docs.jar" + <jar whenmanifestonly="fail" destfile="${dists.dir}/maven/${version.number}/jline/jline-docs.jar" basedir="${build-docs.dir}/jline"> <include name="**/*"/> </jar> - <jar destfile="${dists.dir}/maven/${version.number}/scala-library/scala-library-docs.jar" + <jar whenmanifestonly="fail" destfile="${dists.dir}/maven/${version.number}/scala-library/scala-library-docs.jar" basedir="${build-docs.dir}/library"> <include name="**/*"/> </jar> - <jar destfile="${dists.dir}/maven/${version.number}/scala-compiler/scala-compiler-docs.jar" + <jar whenmanifestonly="fail" destfile="${dists.dir}/maven/${version.number}/scala-compiler/scala-compiler-docs.jar" basedir="${build-docs.dir}/compiler"> <include name="**/*"/> </jar> - <jar destfile="${dists.dir}/maven/${version.number}/scalap/scalap-docs.jar" + <jar whenmanifestonly="fail" destfile="${dists.dir}/maven/${version.number}/scalap/scalap-docs.jar" basedir="${build-docs.dir}/scalap"> <include name="**/*"/> </jar> - <jar destfile="${dists.dir}/maven/${version.number}/scala-partest/scala-partest-docs.jar" - basedir="${build-docs.dir}/scala-partest"> + <jar whenmanifestonly="fail" destfile="${dists.dir}/maven/${version.number}/scala-partest/scala-partest-docs.jar" + basedir="${build-docs.dir}/partest"> <include name="**/*"/> </jar> - <jar destfile="${dists.dir}/maven/${version.number}/plugins/continuations/continuations-docs.jar" + <jar whenmanifestonly="fail" destfile="${dists.dir}/maven/${version.number}/plugins/continuations/continuations-docs.jar" basedir="${build-docs.dir}/continuations-plugin"> <include name="**/*"/> </jar> diff --git a/src/interactive/scala/tools/nsc/interactive/RangePositions.scala b/src/interactive/scala/tools/nsc/interactive/RangePositions.scala index c57e1da184..a24be50b33 100644 --- a/src/interactive/scala/tools/nsc/interactive/RangePositions.scala +++ b/src/interactive/scala/tools/nsc/interactive/RangePositions.scala @@ -7,8 +7,9 @@ package scala.tools.nsc package interactive @deprecated("Use scala.reflect.internal.Positions", "2.11.0") -trait RangePositions extends scala.reflect.internal.Positions with ast.Trees with ast.Positions { +trait RangePositions extends { + override val useOffsetPositions = false +} with scala.reflect.internal.Positions with ast.Trees with ast.Positions { self: scala.tools.nsc.Global => - override def useOffsetPositions = false } |