From 2a13a1158bb250acc5861c9a615dff81f9afda7f Mon Sep 17 00:00:00 2001 From: Pavel Punegov Date: Mon, 22 Jun 2020 20:03:13 +0300 Subject: [PATCH] Fix path that contains task name when copying frameworks --- .../src/main/kotlin/org/jetbrains/kotlin/ExecutorService.kt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build-tools/src/main/kotlin/org/jetbrains/kotlin/ExecutorService.kt b/build-tools/src/main/kotlin/org/jetbrains/kotlin/ExecutorService.kt index 5810f786d28..de1e4ad1d5b 100644 --- a/build-tools/src/main/kotlin/org/jetbrains/kotlin/ExecutorService.kt +++ b/build-tools/src/main/kotlin/org/jetbrains/kotlin/ExecutorService.kt @@ -502,9 +502,9 @@ fun KonanTestExecutable.configureXcodeBuild() { it += "mkdir -p \"\$TARGET_BUILD_DIR/\$FRAMEWORKS_FOLDER_PATH\"" // Copy each framework to the Frameworks dir. it += frameworks.map { framework -> - val name = framework.artifact - "cp -r \"$testOutput/$name/${project.testTarget.name}/$name.framework\" " + - "\"\$TARGET_BUILD_DIR/\$FRAMEWORKS_FOLDER_PATH/$name.framework\"" + val artifact = framework.artifact + "cp -r \"$testOutput/${this.name}/${project.testTarget.name}/$artifact.framework\" " + + "\"\$TARGET_BUILD_DIR/\$FRAMEWORKS_FOLDER_PATH/$artifact.framework\"" } } }.joinToString(separator = "\\n") { it.replace("\"", "\\\"") }