From 1bf06f7c02e7dc7bc68824926bd7f4174b780986 Mon Sep 17 00:00:00 2001
From: chocolateboy <chocolate@cpan.org>
Date: Wed, 8 May 2013 05:10:19 +0100
Subject: [PATCH] make the preloader's required profiler argument (time|notime)
 an optional switch: -pp

fixes for broken Windows batch files
---
 compiler/cli/bin/kotlinc-js      |  9 +++++++--
 compiler/cli/bin/kotlinc-js.bat  | 26 ++++++++++++++++++++++----
 compiler/cli/bin/kotlinc-jvm     |  9 +++++++--
 compiler/cli/bin/kotlinc-jvm.bat | 26 ++++++++++++++++++++++----
 4 files changed, 58 insertions(+), 12 deletions(-)

diff --git a/compiler/cli/bin/kotlinc-js b/compiler/cli/bin/kotlinc-js
index cc2129bf160..9a73260e964 100755
--- a/compiler/cli/bin/kotlinc-js
+++ b/compiler/cli/bin/kotlinc-js
@@ -2,7 +2,7 @@
 #
 ##############################################################################
 # Copyright 2002-2011, LAMP/EPFL
-# Copyright 2011, JetBrains
+# Copyright 2011-2013, JetBrains
 #
 # This is free software; see the distribution for copying conditions.
 # There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A
@@ -45,6 +45,7 @@ fi
 # -D options will be available as system properties.
 declare -a java_args
 declare -a kotlin_args
+profile_preloader="notime"
 
 while [ $# -gt 0 ]; do
   case "$1" in
@@ -62,6 +63,10 @@ while [ $# -gt 0 ]; do
       kotlin_args=("${kotlin_args[@]}" "$1")
       shift
       ;;
+    -pp)
+      profile_preloader="time"
+      shift
+      ;;
     *)
       kotlin_args=("${kotlin_args[@]}" "$1")
       shift
@@ -82,4 +87,4 @@ CPSELECT="-cp "
   $JAVA_OPTS \
   "${java_args[@]}" \
   ${CPSELECT}"${KOTLIN_HOME}/lib/kotlin-preloader.jar" \
-  org.jetbrains.jet.preloading.Preloader "${KOTLIN_HOME}/lib/kotlin-compiler.jar" org.jetbrains.jet.cli.js.K2JSCompiler 4096 "$@"
+  org.jetbrains.jet.preloading.Preloader "${KOTLIN_HOME}/lib/kotlin-compiler.jar" org.jetbrains.jet.cli.js.K2JSCompiler 4096 $profile_preloader "$@"
diff --git a/compiler/cli/bin/kotlinc-js.bat b/compiler/cli/bin/kotlinc-js.bat
index fef3bb6bcc2..4ef29f47720 100644
--- a/compiler/cli/bin/kotlinc-js.bat
+++ b/compiler/cli/bin/kotlinc-js.bat
@@ -2,13 +2,17 @@
 rem based on scalac.bat from the Scala distribution
 rem ##########################################################################
 rem # Copyright 2002-2011, LAMP/EPFL
-rem # Copyright 2011, JetBrains
+rem # Copyright 2011-2013, JetBrains
 rem #
 rem # This is free software; see the distribution for copying conditions.
 rem # There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A
 rem # PARTICULAR PURPOSE.
 rem ##########################################################################
 
+rem We adopt the following conventions:
+rem - System/user environment variables start with a letter
+rem - Local batch variables start with an underscore ('_')
+
 @setlocal
 call :set_home
 
