diff options
| author | Grzegorz Kossakowski <grzegorz.kossakowski@gmail.com> | 2014-04-25 11:30:40 +0200 |
|---|---|---|
| committer | Grzegorz Kossakowski <grzegorz.kossakowski@gmail.com> | 2014-04-25 11:30:40 +0200 |
| commit | 57b6b90af6218e96cb554e9563199d7889c0004a (patch) | |
| tree | 19e00ec17e357725492861890cc852f56685b29b | |
| parent | f61e97af85e70794850044e4c45153a94dd0a37e (diff) | |
| parent | 7d57e248db9cbc444f83de669ed78102bceaaff1 (diff) | |
| download | scala-57b6b90af6218e96cb554e9563199d7889c0004a.tar.gz scala-57b6b90af6218e96cb554e9563199d7889c0004a.tar.bz2 scala-57b6b90af6218e96cb554e9563199d7889c0004a.zip | |
Merge pull request #3698 from adriaanm/scaladoc-sourcelink
Restore linking to source from scaladoc.
| -rw-r--r-- | build-ant-macros.xml | 36 |
1 files changed, 34 insertions, 2 deletions
diff --git a/build-ant-macros.xml b/build-ant-macros.xml index 816a18b13f..ea5652770e 100644 --- a/build-ant-macros.xml +++ b/build-ant-macros.xml @@ -408,12 +408,44 @@ <if> <equals arg1="${@{project}.docroot}" arg2="NOT SET"/> <then> - <scaladoc destdir="${build-docs.dir}/@{project}" doctitle="${@{project}.description}" docfooter="epfl" docversion="${version.number}" sourcepath="${src.dir}" classpathref="docs.@{project}.build.path" srcdir="${src.dir}/${@{project}.srcdir}" addparams="${scalac.args.all}" implicits="on" diagrams="on" groups="on" rawOutput="${scaladoc.raw.output}" noPrefixes="${scaladoc.no.prefixes}" docUncompilable="${src.dir}/library-aux" skipPackages="${@{project}.skipPackages}"> + <scaladoc + destdir="${build-docs.dir}/@{project}" + doctitle="${@{project}.description}" + docfooter="epfl" + docversion="${version.number}" + sourcepath="${src.dir}" + classpathref="docs.@{project}.build.path" + srcdir="${src.dir}/${@{project}.srcdir}" + addparams="${scalac.args.all}" + docsourceurl="${scaladoc.url}€{FILE_PATH}.scala#L1" + implicits="on" + diagrams="on" + groups="on" + rawOutput="${scaladoc.raw.output}" + noPrefixes="${scaladoc.no.prefixes}" + docUncompilable="${src.dir}/library-aux" + skipPackages="${@{project}.skipPackages}"> <includes/> </scaladoc> </then> <else> - <scaladoc destdir="${build-docs.dir}/@{project}" doctitle="${@{project}.description}" docfooter="epfl" docversion="${version.number}" sourcepath="${src.dir}" classpathref="docs.@{project}.build.path" srcdir="${src.dir}/${@{project}.srcdir}" docRootContent="${src.dir}/@{project}/${@{project}.docroot}" addparams="${scalac.args.all}" implicits="on" diagrams="on" groups="on" rawOutput="${scaladoc.raw.output}" noPrefixes="${scaladoc.no.prefixes}" docUncompilable="${src.dir}/library-aux" skipPackages="${@{project}.skipPackages}"> + <scaladoc docRootContent="${src.dir}/@{project}/${@{project}.docroot}" + destdir="${build-docs.dir}/@{project}" + doctitle="${@{project}.description}" + docfooter="epfl" + docversion="${version.number}" + sourcepath="${src.dir}" + classpathref="docs.@{project}.build.path" + srcdir="${src.dir}/${@{project}.srcdir}" + addparams="${scalac.args.all}" + docsourceurl="${scaladoc.url}€{FILE_PATH}.scala#L1" + implicits="on" + diagrams="on" + groups="on" + rawOutput="${scaladoc.raw.output}" + noPrefixes="${scaladoc.no.prefixes}" + docUncompilable="${src.dir}/library-aux" + skipPackages="${@{project}.skipPackages}"> <includes/> </scaladoc> </else> |