diff options
| author | Vlad Ureche <vlad.ureche@gmail.com> | 2012-06-04 19:57:56 +0200 |
|---|---|---|
| committer | Eugene Burmako <xeno.by@gmail.com> | 2012-06-08 15:32:23 +0200 |
| commit | 13213e3df0384b1fd815c0798758a22284572cdb (patch) | |
| tree | ac9c9c51d39f47e17747a2589477f00b028d8d27 /project | |
| parent | 7b0f0a142bb526f4bd108a8c208ec9a8952398c9 (diff) | |
| download | scala-13213e3df0384b1fd815c0798758a22284572cdb.tar.gz scala-13213e3df0384b1fd815c0798758a22284572cdb.tar.bz2 scala-13213e3df0384b1fd815c0798758a22284572cdb.zip | |
Fixes SI-4909 and SI-5763
Finally, -sourcepath is split into:
-Ysourcepath - for the library bootstrapping
-doc-source-path - for scaladoc links to source code
(squished the resident compiler test fix into this commit)
Review by @jsuereth.
Diffstat (limited to 'project')
| -rw-r--r-- | project/Build.scala | 2 | ||||
| -rw-r--r-- | project/Layers.scala | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/project/Build.scala b/project/Build.scala index 610f756a34..f01651b239 100644 --- a/project/Build.scala +++ b/project/Build.scala @@ -359,7 +359,7 @@ object ScalaBuild extends Build with Layers { }, compile := inc.Analysis.Empty, // scaladocOptions in Compile <++= (baseDirectory) map (bd => - // Seq("-sourcepath", (bd / "src" / "library").getAbsolutePath, + // Seq("-doc-source-path", (bd / "src" / "library").getAbsolutePath, // "-doc-no-compile", (bd / "src" / "library-aux").getAbsolutePath, // "-doc-source-url", """https://lampsvn.epfl.ch/trac/scala/browser/scala/trunk/src/€{FILE_PATH}.scala#L1""", // "-doc-root-content", (bd / "compiler/scala/tools/nsc/doc/html/resource/lib/rootdoc.txt").getAbsolutePath diff --git a/project/Layers.scala b/project/Layers.scala index 6d0c68f2a4..fd614ef9ac 100644 --- a/project/Layers.scala +++ b/project/Layers.scala @@ -71,7 +71,7 @@ trait Layers extends Build { resourceDirectory in Compile <<= baseDirectory apply (_ / "src" / "library"), defaultExcludes in unmanagedResources := ("*.scala" | "*.java" | "*.disabled"), // TODO - Allow other scalac option settings. - scalacOptions in Compile <++= (scalaSource in Compile) map (src => Seq("-sourcepath", src.getAbsolutePath)), + scalacOptions in Compile <++= (scalaSource in Compile) map (src => Seq("-Ysourcepath", src.getAbsolutePath)), resourceGenerators in Compile <+= (resourceManaged, Versions.scalaVersions, skip in Compile, streams) map Versions.generateVersionPropertiesFile("library.properties"), referenceScala ) |