diff options
| -rw-r--r-- | project/Build.scala | 12 | ||||
| -rw-r--r-- | project/Partest.scala | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/project/Build.scala b/project/Build.scala index abab775666..5b09e053f0 100644 --- a/project/Build.scala +++ b/project/Build.scala @@ -383,12 +383,12 @@ object ScalaBuild extends Build with Layers { Seq(dir / "src" / "library" / "scala", dir / "src" / "actors", dir / "src" / "swing", dir / "src" / "continuations" / "library") }, compile := inc.Analysis.Empty, - scaladocOptions in Compile in doc <++= (baseDirectory) map (bd => - Seq("-sourcepath", (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 - )), + // scaladocOptions in Compile <++= (baseDirectory) map (bd => + // Seq("-sourcepath", (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 + // )), classpathOptions in Compile := ClasspathOptions.manual ) lazy val documentation = ( diff --git a/project/Partest.scala b/project/Partest.scala index 6fc5e11958..ad8047fa00 100644 --- a/project/Partest.scala +++ b/project/Partest.scala @@ -115,7 +115,7 @@ object partest { } } - def partestRunnerTask(classpath: ScopedTask[Classpath], javacOptions: ScopedSetting[Seq[String]]): Project.Initialize[Task[PartestRunner]] = + def partestRunnerTask(classpath: ScopedTask[Classpath], javacOptions: ScopedTask[Seq[String]]): Project.Initialize[Task[PartestRunner]] = (classpath, javacOptions) map ((cp, opts) => new PartestRunner(Build.data(cp), opts mkString " ")) } |