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

pass explicit language to uncrustify #214

Merged
merged 9 commits into from
Feb 20, 2020
Merged

pass explicit language to uncrustify #214

merged 9 commits into from
Feb 20, 2020

Conversation

dirk-thomas
Copy link
Contributor

Since the latest version of uncrustify fails for C files otherwise and upstream will unlikely fix the regression: see uncrustify/uncrustify#2641.

  • Linux Build Status (unrelated test failures)
  • Linux-aarch64 Build Status (same)
  • macOS Build Status (same)
  • Windows Build Status
  • Windows-container Build Status (unrelated compiler warnings)

@dirk-thomas
pass explicitl language to uncrustify
a742fd6 
Signed-off-by: Dirk Thomas <dirk-thomas@users.noreply.github.com>
@dirk-thomas
remove dst before renaming file to work on Windows
bad9210 
Signed-off-by: Dirk Thomas <dirk-thomas@users.noreply.github.com>
@dirk-thomas dirk-thomas self-assigned this Feb 18, 2020
hidmic
hidmic reviewed Feb 18, 2020
View reviewed changes
ament_uncrustify/ament_uncrustify/main.py Outdated Show resolved Hide resolved
ament_uncrustify/ament_uncrustify/main.py Show resolved Hide resolved
ament_uncrustify/ament_uncrustify/main.py Outdated Show resolved Hide resolved
ament_uncrustify/ament_uncrustify/main.py Show resolved Hide resolved
ament_uncrustify/ament_uncrustify/main.py Outdated Show resolved Hide resolved
@dirk-thomas
use dict comprehension
f82b7dd 
Signed-off-by: Dirk Thomas <dirk-thomas@users.noreply.github.com>
@dirk-thomas
conditionally pass -l in both commands
b3f4a44 
Signed-off-by: Dirk Thomas <dirk-thomas@users.noreply.github.com>
@dirk-thomas
remove unncessary line
c330e7d 
Signed-off-by: Dirk Thomas <dirk-thomas@users.noreply.github.com>
hidmic
hidmic reviewed Feb 18, 2020
View reviewed changes
Copy link
Contributor

@hidmic hidmic left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM but for a final question, plus CI after last changes (at least on one platform, just in case)

ament_uncrustify/ament_uncrustify/main.py Outdated Show resolved Hide resolved
@dirk-thomas
fix comprehension
3c76a9e 
Signed-off-by: Dirk Thomas <dirk-thomas@users.noreply.github.com>
@dirk-thomas
Copy link
Contributor Author

dirk-thomas commented Feb 18, 2020 •
edited
Loading

Another CI build to double check the recent iterations - Linux only: Build Status

@dirk-thomas
fix dict after fiddling with comprehension
996dc12 
Signed-off-by: Dirk Thomas <dirk-thomas@users.noreply.github.com>
@dirk-thomas
add CMake option for force specific language for uncrustify
ed2798f 
Signed-off-by: Dirk Thomas <dirk-thomas@users.noreply.github.com>
This was referenced Feb 19, 2020
Merged
Merged
Merged
Merged
Merged
@dirk-thomas
Copy link
Contributor Author

For urdf an option to pass an explicit language was necessary (same as already done for cppcheck) since the package uses .h for C++ files.

  • Linux: Build Status

hidmic
hidmic approved these changes Feb 20, 2020
View reviewed changes
Copy link
Contributor

@hidmic hidmic left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM but for a nit

ament_uncrustify/ament_uncrustify/main.py Show resolved Hide resolved
ament_uncrustify/ament_uncrustify/main.py Outdated Show resolved Hide resolved
@dirk-thomas
feedback about help message
7f015e5 
Signed-off-by: Dirk Thomas <dirk-thomas@users.noreply.github.com>
@dirk-thomas dirk-thomas merged commit 608c41e into master Feb 20, 2020
@delete-merged-branch delete-merged-branch bot deleted the dirk-thomas/uncrustify-pass-explicit-language branch February 20, 2020 16:51
@dirk-thomas dirk-thomas mentioned this pull request Apr 8, 2020
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@hidmic hidmic hidmic approved these changes

Assignees

@dirk-thomas dirk-thomas

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@dirk-thomas @hidmic