diff options
| author | michelou <michelou@epfl.ch> | 2005-10-16 20:31:40 +0000 |
|---|---|---|
| committer | michelou <michelou@epfl.ch> | 2005-10-16 20:31:40 +0000 |
| commit | 5ae9ab371ee14ac1c50615a18e4ee2165031d081 (patch) | |
| tree | dde20084874d17070257af3ac1a50666d96536bc /bin | |
| parent | df9d094d277c449222493e27d44dc4136d1a3c80 (diff) | |
| download | scala-5ae9ab371ee14ac1c50615a18e4ee2165031d081.tar.gz scala-5ae9ab371ee14ac1c50615a18e4ee2165031d081.tar.bz2 scala-5ae9ab371ee14ac1c50615a18e4ee2165031d081.zip | |
- added Ant token '@COPYRIGHT@'.
- added command 'scala'.
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/.nsc_wrapper.tmpl | 28 |
1 files changed, 21 insertions, 7 deletions
diff --git a/bin/.nsc_wrapper.tmpl b/bin/.nsc_wrapper.tmpl index 4abc1b4f45..12c6fad143 100755 --- a/bin/.nsc_wrapper.tmpl +++ b/bin/.nsc_wrapper.tmpl @@ -1,7 +1,7 @@ #!/bin/bash ############################################################################## -# Copyright (C) 2002-2005 LAMP/EPFL +# Copyright @COPYRIGHT@ # # This is free software; see the distribution for copying conditions. # There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A @@ -46,15 +46,29 @@ fi main= case "$SCRIPT" in + scala ) ;; scalac* ) main=scala.tools.nsc.Main;; scaladoc* ) main=scala.tools.scaladoc.Main;; scalap* ) main=scala.tools.scalap.Main;; * ) abort "Don't know what to do for $SCRIPT.";; esac; -$_JAVACMD \ - -Dscala.product="$SCRIPT" \ - -Dscala.version="@VERSION@" \ - -Dscala.home="$PREFIX" \ - -cp "$_CPATH" \ - $main "$@" +if [ -z "$main" ]; then + for arg in "" "$@"; do + [ -z "$arg" ] && continue; + if [ "$arg" = "-version" ]; then + echo "$SCRIPT @VERSION@ -- @COPYRIGHT@"; + exit 0 + fi + done; + $_JAVACMD \ + -Xbootclasspath/a:"$_CPATH" \ + "$@" +else + $_JAVACMD \ + -Dscala.product="$SCRIPT" \ + -Dscala.version="@VERSION@" \ + -Dscala.home="$PREFIX" \ + -cp "$_CPATH" \ + $main "$@" +fi |