Skip to content

Commit a7cbfdd

Browse files
EddyTheCoEddyTheCo
authored
Add initial repository structure, CMake, and base ConnMan and Clock interfaces.
* Add proxy class and test * Add connman and connmanclock classes. * Add CMake configuration and project structure. * Add git and clang configuration files * workflows: continue if clag-tidy failed Signed-off-by: Eduardo Gonzalez <eduardo.gonzalez@amarulasolutions.com>
1 parent 3c9d0cf commit a7cbfdd

22 files changed

Lines changed: 1155 additions & 0 deletions

‎.clang-format‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
---
2+
BasedOnStyle: Google
3+
IndentWidth: '4'
4+
...

‎.clang-tidy‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
---
2+
Checks:
3+
-*,
4+
bugprone-*,
5+
clang-*,
6+
google-*,
7+
modernize-*,
8+
performance-*,
9+
portability-*,
10+
readability-*,
11+
-google-build-using-namespace,
12+
-modernize-use-trailing-return-type,
13+
-readability-identifier-length,
14+
-readability-magic-numbers,
15+
-bugprone-easily-swappable-parameters
16+
17+
HeaderFilterRegex: 'src'
18+
FormatStyle: file
19+
20+
CheckOptions:
21+
- key: misc-include-cleaner.MissingIncludes
22+
value: false
23+
...

‎.github/workflows/conf-build-test.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ jobs:
4444
4545
- name: Clang-tidy
4646
if: ${{ github.event_name == 'pull_request' }}
47+
continue-on-error: true
4748
run: |
4849
pip3 install pyyaml
4950
COMPILE_COMMANDS=$(find . -name compile_commands.json | head -n 1)

