Use forward slash as separator after path relativize

Author: brondani

pkg/maker/contextlists.go

@@ -15,12 +15,13 @@ import (
 	"golang.org/x/exp/maps"
 )
 
-func (m *Maker) CreateContextCMakeLists(index int, cbuild Cbuild) error {
-
+func (m *Maker) CreateContextCMakeLists(index int) error {
+	cbuild := &m.Cbuilds[index]
 	outputByProducts, outputFile, outputType, customCommands := OutputFiles(cbuild.BuildDescType.Output)
 	outputExt := path.Ext(outputFile)
 	outputName := strings.TrimSuffix(outputFile, outputExt)
 	cbuild.ContextRoot, _ = filepath.Rel(m.CbuildIndex.BaseDir, cbuild.BaseDir)
+	cbuild.ContextRoot = filepath.ToSlash(cbuild.ContextRoot)
 	cbuild.Toolchain = m.RegisteredToolchains[m.SelectedToolchainVersion[index]].Name
 	outDir := AddRootPrefix(cbuild.ContextRoot, cbuild.BuildDescType.OutputDirs.Outdir)
 	contextDir := path.Join(m.SolutionIntDir, cbuild.BuildDescType.Context)

pkg/maker/maker.go

@@ -73,7 +73,7 @@ func (m *Maker) GenerateCMakeLists() error {
 
 	// Create context specific CMake files
 	for index := range m.Cbuilds {
-		err = m.CreateContextCMakeLists(index, m.Cbuilds[index])
+		err = m.CreateContextCMakeLists(index)
 		if err != nil {
 			return err
 		}

pkg/maker/maker_test.go

@@ -22,15 +22,24 @@ func init() {
 
 func TestMaker(t *testing.T) {
 	assert := assert.New(t)
-	var m maker.Maker
 
 	t.Run("test maker", func(t *testing.T) {
+		var m maker.Maker
 		m.Params.InputFile = testRoot + "/run/generic/solutionName1.cbuild-idx.yml"
 		err := m.GenerateCMakeLists()
 		assert.Nil(err)
 	})
 
+	t.Run("test maker with cbuild in subfolder", func(t *testing.T) {
+		var m maker.Maker
+		m.Params.InputFile = testRoot + "/run/generic/solutionName4.cbuild-idx.yml"
+		err := m.GenerateCMakeLists()
+		assert.Nil(err)
+		assert.Equal("project/subfolder", m.Cbuilds[0].ContextRoot)
+	})
+
 	t.Run("test maker with invalid input param", func(t *testing.T) {
+		var m maker.Maker
 		m.Params.InputFile = testRoot + "invalid.cbuild-idx.yml"
 		err := m.GenerateCMakeLists()
 		assert.Error(err)

pkg/maker/superlists.go

@@ -33,6 +33,7 @@ func (m *Maker) CreateSuperCMakeLists() error {
 			}
 		}
 		cbuildRelativePath, _ := filepath.Rel(m.CbuildIndex.BaseDir, cbuild.BaseDir)
+		cbuildRelativePath = filepath.ToSlash(cbuildRelativePath)
 		output := AddRootPrefix(cbuildRelativePath, path.Join(cbuild.BuildDescType.OutputDirs.Outdir, outputFile))
 		outputs += "  \"" + output + "\"\n"
 	}

test/data/generic/project/subfolder/contextName.cbuild.yml

@@ -0,0 +1,6 @@
+build:
+  compiler: AC6@>=6.6.6
+  device: deviceName
+  output:
+    - type: lib
+      file: projectName.lib

test/data/generic/solutionName4.cbuild-idx.yml

@@ -0,0 +1,9 @@
+build-idx:
+  generated-by: csolution version 2.2.1
+  csolution: solutionName.csolution.yml
+  cprojects:
+    - cproject: projectName.cproject.yml
+  cbuilds:
+    - cbuild: project/subfolder/contextName.cbuild.yml
+      project: projectName
+      configuration: .BuildType+TargetType