Batch files no longer swallow exit codes

xeno-by · xeno-by · commit d718a7c7f31a · 2011-12-09T22:33:01.000+01:00
Usually scripts like scala.bat and scalac.bat correctly propagate
exit codes from underlying Java invocations. However, if you run these
scripts as follows: "cmd /c scala ...", then errorlevel gets swallowed.
This simple patch fixes the aforementioned problem.

Fixes SI-5295, no review.
diff --git a/src/compiler/scala/tools/ant/templates/tool-windows.tmpl b/src/compiler/scala/tools/ant/templates/tool-windows.tmpl
@@ -86,3 +86,4 @@ goto :eof
 
 :end
 @@endlocal
+exit /b %errorlevel%
diff --git a/test/files/jvm/mkLibNatives.bat b/test/files/jvm/mkLibNatives.bat
@@ -67,4 +67,4 @@ goto end
 
 :end
 if "%OS%"=="Windows_NT" @endlocal
-
+exit /b %errorlevel%
diff --git a/test/partest.bat b/test/partest.bat
@@ -101,3 +101,4 @@ goto end
 
 :end
 if "%OS%"=="Windows_NT" @endlocal
+exit /b %errorlevel%

Original file line number	Diff line number	Diff line change
`@@ -86,3 +86,4 @@ goto :eof`
`86`	`86`
`87`	`87`	`:end`
`88`	`88`	`@@endlocal`
	`89`	`+exit /b %errorlevel%`
Original file line number	Diff line number	Diff line change
`@@ -101,3 +101,4 @@ goto end`
`101`	`101`
`102`	`102`	`:end`
`103`	`103`	`if "%OS%"=="Windows_NT" @endlocal`
	`104`	`+exit /b %errorlevel%`