removed debug code from batch scripts

Author: michelou

dist/bin/common.bat

@@ -3,13 +3,10 @@ rem ## Code common to dotc.bat, dotd.bat and dotr.bat
 
 if defined JAVACMD (
     set _JAVACMD=%JAVACMD%
-    if %_DEBUG%==1 echo [%_BASENAME%] Using environment variable JAVACMD
 ) else if defined JAVA_HOME (
     set _JAVACMD=%JAVA_HOME%\bin\java.exe
-    if %_DEBUG%==1 echo [%_BASENAME%] Using environment variable JAVA_HOME
 ) else if defined JDK_HOME (
     set _JAVACMD=%JDK_HOME%\bin\java.exe
-    if %_DEBUG%==1 echo [%_BASENAME%] Using environment variable JDK_HOME
 ) else (
     where /q java.exe
     if !ERRORLEVEL!==0 (
@@ -25,7 +22,6 @@ if defined JAVACMD (
            for /f %%f in ('dir /ad /b "!_PATH!\jdk*" 2^>NUL') do set _JAVA_HOME=!_PATH!\%%f\jre
         )
         if defined _JAVA_HOME (
-            if %_DEBUG%==1 echo [%_BASENAME%] Using default Java installation directory !_JAVA_HOME!
             set _JAVACMD=!_JAVA_HOME!\bin\java.exe
         )
     )

dist/bin/dotc.bat

@@ -1,9 +1,6 @@
 @echo off
 setlocal enabledelayedexpansion
 
-rem only for interactive debugging !
-set _DEBUG=0
-
 rem ##########################################################################
 rem ## Environment setup
 
@@ -32,12 +29,11 @@ call :classpathArgs
 if defined JAVA_OPTS ( set _JAVA_OPTS=%JAVA_OPTS%
 ) else ( set _JAVA_OPTS=-Xmx768m -Xms768m
 )
-if %_DEBUG%==1 echo [%_BASENAME%] "%_JAVACMD%" %_JAVA_OPTS% %_JAVA_DEBUG% %_JAVA_ARGS% %_JVM_CP_ARGS% -Dscala.usejavacp=true %_PROG_NAME% %_SCALA_ARGS% %_RESIDUAL_ARGS%
 "%_JAVACMD%" %_JAVA_OPTS% %_JAVA_DEBUG% %_JAVA_ARGS% %_JVM_CP_ARGS% ^
 -Dscala.usejavacp=true ^
 %_PROG_NAME% %_SCALA_ARGS% %_RESIDUAL_ARGS%
 if not %ERRORLEVEL%==0 (
-    if %_DEBUG%==1 echo [%_BASENAME%] Dotty compiler execution failed
+    rem echo Error: Dotty compiler execution failed 1>&2
     set _EXITCODE=1
     goto end
 )
@@ -59,7 +55,6 @@ set _RESIDUAL_ARGS=
 :args_loop
 if "%~1"=="" goto args_done
 set __ARG=%~1
-if %_DEBUG%==1 echo [%_BASENAME%] __ARG=%__ARG%
 if "%__ARG%"=="--" (
     rem for arg; do addResidual "$arg"; done; set -- ;;
 ) else if /i "%__ARG%"=="-h" (
@@ -105,26 +100,21 @@ rem will be available as system properties.
 shift
 goto args_loop
 :args_done
-if %_DEBUG%==1 echo [%_BASENAME%] _VERBOSE=%_VERBOSE%
-if %_DEBUG%==1 echo [%_BASENAME%] _PROG_NAME=%_PROG_NAME%
 goto :eof
 
 rem output parameter: _SCALA_ARGS
 :addScala
 set _SCALA_ARGS=%_SCALA_ARGS% %~1
-if %_DEBUG%==1 echo [%_BASENAME%] _SCALA_ARGS=%_SCALA_ARGS%
 goto :eof
 
 rem output parameter: _JAVA_ARGS
 :addJava
 set _JAVA_ARGS=%_JAVA_ARGS% %~1
-if %_DEBUG%==1 echo [%_BASENAME%] _JAVA_ARGS=%_JAVA_ARGS%
 goto :eof
 
 rem output parameter: _RESIDUAL_ARGS
 :addResidual
 set _RESIDUAL_ARGS=%_RESIDUAL_ARGS% %~1
-if %_DEBUG%==1 echo [%_BASENAME%] _RESIDUAL_ARGS=%_RESIDUAL_ARGS%
 goto :eof
 
 rem output parameter: _JVM_CP_ARGS
@@ -157,7 +147,6 @@ rem ##########################################################################
 rem ## Cleanups
 
 :end
-if %_DEBUG%==1 echo [%_BASENAME%] _EXITCODE=%_EXITCODE%
 exit /b %_EXITCODE%
 endlocal
 

dist/bin/dotd.bat

@@ -1,9 +1,6 @@
 @echo off
 setlocal enabledelayedexpansion
 
-rem only for interactive debugging !
-set _DEBUG=0
-
 rem ##########################################################################
 rem ## Environment setup
 
@@ -21,10 +18,9 @@ rem ## Main
 
 call :javaClassPath
 
-if %_DEBUG%==1 echo [%_BASENAME%] "%_JAVACMD%" -Dscala.usejavacp=true -classpath "%_CLASS_PATH%" dotty.tools.dottydoc.Main %*
 "%_JAVACMD%" -Dscala.usejavacp=true -classpath "%_CLASS_PATH%" dotty.tools.dottydoc.Main %*
 if not %ERRORLEVEL%==0 (
-    if %_DEBUG%==1 echo [%_BASENAME%] Dottydoc execution failed
+    rem echo Error: Dottydoc execution failed 1>&2
     set _EXITCODE=1
     goto end
 )
@@ -99,6 +95,5 @@ rem ##########################################################################
 rem ## Cleanups
 
 :end
-if %_DEBUG%==1 echo [%_BASENAME%] _EXITCODE=%_EXITCODE%
 exit /b %_EXITCODE%
 endlocal

dist/bin/dotr.bat

@@ -1,9 +1,6 @@
 @echo off
 setlocal enabledelayedexpansion
 
-rem only for interactive debugging !
-set _DEBUG=0
-
 rem ##########################################################################
 rem ## Environment setup
 
@@ -35,7 +32,6 @@ if %_CASE_1%==1 (
     if defined _CLASS_PATH set _DOTC_ARGS=-classpath "%_CLASS_PATH%"
     set _DOTC_ARGS=!_DOTC_ARGS! %_JAVA_OPTIONS% -repl %_RESIDUAL_ARGS%
     echo Starting dotty REPL...
-    if %_DEBUG%==1 echo [%_BASENAME%] %_PROG_HOME%\bin\dotc.bat !_DOTC_ARGS!
     %_PROG_HOME%\bin\dotc.bat !_DOTC_ARGS!
 rem elif [ $execute_repl == true ] || [ ${#residual_args[@]} -ne 0 ]; then
 ) else if %_CASE_2%==1 (
@@ -50,7 +46,6 @@ rem elif [ $execute_repl == true ] || [ ${#residual_args[@]} -ne 0 ]; then
         set _CP_ARG=!_CP_ARG!%_PSEP%%_DOTTY_COMP%%_PSEP%%_DOTTY_INTF%%_PSEP%%_SCALA_ASM%
     )
     set _JAVA_ARGS=%_JAVA_DEBUG% -classpath "!_CP_ARG!" %_RESIDUAL_ARGS%
-    if %_DEBUG%==1 echo [%_BASENAME%] %_JAVACMD% !_JAVA_ARGS!
     %_JAVACMD% !_JAVA_ARGS!
 ) else (
     echo Warning: Command option is not correct. 1>&2
@@ -103,6 +98,5 @@ rem ##########################################################################
 rem ## Cleanups
 
 :end
-if %_DEBUG%==1 echo [%_BASENAME%] _EXITCODE=%_EXITCODE%
 exit /b %_EXITCODE%
 endlocal