Call optionally cbuild2cmake instead of cbuildgen (#167)

Addressing #165
Open-CMSIS-Pack · Feb 19, 2024 · 5d23fac · 5d23fac
1 parent d2aa039
commit 5d23fac
Show file tree

Hide file tree

Showing 20 changed files with 1,190 additions and 357 deletions.
diff --git a/cmd/cbuild/commands/build/buildcprj_test.go b/cmd/cbuild/commands/build/buildcprj_test.go
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023 Arm Limited. All rights reserved.
+ * Copyright (c) 2023-2024 Arm Limited. All rights reserved.
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -8,6 +8,7 @@ package build_test
 
 import (
 	"os"
+	"path/filepath"
 	"testing"
 
 	"github.com/Open-CMSIS-Pack/cbuild/v2/cmd/cbuild/commands"
@@ -16,10 +17,11 @@ import (
 )
 
 const testRoot = "../../../../test"
+const testDir = "command"
 
 func TestBuildCPRJCommand(t *testing.T) {
 	assert := assert.New(t)
-	cprjFile := testRoot + "/run/minimal.cprj"
+	cprjFile := filepath.Join(testRoot, testDir, "minimal.cprj")
 
 	t.Run("multiple arguments", func(t *testing.T) {
 		cmd := commands.NewRootCmd()
@@ -38,9 +40,9 @@ func TestBuildCPRJCommand(t *testing.T) {
 
 func TestPreLogConfiguration(t *testing.T) {
 	assert := assert.New(t)
-	logDir := testRoot + "/run/log"
-	logFile := logDir + "/test.log"
-	cprjFile := testRoot + "/run/minimal.cprj"
+	logDir := filepath.Join(testRoot, testDir, "log")
+	logFile := filepath.Join(logDir, "test.log")
+	cprjFile := filepath.Join(testRoot, testDir, "minimal.cprj")
 
 	t.Run("test normal verbosity level", func(t *testing.T) {
 		// No quiet, No debug

diff --git a/cmd/cbuild/commands/list/list_contexts_test.go b/cmd/cbuild/commands/list/list_contexts_test.go
@@ -1,12 +1,13 @@
 /*
- * Copyright (c) 2023 Arm Limited. All rights reserved.
+ * Copyright (c) 2023-2024 Arm Limited. All rights reserved.
  *
  * SPDX-License-Identifier: Apache-2.0
  */
 
 package list_test
 
 import (
+	"path/filepath"
 	"testing"
 
 	"github.com/Open-CMSIS-Pack/cbuild/v2/cmd/cbuild/commands"
@@ -15,7 +16,7 @@ import (
 
 func TestListContextsCommand(t *testing.T) {
 	assert := assert.New(t)
-	csolutionFile := testRoot + "/run/TestSolution/test.csolution.yml"
+	csolutionFile := filepath.Join(testRoot, testDir, "TestSolution/test.csolution.yml")
 
 	t.Run("No arguments", func(t *testing.T) {
 		cmd := commands.NewRootCmd()

diff --git a/cmd/cbuild/commands/list/list_test.go b/cmd/cbuild/commands/list/list_test.go
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023 Arm Limited. All rights reserved.
+ * Copyright (c) 2023-2024 Arm Limited. All rights reserved.
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -14,6 +14,7 @@ import (
 )
 
 const testRoot = "../../../../test"
+const testDir = "command"
 
 func TestListCommand(t *testing.T) {
 	assert := assert.New(t)

diff --git a/cmd/cbuild/commands/list/list_toolchains_test.go b/cmd/cbuild/commands/list/list_toolchains_test.go
@@ -1,12 +1,13 @@
 /*
- * Copyright (c) 2023 Arm Limited. All rights reserved.
+ * Copyright (c) 2023-2024 Arm Limited. All rights reserved.
  *
  * SPDX-License-Identifier: Apache-2.0
  */
 
 package list_test
 
 import (
+	"path/filepath"
 	"testing"
 
 	"github.com/Open-CMSIS-Pack/cbuild/v2/cmd/cbuild/commands"
@@ -15,7 +16,7 @@ import (
 
 func TestListToolchainsCommand(t *testing.T) {
 	assert := assert.New(t)
-	csolutionFile := testRoot + "/run/TestSolution/test.csolution.yml"
+	csolutionFile := filepath.Join(testRoot, testDir, "TestSolution/test.csolution.yml")
 
 	t.Run("invalid flag", func(t *testing.T) {
 		cmd := commands.NewRootCmd()

diff --git a/cmd/cbuild/commands/root.go b/cmd/cbuild/commands/root.go
@@ -129,29 +129,31 @@ func NewRootCmd() *cobra.Command {
 			toolchain, _ := cmd.Flags().GetString("toolchain")
 			useContextSet, _ := cmd.Flags().GetBool("context-set")
 			frozenPacks, _ := cmd.Flags().GetBool("frozen-packs")
+			useCbuild2CMake, _ := cmd.Flags().GetBool("cbuild2cmake")
 
 			options := builder.Options{
-				IntDir:        intDir,
-				OutDir:        outDir,
-				LockFile:      lockFile,
-				LogFile:       logFile,
-				Generator:     generator,
-				Target:        target,
-				Jobs:          jobs,
-				Quiet:         quiet,
-				Debug:         debug,
-				Verbose:       verbose,
-				Clean:         clean,
-				Schema:        schema,
-				Packs:         packs,
-				Rebuild:       rebuild,
-				UpdateRte:     updateRte,
-				Contexts:      contexts,
-				UseContextSet: useContextSet,
-				Load:          load,
-				Output:        output,
-				Toolchain:     toolchain,
-				FrozenPacks:   frozenPacks,
+				IntDir:          intDir,
+				OutDir:          outDir,
+				LockFile:        lockFile,
+				LogFile:         logFile,
+				Generator:       generator,
+				Target:          target,
+				Jobs:            jobs,
+				Quiet:           quiet,
+				Debug:           debug,
+				Verbose:         verbose,
+				Clean:           clean,
+				Schema:          schema,
+				Packs:           packs,
+				Rebuild:         rebuild,
+				UpdateRte:       updateRte,
+				Contexts:        contexts,
+				UseContextSet:   useContextSet,
+				Load:            load,
+				Output:          output,
+				Toolchain:       toolchain,
+				FrozenPacks:     frozenPacks,
+				UseCbuild2CMake: useCbuild2CMake,
 			}
 
 			configs, err := utils.GetInstallConfigs()
@@ -208,6 +210,7 @@ func NewRootCmd() *cobra.Command {
 	rootCmd.PersistentFlags().BoolP("schema", "s", false, "Validate project input file(s) against schema")
 	rootCmd.PersistentFlags().StringP("log", "", "", "Save output messages in a log file")
 	rootCmd.PersistentFlags().StringP("toolchain", "", "", "Input toolchain to be used")
+	rootCmd.Flags().BoolP("cbuild2cmake", "", false, "Use cbuild2cmake")
 
 	// CPRJ specific hidden flags
 	rootCmd.Flags().StringP("intdir", "i", "", "Set directory for intermediate files")

diff --git a/cmd/cbuild/commands/root_test.go b/cmd/cbuild/commands/root_test.go
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022-2023 Arm Limited. All rights reserved.
+ * Copyright (c) 2022-2024 Arm Limited. All rights reserved.
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -8,6 +8,7 @@ package commands_test
 
 import (
 	"os"
+	"path/filepath"
 	"testing"
 
 	"github.com/Open-CMSIS-Pack/cbuild/v2/cmd/cbuild/commands"
@@ -17,15 +18,16 @@ import (
 )
 
 const testRoot = "../../../test"
+const testDir = "command"
 
 func init() {
-	inittest.TestInitialization(testRoot)
+	inittest.TestInitialization(testRoot, testDir)
 }
 
 func TestCommands(t *testing.T) {
 	assert := assert.New(t)
-	cprjFile := testRoot + "/run/minimal.cprj"
-	csolutionFile := testRoot + "/run/test.csolution.yml"
+	cprjFile := filepath.Join(testRoot, testDir, "minimal.cprj")
+	csolutionFile := filepath.Join(testRoot, testDir, "test.csolution.yml")
 
 	t.Run("test version", func(t *testing.T) {
 		cmd := commands.NewRootCmd()
@@ -72,8 +74,8 @@ func TestCommands(t *testing.T) {
 
 func TestPreLogConfiguration(t *testing.T) {
 	assert := assert.New(t)
-	logDir := testRoot + "/run/log"
-	logFile := logDir + "/test.log"
+	logDir := filepath.Join(testRoot, testDir, "log")
+	logFile := filepath.Join(logDir, "test.log")
 
 	t.Run("test normal verbosity level", func(t *testing.T) {
 		// No quiet, No debug