diff options
| author | michelou <michelou@epfl.ch> | 2003-11-17 20:46:47 +0000 |
|---|---|---|
| committer | michelou <michelou@epfl.ch> | 2003-11-17 20:46:47 +0000 |
| commit | bcd8a97b88d798245d3d4c621e0b9fbd222b31ff (patch) | |
| tree | 5d75fa41515a0b38c20cc17bd126322bcf4f9b6e /sources/bin | |
| parent | 64913ef74927b3eb231d591e0484e61898204cc7 (diff) | |
| download | scala-bcd8a97b88d798245d3d4c621e0b9fbd222b31ff.tar.gz scala-bcd8a97b88d798245d3d4c621e0b9fbd222b31ff.tar.bz2 scala-bcd8a97b88d798245d3d4c621e0b9fbd222b31ff.zip | |
- started migration of scaladoc from Java to Scala
Diffstat (limited to 'sources/bin')
| -rw-r--r-- | sources/bin/.scala_wrapper.tmpl | 22 |
1 files changed, 21 insertions, 1 deletions
diff --git a/sources/bin/.scala_wrapper.tmpl b/sources/bin/.scala_wrapper.tmpl index a0d974bdc6..0b60f966d0 100644 --- a/sources/bin/.scala_wrapper.tmpl +++ b/sources/bin/.scala_wrapper.tmpl @@ -322,6 +322,26 @@ exec_dtd2scala() { "$@"; } +# Starts a program using scaladoc. The given arguments are passed to +# exec_java. They must, at least, contain the name of the main class. +exec_scaladoc() { + [ $# -gt 0 ] || abort "internal error"; + + # compute Java classpath + append_path JAVA_CLASSPATH RUNTIME_CLASSES; + append_path JAVA_CLASSPATH TOOLS_CLASSES; + + # compute Scala classpath and bootclasspath + compute_scala_classpath; + compute_scala_bootclasspath; + + # invoke Java + exec_java \ + -Dscala.class.path=`get_os_pathlist "$SCALA_CLASSPATH"` \ + -Dscala.boot.class.path=`get_os_pathlist "$SCALA_BOOTCLASSPATH"` \ + "$@"; +} + # Starts a program using scalap. The given arguments are passed to # exec_java. They must, at least, contain the name of the main class. exec_scalap() { @@ -520,7 +540,7 @@ case "$SCRIPT" in scala ) scala "$@";; scala-info ) scala_info "$@";; scalac* ) exec_compile scalac.Main "$@";; - scaladoc* ) exec_compile scala.tools.scaladoc.Main "$@";; + scaladoc* ) exec_scaladoc scala.tools.scaladoc.Main "$@";; scalarun* ) exec_interpret scala.tools.scalai.Main "$@";; scalaint* ) exec_interpret scala.tools.scalai.Main -interactive "$@";; dtd2scala* ) exec_dtd2scala scala.tools.dtd2scala.Main "$@";; |