summaryrefslogtreecommitdiff
path: root/build.xml
diff options
context:
space:
mode:
authorPaul Phillips <paulp@improving.org>2012-02-17 16:07:49 -0800
committerPaul Phillips <paulp@improving.org>2012-02-17 16:07:49 -0800
commit8d5ce774a869814d802c54b180f13aeffdeceba0 (patch)
tree4e09ced77b936804b1e05c8207baffd8ab49d469 /build.xml
parent1f4f1235920fe87e1b1bdfd042683d9651f1d4f1 (diff)
parent0288a0788ae1ffbe9064992f1ac02f647bb64c17 (diff)
downloadscala-8d5ce774a869814d802c54b180f13aeffdeceba0.tar.gz
scala-8d5ce774a869814d802c54b180f13aeffdeceba0.tar.bz2
scala-8d5ce774a869814d802c54b180f13aeffdeceba0.zip
Merge branch 'develop'
Diffstat (limited to 'build.xml')
-rw-r--r--build.xml2
1 files changed, 2 insertions, 0 deletions
diff --git a/build.xml b/build.xml
index 79b36fd4a6..314ce379e1 100644
--- a/build.xml
+++ b/build.xml
@@ -1535,6 +1535,7 @@ DOCUMENTATION
docUncompilable="${src.dir}/library-aux"
sourcepath="${src.dir}"
classpathref="pack.classpath"
+ addparams="${scalac.args.all}"
docRootContent="${src.dir}/library/rootdoc.txt">
<src>
<files includes="${src.dir}/actors"/>
@@ -1620,6 +1621,7 @@ DOCUMENTATION
classpathref="pack.classpath"
srcdir="${src.dir}/compiler"
docRootContent="${src.dir}/compiler/rootdoc.txt">
+ addparams="${scalac.args.all}"
<include name="**/*.scala"/>
</scaladoc>
<touch file="${build-docs.dir}/compiler.complete" verbose="no"/>