fix radiant bug 'Mal-formed command line - please check for extra quotes in macro' #1718
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
trabucayre
reviewed
Jun 23, 2023
litex/build/lattice/radiant.py
Outdated
| @@ -153,7 +153,9 @@ def tcl_path(path): return path.replace("\\", "/") | |||
|
|
|||
| # Add include paths | |||
| vincpath = ";".join(map(lambda x: tcl_path(x), self.platform.verilog_include_paths)) | |||
| tcl.append("prj_set_impl_opt {include path} {\"" + vincpath + "\"}") | |||
| if vincpath != "": # Do not add quotes if vincpath is empty, else Radiant complains | |||
There was a problem hiding this comment.
An empty string is seen as False so:
if vincpath and vincpath.strip():
[...]
```
is more pythoniic and catch empty string and string with only blank.
trabucayre
reviewed
Jun 23, 2023
litex/build/lattice/radiant.py
Outdated
| tcl.append("prj_set_impl_opt {include path} {\"" + vincpath + "\"}") | ||
| if vincpath != "": # Do not add quotes if vincpath is empty, else Radiant complains | ||
| vincpath = "\"" + vincpath + "\"" | ||
| tcl.append("prj_set_impl_opt {include path} {" + vincpath + "}") |
There was a problem hiding this comment.
is include path is a mandatory option? ie when vincpath is empty this line may be skipped?
There was a problem hiding this comment.
Seems to build fine without include path
There was a problem hiding this comment.
@trabucayre see latest commit. Happy to make further changes / take feedback
There was a problem hiding this comment.
LGTM, but l.159 must be removed.
Thanks
There was a problem hiding this comment.
Whoops. Thanks for spotting that.
|
Applied. Thanks @slagernate ! |
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.
See #1596.