Use CommandLineUtil to split and join command lines in CBS Makefile support #1073
+70
−40
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…upport Without this the build and clean command entered in the CBS settings could be parsed and re-assembled incorrectly. A simple example is that an extra space (e.g. "make clean") would lead to an error when running make like: ``` make: *** empty string invalid as file name. Stop. ``` This happened because the code used trivial split on " " and join with " " to handle parsing that command line string into array of arguments. This change fixes that by using the functionality already available in CommandLineUtil Fixes eclipse-cdt#1072
jonahgraham
added a commit
to jonahgraham/cdt
that referenced
this pull request
Feb 2, 2025
Initially CommandLineUtil.argumentsToString was used to provide properly quoted string when interacting with GDB. But it is also useful to print a string that can be copied + pasted to a terminal for the user. When doing this the always quote every argument looks less nice, so this change updates the code to only quote argument if needed. Tests have also been added for the quoting. Improves look and feel of changes in eclipse-cdt#1073
jonahgraham
commented
Feb 2, 2025
| @@ -24,6 +24,11 @@ The following classes have been removed or modified in API breaking ways: | |||
| - spelling corrected for methods with Uninitialized in the name | |||
| - setWarnUnused renamed to setWarnUnusedVars and isWarnUnused renamed to isWarnUnusedVars | |||
|
|
|||
| ### StandardBuildConfiguration.setBuildCommand(String[]) and StandardBuildConfiguration.setCleanCommand(String[]) removed | |||
There was a problem hiding this comment.
@ewaterlander I have gone back and forth a little on straight out removing this API in favour of my new code. Please let me know if you are depending on the array version of setBuildCommand and setCleanCommand.
See #1074 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Without this the build and clean command entered in the CBS settings could be parsed and re-assembled incorrectly.
A simple example is that an extra space (e.g. "make clean") would lead to an error when running make like:
This happened because the code used trivial split on " " and join with " " to handle parsing that command line string into array of arguments. This change fixes that by using the functionality already available in CommandLineUtil
Fixes #1072
For example, when building with a quoted argument with a space it works now, and it also quotes the output correctly in the Console so it can be copied and pasted if needed:
Note that
make, and other arguments that don't need quoting are always output quoted. A separate PR will address that.