AST: Fix source and generates operation in taskfiles.

Signed-off-by: Timothy Rule (VM/EMT3) <Timothy.Rule@de.bosch.com>

Author: timrulebosch

ast/internal/app/generate/taskfile_common.go

@@ -200,12 +200,10 @@ fi`},
 }
 
 func buildSimulationTasks(simSpec ast.SimulationSpec) map[string]Task {
+	// Build the _sequential_ build commands.
 	buildCmds := []Cmd{
-		{Cmd: "mkdir -p {{.SIMDIR}}/data"},
-		{Cmd: "cp {{.ENTRYDIR}}/simulation.yaml {{.SIMDIR}}/data/simulation.yaml"},
+		{Task: "build-setup-sim"},
 	}
-
-	// Sequential stack execution
 	for _, stack := range simSpec.Stacks {
 		if stack.Name == "external" {
 			continue
@@ -215,16 +213,25 @@ func buildSimulationTasks(simSpec ast.SimulationSpec) map[string]Task {
 		})
 	}
 
+	// Construct the simulation tasks.
 	simulationTasks := map[string]Task{
 		"default": {
 			Cmds: &[]Cmd{
 				{Task: "build"},
 			},
 		},
 		"build": {
-			Dir:       util.StringPtr("{{.OUTDIR}}"),
-			Label:     util.StringPtr("build"),
-			Cmds:      &buildCmds,
+			Dir:   util.StringPtr("{{.OUTDIR}}"),
+			Label: util.StringPtr("build"),
+			Cmds:  &buildCmds,
+		},
+		"build-setup-sim": {
+			Dir:   util.StringPtr("{{.OUTDIR}}"),
+			Label: util.StringPtr("build-setup-sim"),
+			Cmds: &[]Cmd{
+				{Cmd: "mkdir -p {{.SIMDIR}}/data"},
+				{Cmd: "cp {{.ENTRYDIR}}/simulation.yaml {{.SIMDIR}}/data/simulation.yaml"},
+			},
 			Sources:   &[]string{"{{.ENTRYDIR}}/simulation.yaml"},
 			Generates: &[]string{"{{.SIMDIR}}/data/simulation.yaml"},
 		},

ast/internal/app/generate/taskfile_model.go

@@ -322,7 +322,7 @@ func genericModelTask(model ast.Model, modelUses ast.Uses) Task {
 	sources := []string{}
 	generates := func() []string {
 		return []string{
-			"downloads/{{base .PACKAGE_URL}}",
+			//"downloads/{{base .PACKAGE_URL}}", // TODO: handled by deps
 		}
 	}()
 	md := map[string]interface{}{}
@@ -532,16 +532,16 @@ func buildModel(model ast.Model, simSpec ast.SimulationSpec) (Task, error) {
 					})
 					*task.Sources = append(*task.Sources, fmt.Sprintf("%s", downloadFile))
 				} else {
+					sourcePath := ""
 					if filepath.IsAbs(f.Value) {
-						*task.Cmds = append(*task.Cmds, Cmd{
-							Cmd: fmt.Sprintf("cp %s %s", f.Value, filePath),
-						})
+						sourcePath = f.Value
 					} else {
-						*task.Cmds = append(*task.Cmds, Cmd{
-							Cmd: fmt.Sprintf("cp {{.ENTRYDIR}}/%s %s", f.Value, filePath),
-						})
+						sourcePath = fmt.Sprintf("{{.ENTRYDIR}}/%s", f.Value)
 					}
-					*task.Sources = append(*task.Sources, fmt.Sprintf("%s", f.Name))
+					*task.Cmds = append(*task.Cmds, Cmd{
+						Cmd: fmt.Sprintf("cp %s %s", sourcePath, filePath),
+					})
+					*task.Sources = append(*task.Sources, sourcePath)
 				}
 			}
 		}