Restructure Power provider

* get rid of src/ subdirectory in power/
* cleanup CMake
* use konkretcmpi_generate macro

14 files changed, 29 insertions, 58 deletions

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/Linux_PowerManagement.mof b/src/power/Linux_PowerManagement.mof
deleted file mode 100644
index 21dfa38..0000000
--- a/src/power/Linux_PowerManagement.mof
+++ /dev/null
@@ -1,58 +0,0 @@
-[ Provider("cmpi:cmpiLinux_PowerManagement") ]
-class Linux_PowerManagementService: CIM_PowerManagementService
-{
-};
-
-[ Association,
-  Provider("cmpi:cmpiLinux_PowerManagement") ]
-class Linux_AssociatedPowerManagementService: CIM_AssociatedPowerManagementService
-{
-    [ Override ("ServiceProvided"),
-      Max ( 1 ),
-      Description ( "The Service that is available." )]
-    Linux_PowerManagementService REF ServiceProvided;
-
-    [ Override ("UserOfService"),
-      Description ( "The ManagedElement that can use the Service." )]
-    Linux_ComputerSystem REF UserOfService;
-};
-
-[ Provider("cmpi:cmpiLinux_PowerManagement") ]
-class Linux_PowerManagementCapabilities: CIM_PowerManagementCapabilities
-{
-};
-
-[ Association,
-  Provider("cmpi:cmpiLinux_PowerManagement") ]
-class Linux_HostedService: CIM_HostedService
-{
-    [ Override ("Antecedent"),
-      Min ( 1 ),
-      Max ( 1 ),
-      Description ( "The hosting System." )]
-    Linux_ComputerSystem REF Antecedent;
-
-    [ Override ( "Dependent" ),
-      Weak,
-      Description ( "The Service hosted on the System." )]
-    Linux_PowerManagementService REF Dependent;
-};
-
-[ Provider("cmpi:cmpiLinux_PowerManagement") ]
-class Linux_ConcreteJob: CIM_ConcreteJob
-{
-};
-
-[ Provider("cmpi:cmpiLinux_PowerManagement") ]
-class Linux_ElementCapabilities: CIM_ElementCapabilities
-{
-    [ Key,
-      Min ( 1 ),
-      Description ( "The managed element." )]
-    Linux_PowerManagementService REF ManagedElement;
-
-    [ Key,
-      Description ( "The Capabilities object associated with the element." )]
-    Linux_PowerManagementCapabilities REF Capabilities;
-};
-
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