diff --git a/jps/jps-common/idea-jps-common.iml b/jps/jps-common/idea-jps-common.iml new file mode 100644 index 00000000000..56fbc16c342 --- /dev/null +++ b/jps/jps-common/idea-jps-common.iml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/jps/jps-common/src/org/jetbrains/kotlin/config/CompilerRunnerConstants.java b/jps/jps-common/src/org/jetbrains/kotlin/config/CompilerRunnerConstants.java new file mode 100644 index 00000000000..70c584e3f28 --- /dev/null +++ b/jps/jps-common/src/org/jetbrains/kotlin/config/CompilerRunnerConstants.java @@ -0,0 +1,22 @@ +/* + * Copyright 2010-2015 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. + */ + +package org.jetbrains.kotlin.config; + +public class CompilerRunnerConstants { + public static final String KOTLIN_COMPILER_NAME = "Kotlin"; + public static final String INTERNAL_ERROR_PREFIX = "[Internal Error] "; +} diff --git a/jps/jps-common/src/org/jetbrains/kotlin/config/CompilerSettings.kt b/jps/jps-common/src/org/jetbrains/kotlin/config/CompilerSettings.kt new file mode 100644 index 00000000000..f1b5b37929e --- /dev/null +++ b/jps/jps-common/src/org/jetbrains/kotlin/config/CompilerSettings.kt @@ -0,0 +1,28 @@ +/* + * Copyright 2010-2015 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. + */ + +package org.jetbrains.kotlin.config + +public class CompilerSettings { + public var additionalArguments: String = DEFAULT_ADDITIONAL_ARGUMENTS + public var copyJsLibraryFiles: Boolean = true + public var outputDirectoryForJsLibraryFiles: String = DEFAULT_OUTPUT_DIRECTORY + + class object { + private val DEFAULT_ADDITIONAL_ARGUMENTS = "-version" + private val DEFAULT_OUTPUT_DIRECTORY = "lib" + } +} diff --git a/jps/jps-common/src/org/jetbrains/kotlin/config/SettingConstants.java b/jps/jps-common/src/org/jetbrains/kotlin/config/SettingConstants.java new file mode 100644 index 00000000000..c3e82c5b17c --- /dev/null +++ b/jps/jps-common/src/org/jetbrains/kotlin/config/SettingConstants.java @@ -0,0 +1,31 @@ +/* + * Copyright 2010-2015 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. + */ + +package org.jetbrains.kotlin.config; + +import static com.intellij.openapi.components.StoragePathMacros.PROJECT_CONFIG_DIR; + +public class SettingConstants { + private SettingConstants() {} + + public static final String KOTLIN_COMMON_COMPILER_ARGUMENTS_SECTION = "KotlinCommonCompilerArguments"; + public static final String KOTLIN_TO_JS_COMPILER_ARGUMENTS_SECTION = "Kotlin2JsCompilerArguments"; + public static final String KOTLIN_TO_JVM_COMPILER_ARGUMENTS_SECTION = "Kotlin2JvmCompilerArguments"; + public static final String KOTLIN_COMPILER_SETTINGS_SECTION = "KotlinCompilerSettings"; + + public static final String KOTLIN_COMPILER_SETTINGS_FILE = "kotlinc.xml"; + public static final String KOTLIN_COMPILER_SETTINGS_PATH = PROJECT_CONFIG_DIR + "/" + KOTLIN_COMPILER_SETTINGS_FILE; +} diff --git a/jps/jps-plugin/jps-plugin.iml b/jps/jps-plugin/jps-plugin.iml index 0e4bcb36611..a61e33d157e 100644 --- a/jps/jps-plugin/jps-plugin.iml +++ b/jps/jps-plugin/jps-plugin.iml @@ -8,7 +8,7 @@ - +