azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename package jet -> kotlin in ide-compiler-runner

Browse Source 
org.jetbrains.jet.compiler.runner -> org.jetbrains.kotlin.compilerRunner
org.jetbrains.jet.compiler -> org.jetbrains.kotlin.config

Original commit: 98faeb8647
This commit is contained in:
Alexander Udalov
2015-01-06 04:06:29 +03:00
parent aff262481f
commit fb4beaa4ed
6 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jps/jps-plugin/src/org/jetbrains/kotlin/jps/JpsKotlinCompilerSettings.java
+1 -1
View File
@@ -20,11 +20,11 @@ import org.jetbrains.annotations.NotNull;
import org.jetbrains.jet.cli.common.arguments.CommonCompilerArguments; import org.jetbrains.jet.cli.common.arguments.CommonCompilerArguments;
import org.jetbrains.jet.cli.common.arguments.K2JSCompilerArguments; import org.jetbrains.jet.cli.common.arguments.K2JSCompilerArguments;
import org.jetbrains.jet.cli.common.arguments.K2JVMCompilerArguments; import org.jetbrains.jet.cli.common.arguments.K2JVMCompilerArguments;
import org.jetbrains.jet.compiler.CompilerSettings;
import org.jetbrains.jps.model.JpsElementChildRole; import org.jetbrains.jps.model.JpsElementChildRole;
import org.jetbrains.jps.model.JpsProject; import org.jetbrains.jps.model.JpsProject;
import org.jetbrains.jps.model.ex.JpsElementBase; import org.jetbrains.jps.model.ex.JpsElementBase;
import org.jetbrains.jps.model.ex.JpsElementChildRoleBase; import org.jetbrains.jps.model.ex.JpsElementChildRoleBase;
import org.jetbrains.kotlin.config.CompilerSettings;
public class JpsKotlinCompilerSettings extends JpsElementBase<JpsKotlinCompilerSettings> { public class JpsKotlinCompilerSettings extends JpsElementBase<JpsKotlinCompilerSettings> {
static final JpsElementChildRole<JpsKotlinCompilerSettings> ROLE = JpsElementChildRoleBase.create("Kotlin Compiler Settings"); static final JpsElementChildRole<JpsKotlinCompilerSettings> ROLE = JpsElementChildRoleBase.create("Kotlin Compiler Settings");
jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt
+7 -7
View File
@@ -23,9 +23,9 @@ import org.jetbrains.jet.cli.common.KotlinVersion
import org.jetbrains.jet.cli.common.messages.CompilerMessageLocation import org.jetbrains.jet.cli.common.messages.CompilerMessageLocation
import org.jetbrains.jet.cli.common.messages.CompilerMessageSeverity import org.jetbrains.jet.cli.common.messages.CompilerMessageSeverity
import org.jetbrains.jet.cli.common.messages.MessageCollector import org.jetbrains.jet.cli.common.messages.MessageCollector
import org.jetbrains.jet.compiler.runner.CompilerEnvironment import org.jetbrains.kotlin.compilerRunner.CompilerEnvironment
import org.jetbrains.jet.compiler.runner.CompilerRunnerConstants import org.jetbrains.kotlin.compilerRunner.CompilerRunnerConstants
import org.jetbrains.jet.compiler.runner.OutputItemsCollectorImpl import org.jetbrains.kotlin.compilerRunner.OutputItemsCollectorImpl
import org.jetbrains.jet.config.Services import org.jetbrains.jet.config.Services
import org.jetbrains.jet.config.IncrementalCompilation import org.jetbrains.jet.config.IncrementalCompilation
import org.jetbrains.kotlin.jps.JpsKotlinCompilerSettings import org.jetbrains.kotlin.jps.JpsKotlinCompilerSettings
@@ -43,9 +43,9 @@ import java.io.File
import java.util.* import java.util.*
import org.jetbrains.jet.cli.common.messages.CompilerMessageLocation.NO_LOCATION import org.jetbrains.jet.cli.common.messages.CompilerMessageLocation.NO_LOCATION
import org.jetbrains.jet.cli.common.messages.CompilerMessageSeverity.* import org.jetbrains.jet.cli.common.messages.CompilerMessageSeverity.*
import org.jetbrains.jet.compiler.runner.CompilerRunnerConstants.INTERNAL_ERROR_PREFIX import org.jetbrains.kotlin.compilerRunner.CompilerRunnerConstants.INTERNAL_ERROR_PREFIX
import org.jetbrains.jet.compiler.runner.KotlinCompilerRunner.runK2JsCompiler import org.jetbrains.kotlin.compilerRunner.KotlinCompilerRunner.runK2JsCompiler
import org.jetbrains.jet.compiler.runner.KotlinCompilerRunner.runK2JvmCompiler import org.jetbrains.kotlin.compilerRunner.KotlinCompilerRunner.runK2JvmCompiler
import org.jetbrains.jet.utils.keysToMap import org.jetbrains.jet.utils.keysToMap
import org.jetbrains.jps.incremental.ModuleLevelBuilder.ExitCode.* import org.jetbrains.jps.incremental.ModuleLevelBuilder.ExitCode.*
import com.intellij.openapi.diagnostic.Logger import com.intellij.openapi.diagnostic.Logger
@@ -54,7 +54,7 @@ import org.jetbrains.jps.builders.java.JavaBuilderUtil
import com.intellij.util.containers.MultiMap import com.intellij.util.containers.MultiMap
import org.jetbrains.jet.cli.common.arguments.CommonCompilerArguments import org.jetbrains.jet.cli.common.arguments.CommonCompilerArguments
import org.jetbrains.jps.model.JpsProject import org.jetbrains.jps.model.JpsProject
import org.jetbrains.jet.compiler.runner.SimpleOutputItem import org.jetbrains.kotlin.compilerRunner.SimpleOutputItem
import org.jetbrains.jet.utils.LibraryUtils import org.jetbrains.jet.utils.LibraryUtils
public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR) { public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR) {
jps/jps-plugin/src/org/jetbrains/kotlin/jps/model/Kotlin2JsCompilerArgumentsSerializer.java
+2 -2
View File
@@ -24,8 +24,8 @@ import org.jetbrains.jps.model.JpsProject;
import org.jetbrains.jps.model.serialization.JpsProjectExtensionSerializer; import org.jetbrains.jps.model.serialization.JpsProjectExtensionSerializer;
import org.jetbrains.kotlin.jps.JpsKotlinCompilerSettings; import org.jetbrains.kotlin.jps.JpsKotlinCompilerSettings;
import static org.jetbrains.jet.compiler.SettingConstants.KOTLIN_COMPILER_SETTINGS_FILE; import static org.jetbrains.kotlin.config.SettingConstants.KOTLIN_COMPILER_SETTINGS_FILE;
import static org.jetbrains.jet.compiler.SettingConstants.KOTLIN_TO_JS_COMPILER_ARGUMENTS_SECTION; import static org.jetbrains.kotlin.config.SettingConstants.KOTLIN_TO_JS_COMPILER_ARGUMENTS_SECTION;
class Kotlin2JsCompilerArgumentsSerializer extends JpsProjectExtensionSerializer { class Kotlin2JsCompilerArgumentsSerializer extends JpsProjectExtensionSerializer {
Kotlin2JsCompilerArgumentsSerializer() { Kotlin2JsCompilerArgumentsSerializer() {
jps/jps-plugin/src/org/jetbrains/kotlin/jps/model/Kotlin2JvmCompilerArgumentsSerializer.java
+2 -2
View File
@@ -24,8 +24,8 @@ import org.jetbrains.jps.model.JpsProject;
import org.jetbrains.jps.model.serialization.JpsProjectExtensionSerializer; import org.jetbrains.jps.model.serialization.JpsProjectExtensionSerializer;
import org.jetbrains.kotlin.jps.JpsKotlinCompilerSettings; import org.jetbrains.kotlin.jps.JpsKotlinCompilerSettings;
import static org.jetbrains.jet.compiler.SettingConstants.KOTLIN_COMPILER_SETTINGS_FILE; import static org.jetbrains.kotlin.config.SettingConstants.KOTLIN_COMPILER_SETTINGS_FILE;
import static org.jetbrains.jet.compiler.SettingConstants.KOTLIN_TO_JVM_COMPILER_ARGUMENTS_SECTION; import static org.jetbrains.kotlin.config.SettingConstants.KOTLIN_TO_JVM_COMPILER_ARGUMENTS_SECTION;
class Kotlin2JvmCompilerArgumentsSerializer extends JpsProjectExtensionSerializer { class Kotlin2JvmCompilerArgumentsSerializer extends JpsProjectExtensionSerializer {
Kotlin2JvmCompilerArgumentsSerializer() { Kotlin2JvmCompilerArgumentsSerializer() {
jps/jps-plugin/src/org/jetbrains/kotlin/jps/model/KotlinCommonCompilerArgumentsSerializer.java
+2 -2
View File
@@ -24,8 +24,8 @@ import org.jetbrains.jps.model.JpsProject;
import org.jetbrains.jps.model.serialization.JpsProjectExtensionSerializer; import org.jetbrains.jps.model.serialization.JpsProjectExtensionSerializer;
import org.jetbrains.kotlin.jps.JpsKotlinCompilerSettings; import org.jetbrains.kotlin.jps.JpsKotlinCompilerSettings;
import static org.jetbrains.jet.compiler.SettingConstants.KOTLIN_COMMON_COMPILER_ARGUMENTS_SECTION; import static org.jetbrains.kotlin.config.SettingConstants.KOTLIN_COMMON_COMPILER_ARGUMENTS_SECTION;
import static org.jetbrains.jet.compiler.SettingConstants.KOTLIN_COMPILER_SETTINGS_FILE; import static org.jetbrains.kotlin.config.SettingConstants.KOTLIN_COMPILER_SETTINGS_FILE;
class KotlinCommonCompilerArgumentsSerializer extends JpsProjectExtensionSerializer { class KotlinCommonCompilerArgumentsSerializer extends JpsProjectExtensionSerializer {
KotlinCommonCompilerArgumentsSerializer() { KotlinCommonCompilerArgumentsSerializer() {
jps/jps-plugin/src/org/jetbrains/kotlin/jps/model/KotlinCompilerSettingsSerializer.java
+3 -3
View File
@@ -19,13 +19,13 @@ package org.jetbrains.kotlin.jps.model;
import com.intellij.util.xmlb.XmlSerializer; import com.intellij.util.xmlb.XmlSerializer;
import org.jdom.Element; import org.jdom.Element;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.jet.compiler.CompilerSettings;
import org.jetbrains.jps.model.JpsProject; import org.jetbrains.jps.model.JpsProject;
import org.jetbrains.jps.model.serialization.JpsProjectExtensionSerializer; import org.jetbrains.jps.model.serialization.JpsProjectExtensionSerializer;
import org.jetbrains.kotlin.config.CompilerSettings;
import org.jetbrains.kotlin.jps.JpsKotlinCompilerSettings; import org.jetbrains.kotlin.jps.JpsKotlinCompilerSettings;
import static org.jetbrains.jet.compiler.SettingConstants.KOTLIN_COMPILER_SETTINGS_FILE; import static org.jetbrains.kotlin.config.SettingConstants.KOTLIN_COMPILER_SETTINGS_FILE;
import static org.jetbrains.jet.compiler.SettingConstants.KOTLIN_COMPILER_SETTINGS_SECTION; import static org.jetbrains.kotlin.config.SettingConstants.KOTLIN_COMPILER_SETTINGS_SECTION;
class KotlinCompilerSettingsSerializer extends JpsProjectExtensionSerializer { class KotlinCompilerSettingsSerializer extends JpsProjectExtensionSerializer {
KotlinCompilerSettingsSerializer() { KotlinCompilerSettingsSerializer() {