diff options
| author | paltherr <paltherr@epfl.ch> | 2003-08-11 06:24:39 +0000 |
|---|---|---|
| committer | paltherr <paltherr@epfl.ch> | 2003-08-11 06:24:39 +0000 |
| commit | 5ea9e558290bf3cdbdb0c941dcbdc14a9b90cc9f (patch) | |
| tree | f1c4bf2b7d34c6f2377f59197a02897757eb2482 | |
| parent | 6150a5b04ecbb2fa46aab49a226cf00dfae24e74 (diff) | |
| download | scala-5ea9e558290bf3cdbdb0c941dcbdc14a9b90cc9f.tar.gz scala-5ea9e558290bf3cdbdb0c941dcbdc14a9b90cc9f.tar.bz2 scala-5ea9e558290bf3cdbdb0c941dcbdc14a9b90cc9f.zip | |
- Added new command names
| -rw-r--r-- | Makefile | 8 | ||||
| -rw-r--r-- | Makefile.config | 2 | ||||
| -rw-r--r-- | sources/bin/.scala_wrapper.tmpl | 18 |
3 files changed, 23 insertions, 5 deletions
@@ -36,6 +36,14 @@ SCRIPTS_PREFIX = $(PROJECT_BINARYDIR) SCRIPTS_WRAPPER = $(SCRIPTS_PREFIX)/.scala_wrapper SCRIPTS_WRAPPER_LINKS += $(SCRIPTS_WRAPPER_ALIASES:%=$(SCRIPTS_PREFIX)/%) SCRIPTS_WRAPPER_ALIASES += scala-info +SCRIPTS_WRAPPER_ALIASES += scalac +SCRIPTS_WRAPPER_ALIASES += scalac-debug +SCRIPTS_WRAPPER_ALIASES += scaladoc +SCRIPTS_WRAPPER_ALIASES += scaladoc-debug +SCRIPTS_WRAPPER_ALIASES += scalarun +SCRIPTS_WRAPPER_ALIASES += scalarun-debug +SCRIPTS_WRAPPER_ALIASES += scalaint +SCRIPTS_WRAPPER_ALIASES += scalaint-debug SCRIPTS_WRAPPER_ALIASES += socos SCRIPTS_WRAPPER_ALIASES += socos-debug SCRIPTS_WRAPPER_ALIASES += siris diff --git a/Makefile.config b/Makefile.config index 9910f103ea..632ceeea85 100644 --- a/Makefile.config +++ b/Makefile.config @@ -84,7 +84,7 @@ PICO_FLAGS ?= -make -source 1.4 ############################################################################## # Scala compiler -SCALAC ?= $(PROJECT_BINARYDIR)/socos +SCALAC ?= $(PROJECT_BINARYDIR)/scalac ############################################################################## # Makefile functions diff --git a/sources/bin/.scala_wrapper.tmpl b/sources/bin/.scala_wrapper.tmpl index 655ea7be68..1e3d5c8fac 100644 --- a/sources/bin/.scala_wrapper.tmpl +++ b/sources/bin/.scala_wrapper.tmpl @@ -89,7 +89,7 @@ configure() { # Prints a warning message on stderr. warning() { - echo "$0: warning: " "$@" 1>&2; + echo "$0: warning:" "$@" 1>&2; } # Prints an error message on stderr. @@ -327,10 +327,20 @@ configure; case "$SCRIPT" in scala-info ) scala_info "$@";; - socos* ) exec_compile scalac.Main "$@";; - surus* ) exec_compile scalai.Main "$@";; - siris* ) exec_compile scalai.Main -interactive "$@";; + scalac* ) exec_compile scalac.Main "$@";; + scaladoc* ) exec_compile scalac.Main -doc "$@";; + scalarun* ) exec_compile scalai.Main "$@";; + scalaint* ) exec_compile scalai.Main -interactive "$@";; dtd2scala* ) exec_dtd2scala dtd2scala.Main "$@";; + socos* ) + warning "Deprecated command, use scalac${SCRIPT#socos} instead."; + exec_compile scalac.Main "$@";; + surus* ) + warning "Deprecated command, use scalarun${SCRIPT#socos} instead."; + exec_compile scalai.Main "$@";; + siris* ) + warning "Deprecated command, use scalaint${SCRIPT#socos} instead."; + exec_compile scalai.Main -interactive "$@";; * ) abort "Don't know what to do for $SCRIPT.";; esac; |