Fix old scala runner to use correct JLine classpath (#22464)

* Remove JNA dependencies from dist scripts. * Add `jline-native` dependency (used by jline-terminal-jni) Issue affected only Windows users - when executing the script the no longer existing class path entries (jna-5, and jline-terminal-jna) were reported with errors as not existing files Fixes #22460 Forward-portable to Scala Next legacy runner scripts
scala · Jan 27, 2025 · 3231b5b · 3231b5b
2 parents 2bda6c1 + f70ef36
commit 3231b5b
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 12 deletions.
diff --git a/dist/bin/common b/dist/bin/common
@@ -156,10 +156,8 @@ SCALA_LIB=$(find_lib "*scala-library*")
 SBT_INTF=$(find_lib "*compiler-interface*")
 JLINE_READER=$(find_lib "*jline-reader-3*")
 JLINE_TERMINAL=$(find_lib "*jline-terminal-3*")
-JLINE_TERMINAL_JNA=$(find_lib "*jline-terminal-jna-3*")
-
-# jna-5 only appropriate for some combinations
-[[ ${conemu-} && ${msys-} ]] || JNA=$(find_lib "*jna-5*")
+JLINE_TERMINAL_JNI=$(find_lib "*jline-terminal-jni-3*")
+JLINE_NATIVE=$(find_lib "*jline-native-3*")
 
 compilerJavaClasspathArgs () {
   # echo "dotty-compiler: $DOTTY_COMP"
@@ -184,8 +182,8 @@ compilerJavaClasspathArgs () {
   # jine
   toolchain+="$JLINE_READER$PSEP"
   toolchain+="$JLINE_TERMINAL$PSEP"
-  toolchain+="$JLINE_TERMINAL_JNA$PSEP"
-  [ -n "${JNA-}" ] && toolchain+="$JNA$PSEP"
+  toolchain+="$JLINE_TERMINAL_JNI$PSEP"
+  toolchain+="$JLINE_NATIVE$PSEP"
 
   if [ -n "${jvm_cp_args-}" ]; then
     jvm_cp_args="$toolchain$jvm_cp_args"

diff --git a/dist/bin/common.bat b/dist/bin/common.bat
@@ -53,5 +53,5 @@ for /f "delims=" %%f in ('dir /a-d /b "%_LIB_DIR%\*scala-library*"')          do
 for /f "delims=" %%f in ('dir /a-d /b "%_LIB_DIR%\*compiler-interface*"')     do set "_SBT_INTF=%_LIB_DIR%\%%f"
 for /f "delims=" %%f in ('dir /a-d /b "%_LIB_DIR%\*jline-reader-3*"')         do set "_JLINE_READER=%_LIB_DIR%\%%f"
 for /f "delims=" %%f in ('dir /a-d /b "%_LIB_DIR%\*jline-terminal-3*"')       do set "_JLINE_TERMINAL=%_LIB_DIR%\%%f"
-for /f "delims=" %%f in ('dir /a-d /b "%_LIB_DIR%\*jline-terminal-jna-3*"')   do set "_JLINE_TERMINAL_JNA=%_LIB_DIR%\%%f"
-for /f "delims=" %%f in ('dir /a-d /b "%_LIB_DIR%\*jna-5*"')                  do set "_JNA=%_LIB_DIR%\%%f"
+for /f "delims=" %%f in ('dir /a-d /b "%_LIB_DIR%\*jline-terminal-jni-3*"')   do set "_JLINE_TERMINAL_JNI=%_LIB_DIR%\%%f"
+for /f "delims=" %%f in ('dir /a-d /b "%_LIB_DIR%\*jline-native-3*"')         do set "_JLINE_NATIVE=%_LIB_DIR%\%%f"
diff --git a/dist/bin/scala.bat b/dist/bin/scala.bat
@@ -77,8 +77,8 @@ 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%"
+set "__TOOLCHAIN=%__TOOLCHAIN%%_JLINE_TERMINAL_JNI%%_PSEP%"
+set "__TOOLCHAIN=%__TOOLCHAIN%%_JLINE_NATIVE%%_PSEP%"
 
 if defined _SCALA_CPATH (
     set "_JVM_CP_ARGS=%__TOOLCHAIN%%_SCALA_CPATH%"

diff --git a/dist/bin/scalac.bat b/dist/bin/scalac.bat
@@ -106,8 +106,8 @@ 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%"
+set "__TOOLCHAIN=%__TOOLCHAIN%%_JLINE_TERMINAL_JNI%%_PSEP%"
+set "__TOOLCHAIN=%__TOOLCHAIN%%_JLINE_NATIVE%%_PSEP%"
 
 if defined _SCALA_CPATH (
     set "_JVM_CP_ARGS=%__TOOLCHAIN%%_SCALA_CPATH%"