diff options
| author | Paul Phillips <paulp@improving.org> | 2012-02-05 22:39:08 -0800 |
|---|---|---|
| committer | Paul Phillips <paulp@improving.org> | 2012-02-05 22:39:08 -0800 |
| commit | 28b2d0c13aba7156431076119c920c7dcee6dc77 (patch) | |
| tree | 9dbafc7e785cb9e1bec309c3677f14df0f1633fc | |
| parent | 5be13bf0e0a2df0ddeda7652db0f54c0cba6c3bf (diff) | |
| download | scala-28b2d0c13aba7156431076119c920c7dcee6dc77.tar.gz scala-28b2d0c13aba7156431076119c920c7dcee6dc77.tar.bz2 scala-28b2d0c13aba7156431076119c920c7dcee6dc77.zip | |
Revert "Added a rootdoc page for the compiler API scaladoc"
This reverts commit e34098b7f6e37420198fa5c7c2820d0443b46cc4.
| -rw-r--r-- | build.xml | 5 | ||||
| -rw-r--r-- | src/compiler/rootdoc.txt | 6 | ||||
| -rw-r--r-- | src/compiler/scala/tools/nsc/doc/html/HtmlFactory.scala | 4 | ||||
| -rw-r--r-- | src/compiler/scala/tools/nsc/doc/html/resource/lib/rootdoc.txt (renamed from src/library/rootdoc.txt) | 0 |
4 files changed, 5 insertions, 10 deletions
@@ -1530,7 +1530,7 @@ DOCUMENTATION docUncompilable="${src.dir}/library-aux" sourcepath="${src.dir}" classpathref="pack.classpath" - docRootContent="${src.dir}/library/rootdoc.txt"> + docRootContent="${build-docs.dir}/library/lib/rootdoc.txt"> <src> <files includes="${src.dir}/actors"/> <files includes="${src.dir}/library/scala"/> @@ -1613,8 +1613,7 @@ DOCUMENTATION docsourceurl="https://lampsvn.epfl.ch/trac/scala/browser/scala/trunk/src/€{FILE_PATH}.scala#L1" sourcepath="${src.dir}" classpathref="pack.classpath" - srcdir="${src.dir}/compiler" - docRootContent="${src.dir}/compiler/rootdoc.txt"> + srcdir="${src.dir}/compiler"> <include name="**/*.scala"/> </scaladoc> <touch file="${build-docs.dir}/compiler.complete" verbose="no"/> diff --git a/src/compiler/rootdoc.txt b/src/compiler/rootdoc.txt deleted file mode 100644 index 173f604098..0000000000 --- a/src/compiler/rootdoc.txt +++ /dev/null @@ -1,6 +0,0 @@ -The Scala compiler API. - -The following resources are useful for Scala plugin/compiler development: - - [[http://www.scala-lang.org/node/215 Scala development tutorials]] on [[http://www.scala-lang.org www.scala-lang.org]] - - [[https://wiki.scala-lang.org/display/SIW/ Scala Internals wiki]] - - [[http://lampwww.epfl.ch/~magarcia/ScalaCompilerCornerReloaded/ Scala compiler corner]], maintained by Miguel diff --git a/src/compiler/scala/tools/nsc/doc/html/HtmlFactory.scala b/src/compiler/scala/tools/nsc/doc/html/HtmlFactory.scala index 4f05678d85..c21507ef45 100644 --- a/src/compiler/scala/tools/nsc/doc/html/HtmlFactory.scala +++ b/src/compiler/scala/tools/nsc/doc/html/HtmlFactory.scala @@ -80,7 +80,9 @@ class HtmlFactory(val universe: doc.Universe, index: doc.Index) { "selected.png", "selected2-right.png", "selected2.png", - "unselected.png" + "unselected.png", + + "rootdoc.txt" ) /** Generates the Scaladoc site for a model into the site root. diff --git a/src/library/rootdoc.txt b/src/compiler/scala/tools/nsc/doc/html/resource/lib/rootdoc.txt index 6145429f1e..6145429f1e 100644 --- a/src/library/rootdoc.txt +++ b/src/compiler/scala/tools/nsc/doc/html/resource/lib/rootdoc.txt |