Windows - forward to scala-cli jar launcher

Author: bishabosha

dist/bin/scala.bat

@@ -14,86 +14,27 @@ for %%f in ("%~dp0.") do (
 call "%_PROG_HOME%\bin\common.bat"
 if not %_EXITCODE%==0 goto end
 
-call :args %*
-
 @rem #########################################################################
 @rem ## Main
 
-call :compilerJavaClasspathArgs
-
-call :setScalaVersion
+call :setScalaOpts
 
 @rem we need to escape % in the java command path, for some reason this doesnt work in common.bat
 set "_JAVACMD=!_JAVACMD:%%=%%%%!"
 
-call "%_JAVACMD%" %_JAVA_ARGS% "-Dscala.releaseversion=%_SCALA_VERSION%" "-Dscala.home=%_PROG_HOME%" -classpath "%_JVM_CP_ARGS%" dotty.tools.MainGenericRunner -classpath "%_JVM_CP_ARGS%" %_SCALA_ARGS%
+call "%_JAVACMD%" "-jar" "%SCALA_CLI_JAR%" "--cli-default-scala-version" "%_SCALA_VERSION%" "-r" "%MVN_REPOSITORY%" %*
 if not %ERRORLEVEL%==0 ( set _EXITCODE=1& goto end )
 
 goto end
 
 @rem #########################################################################
 @rem ## Subroutines
 
-:args
-set _JAVA_ARGS=
-set _SCALA_ARGS=
-set _SCALA_CPATH=
-set "_SCALA_VERSION="
-
-:args_loop
-if "%~1"=="" goto args_done
-set "__ARG=%~1"
-if "%__ARG:~0,2%"=="-D" (
-    @rem pass to scala as well: otherwise we lose it sometimes when we
-    @rem need it, e.g. communicating with a server compiler.
-    set _JAVA_ARGS=!_JAVA_ARGS! "%__ARG%"
-    set _SCALA_ARGS=!_SCALA_ARGS! "%__ARG%"
-) else if "%__ARG:~0,2%"=="-J" (
-    @rem as with -D, pass to scala even though it will almost
-    @rem never be used.
-    set _JAVA_ARGS=!_JAVA_ARGS! %__ARG:~2%
-    set _SCALA_ARGS=!_SCALA_ARGS! "%__ARG%"
-) else if "%__ARG%"=="-classpath" (
-    set "_SCALA_CPATH=%~2"
-    shift
-) else if "%__ARG%"=="-cp" (
-    set "_SCALA_CPATH=%~2"
-    shift
-) else (
-    set _SCALA_ARGS=!_SCALA_ARGS! "%__ARG%"
-)
-shift
-goto args_loop
-:args_done
-goto :eof
-
-@rem output parameter: _JVM_CP_ARGS
-:compilerJavaClasspathArgs
-set __TOOLCHAIN=
-set "__TOOLCHAIN=%__TOOLCHAIN%%_SCALA_LIB%%_PSEP%"
-set "__TOOLCHAIN=%__TOOLCHAIN%%_SCALA3_LIB%%_PSEP%"
-set "__TOOLCHAIN=%__TOOLCHAIN%%_SCALA_ASM%%_PSEP%"
-set "__TOOLCHAIN=%__TOOLCHAIN%%_SBT_INTF%%_PSEP%"
-set "__TOOLCHAIN=%__TOOLCHAIN%%_SCALA3_INTF%%_PSEP%"
-set "__TOOLCHAIN=%__TOOLCHAIN%%_SCALA3_COMP%%_PSEP%"
-set "__TOOLCHAIN=%__TOOLCHAIN%%_TASTY_CORE%%_PSEP%"
-set "__TOOLCHAIN=%__TOOLCHAIN%%_SCALA3_STAGING%%_PSEP%"
-set "__TOOLCHAIN=%__TOOLCHAIN%%_SCALA3_TASTY_INSPECTOR%%_PSEP%"
-
-@rem # jline
-set "__TOOLCHAIN=%__TOOLCHAIN%%_JLINE_READER%%_PSEP%"
-set "__TOOLCHAIN=%__TOOLCHAIN%%_JLINE_TERMINAL%%_PSEP%"
-set "__TOOLCHAIN=%__TOOLCHAIN%%_JLINE_TERMINAL_JNA%%_PSEP%"
-set "__TOOLCHAIN=%__TOOLCHAIN%%_JNA%%_PSEP%"
-
-if defined _SCALA_CPATH (
-    set "_JVM_CP_ARGS=%__TOOLCHAIN%%_SCALA_CPATH%"
-) else (
-    set "_JVM_CP_ARGS=%__TOOLCHAIN%"
-)
-goto :eof
+:setScalaOpts
 
-:setScalaVersion
+set "_SCALA_VERSION="
+set "MVN_REPOSITORY=file://%_PROG_HOME:\=/%/maven2"
+set "SCALA_CLI_JAR=%_PROG_HOME%\etc\scala-cli.jar"
 
 @rem read for version:=_SCALA_VERSION in VERSION_FILE
 FOR /F "usebackq delims=" %%G IN ("%_PROG_HOME%\VERSION") DO (