From e34098b7f6e37420198fa5c7c2820d0443b46cc4 Mon Sep 17 00:00:00 2001 From: Vlad Ureche Date: Sun, 5 Feb 2012 19:32:52 +0100 Subject: Added a rootdoc page for the compiler API scaladoc --- build.xml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'build.xml') diff --git a/build.xml b/build.xml index 57d2eed1c0..e65b66219b 100644 --- a/build.xml +++ b/build.xml @@ -1530,7 +1530,7 @@ DOCUMENTATION docUncompilable="${src.dir}/library-aux" sourcepath="${src.dir}" classpathref="pack.classpath" - docRootContent="${build-docs.dir}/library/lib/rootdoc.txt"> + docRootContent="${src.dir}/library/rootdoc.txt"> @@ -1613,7 +1613,8 @@ 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"> + srcdir="${src.dir}/compiler" + docRootContent="${src.dir}/compiler/rootdoc.txt"> -- cgit v1.2.3 From 28b2d0c13aba7156431076119c920c7dcee6dc77 Mon Sep 17 00:00:00 2001 From: Paul Phillips Date: Sun, 5 Feb 2012 22:39:08 -0800 Subject: Revert "Added a rootdoc page for the compiler API scaladoc" This reverts commit e34098b7f6e37420198fa5c7c2820d0443b46cc4. --- build.xml | 5 ++-- src/compiler/rootdoc.txt | 6 ----- .../scala/tools/nsc/doc/html/HtmlFactory.scala | 4 +++- .../tools/nsc/doc/html/resource/lib/rootdoc.txt | 27 ++++++++++++++++++++++ src/library/rootdoc.txt | 27 ---------------------- 5 files changed, 32 insertions(+), 37 deletions(-) delete mode 100644 src/compiler/rootdoc.txt create mode 100644 src/compiler/scala/tools/nsc/doc/html/resource/lib/rootdoc.txt delete mode 100644 src/library/rootdoc.txt (limited to 'build.xml') diff --git a/build.xml b/build.xml index e65b66219b..57d2eed1c0 100644 --- a/build.xml +++ b/build.xml @@ -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"> @@ -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"> 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/compiler/scala/tools/nsc/doc/html/resource/lib/rootdoc.txt b/src/compiler/scala/tools/nsc/doc/html/resource/lib/rootdoc.txt new file mode 100644 index 0000000000..6145429f1e --- /dev/null +++ b/src/compiler/scala/tools/nsc/doc/html/resource/lib/rootdoc.txt @@ -0,0 +1,27 @@ +This is the documentation for the Scala standard library. + +== Package structure == + +The [[scala]] package contains core types. + +scala.[[scala.collection]] and its subpackages contain a collections framework with higher-order functions for manipulation. Both [[scala.collection.immutable]] and [[scala.collection.mutable]] data structures are available, with immutable as the default. The [[scala.collection.parallel]] collections provide automatic parallel operation. + +Other important packages include: + + - scala.[[scala.actors]] - Concurrency framework inspired by Erlang. + - scala.[[scala.io]] - Input and output. + - scala.[[scala.math]] - Basic math functions and additional numeric types. + - scala.[[scala.sys]] - Interaction with other processes and the operating system. + - scala.util.[[scala.util.matching]] - Pattern matching in text using regular expressions. + - scala.util.parsing.[[scala.util.parsing.combinator]] - Composable combinators for parsing. + - scala.[[scala.xml]] - XML parsing, manipulation, and serialization. + +Many other packages exist. See the complete list on the left. + +== Automatic imports == + +Identifiers in the scala package and the [[scala.Predef]] object are always in scope by default. + +Some of these identifiers are type aliases provided as shortcuts to commonly used classes. For example, List is an alias for scala.collection.immutable.[[scala.collection.immutable.List]]. + +Other aliases refer to classes providing by the underlying platform. For example, on the JVM, String is an alias for java.lang.String. diff --git a/src/library/rootdoc.txt b/src/library/rootdoc.txt deleted file mode 100644 index 6145429f1e..0000000000 --- a/src/library/rootdoc.txt +++ /dev/null @@ -1,27 +0,0 @@ -This is the documentation for the Scala standard library. - -== Package structure == - -The [[scala]] package contains core types. - -scala.[[scala.collection]] and its subpackages contain a collections framework with higher-order functions for manipulation. Both [[scala.collection.immutable]] and [[scala.collection.mutable]] data structures are available, with immutable as the default. The [[scala.collection.parallel]] collections provide automatic parallel operation. - -Other important packages include: - - - scala.[[scala.actors]] - Concurrency framework inspired by Erlang. - - scala.[[scala.io]] - Input and output. - - scala.[[scala.math]] - Basic math functions and additional numeric types. - - scala.[[scala.sys]] - Interaction with other processes and the operating system. - - scala.util.[[scala.util.matching]] - Pattern matching in text using regular expressions. - - scala.util.parsing.[[scala.util.parsing.combinator]] - Composable combinators for parsing. - - scala.[[scala.xml]] - XML parsing, manipulation, and serialization. - -Many other packages exist. See the complete list on the left. - -== Automatic imports == - -Identifiers in the scala package and the [[scala.Predef]] object are always in scope by default. - -Some of these identifiers are type aliases provided as shortcuts to commonly used classes. For example, List is an alias for scala.collection.immutable.[[scala.collection.immutable.List]]. - -Other aliases refer to classes providing by the underlying platform. For example, on the JVM, String is an alias for java.lang.String. -- cgit v1.2.3 From 0c73665be747937a80a8178268782a470f0b3413 Mon Sep 17 00:00:00 2001 From: Geoff Reedy Date: Mon, 6 Feb 2012 09:05:32 -0700 Subject: Automatically fetch jars as needed Use mappers with uptodate and touch tasks to detect if any jars need to be downloaded based on the modification time of the desired.sha1 files --- build.xml | 33 +++++++++++++++++++-------------- 1 file changed, 19 insertions(+), 14 deletions(-) (limited to 'build.xml') diff --git a/build.xml b/build.xml index 57d2eed1c0..d5a35bd7e7 100644 --- a/build.xml +++ b/build.xml @@ -210,28 +210,33 @@ PROPERTIES INITIALISATION ============================================================================ --> - - - - - - - + + + + + + + + + - + - - + + + + + + + + - +