File tree 4 files changed +10
-12
lines changed
4 files changed +10
-12
lines changed Original file line number Diff line number Diff line change @@ -156,10 +156,8 @@ SCALA_LIB=$(find_lib "*scala-library*")
156
156
SBT_INTF=$( find_lib " *compiler-interface*" )
157
157
JLINE_READER=$( find_lib " *jline-reader-3*" )
158
158
JLINE_TERMINAL=$( find_lib " *jline-terminal-3*" )
159
- JLINE_TERMINAL_JNA=$( find_lib " *jline-terminal-jna-3*" )
160
-
161
- # jna-5 only appropriate for some combinations
162
- [[ ${conemu-} && ${msys-} ]] || JNA=$( find_lib " *jna-5*" )
159
+ JLINE_TERMINAL_JNI=$( find_lib " *jline-terminal-jni-3*" )
160
+ JLINE_NATIVE=$( find_lib " *jline-native-3*" )
163
161
164
162
compilerJavaClasspathArgs () {
165
163
# echo "dotty-compiler: $DOTTY_COMP"
@@ -184,8 +182,8 @@ compilerJavaClasspathArgs () {
184
182
# jine
185
183
toolchain+=" $JLINE_READER$PSEP "
186
184
toolchain+=" $JLINE_TERMINAL$PSEP "
187
- toolchain+=" $JLINE_TERMINAL_JNA $PSEP "
188
- [ -n " ${JNA-} " ] && toolchain+=" $JNA $PSEP "
185
+ toolchain+=" $JLINE_TERMINAL_JNI $PSEP "
186
+ toolchain+=" $JLINE_NATIVE $PSEP "
189
187
190
188
if [ -n " ${jvm_cp_args-} " ]; then
191
189
jvm_cp_args=" $toolchain$jvm_cp_args "
Original file line number Diff line number Diff line change @@ -53,5 +53,5 @@ for /f "delims=" %%f in ('dir /a-d /b "%_LIB_DIR%\*scala-library*"') do
53
53
for /f " delims=" %%f in ('dir /a-d /b " %_LIB_DIR% \*compiler-interface*" ') do set " _SBT_INTF = %_LIB_DIR% \%%f "
54
54
for /f " delims=" %%f in ('dir /a-d /b " %_LIB_DIR% \*jline-reader-3*" ') do set " _JLINE_READER = %_LIB_DIR% \%%f "
55
55
for /f " delims=" %%f in ('dir /a-d /b " %_LIB_DIR% \*jline-terminal-3*" ') do set " _JLINE_TERMINAL = %_LIB_DIR% \%%f "
56
- for /f " delims=" %%f in ('dir /a-d /b " %_LIB_DIR% \*jline-terminal-jna -3*" ') do set " _JLINE_TERMINAL_JNA = %_LIB_DIR% \%%f "
57
- for /f " delims=" %%f in ('dir /a-d /b " %_LIB_DIR% \*jna-5 *" ') do set " _JNA = %_LIB_DIR% \%%f "
56
+ for /f " delims=" %%f in ('dir /a-d /b " %_LIB_DIR% \*jline-terminal-jni -3*" ') do set " _JLINE_TERMINAL_JNI = %_LIB_DIR% \%%f "
57
+ for /f " delims=" %%f in ('dir /a-d /b " %_LIB_DIR% \*jline-native-3 *" ') do set " _JLINE_NATIVE = %_LIB_DIR% \%%f "
Original file line number Diff line number Diff line change @@ -77,8 +77,8 @@ set "__TOOLCHAIN=%__TOOLCHAIN%%_SCALA3_TASTY_INSPECTOR%%_PSEP%"
77
77
@ rem # jline
78
78
set " __TOOLCHAIN = %__TOOLCHAIN%%_JLINE_READER%%_PSEP% "
79
79
set " __TOOLCHAIN = %__TOOLCHAIN%%_JLINE_TERMINAL%%_PSEP% "
80
- set " __TOOLCHAIN = %__TOOLCHAIN%%_JLINE_TERMINAL_JNA %%_PSEP% "
81
- set " __TOOLCHAIN = %__TOOLCHAIN%%_JNA %%_PSEP% "
80
+ set " __TOOLCHAIN = %__TOOLCHAIN%%_JLINE_TERMINAL_JNI %%_PSEP% "
81
+ set " __TOOLCHAIN = %__TOOLCHAIN%%_JLINE_NATIVE %%_PSEP% "
82
82
83
83
if defined _SCALA_CPATH (
84
84
set " _JVM_CP_ARGS = %__TOOLCHAIN%%_SCALA_CPATH% "
Original file line number Diff line number Diff line change @@ -106,8 +106,8 @@ set "__TOOLCHAIN=%__TOOLCHAIN%%_SCALA3_TASTY_INSPECTOR%%_PSEP%"
106
106
@ rem # jline
107
107
set " __TOOLCHAIN = %__TOOLCHAIN%%_JLINE_READER%%_PSEP% "
108
108
set " __TOOLCHAIN = %__TOOLCHAIN%%_JLINE_TERMINAL%%_PSEP% "
109
- set " __TOOLCHAIN = %__TOOLCHAIN%%_JLINE_TERMINAL_JNA %%_PSEP% "
110
- set " __TOOLCHAIN = %__TOOLCHAIN%%_JNA %%_PSEP% "
109
+ set " __TOOLCHAIN = %__TOOLCHAIN%%_JLINE_TERMINAL_JNI %%_PSEP% "
110
+ set " __TOOLCHAIN = %__TOOLCHAIN%%_JLINE_NATIVE %%_PSEP% "
111
111
112
112
if defined _SCALA_CPATH (
113
113
set " _JVM_CP_ARGS = %__TOOLCHAIN%%_SCALA_CPATH% "
You can’t perform that action at this time.
0 commit comments