mirror of https://github.com/sbt/sbt.git
Merge pull request #272 from gladiac1337/fix-sbt-bat
Add --java-home and fix JVM_DEBUG in sbt.bat
This commit is contained in:
commit
c033559e1c
|
|
@ -64,8 +64,11 @@ set INIT_SBT_VERSION=_TO_BE_REPLACED
|
|||
:args_loop
|
||||
if "%~1" == "" goto args_end
|
||||
|
||||
if "%~1" == "-jvm-debug" set set JVM_DEBUG=true
|
||||
if "%~1" == "--jvm-debug" set set JVM_DEBUG=true
|
||||
if "%~1" == "-jvm-debug" set JVM_DEBUG=true
|
||||
if "%~1" == "--jvm-debug" set JVM_DEBUG=true
|
||||
|
||||
if "%~1" == "-java-home" set SET_JAVA_HOME=true
|
||||
if "%~1" == "--java-home" set SET_JAVA_HOME=true
|
||||
|
||||
if "%JVM_DEBUG%" == "true" (
|
||||
set /a JVM_DEBUG_PORT=5005 2>nul >nul
|
||||
|
|
@ -81,6 +84,24 @@ if "%JVM_DEBUG%" == "true" (
|
|||
set SBT_ARGS=!SBT_ARGS! %1
|
||||
)
|
||||
|
||||
if "%SET_JAVA_HOME%" == "true" (
|
||||
set SET_JAVA_HOME=
|
||||
if NOT "%~2" == "" (
|
||||
if exist "%~2\bin\java.exe" (
|
||||
set _JAVACMD="%~2\bin\java.exe"
|
||||
set JAVA_HOME="%~2"
|
||||
set JDK_HOME="%~2"
|
||||
shift
|
||||
) else (
|
||||
echo Directory "%~2" for JAVA_HOME is not valid
|
||||
goto error
|
||||
)
|
||||
) else (
|
||||
echo Second argument for --java-home missing
|
||||
goto error
|
||||
)
|
||||
)
|
||||
|
||||
shift
|
||||
goto args_loop
|
||||
:args_end
|
||||
|
|
|
|||
Loading…
Reference in New Issue