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.

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

update clang format #55

Merged
merged 4 commits into from
Jun 10, 2016
Merged

update clang format #55

merged 4 commits into from
Jun 10, 2016

Conversation

dirk-thomas
Copy link
Contributor

Split into Python and CMake package as well as use a configuration file to define the style.

Currently the config uses the Google style and is not matching our existing code.

@dirk-thomas dirk-thomas added the in review Waiting for review (Kanban column) label Jun 10, 2016
@dirk-thomas dirk-thomas self-assigned this Jun 10, 2016
@@ -44,7 +72,7 @@ def main(argv=sys.argv[1:]):
print('No files found', file=sys.stderr)
return 1

bin_names = ['clang-format-3.5', 'clang-format-3.4', 'clang-format-3.3']
bin_names = ['clang-format-3.8', 'clang-format-3.7', 'clang-format-3.6', 'clang-format-3.5', 'clang-format-3.4', 'clang-format-3.3']
Copy link
Contributor

Choose a reason for hiding this comment

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

On OS X the bin name is just clang-format.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Added in abb625f

@wjwwood
Copy link
Contributor

wjwwood commented Jun 10, 2016

Seems reasonable to me, though I didn't check to see if it matched our style. The other thing I noticed when trying to revive this before is that the setting may not be flexible enough to meet our current style. I don't remember off hand which thing was giving me trouble, but there were a few things you couldn't seem to change.

If the goal is just to get it working but not have it match our current style then +1.

@dirk-thomas
Copy link
Contributor Author

This patch gets it in a working and configurable state. based on that anyone who would like to fiddle with the style options can try to update the config to match our style (or our style updated to match clang-format).

@dirk-thomas dirk-thomas merged commit 2fd652b into master Jun 10, 2016
@dirk-thomas dirk-thomas deleted the ament_clang_format branch June 10, 2016 18:43
@dirk-thomas dirk-thomas removed the in review Waiting for review (Kanban column) label Jun 10, 2016
@dirk-thomas dirk-thomas mentioned this pull request Jun 10, 2016
26 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants