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

JS: add suffix '_test' to test module output files to avoid name conflicts (KT-16979)

Browse Source 
Also stop setting AMD module ids explicitly.

Original commit: 4086a84622
This commit is contained in:
Anton Bannykh
2017-03-27 18:44:53 +03:00
parent 2208b46941
commit 34e697e991
3 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt
+3 -4
View File
@@ -133,8 +133,8 @@ class KotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() {
val list = arrayListOf<String>() val list = arrayListOf<String>()
for (moduleName in moduleNames) { for (moduleName in moduleNames) {
val outputDir = File("out/production/$moduleName") val outputDir = File("out/production/$moduleName")
list.add(toSystemIndependentName(JpsJsModuleUtils.getOutputFile(outputDir, moduleName).path)) list.add(toSystemIndependentName(JpsJsModuleUtils.getOutputFile(outputDir, moduleName, false).path))
list.add(toSystemIndependentName(JpsJsModuleUtils.getOutputMetaFile(outputDir, moduleName).path)) list.add(toSystemIndependentName(JpsJsModuleUtils.getOutputMetaFile(outputDir, moduleName, false).path))
} }
return list.toTypedArray() return list.toTypedArray()
} }
@@ -389,8 +389,7 @@ class KotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() {
buildResult.assertSuccessful() buildResult.assertSuccessful()
val warnings = buildResult.getMessages(BuildMessage.Kind.WARNING) val warnings = buildResult.getMessages(BuildMessage.Kind.WARNING)
assertEquals("Warning about duplicate module definition: $warnings", 1, warnings.size) assertEquals("Warning about duplicate module definition: $warnings", 0, warnings.size)
assertEquals("Module \"srcAndTests\" is defined in more than one file", warnings[0].messageText)
} }
fun testKotlinJavaScriptProjectWithTwoSrcModuleDependency() { fun testKotlinJavaScriptProjectWithTwoSrcModuleDependency() {
jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/JpsJsModuleUtils.kt
+7 -3
View File
@@ -62,7 +62,7 @@ object JpsJsModuleUtils {
fun addTarget(module: JpsModule, targetType: JavaModuleBuildTargetType) { fun addTarget(module: JpsModule, targetType: JavaModuleBuildTargetType) {
val moduleBuildTarget = ModuleBuildTarget(module, targetType) val moduleBuildTarget = ModuleBuildTarget(module, targetType)
val outputDir = KotlinBuilderModuleScriptGenerator.getOutputDirSafe(moduleBuildTarget) val outputDir = KotlinBuilderModuleScriptGenerator.getOutputDirSafe(moduleBuildTarget)
val metaInfoFile = getOutputMetaFile(outputDir, module.name) val metaInfoFile = getOutputMetaFile(outputDir, module.name, targetType.isTests)
if (metaInfoFile.exists()) { if (metaInfoFile.exists()) {
result.add(metaInfoFile.absolutePath) result.add(metaInfoFile.absolutePath)
} }
@@ -71,8 +71,12 @@ object JpsJsModuleUtils {
} }
@JvmStatic @JvmStatic
fun getOutputFile(outputDir: File, moduleName: String) = File(outputDir, moduleName + KotlinJavascriptMetadataUtils.JS_EXT) fun getOutputFile(outputDir: File, moduleName: String, isTests: Boolean)
= File(outputDir, moduleName + suffix(isTests) + KotlinJavascriptMetadataUtils.JS_EXT)
@JvmStatic @JvmStatic
fun getOutputMetaFile(outputDir: File, moduleName: String) = File(outputDir, moduleName + KotlinJavascriptMetadataUtils.META_JS_SUFFIX) fun getOutputMetaFile(outputDir: File, moduleName: String, isTests: Boolean)
= File(outputDir, moduleName + suffix(isTests) + KotlinJavascriptMetadataUtils.META_JS_SUFFIX)
private fun suffix(isTests: Boolean) = if (isTests) "_test" else ""
} }
jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt
+3 -3
View File
@@ -294,7 +294,7 @@ class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR) {
} }
if (JpsUtils.isJsKotlinModule(chunk.representativeTarget())) { if (JpsUtils.isJsKotlinModule(chunk.representativeTarget())) {
copyJsLibraryFilesIfNeeded(chunk, project) copyJsLibraryFilesIfNeeded(chunk)
return OK return OK
} }
@@ -666,7 +666,7 @@ class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR) {
val representativeModule = representativeTarget.module val representativeModule = representativeTarget.module
val moduleName = representativeModule.name val moduleName = representativeModule.name
val outputFile = JpsJsModuleUtils.getOutputFile(outputDir, moduleName) val outputFile = JpsJsModuleUtils.getOutputFile(outputDir, moduleName, representativeTarget.isTests)
val libraries = JpsJsModuleUtils.getLibraryFilesAndDependencies(representativeTarget) val libraries = JpsJsModuleUtils.getLibraryFilesAndDependencies(representativeTarget)
val compilerSettings = JpsKotlinCompilerSettings.getCompilerSettings(representativeModule) val compilerSettings = JpsKotlinCompilerSettings.getCompilerSettings(representativeModule)
val k2JsArguments = JpsKotlinCompilerSettings.getK2JsCompilerArguments(representativeModule) val k2JsArguments = JpsKotlinCompilerSettings.getK2JsCompilerArguments(representativeModule)
@@ -676,7 +676,7 @@ class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR) {
return environment.outputItemsCollector return environment.outputItemsCollector
} }
private fun copyJsLibraryFilesIfNeeded(chunk: ModuleChunk, project: JpsProject) { private fun copyJsLibraryFilesIfNeeded(chunk: ModuleChunk) {
val representativeTarget = chunk.representativeTarget() val representativeTarget = chunk.representativeTarget()
val outputDir = KotlinBuilderModuleScriptGenerator.getOutputDirSafe(representativeTarget) val outputDir = KotlinBuilderModuleScriptGenerator.getOutputDirSafe(representativeTarget)
val compilerSettings = JpsKotlinCompilerSettings.getCompilerSettings(representativeTarget.module) val compilerSettings = JpsKotlinCompilerSettings.getCompilerSettings(representativeTarget.module)