diff options
| -rw-r--r-- | build.xml | 8 | ||||
| -rw-r--r-- | sources/bin/nscala-tool.win.tmpl | 5 | ||||
| -rw-r--r-- | sources/bin/nscala.unix.tmpl | 2 |
3 files changed, 9 insertions, 6 deletions
@@ -316,7 +316,7 @@ <filterset> <filter token="VERSION" value="${scala.version}"/> <filter token="COPYRIGHT" value="${copyright.notice}"/> - <filter token="TOOLS_CPATH" value="$PREFIX/lib/fjbg.jar:$PREFIX/lib/msil.jar:$PREFIX/lib/scala.jar:$PREFIX/lib/tools.jar:$PREFIX/lib/${osc-nstools.jar.name}:$PREFIX/lib/${nslib.jar.name}"/> + <filter token="TOOLS_CPATH" value="$PREFIX/lib/fjbg.jar:$PREFIX/lib/msil.jar:$PREFIX/lib/scala.jar:$PREFIX/lib/tools.jar:$PREFIX/lib/${osc-nstools.jar.name}"/> <filter token="LIB_CPATH" value="$PREFIX/lib/${nslib.jar.name}"/> </filterset> </copy> @@ -377,7 +377,8 @@ <filter token="VERSION" value="${scala.version}"/> <filter token="COPYRIGHT" value="${copyright.notice}"/> <filter token="MAIN" value="scala.tools.nsc.Main"/> - <filter token="CPATH" value="${quotted.lib.dir}\fjbg.jar;${quotted.lib.dir}\msil.jar;${quotted.lib.dir}\scala.jar;${quotted.lib.dir}\tools.jar;${quotted.lib.dir}\${osc-nstools.jar.name};${quotted.lib.dir}\${nslib.jar.name}"/> + <filter token="TOOLS_CPATH" value="${quotted.lib.dir}\fjbg.jar;${quotted.lib.dir}\msil.jar;${quotted.lib.dir}\scala.jar;${quotted.lib.dir}\tools.jar;${quotted.lib.dir}\${osc-nstools.jar.name}"/> + <filter token="LIB_CPATH" value="${quotted.lib.dir}\${nslib.jar.name}"/> </filterset> </copy> <copy file="${support.dir}/bin/nscala-tool.win.tmpl" @@ -387,7 +388,8 @@ <filter token="VERSION" value="${scala.version}"/> <filter token="COPYRIGHT" value="${copyright.notice}"/> <filter token="MAIN" value="scala.tools.scalap.Main"/> - <filter token="CPATH" value="${quotted.lib.dir}\fjbg.jar;${quotted.lib.dir}\msil.jar;${quotted.lib.dir}\scala.jar;${quotted.lib.dir}\tools.jar;${quotted.lib.dir}\${osc-nstools.jar.name};${quotted.lib.dir}\${nslib.jar.name}"/> + <filter token="TOOLS_CPATH" value="${quotted.lib.dir}\fjbg.jar;${quotted.lib.dir}\msil.jar;${quotted.lib.dir}\scala.jar;${quotted.lib.dir}\tools.jar;${quotted.lib.dir}\${osc-nstools.jar.name}"/> + <filter token="LIB_CPATH" value="${quotted.lib.dir}\${nslib.jar.name}"/> </filterset> </copy> <fixcrlf srcdir="${distrib.win.current.dir}/bin" eol="dos"/> diff --git a/sources/bin/nscala-tool.win.tmpl b/sources/bin/nscala-tool.win.tmpl index 5006ac5ec1..0e6a5cdb70 100644 --- a/sources/bin/nscala-tool.win.tmpl +++ b/sources/bin/nscala-tool.win.tmpl @@ -24,10 +24,11 @@ goto loop set _JAVACMD=java set _PROPS=-Dscala.product=@PRODUCT@ -Dscala.version=@VERSION@ set _MAIN=@MAIN@ -set _CPATH=@CPATH@ +set _TOOLS_CPATH=@TOOLS_CPATH@ +set _LIB_CPATH=@LIB_CPATH@ rem echo %_JAVACMD% %_PROPS% -cp %_CPATH% %_MAIN% %_ARGS% -%_JAVACMD% %_PROPS% -cp %_CPATH% %_MAIN% %_ARGS% +%_JAVACMD% %_PROPS% -cp %_TOOLS_CPATH% %_MAIN% -sourcepath %_LIB_CPATH% %_ARGS% goto end rem ########################################################################## diff --git a/sources/bin/nscala.unix.tmpl b/sources/bin/nscala.unix.tmpl index 22f9dc229e..8825b6b27a 100644 --- a/sources/bin/nscala.unix.tmpl +++ b/sources/bin/nscala.unix.tmpl @@ -76,5 +76,5 @@ else -Dscala.version="@VERSION@" \ -Dscala.home="$PREFIX" \ -cp "$_TOOLS_CPATH" \ - $main "$@" + $main -sourcepath "$_LIB_CPATH" "$@" fi |