diff options
| author | Paul Phillips <paulp@improving.org> | 2010-11-16 05:03:50 +0000 |
|---|---|---|
| committer | Paul Phillips <paulp@improving.org> | 2010-11-16 05:03:50 +0000 |
| commit | 81d659141ae743d1d0ced41961ea6d4461c005ea (patch) | |
| tree | 44f082cd5032bc2ff3530a9a61f3a8c08d666c8f /src | |
| parent | e3c3cc97597d8c77b0e8f8552b3ba78d111fac97 (diff) | |
| download | scala-81d659141ae743d1d0ced41961ea6d4461c005ea.tar.gz scala-81d659141ae743d1d0ced41961ea6d4461c005ea.tar.bz2 scala-81d659141ae743d1d0ced41961ea6d4461c005ea.zip | |
ant, build.xml and classpath issues.
been ignoring their painstakingly set classpaths and using whatever they
can find in the vicinity of the scala script, which works OK for pack
but not so well for quick.
I also added a build.xml feature so you can drop jars into a dir
and have them automatically used everywhere. The directory is
lib/extra. Pro tip: add lib/extra to .gitignore and put jars like
yjp-controller-api-redist.jar in there.
Closes #3706, no review.
Diffstat (limited to 'src')
| -rw-r--r-- | src/compiler/scala/tools/ant/templates/tool-unix.tmpl | 2 | ||||
| -rw-r--r-- | src/compiler/scala/tools/nsc/symtab/NameManglers.scala (renamed from src/compiler/scala/tools/nsc/symtab/NameMangling.scala) | 0 |
2 files changed, 1 insertions, 1 deletions
diff --git a/src/compiler/scala/tools/ant/templates/tool-unix.tmpl b/src/compiler/scala/tools/ant/templates/tool-unix.tmpl index b87463f0b9..ceb6ec5ad4 100644 --- a/src/compiler/scala/tools/ant/templates/tool-unix.tmpl +++ b/src/compiler/scala/tools/ant/templates/tool-unix.tmpl @@ -80,4 +80,4 @@ if [ -z "$JAVACMD" -a -n "$JAVA_HOME" -a -x "$JAVA_HOME/bin/java" ]; then JAVACMD="$JAVA_HOME/bin/java" fi -exec "${JAVACMD:=java}" $JAVA_OPTS -cp "$TOOL_CLASSPATH" -Dscala.home="$SCALA_HOME" -Denv.emacs="$EMACS" @properties@ @class@ @toolflags@ "$@@" +exec "${JAVACMD:=java}" $JAVA_OPTS -cp "$TOOL_CLASSPATH" -Dscala.usejavacp=true -Dscala.home="$SCALA_HOME" -Denv.emacs="$EMACS" @properties@ @class@ @toolflags@ "$@@" diff --git a/src/compiler/scala/tools/nsc/symtab/NameMangling.scala b/src/compiler/scala/tools/nsc/symtab/NameManglers.scala index 525fcced84..525fcced84 100644 --- a/src/compiler/scala/tools/nsc/symtab/NameMangling.scala +++ b/src/compiler/scala/tools/nsc/symtab/NameManglers.scala |