diff options
| author | Gilles Dubochet <gilles.dubochet@epfl.ch> | 2005-12-20 13:43:47 +0000 |
|---|---|---|
| committer | Gilles Dubochet <gilles.dubochet@epfl.ch> | 2005-12-20 13:43:47 +0000 |
| commit | 7ccea812b72c15670fb3c5026acb7856a36e7fad (patch) | |
| tree | ae588207aeb2a4414804357d7aad20e6c867d73c | |
| parent | ec2227a0609b192f3365394ce73ea665debf06fa (diff) | |
| download | scala-7ccea812b72c15670fb3c5026acb7856a36e7fad.tar.gz scala-7ccea812b72c15670fb3c5026acb7856a36e7fad.tar.bz2 scala-7ccea812b72c15670fb3c5026acb7856a36e7fad.zip | |
1.
2. Removed dead text in ant/NSC.
| -rw-r--r-- | build.xml | 4 | ||||
| -rw-r--r-- | src/compiler/scala/tools/nsc/ant/NSC.scala | 5 | ||||
| -rw-r--r-- | src/exec/scala-tool.unix.tmpl | 2 |
3 files changed, 3 insertions, 8 deletions
@@ -493,8 +493,8 @@ basedir="${strap.lib.dir}"> </jar> <mkdir dir="${dist.dir}/bin"/> - <build.exec lib.dir="lib/${lib.jar.name}" - comp.dir="lib/${comp.jar.name}" + <build.exec lib.dir="$$PREFIX/lib/${lib.jar.name}" + comp.dir="$$PREFIX/lib/${comp.jar.name}" exec.dir="${dist.dir}/bin"/> </target> diff --git a/src/compiler/scala/tools/nsc/ant/NSC.scala b/src/compiler/scala/tools/nsc/ant/NSC.scala index 9010a92bf9..33ae7d4f03 100644 --- a/src/compiler/scala/tools/nsc/ant/NSC.scala +++ b/src/compiler/scala/tools/nsc/ant/NSC.scala @@ -609,11 +609,6 @@ package scala.tools.nsc.ant { settings.debuginfo.value = debugInfo; if (!logPhase.isEmpty) settings.log.value = logPhase; - // Sets path properties to prevent ClassPath from being corrupted. - // It this isn't done, classpath will contain more than - //System.setProperty("scala.library.class.path", ""); - //System.setProperty("scala.library.source.path", ""); - // Compiles the actual code val compiler = new Global(settings, reporter); try { diff --git a/src/exec/scala-tool.unix.tmpl b/src/exec/scala-tool.unix.tmpl index 1be39c4fe1..71f10fa261 100644 --- a/src/exec/scala-tool.unix.tmpl +++ b/src/exec/scala-tool.unix.tmpl @@ -39,4 +39,4 @@ $JAVA \ -Dscala.version="20051219-1541" \ -Dscala.home="$PREFIX" \ -cp "$JAVA_CLASSPATH" \ - "$TOOL" -bootclasspath "$TOOL_CLASSPATH" "$@"
\ No newline at end of file + "$TOOL" -sourcepath "$TOOL_CLASSPATH" "$@"
\ No newline at end of file |