Skip to content

Commit 58cb15c

Browse files
committed
Making sbt build work.
1 parent bb54827 commit 58cb15c

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

project/Build.scala

+6-6
Original file line numberDiff line numberDiff line change
@@ -383,12 +383,12 @@ object ScalaBuild extends Build with Layers {
383383
Seq(dir / "src" / "library" / "scala", dir / "src" / "actors", dir / "src" / "swing", dir / "src" / "continuations" / "library")
384384
},
385385
compile := inc.Analysis.Empty,
386-
scaladocOptions in Compile in doc <++= (baseDirectory) map (bd =>
387-
Seq("-sourcepath", (bd / "src" / "library").getAbsolutePath,
388-
"-doc-no-compile", (bd / "src" / "library-aux").getAbsolutePath,
389-
"-doc-source-url", """https://lampsvn.epfl.ch/trac/scala/browser/scala/trunk/src/€{FILE_PATH}.scala#L1""",
390-
"-doc-root-content", (bd / "compiler/scala/tools/nsc/doc/html/resource/lib/rootdoc.txt").getAbsolutePath
391-
)),
386+
// scaladocOptions in Compile <++= (baseDirectory) map (bd =>
387+
// Seq("-sourcepath", (bd / "src" / "library").getAbsolutePath,
388+
// "-doc-no-compile", (bd / "src" / "library-aux").getAbsolutePath,
389+
// "-doc-source-url", """https://lampsvn.epfl.ch/trac/scala/browser/scala/trunk/src/€{FILE_PATH}.scala#L1""",
390+
// "-doc-root-content", (bd / "compiler/scala/tools/nsc/doc/html/resource/lib/rootdoc.txt").getAbsolutePath
391+
// )),
392392
classpathOptions in Compile := ClasspathOptions.manual
393393
)
394394
lazy val documentation = (

project/Partest.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ object partest {
115115
}
116116
}
117117

118-
def partestRunnerTask(classpath: ScopedTask[Classpath], javacOptions: ScopedSetting[Seq[String]]): Project.Initialize[Task[PartestRunner]] =
118+
def partestRunnerTask(classpath: ScopedTask[Classpath], javacOptions: ScopedTask[Seq[String]]): Project.Initialize[Task[PartestRunner]] =
119119
(classpath, javacOptions) map ((cp, opts) => new PartestRunner(Build.data(cp), opts mkString " "))
120120
}
121121

0 commit comments

Comments
 (0)