[cbuild2cmake] Improve executes dependencies

Author: brondani

cmd/cbuild2cmake/commands/root_test.go

@@ -305,49 +305,9 @@ set(OUTPUTS_1
 		err := cmd.Execute()
 		assert.Nil(err)
 
-		// check super CMakeLists contents
-		content, err := utils.ReadFileContent(testCaseRoot + "/tmp/CMakeLists.txt")
+		// check golden references
+		err, mismatch := inittest.CompareFiles(testCaseRoot+"/ref", testCaseRoot+"/tmp")
 		assert.Nil(err)
-
-		content = strings.ReplaceAll(content, "\r\n", "\n")
-		assert.Contains(content, `
-# Execute: project.Release+ARMCM0-Sign_Artifact
-set(INPUT
-  ${SOLUTION_ROOT}/script/sign.cmake
-  ${SOLUTION_ROOT}/out/project/ARMCM0/Release/project.axf
-)
-list(GET INPUT 0 INPUT_0)
-set(OUTPUT
-  ${SOLUTION_ROOT}/out/project/ARMCM0/Release/project.axf.signed
-)
-add_custom_target(project.Release+ARMCM0-Sign_Artifact ALL DEPENDS ${OUTPUT})
-add_custom_command(OUTPUT ${OUTPUT} DEPENDS ${INPUT}
-  COMMAND ${CMAKE_COMMAND} -DINPUT="${INPUT}" -DOUTPUT="${OUTPUT}" -P "${INPUT_0}"
-  COMMENT project.Release+ARMCM0-Sign_Artifact
-)`)
-		assert.Contains(content, `
-# Build dependencies
-add_dependencies(project.Debug+ARMCM0-build
-  Generate_Project_Sources
-)
-add_dependencies(project.Release+ARMCM0-build
-  Generate_Project_Sources
-)
-add_dependencies(Archive_Artifacts
-  project.Release+ARMCM0-build
-  project.Release+ARMCM0-Sign_Artifact
-)
-add_dependencies(project.Release+ARMCM0-executes
-  Archive_Artifacts
-)
-add_dependencies(Run_After_Archiving
-  Archive_Artifacts
-)
-add_dependencies(project.Release+ARMCM0-Sign_Artifact
-  project.Release+ARMCM0-build
-)
-add_dependencies(project.Release+ARMCM0-executes
-  project.Release+ARMCM0-Sign_Artifact
-)`)
+		assert.False(mismatch)
 	})
 }

pkg/maker/buildcontent.go

