Skip to content

Commit e8ff570

Browse files
committed
Windows - extract scala version from VERSION file
1 parent 222d60f commit e8ff570

File tree

1 file changed

+18
-1
lines changed

1 file changed

+18
-1
lines changed

dist/bin/scala.bat

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,12 @@ call :args %*
2121

2222
call :compilerJavaClasspathArgs
2323

24+
call :setScalaVersion
25+
2426
@rem we need to escape % in the java command path, for some reason this doesnt work in common.bat
2527
set "_JAVACMD=!_JAVACMD:%%=%%%%!"
2628

27-
call "%_JAVACMD%" %_JAVA_ARGS% "-Dscala.home=%_PROG_HOME%" -classpath "%_JVM_CP_ARGS%" dotty.tools.MainGenericRunner -classpath "%_JVM_CP_ARGS%" %_SCALA_ARGS%
29+
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%
2830
if not %ERRORLEVEL%==0 ( set _EXITCODE=1& goto end )
2931

3032
goto end
@@ -36,6 +38,7 @@ goto end
3638
set _JAVA_ARGS=
3739
set _SCALA_ARGS=
3840
set _SCALA_CPATH=
41+
set "_SCALA_VERSION="
3942

4043
:args_loop
4144
if "%~1"=="" goto args_done
@@ -90,6 +93,20 @@ if defined _SCALA_CPATH (
9093
)
9194
goto :eof
9295

96+
:setScalaVersion
97+
98+
@rem read for version:=_SCALA_VERSION in VERSION_FILE
99+
FOR /F "usebackq delims=" %%G IN ("%_PROG_HOME%\VERSION") DO (
100+
SET "line=%%G"
101+
IF "!line:~0,9!"=="version:=" (
102+
SET "_SCALA_VERSION=!line:~9!"
103+
GOTO :foundVersion
104+
)
105+
)
106+
107+
:foundVersion
108+
goto :eof
109+
93110
@rem #########################################################################
94111
@rem ## Cleanups
95112

0 commit comments

Comments
 (0)