From 4afc7be7b71aea52bd4976cd8932f6bdb2fdd3e3 Mon Sep 17 00:00:00 2001 From: Alexander Gorshenev Date: Mon, 7 Nov 2016 18:03:30 +0300 Subject: [PATCH] 'native' is a java keyword, so javac doesn't allow it as a package name component. Renamed 'native' to 'konan'. Moved BinaryMetadata.proto to konan/llvm where it belongs for now. --- .../kotlin/backend/{native => konan}/DescriptorUtils.kt | 0 .../jetbrains/kotlin/backend/{native => konan}/ModuleIndex.kt | 0 .../kotlin/backend/{native => konan}/NativeBackendFacade.kt | 0 .../kotlin/backend/{native => konan}/NativeIrCodegenFactory.kt | 0 .../kotlin/backend/{ => konan/llvm}/BinaryMetadata.proto | 3 ++- .../kotlin/backend/{native => konan}/llvm/CodeGenerator.kt | 0 .../jetbrains/kotlin/backend/{native => konan}/llvm/Context.kt | 0 .../kotlin/backend/{native => konan}/llvm/ContextUtils.kt | 0 .../kotlin/backend/{native => konan}/llvm/DataLayout.kt | 0 .../kotlin/backend/{native => konan}/llvm/HashUtils.kt | 0 .../kotlin/backend/{native => konan}/llvm/IrToBitcode.kt | 0 .../kotlin/backend/{native => konan}/llvm/LlvmUtils.kt | 0 .../jetbrains/kotlin/backend/{native => konan}/llvm/Logger.kt | 0 .../kotlin/backend/{native => konan}/llvm/MetadataGenerator.kt | 0 .../kotlin/backend/{native => konan}/llvm/NameUtils.kt | 0 .../kotlin/backend/{native => konan}/llvm/RTTIGenerator.kt | 0 .../jetbrains/kotlin/backend/{native => konan}/llvm/Runtime.kt | 0 17 files changed, 2 insertions(+), 1 deletion(-) rename backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/{native => konan}/DescriptorUtils.kt (100%) rename backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/{native => konan}/ModuleIndex.kt (100%) rename backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/{native => konan}/NativeBackendFacade.kt (100%) rename backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/{native => konan}/NativeIrCodegenFactory.kt (100%) rename backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/{ => konan/llvm}/BinaryMetadata.proto (74%) rename backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/{native => konan}/llvm/CodeGenerator.kt (100%) rename backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/{native => konan}/llvm/Context.kt (100%) rename backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/{native => konan}/llvm/ContextUtils.kt (100%) rename backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/{native => konan}/llvm/DataLayout.kt (100%) rename backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/{native => konan}/llvm/HashUtils.kt (100%) rename backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/{native => konan}/llvm/IrToBitcode.kt (100%) rename backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/{native => konan}/llvm/LlvmUtils.kt (100%) rename backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/{native => konan}/llvm/Logger.kt (100%) rename backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/{native => konan}/llvm/MetadataGenerator.kt (100%) rename backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/{native => konan}/llvm/NameUtils.kt (100%) rename backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/{native => konan}/llvm/RTTIGenerator.kt (100%) rename backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/{native => konan}/llvm/Runtime.kt (100%) diff --git a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/native/DescriptorUtils.kt b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/DescriptorUtils.kt similarity index 100% rename from backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/native/DescriptorUtils.kt rename to backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/DescriptorUtils.kt diff --git a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/native/ModuleIndex.kt b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/ModuleIndex.kt similarity index 100% rename from backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/native/ModuleIndex.kt rename to backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/ModuleIndex.kt diff --git a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/native/NativeBackendFacade.kt b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/NativeBackendFacade.kt similarity index 100% rename from backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/native/NativeBackendFacade.kt rename to backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/NativeBackendFacade.kt diff --git a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/native/NativeIrCodegenFactory.kt b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/NativeIrCodegenFactory.kt similarity index 100% rename from backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/native/NativeIrCodegenFactory.kt rename to backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/NativeIrCodegenFactory.kt diff --git a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/BinaryMetadata.proto b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/BinaryMetadata.proto similarity index 74% rename from backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/BinaryMetadata.proto rename to backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/BinaryMetadata.proto index 66d8254edb2..45680031844 100644 --- a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/BinaryMetadata.proto +++ b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/BinaryMetadata.proto @@ -1,6 +1,6 @@ syntax="proto2"; -package org.jetbrains.kotlin.backend; +package org.jetbrains.kotlin.backend.konan.llvm; option java_outer_classname = "BinaryMetadata"; @@ -8,3 +8,4 @@ message FunMetadata { required string hash = 1; required string name = 2; } + diff --git a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/native/llvm/CodeGenerator.kt b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/CodeGenerator.kt similarity index 100% rename from backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/native/llvm/CodeGenerator.kt rename to backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/CodeGenerator.kt diff --git a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/native/llvm/Context.kt b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/Context.kt similarity index 100% rename from backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/native/llvm/Context.kt rename to backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/Context.kt diff --git a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/native/llvm/ContextUtils.kt b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/ContextUtils.kt similarity index 100% rename from backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/native/llvm/ContextUtils.kt rename to backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/ContextUtils.kt diff --git a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/native/llvm/DataLayout.kt b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/DataLayout.kt similarity index 100% rename from backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/native/llvm/DataLayout.kt rename to backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/DataLayout.kt diff --git a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/native/llvm/HashUtils.kt b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/HashUtils.kt similarity index 100% rename from backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/native/llvm/HashUtils.kt rename to backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/HashUtils.kt diff --git a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/native/llvm/IrToBitcode.kt b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/IrToBitcode.kt similarity index 100% rename from backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/native/llvm/IrToBitcode.kt rename to backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/IrToBitcode.kt diff --git a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/native/llvm/LlvmUtils.kt b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/LlvmUtils.kt similarity index 100% rename from backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/native/llvm/LlvmUtils.kt rename to backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/LlvmUtils.kt diff --git a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/native/llvm/Logger.kt b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/Logger.kt similarity index 100% rename from backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/native/llvm/Logger.kt rename to backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/Logger.kt diff --git a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/native/llvm/MetadataGenerator.kt b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/MetadataGenerator.kt similarity index 100% rename from backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/native/llvm/MetadataGenerator.kt rename to backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/MetadataGenerator.kt diff --git a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/native/llvm/NameUtils.kt b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/NameUtils.kt similarity index 100% rename from backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/native/llvm/NameUtils.kt rename to backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/NameUtils.kt diff --git a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/native/llvm/RTTIGenerator.kt b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/RTTIGenerator.kt similarity index 100% rename from backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/native/llvm/RTTIGenerator.kt rename to backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/RTTIGenerator.kt diff --git a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/native/llvm/Runtime.kt b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/Runtime.kt similarity index 100% rename from backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/native/llvm/Runtime.kt rename to backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/Runtime.kt