[cbuild2cmake] Fix executes IO paths for shifted cbuild-idx

Author: brondani

pkg/maker/buildcontent.go

@@ -900,7 +900,7 @@ func (m *Maker) ListExecutesIOs(io string, list []string, run string) string {
 	content := "\nset(" + io
 	var listItems string
 	for index, input := range list {
-		content += "\n  " + AddRootPrefix("", input, m.SolutionRoot)
+		content += "\n  " + AddRootPrefix(m.CbuildIndex.RelDir, input, m.SolutionRoot)
 		if strings.Contains(run, "${"+io+"_"+strconv.Itoa(index)+"}") {
 			listItems += "\nlist(GET " + io + " " + strconv.Itoa(index) + " " + io + "_" + strconv.Itoa(index) + ")"
 		}
@@ -912,7 +912,7 @@ func (m *Maker) ListExecutesIOs(io string, list []string, run string) string {
 
 func (m *Maker) GetGeneratedFiles(list []string) {
 	for _, input := range list {
-		file := AddRootPrefix("", input, m.SolutionRoot)
+		file := AddRootPrefix(m.CbuildIndex.RelDir, input, m.SolutionRoot)
 		m.GeneratedFiles = utils.AppendUniquely(m.GeneratedFiles, file)
 	}
 }

pkg/maker/buildcontent_test.go

@@ -522,12 +522,26 @@ add_dependencies(project.debug+target-executes
 
 	t.Run("get executes generated files", func(t *testing.T) {
 		var m maker.Maker
-		var files = []string{"./source0.c", "./source1.c"}
+		m.SolutionRoot, _ = filepath.Abs(testRoot)
+		m.SolutionRoot = filepath.ToSlash(m.SolutionRoot)
+		m.CbuildIndex.RelDir = "1/2/3"
+		var files = []string{"../source0.c", "../../source1.c"}
 		m.GetGeneratedFiles(files)
 		assert.Equal(
-			[]string{"${SOLUTION_ROOT}/source0.c", "${SOLUTION_ROOT}/source1.c"},
+			[]string{"${SOLUTION_ROOT}/1/2/source0.c", "${SOLUTION_ROOT}/1/source1.c"},
 			m.GeneratedFiles,
 		)
 	})
 
+	t.Run("list executes IOs", func(t *testing.T) {
+		var m maker.Maker
+		m.SolutionRoot, _ = filepath.Abs(testRoot)
+		m.SolutionRoot = filepath.ToSlash(m.SolutionRoot)
+		m.CbuildIndex.RelDir = "1/2/3"
+		var files = []string{"../source0.c", "../../source1.c"}
+		assert.Equal(
+			"\nset(INPUT\n  ${SOLUTION_ROOT}/1/2/source0.c\n  ${SOLUTION_ROOT}/1/source1.c\n)",
+			m.ListExecutesIOs("INPUT", files, ""),
+		)
+	})
 }

pkg/maker/parser.go

@@ -30,6 +30,7 @@ type CbuildIndex struct {
 		Executes    []Executes  `yaml:"executes"`
 	} `yaml:"build-idx"`
 	BaseDir string
+	RelDir  string
 }
 
 type CbuildSet struct {
@@ -294,6 +295,8 @@ func (m *Maker) ParseCbuildFiles() error {
 	m.SolutionName = filepath.Base(m.CbuildIndex.BuildIdx.Csolution)
 	reg := regexp.MustCompile(`(.*)\.csolution.ya?ml`)
 	m.SolutionName = reg.ReplaceAllString(m.SolutionName, "$1")
+	m.CbuildIndex.RelDir, _ = filepath.Rel(m.SolutionRoot, m.CbuildIndex.BaseDir)
+	m.CbuildIndex.RelDir = filepath.ToSlash(m.CbuildIndex.RelDir)
 
 	// Parse cbuild-set file
 	if m.Options.UseContextSet {