From ba8f499f81ea762acdb69f2fb79a9e0e1af51b37 Mon Sep 17 00:00:00 2001 From: Przemyslaw Szczepaniak Date: Fri, 2 Mar 2018 17:36:21 +0000 Subject: Update kotlinc to 1.2.30 prebuilts From https://github.com/JetBrains/kotlin/releases/download/v1.2.30/kotlin-compiler-1.2.30.zip Bug: 65219535 Fixes: 72993971 Test: make -j hidl-doc Change-Id: I1eedff12b2d1977997087d38949dd50af922cca5 --- bin/kotlin-dce-js.bat | 40 +++++++++---------- bin/kotlin.bat | 40 +++++++++---------- bin/kotlinc-js.bat | 40 +++++++++---------- bin/kotlinc-jvm.bat | 34 ++++++++-------- bin/kotlinc.bat | 106 +++++++++++++++++++++++++------------------------- 5 files changed, 130 insertions(+), 130 deletions(-) (limited to 'bin') diff --git a/bin/kotlin-dce-js.bat b/bin/kotlin-dce-js.bat index ff6a9ce..5d0b0c4 100644 --- a/bin/kotlin-dce-js.bat +++ b/bin/kotlin-dce-js.bat @@ -1,20 +1,20 @@ -@echo off - -rem Copyright 2010-2015 JetBrains s.r.o. -rem -rem Licensed under the Apache License, Version 2.0 (the "License"); -rem you may not use this file except in compliance with the License. -rem You may obtain a copy of the License at -rem -rem http://www.apache.org/licenses/LICENSE-2.0 -rem -rem Unless required by applicable law or agreed to in writing, software -rem distributed under the License is distributed on an "AS IS" BASIS, -rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -rem See the License for the specific language governing permissions and -rem limitations under the License. - -setlocal -set _KOTLIN_COMPILER=org.jetbrains.kotlin.cli.js.dce.K2JSDce - -call %~dps0kotlinc.bat %* +@echo off + +rem Copyright 2010-2015 JetBrains s.r.o. +rem +rem Licensed under the Apache License, Version 2.0 (the "License"); +rem you may not use this file except in compliance with the License. +rem You may obtain a copy of the License at +rem +rem http://www.apache.org/licenses/LICENSE-2.0 +rem +rem Unless required by applicable law or agreed to in writing, software +rem distributed under the License is distributed on an "AS IS" BASIS, +rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +rem See the License for the specific language governing permissions and +rem limitations under the License. + +setlocal +set _KOTLIN_COMPILER=org.jetbrains.kotlin.cli.js.dce.K2JSDce + +call %~dps0kotlinc.bat %* diff --git a/bin/kotlin.bat b/bin/kotlin.bat index 4817fa8..fcbbd1f 100644 --- a/bin/kotlin.bat +++ b/bin/kotlin.bat @@ -1,20 +1,20 @@ -@echo off - -rem Copyright 2010-2015 JetBrains s.r.o. -rem -rem Licensed under the Apache License, Version 2.0 (the "License"); -rem you may not use this file except in compliance with the License. -rem You may obtain a copy of the License at -rem -rem http://www.apache.org/licenses/LICENSE-2.0 -rem -rem Unless required by applicable law or agreed to in writing, software -rem distributed under the License is distributed on an "AS IS" BASIS, -rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -rem See the License for the specific language governing permissions and -rem limitations under the License. - -setlocal -set _KOTLIN_RUNNER=1 - -call %~dps0kotlinc.bat %* +@echo off + +rem Copyright 2010-2015 JetBrains s.r.o. +rem +rem Licensed under the Apache License, Version 2.0 (the "License"); +rem you may not use this file except in compliance with the License. +rem You may obtain a copy of the License at +rem +rem http://www.apache.org/licenses/LICENSE-2.0 +rem +rem Unless required by applicable law or agreed to in writing, software +rem distributed under the License is distributed on an "AS IS" BASIS, +rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +rem See the License for the specific language governing permissions and +rem limitations under the License. + +setlocal +set _KOTLIN_RUNNER=1 + +call %~dps0kotlinc.bat %* diff --git a/bin/kotlinc-js.bat b/bin/kotlinc-js.bat index 9a549d1..b3b5c24 100644 --- a/bin/kotlinc-js.bat +++ b/bin/kotlinc-js.bat @@ -1,20 +1,20 @@ -@echo off - -rem Copyright 2010-2015 JetBrains s.r.o. -rem -rem Licensed under the Apache License, Version 2.0 (the "License"); -rem you may not use this file except in compliance with the License. -rem You may obtain a copy of the License at -rem -rem http://www.apache.org/licenses/LICENSE-2.0 -rem -rem Unless required by applicable law or agreed to in writing, software -rem distributed under the License is distributed on an "AS IS" BASIS, -rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -rem See the License for the specific language governing permissions and -rem limitations under the License. - -setlocal -set _KOTLIN_COMPILER=org.jetbrains.kotlin.cli.js.K2JSCompiler - -call %~dps0kotlinc.bat %* +@echo off + +rem Copyright 2010-2015 JetBrains s.r.o. +rem +rem Licensed under the Apache License, Version 2.0 (the "License"); +rem you may not use this file except in compliance with the License. +rem You may obtain a copy of the License at +rem +rem http://www.apache.org/licenses/LICENSE-2.0 +rem +rem Unless required by applicable law or agreed to in writing, software +rem distributed under the License is distributed on an "AS IS" BASIS, +rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +rem See the License for the specific language governing permissions and +rem limitations under the License. + +setlocal +set _KOTLIN_COMPILER=org.jetbrains.kotlin.cli.js.K2JSCompiler + +call %~dps0kotlinc.bat %* diff --git a/bin/kotlinc-jvm.bat b/bin/kotlinc-jvm.bat index dd60b1c..a4f620a 100644 --- a/bin/kotlinc-jvm.bat +++ b/bin/kotlinc-jvm.bat @@ -1,17 +1,17 @@ -@echo off - -rem Copyright 2010-2015 JetBrains s.r.o. -rem -rem Licensed under the Apache License, Version 2.0 (the "License"); -rem you may not use this file except in compliance with the License. -rem You may obtain a copy of the License at -rem -rem http://www.apache.org/licenses/LICENSE-2.0 -rem -rem Unless required by applicable law or agreed to in writing, software -rem distributed under the License is distributed on an "AS IS" BASIS, -rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -rem See the License for the specific language governing permissions and -rem limitations under the License. - -call %~dps0kotlinc.bat %* +@echo off + +rem Copyright 2010-2015 JetBrains s.r.o. +rem +rem Licensed under the Apache License, Version 2.0 (the "License"); +rem you may not use this file except in compliance with the License. +rem You may obtain a copy of the License at +rem +rem http://www.apache.org/licenses/LICENSE-2.0 +rem +rem Unless required by applicable law or agreed to in writing, software +rem distributed under the License is distributed on an "AS IS" BASIS, +rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +rem See the License for the specific language governing permissions and +rem limitations under the License. + +call %~dps0kotlinc.bat %* diff --git a/bin/kotlinc.bat b/bin/kotlinc.bat index b10e23a..9e60fe9 100644 --- a/bin/kotlinc.bat +++ b/bin/kotlinc.bat @@ -1,53 +1,53 @@ -@echo off -rem based on scalac.bat from the Scala distribution -rem ########################################################################## -rem # Copyright 2002-2011, LAMP/EPFL -rem # Copyright 2011-2015, 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 - -if "%_KOTLIN_COMPILER%"=="" set _KOTLIN_COMPILER=org.jetbrains.kotlin.cli.jvm.K2JVMCompiler - -if not "%JAVA_HOME%"=="" ( - if exist "%JAVA_HOME%\bin\java.exe" set "_JAVACMD=%JAVA_HOME%\bin\java.exe" -) - -if "%_JAVACMD%"=="" set _JAVACMD=java - -rem We use the value of the JAVA_OPTS environment variable if defined -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" ^ - org.jetbrains.kotlin.runner.Main %* -) else ( - "%_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% %* -) - -exit /b %ERRORLEVEL% -goto end - -rem ########################################################################## -rem # subroutines - -:set_home - set _BIN_DIR= - for %%i in (%~sf0) do set _BIN_DIR=%_BIN_DIR%%%~dpsi - set _KOTLIN_HOME=%_BIN_DIR%.. -goto :eof - -:end -endlocal - +@echo off +rem based on scalac.bat from the Scala distribution +rem ########################################################################## +rem # Copyright 2002-2011, LAMP/EPFL +rem # Copyright 2011-2015, 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 + +if "%_KOTLIN_COMPILER%"=="" set _KOTLIN_COMPILER=org.jetbrains.kotlin.cli.jvm.K2JVMCompiler + +if not "%JAVA_HOME%"=="" ( + if exist "%JAVA_HOME%\bin\java.exe" set "_JAVACMD=%JAVA_HOME%\bin\java.exe" +) + +if "%_JAVACMD%"=="" set _JAVACMD=java + +rem We use the value of the JAVA_OPTS environment variable if defined +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" ^ + org.jetbrains.kotlin.runner.Main %* +) else ( + "%_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% %* +) + +exit /b %ERRORLEVEL% +goto end + +rem ########################################################################## +rem # subroutines + +:set_home + set _BIN_DIR= + for %%i in (%~sf0) do set _BIN_DIR=%_BIN_DIR%%%~dpsi + set _KOTLIN_HOME=%_BIN_DIR%.. +goto :eof + +:end +endlocal + -- cgit v1.2.3