@@ -18,12 +22,26 @@ if not "%JAVA_HOME%"=="" (
 
 if "%_JAVACMD%"=="" set _JAVACMD=java
 
+set _PROFILE_PRELOADER=notime
+rem re: E%1 &c., see http://www.riedquat.de/blog/2011-11-27-01#w9aab1c45
+if E%1==E-pp (
+  shift
+  set _PROFILE_PRELOADER=time
+)
+
 rem We use the value of the JAVA_OPTS environment variable if defined
 set _JAVA_OPTS=-Xmx256M -Xms32M -noverify
 
-"%_JAVACMD%" %_JAVA_OPTS% -cp "%_KOTLIN_HOME%\lib\kotlin-preloader.jar" ^
-    org.jetbrains.jet.preloading.Preloader "${KOTLIN_HOME}/lib/kotlin-compiler.jar" ^
-    org.jetbrains.jet.cli.jvm.K2JVMCompiler 4096 org.jetbrains.jet.cli.js.K2JSCompiler %*
+rem re: %1 %2 &c., see http://www.riedquat.de/blog/2011-11-27-01#w9aab1c60
+if "%_PROFILE_PRELOADER%"=="time" (
+  "%_JAVACMD%" %_JAVA_OPTS% -cp "%_KOTLIN_HOME%\lib\kotlin-preloader.jar" ^
+    org.jetbrains.jet.preloading.Preloader "%_KOTLIN_HOME%\lib\kotlin-compiler.jar" ^
+    org.jetbrains.jet.cli.js.K2JSCompiler 4096 %_PROFILE_PRELOADER% %1 %2 %3 %4 %5 %6 %7 %8 %9
+) else (
+  "%_JAVACMD%" %_JAVA_OPTS% -cp "%_KOTLIN_HOME%\lib\kotlin-preloader.jar" ^
+    org.jetbrains.jet.preloading.Preloader "%_KOTLIN_HOME%\lib\kotlin-compiler.jar" ^
+    org.jetbrains.jet.cli.js.K2JSCompiler 4096 %_PROFILE_PRELOADER% %*
+)
 goto end
 
 rem ##########################################################################
diff --git a/compiler/cli/bin/kotlinc-jvm b/compiler/cli/bin/kotlinc-jvm
index c837ecb6cb5..70b7a826def 100755
--- a/compiler/cli/bin/kotlinc-jvm
+++ b/compiler/cli/bin/kotlinc-jvm
@@ -2,7 +2,7 @@
 #
 ##############################################################################
 # Copyright 2002-2011, LAMP/EPFL
-# Copyright 2011, JetBrains
+# Copyright 2011-2013, JetBrains
 #
 # This is free software; see the distribution for copying conditions.
 # There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A
@@ -45,6 +45,7 @@ fi
 # -D options will be available as system properties.
 declare -a java_args
 declare -a kotlin_args
+profile_preloader="notime"
 
 while [ $# -gt 0 ]; do
   case "$1" in
@@ -62,6 +63,10 @@ while [ $# -gt 0 ]; do
       kotlin_args=("${kotlin_args[@]}" "$1")
       shift
       ;;
+    -pp)
+      profile_preloader="time"
+      shift
+      ;;
     *)
       kotlin_args=("${kotlin_args[@]}" "$1")
       shift
@@ -82,4 +87,4 @@ CPSELECT="-cp "
   $JAVA_OPTS \
   "${java_args[@]}" \
   ${CPSELECT}"${KOTLIN_HOME}/lib/kotlin-preloader.jar" \
-  org.jetbrains.jet.preloading.Preloader "${KOTLIN_HOME}/lib/kotlin-compiler.jar" org.jetbrains.jet.cli.jvm.K2JVMCompiler 4096 "$@"
+  org.jetbrains.jet.preloading.Preloader "${KOTLIN_HOME}/lib/kotlin-compiler.jar" org.jetbrains.jet.cli.jvm.K2JVMCompiler 4096 $profile_preloader "$@"
diff --git a/compiler/cli/bin/kotlinc-jvm.bat b/compiler/cli/bin/kotlinc-jvm.bat
index 3949f6f5797..b9a35548557 100644
--- a/compiler/cli/bin/kotlinc-jvm.bat
+++ b/compiler/cli/bin/kotlinc-jvm.bat
@@ -2,13 +2,17 @@
 rem based on scalac.bat from the Scala distribution
 rem ##########################################################################
 rem # Copyright 2002-2011, LAMP/EPFL
-rem # Copyright 2011, JetBrains
+rem # Copyright 2011-2013, JetBrains
 rem #
 rem # This is free software; see the distribution for copying conditions.
 rem # There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A
 rem # PARTICULAR PURPOSE.
 rem ##########################################################################
 
+rem We adopt the following conventions:
+rem - System/user environment variables start with a letter
+rem - Local batch variables start with an underscore ('_')
+
 @setlocal
 call :set_home
 
@@ -18,12 +22,26 @@ if not "%JAVA_HOME%"=="" (
 
 if "%_JAVACMD%"=="" set _JAVACMD=java
 
+set _PROFILE_PRELOADER=notime
+rem re: E%1 &c., see http://www.riedquat.de/blog/2011-11-27-01#w9aab1c45
+if E%1==E-pp (
+  shift
+  set _PROFILE_PRELOADER=time
+)
+
 rem We use the value of the JAVA_OPTS environment variable if defined
 set _JAVA_OPTS=-Xmx256M -Xms32M -noverify
 
-"%_JAVACMD%" %_JAVA_OPTS% -cp "%_KOTLIN_HOME%\lib\kotlin-preloader.jar" ^
-    org.jetbrains.jet.preloading.Preloader "${KOTLIN_HOME}/lib/kotlin-compiler.jar" ^
-    org.jetbrains.jet.cli.jvm.K2JVMCompiler 4096 org.jetbrains.jet.cli.jvm.K2JVMCompiler %*
+rem re: %1 %2 &c., see http://www.riedquat.de/blog/2011-11-27-01#w9aab1c60
+if "%_PROFILE_PRELOADER%"=="time" (
+  "%_JAVACMD%" %_JAVA_OPTS% -cp "%_KOTLIN_HOME%\lib\kotlin-preloader.jar" ^
+    org.jetbrains.jet.preloading.Preloader "%_KOTLIN_HOME%\lib\kotlin-compiler.jar" ^
+    org.jetbrains.jet.cli.jvm.K2JVMCompiler 4096 %_PROFILE_PRELOADER% %1 %2 %3 %4 %5 %6 %7 %8 %9
+) else (
+  "%_JAVACMD%" %_JAVA_OPTS% -cp "%_KOTLIN_HOME%\lib\kotlin-preloader.jar" ^
+    org.jetbrains.jet.preloading.Preloader "%_KOTLIN_HOME%\lib\kotlin-compiler.jar" ^
+    org.jetbrains.jet.cli.jvm.K2JVMCompiler 4096 %_PROFILE_PRELOADER% %*
+)
 goto end
 
 rem ##########################################################################