Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Removing cbuild2cmake option and keeping it default option #296

Merged
merged 5 commits into from
Sep 9, 2024
Merged

Removing cbuild2cmake option and keeping it default option #296

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2c32df6
Removing cbuild2cmake option and keeping it default option
soumeh01 Sep 6, 2024
20257e4
help text improvement
soumeh01 Sep 9, 2024
d048c95
Update setup.go
soumeh01 Sep 9, 2024
bb81fba
Merge branch 'main' into cmdlineOption
soumeh01 Sep 9, 2024
b58a89a
Removed forwarding of --cbuild2cmake flag
soumeh01 Sep 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions cmd/cbuild/commands/root.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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, "Generate legacy *.cprj files and use cbuildgen backend")

// CPRJ specific hidden flags
rootCmd.Flags().StringP("intdir", "i", "", "Set directory for intermediate files")
Expand Down
3 changes: 1 addition & 2 deletions cmd/cbuild/commands/setup/setup.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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, "Generate legacy *.cprj files and use cbuildgen backend")
}
4 changes: 2 additions & 2 deletions pkg/builder/csolution/builder.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down