summaryrefslogtreecommitdiff
path: root/build.xml
diff options
context:
space:
mode:
authorVlad Ureche <vlad.ureche@gmail.com>2012-06-04 19:57:56 +0200
committerEugene Burmako <xeno.by@gmail.com>2012-06-08 15:32:23 +0200
commit13213e3df0384b1fd815c0798758a22284572cdb (patch)
treeac9c9c51d39f47e17747a2589477f00b028d8d27 /build.xml
parent7b0f0a142bb526f4bd108a8c208ec9a8952398c9 (diff)
downloadscala-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 'build.xml')
-rw-r--r--build.xml14
1 files changed, 7 insertions, 7 deletions
diff --git a/build.xml b/build.xml
index 28c323d7a1..cf4cb59d30 100644
--- a/build.xml
+++ b/build.xml
@@ -1731,7 +1731,7 @@ DOCUMENTATION
docfooter="epfl"
docsourceurl="${scaladoc.url}€{FILE_PATH}.scala#L1"
docUncompilable="${src.dir}/library-aux"
- sourcepath="${src.dir}"
+ docSourcePath="${src.dir}"
classpathref="pack.classpath"
addparams="${scalac.args.all}"
docRootContent="${src.dir}/library/rootdoc.txt"
@@ -1813,7 +1813,7 @@ DOCUMENTATION
doctitle="Scala Compiler"
docversion="${version.number}"
docsourceurl="${scaladoc.url}€{FILE_PATH}.scala#L1"
- sourcepath="${src.dir}"
+ docSourcePath="${src.dir}"
classpathref="pack.classpath"
srcdir="${src.dir}/compiler"
docRootContent="${src.dir}/compiler/rootdoc.txt"
@@ -1836,7 +1836,7 @@ DOCUMENTATION
destdir="${build-docs.dir}/jline"
doctitle="Scala JLine"
docversion="${version.number}"
- sourcepath="${src.dir}"
+ docSourcePath="${src.dir}"
classpathref="pack.classpath"
srcdir="${src.dir}/jline/src/main/java"
addparams="${scalac.args.all}"
@@ -1860,7 +1860,7 @@ DOCUMENTATION
doctitle="Scalap"
docversion="${version.number}"
docsourceurl="${scaladoc.url}€{FILE_PATH}.scala#L1"
- sourcepath="${src.dir}"
+ docSourcePath="${src.dir}"
classpathref="pack.classpath"
srcdir="${src.dir}/scalap"
addparams="${scalac.args.all}"
@@ -1882,7 +1882,7 @@ DOCUMENTATION
destdir="${build-docs.dir}/scala-partest"
doctitle="Scala Parallel Testing Framework"
docversion="${version.number}"
- sourcepath="${src.dir}"
+ docSourcePath="${src.dir}"
classpathref="pack.classpath"
srcdir="${src.dir}/partest"
addparams="${scalac.args.all}"
@@ -1904,7 +1904,7 @@ DOCUMENTATION
destdir="${build-docs.dir}/continuations-plugin"
doctitle="Delimited Continuations Compiler Plugin"
docversion="${version.number}"
- sourcepath="${src.dir}"
+ docSourcePath="${src.dir}"
classpathref="pack.classpath"
srcdir="${src.dir}/continuations/plugin"
addparams="${scalac.args.all}"
@@ -1926,7 +1926,7 @@ DOCUMENTATION
destdir="${build-docs.dir}/actors-migration"
doctitle="Actors Migration Kit"
docversion="${version.number}"
- sourcepath="${src.dir}"
+ docSourcePath="${src.dir}"
classpathref="pack.classpath"
srcdir="${src.dir}/actors-migration"
addparams="${scalac.args.all}"