From 2c32df606247464ff0795081070136506fb0ef05 Mon Sep 17 00:00:00 2001 From: Sourabh Mehta Date: Fri, 6 Sep 2024 08:36:06 +0200 Subject: [PATCH 1/4] Removing cbuild2cmake option and keeping it default option --- cmd/cbuild/commands/root.go | 3 +-- cmd/cbuild/commands/setup/setup.go | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/cmd/cbuild/commands/root.go b/cmd/cbuild/commands/root.go index c7a45fc..ed2a85a 100644 --- a/cmd/cbuild/commands/root.go +++ b/cmd/cbuild/commands/root.go @@ -234,8 +234,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("cbuildgen", "", false, "Use build information files with cbuildgen backend") - rootCmd.Flags().BoolP("cbuild2cmake", "", false, "Use build information files with cbuild2cmake backend (default)") + rootCmd.Flags().BoolP("cbuildgen", "", false, "Generated legacy *.cprj files and use cbuildgen backend") // CPRJ specific hidden flags rootCmd.Flags().StringP("intdir", "i", "", "Set directory for intermediate files") diff --git a/cmd/cbuild/commands/setup/setup.go b/cmd/cbuild/commands/setup/setup.go index c83059c..6cf2489 100644 --- a/cmd/cbuild/commands/setup/setup.go +++ b/cmd/cbuild/commands/setup/setup.go @@ -148,6 +148,5 @@ func init() { SetUpCmd.Flags().BoolP("schema", "s", true, "Validate project input file(s) against schema") SetUpCmd.Flags().StringP("log", "", "", "Save output messages in a log file") SetUpCmd.Flags().StringP("toolchain", "", "", "Input toolchain to be used") - SetUpCmd.Flags().BoolP("cbuildgen", "", false, "Use build information files with cbuildgen backend") - SetUpCmd.Flags().BoolP("cbuild2cmake", "", false, "Use build information files with cbuild2cmake backend (default)") + SetUpCmd.Flags().BoolP("cbuildgen", "", false, "Generated legacy *.cprj files and use cbuildgen backend") } From 20257e4de3cd9c1feaa60f1cf52f9f4e27bb5c9e Mon Sep 17 00:00:00 2001 From: Sourabh Mehta <73165318+soumeh01@users.noreply.github.com> Date: Mon, 9 Sep 2024 11:08:44 +0200 Subject: [PATCH 2/4] help text improvement --- cmd/cbuild/commands/root.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/cbuild/commands/root.go b/cmd/cbuild/commands/root.go index ed2a85a..a1ea907 100644 --- a/cmd/cbuild/commands/root.go +++ b/cmd/cbuild/commands/root.go @@ -234,7 +234,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("cbuildgen", "", false, "Generated legacy *.cprj files and use cbuildgen backend") + rootCmd.Flags().BoolP("cbuildgen", "", false, "Generate legacy *.cprj files and use cbuildgen backend") // CPRJ specific hidden flags rootCmd.Flags().StringP("intdir", "i", "", "Set directory for intermediate files") From d048c95198ba7f3b49200980f1cdf6ffd9964a40 Mon Sep 17 00:00:00 2001 From: Sourabh Mehta <73165318+soumeh01@users.noreply.github.com> Date: Mon, 9 Sep 2024 11:09:08 +0200 Subject: [PATCH 3/4] Update setup.go --- cmd/cbuild/commands/setup/setup.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/cbuild/commands/setup/setup.go b/cmd/cbuild/commands/setup/setup.go index 6cf2489..197513e 100644 --- a/cmd/cbuild/commands/setup/setup.go +++ b/cmd/cbuild/commands/setup/setup.go @@ -148,5 +148,5 @@ func init() { SetUpCmd.Flags().BoolP("schema", "s", true, "Validate project input file(s) against schema") SetUpCmd.Flags().StringP("log", "", "", "Save output messages in a log file") SetUpCmd.Flags().StringP("toolchain", "", "", "Input toolchain to be used") - SetUpCmd.Flags().BoolP("cbuildgen", "", false, "Generated legacy *.cprj files and use cbuildgen backend") + SetUpCmd.Flags().BoolP("cbuildgen", "", false, "Generate legacy *.cprj files and use cbuildgen backend") } From b58a89a284bea84dbb43ab63047489748f885baa Mon Sep 17 00:00:00 2001 From: Sourabh Mehta Date: Mon, 9 Sep 2024 15:25:39 +0200 Subject: [PATCH 4/4] Removed forwarding of --cbuild2cmake flag --- pkg/builder/csolution/builder.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/builder/csolution/builder.go b/pkg/builder/csolution/builder.go index 3931315..afb982d 100644 --- a/pkg/builder/csolution/builder.go +++ b/pkg/builder/csolution/builder.go @@ -148,8 +148,8 @@ func (b CSolutionBuilder) generateBuildFiles() (err error) { args = append(args, "--quiet") } - if b.Options.UseCbuild2CMake { - args = append(args, "--cbuild2cmake") + if !b.Options.UseCbuild2CMake { + args = append(args, "--cbuildgen") } var stdErr string