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

Feature/coding conventions #544

Merged
merged 17 commits into from
Jun 11, 2023
Merged
Show file tree
Hide file tree
Changes from 12 commits
Commits
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
30 changes: 30 additions & 0 deletions .clang-format
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
BasedOnStyle: LLVM
pnoltes marked this conversation as resolved.
Show resolved Hide resolved
Language: Cpp
IndentWidth: 4
AllowShortIfStatementsOnASingleLine: false
AlwaysBreakTemplateDeclarations: Yes
BinPackArguments: false
BinPackParameters: false
ColumnLimit: 120
DerivePointerAlignment: false
KeepEmptyLinesAtTheStartOfBlocks: false
PointerAlignment: Left
SpacesBeforeTrailingComments: 1
SortIncludes: true
IncludeBlocks: Regroup
IncludeCategories:
#gtest headers
- Regex: '^((<|")gtest/)'
Priority: 1
#stdlib C++ headers
- Regex: '^<([^.])*>'
Priority: 2
#external headers
- Regex: '^<([^.])*\.h>'
Priority: 3
#celix C API
- Regex: '^(<|")celix_.*'
Priority: 4
#celix C++ API
- Regex: '^(<|")celix/.*'
Priority: 5
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ if (ENABLE_TESTING)
endif ()

# Set C specific flags
set(CMAKE_C_FLAGS "-D_GNU_SOURCE -std=gnu99 -fPIC ${CMAKE_C_FLAGS}")
set(CMAKE_C_FLAGS "-D_GNU_SOURCE -std=c99 -fPIC ${CMAKE_C_FLAGS}")
set(CMAKE_C_FLAGS "-Wall -Werror -Wformat -Wno-error=deprecated-declarations ${CMAKE_C_FLAGS}")

# Set C++ specific flags
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
*/

#include "RemoteServiceAdmin.h"

#include "celix/BundleContext.h"
#include "celix/rsa/RemoteConstants.h"

Expand Down
1 change: 1 addition & 0 deletions documents/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -88,3 +88,4 @@ bundles contains binaries depending on the stdlibc++ library.
* [Apache Celix Patterns](patterns.md)
* [Apache Celix CMake Commands](cmake_commands)
* [Apache Celix Sub Projects](subprojects.md)
* [Apache Celix Coding Conventions Guide](development/README.md)
Loading