Remove kotlinc K/N scripts because they clash with real (K/JVM) kotlinc
These scripts were deprecated in 1.5.0.
This commit is contained in:
committed by
Space Team
parent
d3549c2c5b
commit
399ea1092e
@@ -1,20 +0,0 @@
|
|||||||
#!/usr/bin/env bash
|
|
||||||
|
|
||||||
# Copyright 2010-2017 JetBrains s.r.o.
|
|
||||||
#
|
|
||||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
|
||||||
# you may not use this file except in compliance with the License.
|
|
||||||
# You may obtain a copy of the License at
|
|
||||||
#
|
|
||||||
# http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
#
|
|
||||||
# Unless required by applicable law or agreed to in writing, software
|
|
||||||
# distributed under the License is distributed on an "AS IS" BASIS,
|
|
||||||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
||||||
# See the License for the specific language governing permissions and
|
|
||||||
# limitations under the License.
|
|
||||||
|
|
||||||
DIR="${BASH_SOURCE[0]%/*}"
|
|
||||||
: ${DIR:="."}
|
|
||||||
|
|
||||||
"${DIR}"/run_konan kotlinc "$@"
|
|
||||||
@@ -1,17 +0,0 @@
|
|||||||
@echo off
|
|
||||||
|
|
||||||
rem Copyright 2010-2017 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 %~dps0run_konan.bat kotlinc %*
|
|
||||||
-18
@@ -17,25 +17,7 @@ private fun mainImpl(args: Array<String>, runFromDaemon: Boolean, konancMain: (A
|
|||||||
when (utilityName) {
|
when (utilityName) {
|
||||||
"konanc" ->
|
"konanc" ->
|
||||||
konancMain(utilityArgs)
|
konancMain(utilityArgs)
|
||||||
"kotlinc" -> {
|
|
||||||
println("""
|
|
||||||
NOTE: you are running "kotlinc" CLI tool from Kotlin/Native distribution,
|
|
||||||
it runs Kotlin/Native compiler that produces native binaries from Kotlin code.
|
|
||||||
If your intention was to compile Kotlin code to JVM bytecode instead, then you
|
|
||||||
need to use "kotlinc" from the main Kotlin distribution (e.g. it can be
|
|
||||||
downloaded as kotlin-compiler-X.Y.ZZ.zip archive from
|
|
||||||
https://github.com/JetBrains/kotlin/releases/latest, or installed using various
|
|
||||||
package managers).
|
|
||||||
|
|
||||||
WARNING: if your intention was to run Kotlin/Native compiler, then please use
|
|
||||||
"kotlinc-native" CLI tool instead of "kotlinc". "kotlinc" tool will be removed
|
|
||||||
from Kotlin/Native distribution, so it will stop clashing with "kotlinc" from
|
|
||||||
the main Kotlin distribution.
|
|
||||||
|
|
||||||
""".trimIndent())
|
|
||||||
|
|
||||||
konancMain(utilityArgs)
|
|
||||||
}
|
|
||||||
"cinterop" -> {
|
"cinterop" -> {
|
||||||
val konancArgs = invokeInterop("native", utilityArgs, runFromDaemon)
|
val konancArgs = invokeInterop("native", utilityArgs, runFromDaemon)
|
||||||
konancArgs?.let { konancMain(it) }
|
konancArgs?.let { konancMain(it) }
|
||||||
|
|||||||
Reference in New Issue
Block a user