‎.gitignore‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
.vscode
2+
build*
3+
doc
4+
tags
5+
CMakeUserPresets.json
6+
dbus_xml/net.connman/*.h
7+
dbus_xml/net.connman/*.c

‎CMakeLists.txt‎

Lines changed: 118 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,118 @@
1+
cmake_minimum_required(VERSION 3.24)
2+
3+
option(BUILD_EXAMPLES "Build Examples" OFF)
4+
option(BUILD_TESTS "Build Tests" OFF)
5+
option(BUILD_CONNMAN "Build Connman Proxy" ON)
6+
7+
include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/VersionFromGit.cmake)
8+
version_from_git(LOG OFF TIMESTAMP "%Y%m%d%H%M%S")
9+
10+
project(
11+
GDbusCpp
12+
VERSION ${VERSION}
13+
DESCRIPTION ""
14+
LANGUAGES C CXX)
15+
16+
set_property(GLOBAL PROPERTY USE_FOLDERS ON)
17+
set(CMAKE_CXX_STANDARD 17)
18+
set(CMAKE_CXX_STANDARD_REQUIRED ON)
19+
set(CMAKE_CXX_EXTENSIONS OFF)
20+
include(GNUInstallDirs)
21+
22+
add_library(GDbusProxy include/amarula/dbus/gproxy.hpp src/dbus/gproxy.cpp)
23+
add_library(Amarula::GDbusProxy ALIAS GDbusProxy)
24+
target_include_directories(
25+
GDbusProxy PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
26+
"$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>")
27+
install(
28+
TARGETS GDbusProxy
29+
EXPORT ${PROJECT_NAME}-config
30+
COMPONENT ${PROJECT_NAME}
31+
ARCHIVE COMPONENT ${PROJECT_NAME}-dev)
32+
install(
33+
DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/include/
34+
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
35+
COMPONENT ${PROJECT_NAME}-dev)
36+
37+
find_package(PkgConfig REQUIRED)
38+
pkg_check_modules(GIO_UNIX REQUIRED IMPORTED_TARGET gio-unix-2.0)
39+
target_link_libraries(GDbusProxy PUBLIC PkgConfig::GIO_UNIX)
40+
41+
add_subdirectory(dbus_xml)
42+
43+
if(BUILD_CONNMAN)
44+
add_library(
45+
GConnmanDbus
46+
$<TARGET_OBJECTS:gconnmanproxy> src/dbus/gconnman_definitions.hpp
47+
include/amarula/dbus/gconnman.hpp include/amarula/dbus/gconnman_clock.hpp
48+
src/dbus/gconnman_clock.cpp src/dbus/gconnman.cpp)
49+
add_library(Amarula::GConnmanDbus ALIAS GConnmanDbus)
50+
get_target_property(CONNMAN_PROXY_INCLUDES gconnmanproxy
51+
INTERFACE_INCLUDE_DIRECTORIES)
52+
target_include_directories(
53+
GConnmanDbus PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
54+
"$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>")
55+
target_include_directories(GConnmanDbus PRIVATE ${CONNMAN_PROXY_INCLUDES})
56+
target_link_libraries(GConnmanDbus PUBLIC GDbusProxy)
57+
58+
install(
59+
TARGETS GConnmanDbus
60+
EXPORT ${PROJECT_NAME}-config
61+
COMPONENT ${PROJECT_NAME}
62+
ARCHIVE COMPONENT ${PROJECT_NAME}-dev)
63+
endif(BUILD_CONNMAN)
64+
65+
if(CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME)
66+
if(BUILD_TESTS)
67+
include(CTest)
68+
add_subdirectory(tests)
69+
endif(BUILD_TESTS)
70+
if(BUILD_EXAMPLES)
71+
include(CTest)
72+
add_subdirectory(examples)
73+
endif(BUILD_EXAMPLES)
74+
if(BUILD_DOCS)
75+
find_package(Doxygen)
76+
if(DOXYGEN_FOUND)
77+
set(DOXYGEN_OUTPUT_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/doc")
78+
set(DOXYGEN_EXCLUDE_PATTERNS "*/doc/*" "*/build/*" "${CMAKE_CURRENT_BINARY_DIR}/*")
79+
doxygen_add_docs(doxygen_docs ${PROJECT_SOURCE_DIR}
80+
COMMENT "Generate man pages")
81+
endif(DOXYGEN_FOUND)
82+
endif(BUILD_DOCS)
83+
set(cpack_file_name
84+
"${PROJECT_NAME}-v${SEMVER}-${CMAKE_SYSTEM_NAME}_${CMAKE_SYSTEM_VERSION}-${CMAKE_SYSTEM_PROCESSOR}-${CMAKE_CXX_COMPILER_ID}"
85+
)
86+
set(CPACK_PACKAGE_FILE_NAME ${cpack_file_name})
87+
include(CPack)
88+
include(CPackIFW)
89+
cpack_add_component(${PROJECT_NAME})
90+
endif(CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME)
91+
92+
install(
93+
EXPORT ${PROJECT_NAME}-config
94+
DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}
95+
NAMESPACE Amarula::
96+
COMPONENT ${PROJECT_NAME}-dev)
97+
install(
98+
FILES ${CMAKE_SOURCE_DIR}/LICENSE
99+
DESTINATION ${CMAKE_INSTALL_DATADIR}/Amarula/${PROJECT_NAME}
100+
COMPONENT ${PROJECT_NAME})
101+
include(CMakePackageConfigHelpers)
102+
configure_package_config_file(
103+
${CMAKE_CURRENT_SOURCE_DIR}/cmake/Config.cmake.in
104+
${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config.cmake
105+
INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME})
106+
write_basic_package_version_file(
107+
${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake
108+
VERSION ${VERSION}
109+
COMPATIBILITY SameMajorVersion)
110+
install(
111+
FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config.cmake
112+
${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake
113+
DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}
114+
COMPONENT ${PROJECT_NAME}-dev)
115+
export(
116+
EXPORT ${PROJECT_NAME}-config
117+
NAMESPACE Amarula::
118+
FILE ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}-config.cmake)

‎CMakePresets.json‎

Lines changed: 104 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,104 @@
1+
{
2+
"version": 6,
3+
"configurePresets": [
4+
{
5+
"name": "default-release",
6+
"displayName": "Default Release",
7+
"description": "Default configuration for release with runtime components only",
8+
"generator": "Ninja",
9+
"binaryDir": "${sourceDir}/build/${presetName}",
10+
"cacheVariables": {
11+
"CMAKE_BUILD_TYPE": "Release"
12+
}
13+
},
14+
{
15+
"name": "default-develop",
16+
"displayName": "Default Config for development",
17+
"description": "Default configuration for development, release runtime and dev components, build tests ",
18+
"inherits": "default-release",
19+
"cacheVariables": {
20+
"CMAKE_BUILD_TYPE": "Debug",
21+
"BUILD_TESTS": "ON",
22+
"CMAKE_EXPORT_COMPILE_COMMANDS": "ON",
23+
"BUILD_DOCS": "ON",
24+
"BUILD_EXAMPLES": "ON"
25+
}
26+
}
27+
],
28+
"buildPresets": [
29+
{
30+
"name": "default-release",
31+
"configurePreset": "default-release"
32+
},
33+
{
34+
"name": "default-develop",
35+
"configurePreset": "default-develop"
36+
},
37+
{
38+
"name": "default-documentation",
39+
"configurePreset": "default-develop",
40+
"targets": "doxygen_docs"
41+
}
42+
],
43+
"testPresets": [
44+
{
45+
"name": "default-develop",
46+
"configurePreset": "default-develop",
47+
"output": {
48+
"outputOnFailure": true
49+
}
50+
}
51+
],
52+
"packagePresets": [
53+
{
54+
"name": "default-develop",
55+
"configurePreset": "default-develop",
56+
"generators": [
57+
"TGZ"
58+
],
59+
"variables": {
60+
"CPACK_COMPONENTS_GROUPING": "ALL_COMPONENTS_IN_ONE",
61+
"CPACK_PACKAGE_CONTACT": "develop@amarulasolutions.com",
62+
"CPACK_PACKAGE_VENDOR": "amarulasolutions"
63+
},
64+
"packageDirectory": "packages-${presetName}"
65+
}
66+
],
67+
"workflowPresets": [
68+
{
69+
"name": "default-develop",
70+
"steps": [
71+
{
72+
"type": "configure",
73+
"name": "default-develop"
74+
},
75+
{
76+
"type": "build",
77+
"name": "default-develop"
78+
},
79+
{
80+
"type": "test",
81+
"name": "default-develop"
82+
},
83+
{
84+
"type": "package",
85+
"name": "default-develop"
86+
87+
}
88+
]
89+
},
90+
{
91+
"name": "default-documentation",
92+
"steps": [
93+
{
94+
"type": "configure",
95+
"name": "default-develop"
96+
},
97+
{
98+
"type": "build",
99+
"name": "default-documentation"
100+
}
101+
]
102+
}
103+
]
104+
}

‎LICENSE‎

Whitespace-only changes.

‎cmake/Config.cmake.in‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
@PACKAGE_INIT@
2+
include(CMakeFindDependencyMacro)
3+
find_dependency(PkgConfig)
4+
pkg_check_modules(GIO_UNIX REQUIRED IMPORTED_TARGET gio-unix-2.0)
5+
include("${CMAKE_CURRENT_LIST_DIR}/@PROJECT_NAME@-config.cmake")

0 commit comments

Comments
 (0)