Logic related to command-line options moved to android-compiler-plugin

plugins/android-compiler-plugin/src/AndroidComponentRegistrar.kt

@@ -0,0 +1,64 @@
+/*
+ * Copyright 2010-2014 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.android
+
+import org.jetbrains.kotlin.compiler.plugin.ComponentRegistrar
+import org.jetbrains.jet.lang.resolve.android.CliAndroidUIXmlProcessor
+import org.jetbrains.jet.config.CompilerConfiguration
+import org.jetbrains.jet.lang.resolve.android.AndroidUIXmlProcessor
+import com.intellij.mock.MockProject
+import org.jetbrains.jet.config.CompilerConfigurationKey
+import org.jetbrains.kotlin.compiler.plugin.CommandLineProcessor
+import org.jetbrains.kotlin.compiler.plugin.CliOption
+import org.jetbrains.kotlin.compiler.plugin.CliOptionProcessingException
+
+public object AndroidConfigurationKeys {
+
+    public val ANDROID_RES_PATH: CompilerConfigurationKey<String> = CompilerConfigurationKey.create<String>("android resources search path")
+
+    public val ANDROID_MANIFEST: CompilerConfigurationKey<String> = CompilerConfigurationKey.create<String>("android manifest file")
+}
+
+public class AndroidCommandLineProcessor : CommandLineProcessor {
+    class object {
+        public val ANDROID_COMPILER_PLUGIN_ID: String = "org.jetbrains.kotlin.android"
+
+        public val RESOURCE_PATH_OPTION: CliOption = CliOption("androidRes", "<path>", "Android resources path")
+        public val MANIFEST_FILE_OPTION: CliOption = CliOption("androidManifest", "<path>", "Android manifest file")
+    }
+
+    override val pluginId: String = ANDROID_COMPILER_PLUGIN_ID
+
+    override val pluginOptions: Collection<CliOption> = listOf(RESOURCE_PATH_OPTION, MANIFEST_FILE_OPTION)
+
+    override fun processOption(option: CliOption, value: String, configuration: CompilerConfiguration) {
+        when (option) {
+            RESOURCE_PATH_OPTION -> configuration.put(AndroidConfigurationKeys.ANDROID_RES_PATH, value)
+            MANIFEST_FILE_OPTION -> configuration.put(AndroidConfigurationKeys.ANDROID_MANIFEST, value)
+            else -> throw CliOptionProcessingException("Unknown option: ${option.name}")
+        }
+    }
+}
+
+public class AndroidComponentRegistrar : ComponentRegistrar {
+
+    public override fun registerProjectComponents(project: MockProject, configuration: CompilerConfiguration) {
+        val androidResPath = configuration.get(AndroidConfigurationKeys.ANDROID_RES_PATH)
+        val androidManifest = configuration.get(AndroidConfigurationKeys.ANDROID_MANIFEST)
+        project.registerService(javaClass<AndroidUIXmlProcessor>(), CliAndroidUIXmlProcessor(project, androidResPath, androidManifest))
+    }
+}

plugins/android-compiler-plugin/src/META-INF/MANIFEST.MF

@@ -0,0 +1,6 @@
+Manifest-Version: 1.0
+Implementation-Vendor: JetBrains
+
+Name: org.jetbrains.kotlin.compiler.plugin
+CommandLineProcessor: org.jetbrains.kotlin.android.AndroidCommandLineProcessor
+ComponentRegistrar: org.jetbrains.kotlin.android.AndroidComponentRegistrar

plugins/android-jps-plugin/android-jps-plugin.iml

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module" module-name="jps-plugin" scope="PROVIDED" />
+    <orderEntry type="library" scope="PROVIDED" name="jps" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="android" level="project" />
+    <orderEntry type="library" name="kotlin-runtime" level="project" />
+    <orderEntry type="module" module-name="android-compiler-plugin" />
+  </component>
+</module>
+

plugins/android-jps-plugin/src/KotlinAndroidJpsPlugin.kt

@@ -0,0 +1,53 @@
+/*
+ * Copyright 2010-2014 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.android.jps
+
+import org.jetbrains.jet.jps.build.KotlinJpsCompilerArgumentsProvider
+import org.jetbrains.jps.incremental.ModuleBuildTarget
+import org.jetbrains.jps.incremental.CompileContext
+import org.jetbrains.jps.model.module.JpsModule
+import java.io.File
+import org.jetbrains.jps.android.AndroidJpsUtil
+import org.jetbrains.kotlin.android.AndroidCommandLineProcessor
+import org.jetbrains.kotlin.compiler.plugin.CliOption
+
+public class KotlinAndroidJpsPlugin : KotlinJpsCompilerArgumentsProvider {
+    override fun getExtraArguments(moduleBuildTarget: ModuleBuildTarget, context: CompileContext): List<String> {
+        val module = moduleBuildTarget.getModule()
+        return listOf(
+                makePluginOption(AndroidCommandLineProcessor.RESOURCE_PATH_OPTION, getAndroidResPath(module)),
+                makePluginOption(AndroidCommandLineProcessor.MANIFEST_FILE_OPTION, getAndroidManifest(module))
+        )
+    }
+
+    private fun makePluginOption(option: CliOption, value: String): String {
+        return "plugin:${AndroidCommandLineProcessor.ANDROID_COMPILER_PLUGIN_ID}:${option.name}=$value"
+    }
+
+    private fun getAndroidResPath(module: JpsModule): String {
+        val extension = AndroidJpsUtil.getExtension(module)
+        if (extension == null) return ""
+        val path = AndroidJpsUtil.getResourceDirForCompilationPath(extension)
+        return File(path!!.getAbsolutePath() + "/layout").getAbsolutePath()
+    }
+
+    private fun getAndroidManifest(module: JpsModule): String {
+        val extension = AndroidJpsUtil.getExtension(module)
+        if (extension == null) return ""
+        return AndroidJpsUtil.getManifestFileForCompilationPath(extension)!!.getAbsolutePath()
+    }
+}

plugins/android-jps-plugin/src/META-INF/services/org.jetbrains.jet.jps.build.KotlinJpsCompilerArgumentsProvider

@@ -0,0 +1 @@
+org.jetbrains.kotlin.android.jps.KotlinAndroidJpsPlugin