From 94db9d983cdd28c053e568b6185fe2494bd7ffec Mon Sep 17 00:00:00 2001
From: Vlad Ureche <vlad.ureche@gmail.com>
Date: Fri, 8 Jun 2012 01:14:17 +0200
Subject: 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.
---
 build.xml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'build.xml')

diff --git a/build.xml b/build.xml
index a23ed7ec7c..da52cd570a 100644
--- a/build.xml
+++ b/build.xml
@@ -1938,7 +1938,7 @@ DOCUMENTATION
       docfooter="epfl"
       docsourceurl="${scaladoc.url}€{FILE_PATH}.scala#L1"
       docUncompilable="${src.dir}/library-aux"
-      docSourcePath="${src.dir}"
+      sourcepath="${src.dir}"
       classpathref="pack.classpath"
       addparams="${scalac.args.all}"
       docRootContent="${src.dir}/library/rootdoc.txt"
@@ -2020,7 +2020,7 @@ DOCUMENTATION
       doctitle="Scala Compiler"
       docversion="${version.number}"
       docsourceurl="${scaladoc.url}€{FILE_PATH}.scala#L1"
-      docSourcePath="${src.dir}"
+      sourcepath="${src.dir}"
       classpathref="pack.classpath"
       srcdir="${src.dir}/compiler"
       docRootContent="${src.dir}/compiler/rootdoc.txt"
@@ -2043,7 +2043,7 @@ DOCUMENTATION
       destdir="${build-docs.dir}/jline"
       doctitle="Scala JLine"
       docversion="${version.number}"
-      docSourcePath="${src.dir}"
+      sourcepath="${src.dir}"
       classpathref="pack.classpath"
       srcdir="${src.dir}/jline/src/main/java"
       addparams="${scalac.args.all}"
@@ -2067,7 +2067,7 @@ DOCUMENTATION
       doctitle="Scalap"
       docversion="${version.number}"
       docsourceurl="${scaladoc.url}€{FILE_PATH}.scala#L1"
-      docSourcePath="${src.dir}"
+      sourcepath="${src.dir}"
       classpathref="pack.classpath"
       srcdir="${src.dir}/scalap"
       addparams="${scalac.args.all}"
@@ -2089,7 +2089,7 @@ DOCUMENTATION
       destdir="${build-docs.dir}/scala-partest"
       doctitle="Scala Parallel Testing Framework"
       docversion="${version.number}"
-      docSourcePath="${src.dir}"
+      sourcepath="${src.dir}"
       classpathref="pack.classpath"
       srcdir="${src.dir}/partest"
       addparams="${scalac.args.all}"
@@ -2111,7 +2111,7 @@ DOCUMENTATION
       destdir="${build-docs.dir}/continuations-plugin"
       doctitle="Delimited Continuations Compiler Plugin"
       docversion="${version.number}"
-      docSourcePath="${src.dir}"
+      sourcepath="${src.dir}"
       classpathref="pack.classpath"
       srcdir="${src.dir}/continuations/plugin"
       addparams="${scalac.args.all}"
@@ -2133,7 +2133,7 @@ DOCUMENTATION
       destdir="${build-docs.dir}/actors-migration"
       doctitle="Actors Migration Kit"
       docversion="${version.number}"
-      docSourcePath="${src.dir}"
+      sourcepath="${src.dir}"
       classpathref="pack.classpath"
       srcdir="${src.dir}/actors-migration"
       addparams="${scalac.args.all}"
-- 
cgit v1.2.3