File tree 1 file changed +18
-1
lines changed
1 file changed +18
-1
lines changed Original file line number Diff line number Diff line change @@ -21,10 +21,12 @@ call :args %*
21
21
22
22
call :compilerJavaClasspathArgs
23
23
24
+ call :setScalaVersion
25
+
24
26
@ rem we need to escape % in the java command path, for some reason this doesnt work in common.bat
25
27
set " _JAVACMD = !_JAVACMD:%% =%%%% ! "
26
28
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%
28
30
if not %ERRORLEVEL% == 0 ( set _EXITCODE = 1& goto end )
29
31
30
32
goto end
@@ -36,6 +38,7 @@ goto end
36
38
set _JAVA_ARGS =
37
39
set _SCALA_ARGS =
38
40
set _SCALA_CPATH =
41
+ set " _SCALA_VERSION = "
39
42
40
43
:args_loop
41
44
if " %~1 " == " " goto args_done
@@ -90,6 +93,20 @@ if defined _SCALA_CPATH (
90
93
)
91
94
goto :eof
92
95
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
+
93
110
@ rem #########################################################################
94
111
@ rem ## Cleanups
95
112
You can’t perform that action at this time.
0 commit comments