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

Gradle: Import production output path for JavaScript modules

Browse Source 
Original commit: 1f7fab837f
This commit is contained in:
Alexey Sedunov
2018-01-24 16:27:02 +03:00
parent 0f68c3017a
commit 1577239e4d
2 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jps/jps-common/src/org/jetbrains/kotlin/config/KotlinFacetSettings.kt
+1
View File
@@ -194,6 +194,7 @@ class KotlinFacetSettings {
var implementedModuleName: String? = null var implementedModuleName: String? = null
var productionOutputPath: String? = null
var testOutputPath: String? = null var testOutputPath: String? = null
} }
jps/jps-common/src/org/jetbrains/kotlin/config/facetSerialization.kt
+8
View File
@@ -110,6 +110,9 @@ private fun readV2AndLaterConfig(element: Element): KotlinFacetSettings {
XmlSerializer.deserializeInto(compilerArguments!!, it) XmlSerializer.deserializeInto(compilerArguments!!, it)
compilerArguments!!.detectVersionAutoAdvance() compilerArguments!!.detectVersionAutoAdvance()
} }
productionOutputPath = element.getChild("productionOutputPath")?.let {
PathUtil.toSystemDependentName((it.content.firstOrNull() as? Text)?.textTrim)
} ?: (compilerArguments as? K2JSCompilerArguments)?.outputFile
testOutputPath = element.getChild("testOutputPath")?.let { testOutputPath = element.getChild("testOutputPath")?.let {
PathUtil.toSystemDependentName((it.content.firstOrNull() as? Text)?.textTrim) PathUtil.toSystemDependentName((it.content.firstOrNull() as? Text)?.textTrim)
} ?: (compilerArguments as? K2JSCompilerArguments)?.outputFile } ?: (compilerArguments as? K2JSCompilerArguments)?.outputFile
@@ -237,6 +240,11 @@ private fun KotlinFacetSettings.writeLatestConfig(element: Element) {
implementedModuleName?.let { implementedModuleName?.let {
element.addContent(Element("implements").apply { addContent(it) }) element.addContent(Element("implements").apply { addContent(it) })
} }
productionOutputPath?.let {
if (it != (compilerArguments as? K2JSCompilerArguments)?.outputFile) {
element.addContent(Element("productionOutputPath").apply { addContent(PathUtil.toSystemIndependentName(it)) })
}
}
testOutputPath?.let { testOutputPath?.let {
if (it != (compilerArguments as? K2JSCompilerArguments)?.outputFile) { if (it != (compilerArguments as? K2JSCompilerArguments)?.outputFile) {
element.addContent(Element("testOutputPath").apply { addContent(PathUtil.toSystemIndependentName(it)) }) element.addContent(Element("testOutputPath").apply { addContent(PathUtil.toSystemIndependentName(it)) })