diff options
| author | buraq <buraq@epfl.ch> | 2003-07-15 13:30:26 +0000 |
|---|---|---|
| committer | buraq <buraq@epfl.ch> | 2003-07-15 13:30:26 +0000 |
| commit | 177dba42d55610b4b8fb17a743e11ea30e6c3abf (patch) | |
| tree | eaf47fa50c2681c743d49275efee5ff58d32bf47 | |
| parent | f56a073205c25b0f14ec6f7764d3f7e1da6cd586 (diff) | |
| download | scala-177dba42d55610b4b8fb17a743e11ea30e6c3abf.tar.gz scala-177dba42d55610b4b8fb17a743e11ea30e6c3abf.tar.bz2 scala-177dba42d55610b4b8fb17a743e11ea30e6c3abf.zip | |
XERCES_PATH has to come before scala (esp.
| -rwxr-xr-x | bin/.scala_wrapper | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/bin/.scala_wrapper b/bin/.scala_wrapper index 24e3f8ab74..6564f8ff98 100755 --- a/bin/.scala_wrapper +++ b/bin/.scala_wrapper @@ -69,7 +69,7 @@ if [ "$CVSTREE" = "true" ]; then BCEL_PATH="${BCEL_PATH:-/home/linuxsoft/apps/BCEL-5/bcel.jar}"; FJBG_PATH="${FJBG_PATH:-/home/linuxsoft/apps/fjbg/jars/fjbg.jar}"; MSIL_PATH="${MSIL_PATH:-/home/linuxsoft/apps/java2net/msil.jar}"; - XERCES_PATH="${XERCES_PATH:-/home/linuxsoft/apps/xerces-j/xercesImpl.jar}"; + XERCES_PATH="${XERCES_PATH:-/home/linuxsoft/apps/xerces/xercesImpl.jar}"; SCALA_CLASSES="$PREFIX/classes"; SCALA_SOURCES="$PREFIX/sources"; else @@ -88,6 +88,7 @@ JAVA_CLASSPATH="$SCALA_CLASSES"; JAVA_CLASSPATH="$JAVA_CLASSPATH:$BCEL_PATH"; JAVA_CLASSPATH="$JAVA_CLASSPATH:$FJBG_PATH"; JAVA_CLASSPATH="$JAVA_CLASSPATH:$MSIL_PATH"; +JAVA_CLASSPATH="$JAVA_CLASSPATH:$XERCES_PATH"; SCALA_CLASSPATH="${CLASSPATH:-.}" @@ -139,8 +140,7 @@ case "$SCRIPT" in MAIN_ARGS="$MAIN_ARGS -interactive"; ;; dtd2scala* ) - JAVA_CLASSPATH="$JAVA_CLASSPATH:$XERCES_PATH"; - JAVA_MAIN="scala.xml.dtd2scala"; + JAVA_MAIN="dtd2scala.Main"; ;; esac; |