diff options
author | Radek Novacek <rnovacek@redhat.com> | 2012-07-23 13:41:47 +0200 |
---|---|---|
committer | Radek Novacek <rnovacek@redhat.com> | 2012-07-23 14:35:13 +0200 |
commit | ce3f2520c5046c7b7703742dd5c7481b5f98c52e (patch) | |
tree | 4e6ac6dbcb4b06f6d0ad02630a086ab263c1071b | |
parent | 3f906be3f651313c1b8709732ea0bdebba296784 (diff) | |
download | openlmi-providers-ce3f2520c5046c7b7703742dd5c7481b5f98c52e.tar.gz openlmi-providers-ce3f2520c5046c7b7703742dd5c7481b5f98c52e.tar.xz openlmi-providers-ce3f2520c5046c7b7703742dd5c7481b5f98c52e.zip |
Restructure Power provider
* get rid of src/ subdirectory in power/
* cleanup CMake
* use konkretcmpi_generate macro
-rw-r--r-- | CMakeLists.txt | 3 | ||||
-rw-r--r-- | mof/Linux_PowerManagement.mof (renamed from src/power/Linux_PowerManagement.mof) | 4 | ||||
-rw-r--r-- | src/power/CMakeLists.txt | 28 | ||||
-rw-r--r-- | src/power/Linux_AssociatedPowerManagementServiceProvider.c (renamed from src/power/src/Linux_AssociatedPowerManagementServiceProvider.c) | 0 | ||||
-rw-r--r-- | src/power/Linux_ConcreteJobProvider.c (renamed from src/power/src/Linux_ConcreteJobProvider.c) | 0 | ||||
-rw-r--r-- | src/power/Linux_ElementCapabilitiesProvider.c (renamed from src/power/src/Linux_ElementCapabilitiesProvider.c) | 0 | ||||
-rw-r--r-- | src/power/Linux_HostedServiceProvider.c (renamed from src/power/src/Linux_HostedServiceProvider.c) | 0 | ||||
-rw-r--r-- | src/power/Linux_PowerManagementCapabilitiesProvider.c (renamed from src/power/src/Linux_PowerManagementCapabilitiesProvider.c) | 0 | ||||
-rw-r--r-- | src/power/Linux_PowerManagementServiceProvider.c (renamed from src/power/src/Linux_PowerManagementServiceProvider.c) | 0 | ||||
-rw-r--r-- | src/power/globals.c (renamed from src/power/src/globals.c) | 0 | ||||
-rw-r--r-- | src/power/globals.h (renamed from src/power/src/globals.h) | 0 | ||||
-rw-r--r-- | src/power/power.c (renamed from src/power/src/power.c) | 1 | ||||
-rw-r--r-- | src/power/power.h (renamed from src/power/src/power.h) | 0 | ||||
-rw-r--r-- | src/power/trace.c (renamed from src/power/src/trace.c) | 0 | ||||
-rw-r--r-- | src/power/trace.h (renamed from src/power/src/trace.h) | 0 |
15 files changed, 34 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 36df36f..76816f2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -21,4 +21,7 @@ include(CuraMacros) find_package(CMPI REQUIRED) find_package(KonkretCMPI REQUIRED) +find_package(PkgConfig) +pkg_check_modules(GLIB REQUIRED glib-2.0) + add_subdirectory(src) diff --git a/src/power/Linux_PowerManagement.mof b/mof/Linux_PowerManagement.mof index 21dfa38..417ebc8 100644 --- a/src/power/Linux_PowerManagement.mof +++ b/mof/Linux_PowerManagement.mof @@ -14,7 +14,7 @@ class Linux_AssociatedPowerManagementService: CIM_AssociatedPowerManagementServi [ Override ("UserOfService"), Description ( "The ManagedElement that can use the Service." )] - Linux_ComputerSystem REF UserOfService; + CIM_ComputerSystem REF UserOfService; }; [ Provider("cmpi:cmpiLinux_PowerManagement") ] @@ -30,7 +30,7 @@ class Linux_HostedService: CIM_HostedService Min ( 1 ), Max ( 1 ), Description ( "The hosting System." )] - Linux_ComputerSystem REF Antecedent; + CIM_ComputerSystem REF Antecedent; [ Override ( "Dependent" ), Weak, diff --git a/src/power/CMakeLists.txt b/src/power/CMakeLists.txt index c6bfdad..b362d7f 100644 --- a/src/power/CMakeLists.txt +++ b/src/power/CMakeLists.txt @@ -1,4 +1,32 @@ +set(PROVIDER_NAME PowerManagement) +set(LIBRARY_NAME cmpi${PROVIDER_NAME}) +set(MOF Linux_PowerManagement.mof) + +set(provider_SRCS + power.c + trace.c + globals.c +) + +konkretcmpi_generate(${MOF} + CMPI_PROVIDERS + CMPI_HEADERS +) + +add_library(${LIBRARY_NAME} SHARED + ${provider_SRCS} + ${CIM_PROVIDERS} + ${CIM_HEADERS} +) + +include_directories(${CMAKE_CURRENT_BINARY_DIR} ${CMPI_INCLUDE_DIR} ${GLIB_INCLUDE_DIRS}) + +target_link_libraries(${LIBRARY_NAME} ${KONKRETCMPI_LIBRARIES} ${GLIB_LIBRARIES}) + +install(TARGETS ${LIBRARY_NAME} DESTINATION lib${LIB_SUFFIX}/cmpi) + + install(FILES ${CMAKE_CURRENT_BINARY_DIR}/src/Linux_PowerManagement.registration DESTINATION share/sblim-cmpi-power/) install(FILES Linux_PowerManagement.mof DESTINATION share/sblim-cmpi-power/) install(FILES provider-register.sh DESTINATION share/sblim-cmpi-power/) diff --git a/src/power/src/Linux_AssociatedPowerManagementServiceProvider.c b/src/power/Linux_AssociatedPowerManagementServiceProvider.c index 7d61d83..7d61d83 100644 --- a/src/power/src/Linux_AssociatedPowerManagementServiceProvider.c +++ b/src/power/Linux_AssociatedPowerManagementServiceProvider.c diff --git a/src/power/src/Linux_ConcreteJobProvider.c b/src/power/Linux_ConcreteJobProvider.c index 361d045..361d045 100644 --- a/src/power/src/Linux_ConcreteJobProvider.c +++ b/src/power/Linux_ConcreteJobProvider.c diff --git a/src/power/src/Linux_ElementCapabilitiesProvider.c b/src/power/Linux_ElementCapabilitiesProvider.c index 62c42e6..62c42e6 100644 --- a/src/power/src/Linux_ElementCapabilitiesProvider.c +++ b/src/power/Linux_ElementCapabilitiesProvider.c diff --git a/src/power/src/Linux_HostedServiceProvider.c b/src/power/Linux_HostedServiceProvider.c index 4f6c7ac..4f6c7ac 100644 --- a/src/power/src/Linux_HostedServiceProvider.c +++ b/src/power/Linux_HostedServiceProvider.c diff --git a/src/power/src/Linux_PowerManagementCapabilitiesProvider.c b/src/power/Linux_PowerManagementCapabilitiesProvider.c index bb74e34..bb74e34 100644 --- a/src/power/src/Linux_PowerManagementCapabilitiesProvider.c +++ b/src/power/Linux_PowerManagementCapabilitiesProvider.c diff --git a/src/power/src/Linux_PowerManagementServiceProvider.c b/src/power/Linux_PowerManagementServiceProvider.c index 8ce3f6c..8ce3f6c 100644 --- a/src/power/src/Linux_PowerManagementServiceProvider.c +++ b/src/power/Linux_PowerManagementServiceProvider.c diff --git a/src/power/src/globals.c b/src/power/globals.c index 2ba5075..2ba5075 100644 --- a/src/power/src/globals.c +++ b/src/power/globals.c diff --git a/src/power/src/globals.h b/src/power/globals.h index adec07e..adec07e 100644 --- a/src/power/src/globals.h +++ b/src/power/globals.h diff --git a/src/power/src/power.c b/src/power/power.c index 751ab22..3210a37 100644 --- a/src/power/src/power.c +++ b/src/power/power.c @@ -47,6 +47,7 @@ Power *_power = NULL; // This is just for debugging purposes, remove later #include <execinfo.h> #include <signal.h> +#include <unistd.h> void print_backtrace(int signal) { fprintf(stderr, "BackTrace\n"); diff --git a/src/power/src/power.h b/src/power/power.h index 8f1f0bc..8f1f0bc 100644 --- a/src/power/src/power.h +++ b/src/power/power.h diff --git a/src/power/src/trace.c b/src/power/trace.c index 1f23a6a..1f23a6a 100644 --- a/src/power/src/trace.c +++ b/src/power/trace.c diff --git a/src/power/src/trace.h b/src/power/trace.h index 65118d4..65118d4 100644 --- a/src/power/src/trace.h +++ b/src/power/trace.h |