From 74f97eea233e720686cb3d8a19105f9d3b4b887a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Micheloud?= Date: Tue, 21 Sep 2021 23:21:33 +0200 Subject: [PATCH 1/2] bach files support installation path containing spaces --- dist/bin/common.bat | 28 ++++++++++++++-------------- dist/bin/scalac.bat | 28 ++++++++++++++-------------- 2 files changed, 28 insertions(+), 28 deletions(-) diff --git a/dist/bin/common.bat b/dist/bin/common.bat index 9b5a5ed33875..0ffaed18652c 100644 --- a/dist/bin/common.bat +++ b/dist/bin/common.bat @@ -35,20 +35,20 @@ if not exist "%_JAVACMD%" ( ) if not defined _PROG_HOME set "_PROG_HOME=%~dp0" -for /f %%f in ("%_PROG_HOME%\.") do set "_LIB_DIR=%%~dpflib" +for /f "delims=" %%f in ("%_PROG_HOME%\.") do set "_LIB_DIR=%%~dpflib" set _PSEP=; -for /f %%f in ('dir /a-d /b "%_LIB_DIR%\*scala3-compiler*"') do set "_SCALA3_COMP=%_LIB_DIR%\%%f" -for /f %%f in ('dir /a-d /b "%_LIB_DIR%\*scala3-interfaces*"') do set "_SCALA3_INTF=%_LIB_DIR%\%%f" -for /f %%f in ('dir /a-d /b "%_LIB_DIR%\*scala3-library*"') do set "_SCALA3_LIB=%_LIB_DIR%\%%f" -for /f %%f in ('dir /a-d /b "%_LIB_DIR%\*scala3-staging*"') do set "_SCALA3_STAGING=%_LIB_DIR%\%%f" -for /f %%f in ('dir /a-d /b "%_LIB_DIR%\*scala3-tasty-inspector*"') do set "_SCALA3_TASTY_INSPECTOR=%_LIB_DIR%\%%f" -for /f %%f in ('dir /a-d /b "%_LIB_DIR%\*tasty-core*"') do set "_TASTY_CORE=%_LIB_DIR%\%%f" -for /f %%f in ('dir /a-d /b "%_LIB_DIR%\*scala-asm*"') do set "_SCALA_ASM=%_LIB_DIR%\%%f" -for /f %%f in ('dir /a-d /b "%_LIB_DIR%\*scala-library*"') do set "_SCALA_LIB=%_LIB_DIR%\%%f" -for /f %%f in ('dir /a-d /b "%_LIB_DIR%\*compiler-interface*"') do set "_SBT_INTF=%_LIB_DIR%\%%f" -for /f %%f in ('dir /a-d /b "%_LIB_DIR%\*jline-reader-3*"') do set "_JLINE_READER=%_LIB_DIR%\%%f" -for /f %%f in ('dir /a-d /b "%_LIB_DIR%\*jline-terminal-3*"') do set "_JLINE_TERMINAL=%_LIB_DIR%\%%f" -for /f %%f in ('dir /a-d /b "%_LIB_DIR%\*jline-terminal-jna-3*"') do set "_JLINE_TERMINAL_JNA=%_LIB_DIR%\%%f" -for /f %%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%\*scala3-compiler*"') do set "_SCALA3_COMP=%_LIB_DIR%\%%f" +for /f "delims=" %%f in ('dir /a-d /b "%_LIB_DIR%\*scala3-interfaces*"') do set "_SCALA3_INTF=%_LIB_DIR%\%%f" +for /f "delims=" %%f in ('dir /a-d /b "%_LIB_DIR%\*scala3-library*"') do set "_SCALA3_LIB=%_LIB_DIR%\%%f" +for /f "delims=" %%f in ('dir /a-d /b "%_LIB_DIR%\*scala3-staging*"') do set "_SCALA3_STAGING=%_LIB_DIR%\%%f" +for /f "delims=" %%f in ('dir /a-d /b "%_LIB_DIR%\*scala3-tasty-inspector*"') do set "_SCALA3_TASTY_INSPECTOR=%_LIB_DIR%\%%f" +for /f "delims=" %%f in ('dir /a-d /b "%_LIB_DIR%\*tasty-core*"') do set "_TASTY_CORE=%_LIB_DIR%\%%f" +for /f "delims=" %%f in ('dir /a-d /b "%_LIB_DIR%\*scala-asm*"') do set "_SCALA_ASM=%_LIB_DIR%\%%f" +for /f "delims=" %%f in ('dir /a-d /b "%_LIB_DIR%\*scala-library*"') do set "_SCALA_LIB=%_LIB_DIR%\%%f" +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" diff --git a/dist/bin/scalac.bat b/dist/bin/scalac.bat index 88c615ea0732..a3c6c0599747 100644 --- a/dist/bin/scalac.bat +++ b/dist/bin/scalac.bat @@ -103,7 +103,7 @@ if defined _TARGET_SCRIPT ( ) else if "%__ARG%"=="-run" ( set _PROG_NAME=%_REPL_MAIN% ) else if "%__ARG%"=="-colors" ( set _COLORS=true ) else if "%__ARG%"=="-no-colors" ( set _COLORS= -) else if "%__ARG%"=="-with-compiler" ( set _JVM_CP_ARGS=%_PSEP%%_SCALA3_COMP%%_PSEP%%_TASTY_CORE% +) else if "%__ARG%"=="-with-compiler" ( set "_JVM_CP_ARGS=%_PSEP%%_SCALA3_COMP%%_PSEP%%_TASTY_CORE%" @rem break out -D and -J options and add them to JAVA_OPTS as well @rem so they reach the JVM in time to do some good. The -D options @rem will be available as system properties. @@ -146,21 +146,21 @@ goto :eof @rem echo scala-lib: %_SCALA_LIB% @rem echo sbt-intface: %_SBT_INTF% -set __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% +set "__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% +set "__TOOLCHAIN=%__TOOLCHAIN%%_JLINE_READER%%_PSEP%" +set "__TOOLCHAIN=%__TOOLCHAIN%%_JLINE_TERMINAL%%_PSEP%" +set "__TOOLCHAIN=%__TOOLCHAIN%%_JLINE_TERMINAL_JNA%%_PSEP%" +set "__TOOLCHAIN=%__TOOLCHAIN%%_JNA% set _JVM_CP_ARGS=-classpath "%__TOOLCHAIN%" goto :eof From 8de2c406c7e2f734a84a124f234a2baa60f829d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Micheloud?= Date: Thu, 23 Sep 2021 16:23:18 +0200 Subject: [PATCH 2/2] addressed review --- dist/bin/scalac.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dist/bin/scalac.bat b/dist/bin/scalac.bat index a3c6c0599747..bf34f9275aab 100644 --- a/dist/bin/scalac.bat +++ b/dist/bin/scalac.bat @@ -160,7 +160,7 @@ set "__TOOLCHAIN=%__TOOLCHAIN%%_SCALA3_TASTY_INSPECTOR%%_PSEP%" set "__TOOLCHAIN=%__TOOLCHAIN%%_JLINE_READER%%_PSEP%" set "__TOOLCHAIN=%__TOOLCHAIN%%_JLINE_TERMINAL%%_PSEP%" set "__TOOLCHAIN=%__TOOLCHAIN%%_JLINE_TERMINAL_JNA%%_PSEP%" -set "__TOOLCHAIN=%__TOOLCHAIN%%_JNA% +set "__TOOLCHAIN=%__TOOLCHAIN%%_JNA%" set _JVM_CP_ARGS=-classpath "%__TOOLCHAIN%" goto :eof