@@ -38,6 +38,7 @@ type CompilerAbstractions struct {
 
 type ScopeMap map[string]map[string][]string
 type LanguageMap map[string][]string
+type DependenciesMap map[string][]string
 
 var CategoryLanguageMap = map[string]string{
 	"headerAsm":  "ASM",
@@ -158,6 +159,7 @@ func (m *Maker) AddStepSuffix(name string) string {
 
 func (m *Maker) CMakeTargetAddDependencies(name string, dependencies []string) string {
 	var content string
+	dependencies = utils.AppendUniquely(dependencies, m.GetAllRunAlways(name)...)
 	if len(dependencies) > 0 {
 		content += "\nadd_dependencies(" + m.AddStepSuffix(name)
 		for _, dependency := range dependencies {
@@ -176,22 +178,53 @@ func (m *Maker) BuildDependencies() string {
 		}
 		content += m.CMakeTargetAddDependencies(cbuild.Project+cbuild.Configuration, cbuild.DependsOn)
 	}
+	var postBuildDependencies = make(DependenciesMap)
 	for _, item := range m.CbuildIndex.BuildIdx.Executes {
 		content += m.CMakeTargetAddDependencies(item.Execute, item.DependsOn)
-		// add executes statement to ${CONTEXT}-executes target of context
-		// if dependency is a context
-		for _, dependsOn := range item.DependsOn {
-			if slices.Contains(m.Contexts, dependsOn) {
-				content += m.CMakeTargetAddDependencies(dependsOn+"-executes", []string{item.Execute})
-			}
-		}
+		postBuildDependencies = m.GetContextDependencies(item.Execute, item.DependsOn, postBuildDependencies)
+	}
+	// add executes statement to ${CONTEXT}-executes target of context
+	for context, dependencies := range postBuildDependencies {
+		content += m.CMakeTargetAddDependencies(context+"-executes", dependencies)
 	}
 	if len(content) > 0 {
 		content = "\n\n# Build dependencies" + content
 	}
 	return content
 }
 
+func (m *Maker) GetContextDependencies(execute string, dependsOn []string, deps DependenciesMap) DependenciesMap {
+	for _, item := range dependsOn {
+		if slices.Contains(m.Contexts, item) {
+			// collect dependency on context (post build step)
+			deps[item] = utils.AppendUniquely(deps[item], execute)
+		} else {
+			// check recursively further dependencies
+			deps = m.GetContextDependencies(execute, m.GetDependsOn(item), deps)
+		}
+	}
+	return deps
+}
+
+func (m *Maker) GetDependsOn(execute string) (dependsOn []string) {
+	for _, item := range m.CbuildIndex.BuildIdx.Executes {
+		if item.Execute == execute {
+			dependsOn = item.DependsOn
+			break
+		}
+	}
+	return dependsOn
+}
+
+func (m *Maker) GetAllRunAlways(execute string) (elements []string) {
+	for _, item := range m.CbuildIndex.BuildIdx.Executes {
+		if item.Execute != execute && item.Always != nil {
+			elements = utils.AppendUniquely(elements, item.Execute)
+		}
+	}
+	return elements
+}
+
 func CMakeTargetIncludeDirectories(name string, includes ScopeMap) string {
 	if len(includes) == 0 {
 		return ""

test/data/solutions/executes/project/project.Debug+ARMCM0.cbuild.yml

@@ -1,19 +1,19 @@
 build:
-  generated-by: csolution version 0.0.0+gdf212332
+  generated-by: csolution version 2.6.0
   solution: ../solution.csolution.yml
   project: project.cproject.yml
   context: project.Release+ARMCM0
   compiler: AC6
   device: ARMCM0
-  device-pack: ARM::Cortex_DFP@1.0.0
+  device-pack: ARM::Cortex_DFP@1.1.0
   processor:
     fpu: off
     core: Cortex-M0
   packs:
-    - pack: ARM::CMSIS@6.0.0
-      path: ${CMSIS_PACK_ROOT}/ARM/CMSIS/6.0.0
-    - pack: ARM::Cortex_DFP@1.0.0
-      path: ${CMSIS_PACK_ROOT}/ARM/Cortex_DFP/1.0.0
+    - pack: ARM::CMSIS@6.1.0
+      path: ${CMSIS_PACK_ROOT}/ARM/CMSIS/6.1.0
+    - pack: ARM::Cortex_DFP@1.1.0
+      path: ${CMSIS_PACK_ROOT}/ARM/Cortex_DFP/1.1.0
   misc:
     ASM:
       - -masm=auto
@@ -42,50 +42,50 @@ build:
     - _RTE_
   add-path:
     - RTE/_Release_ARMCM0
-    - ${CMSIS_PACK_ROOT}/ARM/CMSIS/6.0.0/CMSIS/Core/Include
-    - ${CMSIS_PACK_ROOT}/ARM/Cortex_DFP/1.0.0/Device/ARMCM0/Include
+    - ${CMSIS_PACK_ROOT}/ARM/CMSIS/6.1.0/CMSIS/Core/Include
+    - ${CMSIS_PACK_ROOT}/ARM/Cortex_DFP/1.1.0/Device/ARMCM0/Include
   add-path-asm:
     - RTE/_Release_ARMCM0
-    - ${CMSIS_PACK_ROOT}/ARM/CMSIS/6.0.0/CMSIS/Core/Include
-    - ${CMSIS_PACK_ROOT}/ARM/Cortex_DFP/1.0.0/Device/ARMCM0/Include
+    - ${CMSIS_PACK_ROOT}/ARM/CMSIS/6.1.0/CMSIS/Core/Include
+    - ${CMSIS_PACK_ROOT}/ARM/Cortex_DFP/1.1.0/Device/ARMCM0/Include
   output-dirs:
-    intdir: ../tmp/project/ARMCM0/Release
+    intdir: ../tmp
     outdir: ../out/project/ARMCM0/Release
     rtedir: RTE
   output:
     - type: elf
       file: project.axf
   components:
-    - component: ARM::CMSIS:CORE@6.0.0
+    - component: ARM::CMSIS:CORE@6.1.0
       condition: ARMv6_7_8-M Device
-      from-pack: ARM::CMSIS@6.0.0
+      from-pack: ARM::CMSIS@6.1.0
       selected-by: ARM::CMSIS:CORE
       files:
-        - file: ${CMSIS_PACK_ROOT}/ARM/CMSIS/6.0.0/CMSIS/Core/Include
+        - file: ${CMSIS_PACK_ROOT}/ARM/CMSIS/6.1.0/CMSIS/Core/Include
           category: include
-          version: 6.0.0
-        - file: ${CMSIS_PACK_ROOT}/ARM/CMSIS/6.0.0/CMSIS/Core/Include/tz_context.h
+          version: 6.1.0
+        - file: ${CMSIS_PACK_ROOT}/ARM/CMSIS/6.1.0/CMSIS/Core/Include/tz_context.h
           category: header
-          version: 6.0.0
-        - file: ${CMSIS_PACK_ROOT}/ARM/CMSIS/6.0.0/CMSIS/Core/Template/ARMv8-M/main_s.c
+          version: 6.1.0
+        - file: ${CMSIS_PACK_ROOT}/ARM/CMSIS/6.1.0/CMSIS/Core/Template/ARMv8-M/main_s.c
           category: sourceC
           attr: template
           version: 1.1.1
           select: Secure mode 'main' module for ARMv8-M
-        - file: ${CMSIS_PACK_ROOT}/ARM/CMSIS/6.0.0/CMSIS/Core/Template/ARMv8-M/tz_context.c
+        - file: ${CMSIS_PACK_ROOT}/ARM/CMSIS/6.1.0/CMSIS/Core/Template/ARMv8-M/tz_context.c
           category: sourceC
           attr: template
           version: 1.1.1
           select: RTOS Context Management (TrustZone for ARMv8-M)
-        - file: ${CMSIS_PACK_ROOT}/ARM/CMSIS/6.0.0/CMSIS/Documentation/html/Core/index.html
+        - file: ${CMSIS_PACK_ROOT}/ARM/CMSIS/6.1.0/CMSIS/Documentation/html/Core/index.html
           category: doc
-          version: 6.0.0
+          version: 6.1.0
     - component: ARM::Device:Startup&C [email protected]
       condition: ARMCM0 CMSIS
-      from-pack: ARM::Cortex_DFP@1.0.0
+      from-pack: ARM::Cortex_DFP@1.1.0
       selected-by: ARM::Device:Startup&C Startup
       files:
-        - file: ${CMSIS_PACK_ROOT}/ARM/Cortex_DFP/1.0.0/Device/ARMCM0/Include/ARMCM0.h
+        - file: ${CMSIS_PACK_ROOT}/ARM/Cortex_DFP/1.1.0/Device/ARMCM0/Include/ARMCM0.h
           category: header
           version: 2.2.0
         - file: RTE/Device/ARMCM0/ARMCM0_ac6.sct
@@ -105,23 +105,18 @@ build:
   groups:
     - group: Source
       files:
-        - file: ./source0.c
+        - file: source0.c
           category: sourceC
-        - file: ./source1.c
+        - file: source1.c
           category: sourceC
   constructed-files:
     - file: RTE/_Release_ARMCM0/RTE_Components.h
       category: header
   licenses:
-    - license: <unknown>
-      license-agreement: ${CMSIS_PACK_ROOT}/ARM/CMSIS/6.0.0/LICENSE
+    - license: Apache-2.0
       packs:
-        - pack: ARM::[email protected]
-      components:
-        - component: ARM::CMSIS:[email protected]
-    - license: <unknown>
-      license-agreement: ${CMSIS_PACK_ROOT}/ARM/Cortex_DFP/1.0.0/LICENSE
-      packs:
-        - pack: ARM::[email protected]
+        - pack: ARM::[email protected]
+        - pack: ARM::[email protected]
       components:
+        - component: ARM::CMSIS:[email protected]
         - component: ARM::Device:Startup&C [email protected]

test/data/solutions/executes/project/project.Release+ARMCM0.cbuild.yml

@@ -13,7 +13,7 @@ project:
         - file: ./source1.c
 
   executes:
-    - execute: Sign Artifact
+    - execute: Sign_Artifact
       run: ${CMAKE_COMMAND} -DINPUT=$input$ -DOUTPUT=$output$ -P $input(0)$
       input:
         - $SolutionDir()$/script/sign.cmake