diff options
author | michelou <michelou@epfl.ch> | 2005-10-11 17:41:57 +0000 |
---|---|---|
committer | michelou <michelou@epfl.ch> | 2005-10-11 17:41:57 +0000 |
commit | 7762de74a5779418c9f64faad8aaede5f1c6d7b6 (patch) | |
tree | 9948ddb715c5d85155356210d47dbb348a5744cf /sources/bin/.scala_wrapper.tmpl | |
parent | 74dabb6ec9474cd04f94651f3c01fd60b48c4755 (diff) | |
download | scala-7762de74a5779418c9f64faad8aaede5f1c6d7b6.tar.gz scala-7762de74a5779418c9f64faad8aaede5f1c6d7b6.tar.bz2 scala-7762de74a5779418c9f64faad8aaede5f1c6d7b6.zip |
- removed nsc-specific code (use build.xml !).
Diffstat (limited to 'sources/bin/.scala_wrapper.tmpl')
-rw-r--r-- | sources/bin/.scala_wrapper.tmpl | 48 |
1 files changed, 6 insertions, 42 deletions
diff --git a/sources/bin/.scala_wrapper.tmpl b/sources/bin/.scala_wrapper.tmpl index b50f4a64fe..40612e64fb 100644 --- a/sources/bin/.scala_wrapper.tmpl +++ b/sources/bin/.scala_wrapper.tmpl @@ -57,12 +57,6 @@ configure() { # Location of the Scala tools library. default_TOOLS_CLASSES={#TOOLS_CLASSES#}; - # Location of the NSRT library. - default_NLIBRARY_CLASSES={#NLIBRARY_CLASSES#}; - - # Location of the NSC library. - default_NTOOLS_CLASSES={#NTOOLS_CLASSES#}; - # Location of the FJBG library. default_FJBG_CLASSES={#FJBG_CLASSES#}; @@ -461,34 +455,6 @@ compiler_start() { } ############################################################################## -# New compiler invocation functions - -# Starts a NSC compiler. The first argument is added to the runtime -# classpath. The following ones are passed to vm_start_scala. They -# must, at least, contain the name of the main class. -ncompiler_start() { - [ $# -gt 1 ] || abort "internal error"; - classpath="$1"; shift 1; - - # compute values - compute_value FJBG_CLASSES; - compute_value MSIL_CLASSES; - compute_value LIBRARY_SOURCES; - compute_value LIBRARY_CLASSES; - compute_value NLIBRARY_CLASSES; - compute_value NTOOLS_CLASSES; - - # append FJBG and MSIL libraries to classpath - classpath=`append_pathlists "$classpath" "$current_FJBG_CLASSES"`; - classpath=`append_pathlists "$classpath" "$current_MSIL_CLASSES"`; - classpath=`append_pathlists "$classpath" "$current_NLIBRARY_CLASSES"`; - classpath=`append_pathlists "$classpath" "$current_NTOOLS_CLASSES"`; - - # start Scala VM - tool_start0 -classpath "`get_os_pathlist "$classpath"`" "$@"; -} - -############################################################################## # Implementation of scala-info # Prints given error message, prints usage and exits with error code 1. @@ -931,13 +897,11 @@ test_main() { SCALAP="$PREFIX/bin/scalap"; DIFF="diff"; - case "$SCRIPT" in - scalanstest* ) - SOCOS="$PREFIX/bin/scalansc"; - TESTROOT={#NTEST_SRCDIR#}; - SRCDIR={#NTEST_SRCDIR#}; - ;; - esac; +# case "$SCRIPT" in +# scalanstest* ) +# SOCOS="$PREFIX/bin/scalansc"; +# ;; +# esac; case `uname` in CYGWIN* ) @@ -1081,7 +1045,7 @@ case "$SCRIPT" in scala ) scala_main "$@";; scala-* ) scala_main "$@";; scalac* ) compiler_start "" scala.tools.scalac.Main "$@";; - scalansc* ) ncompiler_start "" scala.tools.nsc.Main "$@";; +# scalansc* ) ncompiler_start "" scala.tools.nsc.Main "$@";; scalarun* ) compiler_start "" scala.tools.scalai.Main "$@";; scalaint* ) compiler_start "" scala.tools.scalai.Main -interactive "$@";; scaladoc* ) tool_start "" scala.tools.scaladoc.Main "$@";; |