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

add configuration key to pass android manifest file

Browse Source
This commit is contained in:
Mikhail Mutcianko
2014-08-13 17:54:53 +04:00
committed by Yan Zhulanow
parent c6b8cbbb01
commit 376886a9c3
9 changed files with 86 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/cli/src/org/jetbrains/kotlin/cli/jvm/JVMConfigurationKeys.java
+3
View File
@@ -54,4 +54,7 @@ public class JVMConfigurationKeys {
public static final CompilerConfigurationKey<String> ANDROID_RES_PATH =
CompilerConfigurationKey.create("android resources search path");
public static final CompilerConfigurationKey<String> ANDROID_MANIFEST =
CompilerConfigurationKey.create("android manifest file");
}
compiler/cli/src/org/jetbrains/kotlin/cli/jvm/K2JVMCompiler.java
+4
View File
@@ -94,6 +94,10 @@ public class K2JVMCompiler extends CLICompiler<K2JVMCompilerArguments> {
configuration.put(JVMConfigurationKeys.ANDROID_RES_PATH, arguments.androidRes);
}
if (arguments.androidManifest != null) {
configuration.put(JVMConfigurationKeys.ANDROID_MANIFEST, arguments.androidManifest);
}
if (arguments.script) {
if (arguments.freeArgs.isEmpty()) {
messageCollector.report(CompilerMessageSeverity.ERROR, "Specify script source path to evaluate",
compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/JetCoreEnvironment.java
+3 -2
View File
@@ -295,8 +295,9 @@ public class JetCoreEnvironment {
configuration.getList(CommonConfigurationKeys.SCRIPT_DEFINITIONS_KEY)
);
String s = configuration.get(JVMConfigurationKeys.ANDROID_RES_PATH);
project.registerService(AndroidUIXmlProcessor.class, new CliAndroidUIXmlProcessor(project, s));
String androidResPath = configuration.get(JVMConfigurationKeys.ANDROID_RES_PATH);
String androidManifest = configuration.get(JVMConfigurationKeys.ANDROID_MANIFEST);
project.registerService(AndroidUIXmlProcessor.class, new CliAndroidUIXmlProcessor(project, androidResPath, androidManifest));
project.registerService(VirtualFileFinderFactory.class, new CliVirtualFileFinderFactory(classPath));
}