erik/kobalt
erik/kobalt
1
0
Fork 0
mirror of https://github.com/ethauvin/kobalt.git synced 2025-04-26 08:27:12 -07:00
Code Releases Activity

Support internal.

Browse source
This commit is contained in:
Cedric Beust 2016-07-18 01:29:13 -08:00
parent 9d582d5215
commit f73315d97a
5 changed files with 35 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

5
modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/api/CompilerActionInfo.kt
View file

@ -10,6 +10,5 @@ data class CompilerActionInfo(val directory: String?,
val sourceFiles: List<String>,
val suffixesBeingCompiled: List<String>,
val outputDir: File,
val compilerArgs: List<String>)
val compilerArgs: List<String>,
val friendPaths: List<String>)

9
modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/internal/CompilerUtils.kt
View file

@ -170,10 +170,17 @@ class CompilerUtils @Inject constructor(val files: KFiles,
// Finally, alter the info with the compiler interceptors before returning it
val initialActionInfo = CompilerActionInfo(projectDirectory.path, classpath, allSources,
sourceSuffixes, buildDirectory, emptyList() /* the flags will be provided by flag contributors */)
sourceSuffixes, buildDirectory, emptyList() /* the flags will be provided by flag contributors */,
emptyList())
val result = context.pluginInfo.compilerInterceptors.fold(initialActionInfo, { ai, interceptor ->
interceptor.intercept(project, context, ai)
})
//
// friendPaths
//
val friendPaths = KFiles.joinDir(project.buildDirectory, KFiles.CLASSES_DIR)
return result
}

5
modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/internal/GenericRunner.kt
View file

@ -33,8 +33,9 @@ abstract class GenericTestRunner: ITestRunnerContributor {
File(this).mkdirs()
}
val testClasses = IFileSpec.GlobSpec(toClassPaths(testConfig.testIncludes))
.toFiles(project.directory, path, testConfig.testExcludes.map { Glob(it) })
val files = IFileSpec.GlobSpec(toClassPaths(testConfig.testIncludes))
.toFiles(project.directory, path, testConfig.testExcludes.map { Glob(it) })
val testClasses = files
.filter { ! it.path.contains('$') }
.map {
File(KFiles.joinDir(project.directory, testClassDir, it.path))

2
src/main/kotlin/com/beust/kobalt/plugin/apt/AptPlugin.kt
View file

@ -92,7 +92,7 @@ class AptPlugin @Inject constructor(val dependencyManager: DependencyManager, va
val dependencies = dependencyManager.calculateDependencies(project, context)
val info = CompilerActionInfo(sourceDir.absolutePath, dependencies,
listOf(javaFile.absolutePath), listOf("java"), File(sourceDir, "generated"),
listOf())
listOf(), listOf())
val results = compilerUtils.invokeCompiler(project, context, javaCompiler, info)
}

33
src/main/kotlin/com/beust/kobalt/plugin/kotlin/KotlinCompiler.kt
View file

@ -9,10 +9,7 @@ import com.beust.kobalt.internal.KotlinJarFiles
import com.beust.kobalt.kotlin.ParentLastClassLoader
import com.beust.kobalt.maven.DependencyManager
import com.beust.kobalt.maven.dependency.FileDependency
import com.beust.kobalt.misc.KFiles
import com.beust.kobalt.misc.KobaltExecutors
import com.beust.kobalt.misc.Strings
import com.beust.kobalt.misc.log
import com.beust.kobalt.misc.*
import org.jetbrains.kotlin.cli.common.ExitCode
import org.jetbrains.kotlin.cli.common.arguments.K2JVMCompilerArguments
import org.jetbrains.kotlin.cli.common.messages.CompilerMessageLocation
@ -49,7 +46,7 @@ class KotlinCompiler @Inject constructor(
// Don't display the message if compiling Build.kt
log(1, " Kotlin $version compiling " + Strings.pluralizeAll(info.sourceFiles.size, "file"))
}
val cp = compilerFirst(info.dependencies.map {it.jarFile.get()})
val cp = compilerFirst(info.dependencies.map { it.jarFile.get() })
val infoDir = info.directory
val outputDir = if (infoDir != null) {
KFiles.joinDir(infoDir, info.outputDir.path)
@ -76,19 +73,19 @@ class KotlinCompiler @Inject constructor(
allArgs.add("-no-stdlib")
}
// return invokeCompilerWithCompilerArgs(projectName ?: "kobalt-" + Random().nextInt(), outputDir, classpath,
// info.sourceFiles)
return invokeCompilerWithStringArgs(projectName ?: "kobalt-" + Random().nextInt(), cp, allArgs)
return invokeCompilerWithCompilerArgs(projectName ?: "kobalt-" + Random().nextInt(), outputDir, classpath,
info.sourceFiles, info.friendPaths.toTypedArray())
// return invokeCompilerWithStringArgs(projectName ?: "kobalt-" + Random().nextInt(), cp, allArgs)
}
private fun invokeCompilerWithCompilerArgs(projectName: String, outputDir: String?, classpathString: String,
sourceFiles: List<String>): TaskResult {
sourceFiles: List<String>, friends: Array<String>): TaskResult {
val args = K2JVMCompilerArguments().apply {
moduleName = projectName
destination = outputDir
classpath = classpathString
freeArgs = sourceFiles
friendPaths = arrayOf("kobaltBuild\\classes")
friendPaths = friends
}
log(1, "Invoking K2JVMCompiler with arguments:"
+ " -moduleName " + args.moduleName
@ -199,14 +196,26 @@ class KotlinCompiler @Inject constructor(
// .map { FileDependency(it) }
val dependencies = compileDependencies + otherClasspath.map { FileDependency(it) }
val info = CompilerActionInfo(project?.directory, dependencies, sourceFiles, listOf("kt"), outputDir, args)
// The friendPaths is a private setting for the Kotlin compiler that enables a compilation unit
// to see internal symbols from another compilation unit. By default, set it to kobaltBuild/classes
// so that tests can see internal from the main code
val friendPaths =
if (project != null) {
listOf(KFiles.joinDir(project.directory, project.buildDirectory, KFiles.CLASSES_DIR))
} else {
emptyList<String>()
}
val info = CompilerActionInfo(project?.directory, dependencies, sourceFiles, listOf("kt"), outputDir, args,
friendPaths)
return jvmCompiler.doCompile(project, context, compilerAction, info)
}
}
class KConfiguration @Inject constructor(val compiler: KotlinCompiler){
private val classpath = arrayListOf<String>()
val dependencies = arrayListOf<IClasspathDependency>()
var dependencies = arrayListOf<IClasspathDependency>()
var source = arrayListOf<String>()
var output: File by Delegates.notNull()
val args = arrayListOf<String>()