From 510295475b7c80a0ad3f56184e41167cb192c8e8 Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Fri, 23 Dec 2016 17:55:24 +0300 Subject: [PATCH] Batch script: allow to pass JAVA_OPTS from outside Similarly to the Bash version #KT-14917 Fixed --- compiler/cli/bin/kotlinc.bat | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/compiler/cli/bin/kotlinc.bat b/compiler/cli/bin/kotlinc.bat index 9b34523244f..b10e23aade9 100644 --- a/compiler/cli/bin/kotlinc.bat +++ b/compiler/cli/bin/kotlinc.bat @@ -25,13 +25,13 @@ if not "%JAVA_HOME%"=="" ( if "%_JAVACMD%"=="" set _JAVACMD=java rem We use the value of the JAVA_OPTS environment variable if defined -set _JAVA_OPTS=-Xmx256M -Xms32M +if "%JAVA_OPTS%"=="" set JAVA_OPTS=-Xmx256M -Xms32M if not "%_KOTLIN_RUNNER%"=="" ( - "%_JAVACMD%" %_JAVA_OPTS% "-Dkotlin.home=%_KOTLIN_HOME%" -cp "%_KOTLIN_HOME%\lib\kotlin-runner.jar" ^ + "%_JAVACMD%" %JAVA_OPTS% "-Dkotlin.home=%_KOTLIN_HOME%" -cp "%_KOTLIN_HOME%\lib\kotlin-runner.jar" ^ org.jetbrains.kotlin.runner.Main %* ) else ( - "%_JAVACMD%" %_JAVA_OPTS% -noverify -cp "%_KOTLIN_HOME%\lib\kotlin-preloader.jar" ^ + "%_JAVACMD%" %JAVA_OPTS% -noverify -cp "%_KOTLIN_HOME%\lib\kotlin-preloader.jar" ^ org.jetbrains.kotlin.preloading.Preloader -cp "%_KOTLIN_HOME%\lib\kotlin-compiler.jar" ^ %_KOTLIN_COMPILER% %* )