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

Providing plugin classpath through JPS extensions

Browse Source 
Original commit: af9c5cc45d
This commit is contained in:
Yan Zhulanow
2014-10-17 19:52:39 +04:00
parent 6aa4a3c16a
commit fb8ca13e71
2 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinJpsCompilerArgumentsProvider.kt
+1
View File
@@ -22,4 +22,5 @@ import org.jetbrains.jps.incremental.CompileContext
public trait KotlinJpsCompilerArgumentsProvider { public trait KotlinJpsCompilerArgumentsProvider {
public fun getExtraArguments(moduleBuildTarget: ModuleBuildTarget, context: CompileContext): List<String> public fun getExtraArguments(moduleBuildTarget: ModuleBuildTarget, context: CompileContext): List<String>
public fun getClasspath(moduleBuildTarget: ModuleBuildTarget, context: CompileContext): List<String>
} }
jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt
+12 -3
View File
@@ -142,11 +142,20 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR
val representativeTarget = chunk.representativeTarget() val representativeTarget = chunk.representativeTarget()
fun concatenate(strings: Array<String>?, cp: List<String>) = array(*(strings ?: array<String>()), *cp.copyToArray())
for (argumentProvider in ServiceLoader.load(javaClass<KotlinJpsCompilerArgumentsProvider>())) { for (argumentProvider in ServiceLoader.load(javaClass<KotlinJpsCompilerArgumentsProvider>())) {
// appending to pluginOptions // appending to pluginOptions
commonArguments.pluginOptions = array( commonArguments.pluginOptions = concatenate(commonArguments.pluginOptions,
*(commonArguments.pluginOptions ?: array<String>()), argumentProvider.getExtraArguments(representativeTarget, context))
*argumentProvider.getExtraArguments(representativeTarget, context).copyToArray() // appending to classpath
commonArguments.pluginClasspaths = concatenate(commonArguments.pluginClasspaths,
argumentProvider.getClasspath(representativeTarget, context))
messageCollector.report(
INFO,
"Plugin loaded: ${argumentProvider.javaClass.getSimpleName()}",
NO_LOCATION
) )
} }