diff options
| author | michelou <michelou@epfl.ch> | 2003-11-10 14:46:53 +0000 |
|---|---|---|
| committer | michelou <michelou@epfl.ch> | 2003-11-10 14:46:53 +0000 |
| commit | 17638ef00f62e4f843061d34528108e83f55ddf8 (patch) | |
| tree | 0fa4e6b639c891102b0544e61cf39881d6fbbd06 | |
| parent | 8d29db9496fa9f9c9b151bfff2cfd4630b2ebbcd (diff) | |
| download | scala-17638ef00f62e4f843061d34528108e83f55ddf8.tar.gz scala-17638ef00f62e4f843061d34528108e83f55ddf8.tar.bz2 scala-17638ef00f62e4f843061d34528108e83f55ddf8.zip | |
- moved 'scalai' to 'scala/tools/scalai'
| -rw-r--r-- | Makefile | 4 | ||||
| -rw-r--r-- | config/list/interpreter.lst | 2 | ||||
| -rw-r--r-- | sources/bin/.scala_wrapper.tmpl | 4 |
3 files changed, 5 insertions, 5 deletions
@@ -95,7 +95,7 @@ LIBRARY_JAR_INPUTDIR = $(PROJECT_OUTPUTDIR) LIBRARY_JAR_FILES += scala # scala interpreter -INTERPRETER_ROOT = $(PROJECT_SOURCEDIR)/scalai +INTERPRETER_ROOT = $(PROJECT_SOURCEDIR)/scala/tools/scalai INTERPRETER_LIST = $(call READLIST,$(PROJECT_LISTDIR)/interpreter.lst) INTERPRETER_SOURCES += $(INTERPRETER_LIST:%=$(INTERPRETER_ROOT)/%) INTERPRETER_JC_FILES = $(INTERPRETER_SOURCES) @@ -134,7 +134,7 @@ TOOLS_JAR_INPUTDIR = $(PROJECT_OUTPUTDIR) TOOLS_JAR_FILES += ch TOOLS_JAR_FILES += scalac TOOLS_JAR_FILES += scala/tools/scaladoc -TOOLS_JAR_FILES += scalai +TOOLS_JAR_FILES += scala/tools/scalai TOOLS_JAR_FILES += scala/tools/dtd2scala TOOLS_JAR_FILES += scala/tools/scalap TOOLS_JAR_FILES += scala/tools/scalatest diff --git a/config/list/interpreter.lst b/config/list/interpreter.lst index ac639a4b00..356996c7a9 100644 --- a/config/list/interpreter.lst +++ b/config/list/interpreter.lst @@ -1,5 +1,5 @@ ############################################################-*-Makefile-*-#### -# scala interpreter source files (paths are relative to ./sources/scalai) +# scala interpreter source files (paths are relative to ./sources/scala/tools/scalai) ############################################################################## # $Id$ diff --git a/sources/bin/.scala_wrapper.tmpl b/sources/bin/.scala_wrapper.tmpl index ee2d37c363..a0d974bdc6 100644 --- a/sources/bin/.scala_wrapper.tmpl +++ b/sources/bin/.scala_wrapper.tmpl @@ -521,8 +521,8 @@ case "$SCRIPT" in scala-info ) scala_info "$@";; scalac* ) exec_compile scalac.Main "$@";; scaladoc* ) exec_compile scala.tools.scaladoc.Main "$@";; - scalarun* ) exec_interpret scalai.Main "$@";; - scalaint* ) exec_interpret scalai.Main -interactive "$@";; + scalarun* ) exec_interpret scala.tools.scalai.Main "$@";; + scalaint* ) exec_interpret scala.tools.scalai.Main -interactive "$@";; dtd2scala* ) exec_dtd2scala scala.tools.dtd2scala.Main "$@";; scalap* ) exec_scalap scala.tools.scalap.Main "$@";; scalatest* ) exec_scalatest scala.tools.scalatest.Main "$@";; |