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

[Gradle, JS] Windows environment for not ignoring scripts

Browse Source
This commit is contained in:
Ilya Goncharov
2021-11-26 12:39:02 +03:00
committed by Space
parent d4953cb51a
commit 2e350a10bd
2 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/NpmApi.kt
+7 -2
View File
@@ -56,8 +56,13 @@ interface NpmApi : Serializable {
data class NpmEnvironment( data class NpmEnvironment(
val rootPackageDir: File, val rootPackageDir: File,
val nodeExecutable: String val nodeExecutable: String,
val isWindows: Boolean
) : Serializable ) : Serializable
internal val NodeJsRootExtension.asNpmEnvironment internal val NodeJsRootExtension.asNpmEnvironment
get() = NpmEnvironment(rootPackageDir, requireConfigured().nodeExecutable) get() = NpmEnvironment(
rootPackageDir,
requireConfigured().nodeExecutable,
requireConfigured().isWindows
)
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/yarn/YarnBasics.kt
+11 -4
View File
@@ -44,10 +44,17 @@ abstract class YarnBasics : NpmApi {
).filter { it.isNotEmpty() } ).filter { it.isNotEmpty() }
val nodeExecutable = nodeJs.nodeExecutable val nodeExecutable = nodeJs.nodeExecutable
exec.environment( if (!yarn.ignoreScripts) {
"PATH", val nodePath = if (nodeJs.isWindows) {
"$nodeExecutable${File.pathSeparator}${System.getenv("PATH")}" File(nodeExecutable).parent
) } else {
nodeExecutable
}
exec.environment(
"PATH",
"$nodePath${File.pathSeparator}${System.getenv("PATH")}"
)
}
val command = yarn.executable val command = yarn.executable
if (yarn.standalone) { if (yarn.standalone) {