From 1b9d0a09dce610124ac6fa938de1c9d9d30d71a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sergej=20Ko=C5=A1=C4=8Dejev?= Date: Mon, 16 Sep 2024 09:08:30 +0200 Subject: [PATCH] build_mbeddr: add dependency on copy_allScripts The dependency was transitive via the spawner before but has to be added directly now. --- build/com.mbeddr/languages/build.gradle | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/build/com.mbeddr/languages/build.gradle b/build/com.mbeddr/languages/build.gradle index d747c901f0c..21fd03e3abd 100755 --- a/build/com.mbeddr/languages/build.gradle +++ b/build/com.mbeddr/languages/build.gradle @@ -50,18 +50,18 @@ ant.taskdef(name: 'junit', classname: 'org.apache.tools.ant.taskdefs.optional.ju ant.taskdef(name: 'junitreport', classname: 'org.apache.tools.ant.taskdefs.optional.junit.XMLResultAggregator', classpath: configurations.junitAnt.asPath) -def mbeddrDependencies +def mbeddrPlatformDependency def usePrebuiltPlatform = ciBuild && !project.hasProperty('forceBuildPlatform') //on teamcity we don't build the platform we take it from the nexus. Locally we want to build it if (usePrebuiltPlatform) { - mbeddrDependencies = [resolve_mbeddr_platform] + mbeddrPlatformDependency = resolve_mbeddr_platform } else { - mbeddrDependencies = [':com.mbeddr:platform:build_platform'] + mbeddrPlatformDependency = ':com.mbeddr:platform:build_platform' } -task build_mbeddr(type: BuildLanguages, dependsOn: mbeddrDependencies) { +task build_mbeddr(type: BuildLanguages, dependsOn: [':com.mbeddr:platform:copy_allScripts', mbeddrPlatformDependency]) { script script_build_mbeddr outputs.dir("$artifactsDir/mbeddr") }