diff options
| author | Vlad Ureche <vlad.ureche@gmail.com> | 2012-06-08 01:14:17 +0200 |
|---|---|---|
| committer | Eugene Burmako <xeno.by@gmail.com> | 2012-06-08 15:34:45 +0200 |
| commit | 94db9d983cdd28c053e568b6185fe2494bd7ffec (patch) | |
| tree | cfe978c998772eaba085fbe7925b8b0bd10ee8fe /src/compiler/scala/tools/nsc/doc/model/ModelFactory.scala | |
| parent | 0c153ee15e714e0ca8752151012b8f1fa9642983 (diff) | |
| download | scala-94db9d983cdd28c053e568b6185fe2494bd7ffec.tar.gz scala-94db9d983cdd28c053e568b6185fe2494bd7ffec.tar.bz2 scala-94db9d983cdd28c053e568b6185fe2494bd7ffec.zip | |
Reverting 22c8dec5 and preventing bootstapping in scaladoc
Review by @dragos, @jsuereth. Required bootstrapping because the starr was
ant tasks were invoking locker with -Ysourcepath instead of -sourcepath.
Diffstat (limited to 'src/compiler/scala/tools/nsc/doc/model/ModelFactory.scala')
| -rw-r--r-- | src/compiler/scala/tools/nsc/doc/model/ModelFactory.scala | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/compiler/scala/tools/nsc/doc/model/ModelFactory.scala b/src/compiler/scala/tools/nsc/doc/model/ModelFactory.scala index f74fb38056..3dd77d47da 100644 --- a/src/compiler/scala/tools/nsc/doc/model/ModelFactory.scala +++ b/src/compiler/scala/tools/nsc/doc/model/ModelFactory.scala @@ -208,7 +208,7 @@ class ModelFactory(val global: Global, val settings: doc.Settings) { def sourceUrl = { def fixPath(s: String) = s.replaceAll("\\" + java.io.File.separator, "/") - val assumedSourceRoot = fixPath(settings.docSourcePath.value) stripSuffix "/" + val assumedSourceRoot = fixPath(settings.sourcepath.value) stripSuffix "/" if (!settings.docsourceurl.isDefault) inSource map { case (file, _) => |