diff options
| author | Adriaan Moors <adriaan.moors@epfl.ch> | 2011-11-16 17:47:22 +0000 |
|---|---|---|
| committer | Adriaan Moors <adriaan.moors@epfl.ch> | 2011-11-16 17:47:22 +0000 |
| commit | 3b0fd925a85f2d5cdab7c1467fb60fce287114f3 (patch) | |
| tree | 40f9a3e913e8857712a76255a196ce7f672b49c9 /test/partest.bat | |
| parent | 5270d614f019d59f8ec1723666ea9ebbba9b071e (diff) | |
| download | scala-3b0fd925a85f2d5cdab7c1467fb60fce287114f3.tar.gz scala-3b0fd925a85f2d5cdab7c1467fb60fce287114f3.tar.bz2 scala-3b0fd925a85f2d5cdab7c1467fb60fce287114f3.zip | |
another theory on the windows build
i think it couldn't find javac, since it was hardwired to
JAVAHOME/bin/javac, but that didn't exist in the windows jre/ directory
structure
Diffstat (limited to 'test/partest.bat')
| -rwxr-xr-x | test/partest.bat | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/test/partest.bat b/test/partest.bat index 115757d76b..58c4c92447 100755 --- a/test/partest.bat +++ b/test/partest.bat @@ -30,6 +30,10 @@ rem We use the value of the JAVACMD environment variable if defined set _JAVACMD=%JAVACMD%
if "%_JAVACMD%"=="" set _JAVACMD=java
+rem We use the value of the JAVACCMD environment variable if defined
+set _JAVACCMD=%JAVACCMD%
+if "%_JAVACCMD%"=="" set _JAVACCMD=javac
+
rem We use the value of the JAVA_OPTS environment variable if defined
set _JAVA_OPTS=%JAVA_OPTS%
if "%_JAVA_OPTS%"=="" set _JAVA_OPTS=-Xmx256M -Xms16M
@@ -53,7 +57,7 @@ if "%_EXTENSION_CLASSPATH%"=="" ( )
)
-set _PROPS=-Dscala.home="%_SCALA_HOME%" -Dpartest.javacmd="%_JAVACMD%" -Dpartest.java_options="%_JAVA_OPTS%" -Dpartest.scalac_options="%_SCALAC_OPTS%" -Dpartest.javac_cmd="%JAVA_HOME%\bin\javac"
+set _PROPS=-Dscala.home="%_SCALA_HOME%" -Dpartest.javacmd="%_JAVACMD%" -Dpartest.java_options="%_JAVA_OPTS%" -Dpartest.scalac_options="%_SCALAC_OPTS%" -Dpartest.javac_cmd="%_JAVACCMD%"
rem echo %_JAVACMD% %_JAVA_OPTS% %_PROPS% -cp "%_EXTENSION_CLASSPATH%" scala.tools.partest.nest.NestRunner %_ARGS%
%_JAVACMD% %_JAVA_OPTS% %_PROPS% -cp "%_EXTENSION_CLASSPATH%" scala.tools.partest.nest.NestRunner %_ARGS%
|