[libcommonAPI] add first dev packet configuration

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8d432e4..53674ba 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -8,6 +8,7 @@ SET( ${PROJECT_NAME}_PATCH_LEVEL 4 )
 
 set(GENIVI_PROJECT_VERSION ${${PROJECT_NAME}_MAJOR_VERSION}.${${PROJECT_NAME}_MINOR_VERSION}.${${PROJECT_NAME}_PATCH_LEVEL})
 
+set(PACKAGE_VERSION ${GENIVI_PROJECT_VERSION})
 set(GENIVI_RPM_RELEASE ${GENIVI_PROJECT_VERSION})
 
 ##################### RPM CONFIG ########################

diff --git a/commonapi.spec.in b/commonapi.spec.in
index 890220a..4956ffd 100644 (file)
--- a/commonapi.spec.in
+++ b/commonapi.spec.in
@@ -1,6 +1,6 @@
 Name:               @PROJECT_NAME@
-Version:            @GENIVI_PROJECT_VERSION@
-Release:            @GENIVI_RPM_RELEASE@
+Version:            @PACKAGE_VERSION@
+Release:            @PACKAGE_VERSION@
 Summary:            CommonAPI
 Group:              Applications/BMW
 License:            @LICENSE@
@@ -13,6 +13,13 @@ BuildRoot:          %{_tmppath}/%{name}-%{version}-%{release}-root
 %description
 CAPI middleware for IPC
 
+%package dev
+Summary:            CommonAPI header files
+#Requires:           libcommonapi we have in comment as we first have to align packet names
+
+%description dev
+CAPI middleware headers for IPC development
+
 %prep
 %setup
 
@@ -27,14 +34,13 @@ make
 %install
 rm -rf $RPM_BUILD_ROOT
 cd build
+cmake ..
 make install DESTDIR=$RPM_BUILD_ROOT
-
 mkdir -p $RPM_BUILD_ROOT%{_bindir}
-mkdir -p $RPM_BUILD_ROOT/etc/init.d
 
-/usr/bin/install -c -m 755 ../src/shm-daemon $RPM_BUILD_ROOT%{_bindir} 
-/usr/bin/install -c -m 755 ../Config/shm.conf $RPM_BUILD_ROOT%{_sysconfdir}
-/usr/bin/install -c -m 755 ../CommonAPI.pc $RPM_BUILD_ROOT/usr/lib/pkgconfig
+#/usr/bin/install -c -m 755 ../src/shm-daemon $RPM_BUILD_ROOT%{_bindir} 
+#/usr/bin/install -c -m 755 ../Config/shm.conf $RPM_BUILD_ROOT%{_sysconfdir}
+#/usr/bin/install -c -m 755 ../CommonAPI.pc $RPM_BUILD_ROOT/usr/lib/pkgconfig
 
 
 %clean
@@ -45,10 +51,42 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libCommonAPI.so.3
 %{_libdir}/libCommonAPI.so.3.0.0
 %{_libdir}/libCommonAPI.so
-#%{_includedir}/shm/shm_swwd.h 
-%{_libdir}/pkgconfig/CommonAPI.pc
 
+
+%files dev
+%defattr(-,root,root,-)
+%{_libdir}/pkgconfig/CommonAPI.pc
+%{_libdir}/libCommonAPI.so
+#%{_libdir}/libCommonAPI.la
+%{_includedir}/CommonAPI-@PACKAGE_VERSION@/CommonAPI/Attribute.h 
+%{_includedir}/CommonAPI-@PACKAGE_VERSION@/CommonAPI/AttributeExtension.h
+%{_includedir}/CommonAPI-@PACKAGE_VERSION@/CommonAPI/ByteBuffer.h
+%{_includedir}/CommonAPI-@PACKAGE_VERSION@/CommonAPI/CommonAPI.h
+%{_includedir}/CommonAPI-@PACKAGE_VERSION@/CommonAPI/Configuration.h
+%{_includedir}/CommonAPI-@PACKAGE_VERSION@/CommonAPI/ContainerUtils.h
+%{_includedir}/CommonAPI-@PACKAGE_VERSION@/CommonAPI/Event.h
+%{_includedir}/CommonAPI-@PACKAGE_VERSION@/CommonAPI/Factory.h
+%{_includedir}/CommonAPI-@PACKAGE_VERSION@/CommonAPI/Factory.hpp
+%{_includedir}/CommonAPI-@PACKAGE_VERSION@/CommonAPI/InputStream.h
+%{_includedir}/CommonAPI-@PACKAGE_VERSION@/CommonAPI/MainLoopContext.h
+%{_includedir}/CommonAPI-@PACKAGE_VERSION@/CommonAPI/MiddlewareInfo.h
+%{_includedir}/CommonAPI-@PACKAGE_VERSION@/CommonAPI/OutputStream.h
+%{_includedir}/CommonAPI-@PACKAGE_VERSION@/CommonAPI/Proxy.h
+%{_includedir}/CommonAPI-@PACKAGE_VERSION@/CommonAPI/ProxyManager.h
+%{_includedir}/CommonAPI-@PACKAGE_VERSION@/CommonAPI/Runtime.h
+%{_includedir}/CommonAPI-@PACKAGE_VERSION@/CommonAPI/SelectiveEvent.h
+%{_includedir}/CommonAPI-@PACKAGE_VERSION@/CommonAPI/SerializableStruct.h
+%{_includedir}/CommonAPI-@PACKAGE_VERSION@/CommonAPI/SerializableVariant.h
+%{_includedir}/CommonAPI-@PACKAGE_VERSION@/CommonAPI/SerializableVariant.hpp
+%{_includedir}/CommonAPI-@PACKAGE_VERSION@/CommonAPI/ServicePublisher.h
+%{_includedir}/CommonAPI-@PACKAGE_VERSION@/CommonAPI/ServicePublisher.hpp
+%{_includedir}/CommonAPI-@PACKAGE_VERSION@/CommonAPI/Stub.h 
+%{_includedir}/CommonAPI-@PACKAGE_VERSION@/CommonAPI/types.h
+%{_includedir}/CommonAPI-@PACKAGE_VERSION@/CommonAPI/utils.h
+        
 %changelog
+* Wed Jan 29 2014 Gernot Wirschal <Gernot.Wirschal@bmw.de> @GENIVI_PROJECT_VERSION@
+- Add dev packet configuration
 * Mon Jan 27 2014 Gernot Wirschal <Gernot.Wirschal@bmw.de> @GENIVI_PROJECT_VERSION@
 - Initial packaging for GPT
 

diff --git a/src/CommonAPI/CMakeLists.txt b/src/CommonAPI/CMakeLists.txt
index 46a48a2..e397d6b 100644 (file)
--- a/src/CommonAPI/CMakeLists.txt
+++ b/src/CommonAPI/CMakeLists.txt
@@ -4,9 +4,33 @@ set(CAPI_LIB_SRCS Runtime.cpp Configuration.cpp ServicePublisher.cpp ContainerUt
 add_library(CommonAPI ${CAPI_LIB_SRCS})
 set_target_properties(CommonAPI PROPERTIES VERSION 3.0.0 SOVERSION 3 LINKER_LANGUAGE C)
 
-set(CAPI_DEV_INCL *.h )
+install(TARGETS CommonAPI LIBRARY DESTINATION /usr/lib         ARCHIVE DESTINATION lib/static  COMPONENT base) 
+
+install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/Factory.h DESTINATION /usr/include/CommonAPI-${PACKAGE_VERSION}/CommonAPI)   
+install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/Attribute.h DESTINATION /usr/include/CommonAPI-${PACKAGE_VERSION}/CommonAPI) 
+install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/AttributeExtension.h DESTINATION /usr/include/CommonAPI-${PACKAGE_VERSION}/CommonAPI)        
+install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/CommonAPI.h DESTINATION /usr/include/CommonAPI-${PACKAGE_VERSION}/CommonAPI) 
+install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/ByteBuffer.h DESTINATION /usr/include/CommonAPI-${PACKAGE_VERSION}/CommonAPI)        
+install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/Configuration.h DESTINATION /usr/include/CommonAPI-${PACKAGE_VERSION}/CommonAPI)     
+install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/ContainerUtils.h DESTINATION /usr/include/CommonAPI-${PACKAGE_VERSION}/CommonAPI)    
+install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/Event.h DESTINATION /usr/include/CommonAPI-${PACKAGE_VERSION}/CommonAPI)     
+install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/Factory.h DESTINATION /usr/include/CommonAPI-${PACKAGE_VERSION}/CommonAPI)   
+install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/Factory.hpp DESTINATION /usr/include/CommonAPI-${PACKAGE_VERSION}/CommonAPI) 
+install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/InputStream.h DESTINATION /usr/include/CommonAPI-${PACKAGE_VERSION}/CommonAPI)       
+install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/MainLoopContext.h DESTINATION /usr/include/CommonAPI-${PACKAGE_VERSION}/CommonAPI)   
+install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/OutputStream.h DESTINATION /usr/include/CommonAPI-${PACKAGE_VERSION}/CommonAPI)      
+install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/MiddlewareInfo.h DESTINATION /usr/include/CommonAPI-${PACKAGE_VERSION}/CommonAPI)    
+install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/Proxy.h DESTINATION /usr/include/CommonAPI-${PACKAGE_VERSION}/CommonAPI)     
+install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/ProxyManager.h DESTINATION /usr/include/CommonAPI-${PACKAGE_VERSION}/CommonAPI)      
+install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/Runtime.h DESTINATION /usr/include/CommonAPI-${PACKAGE_VERSION}/CommonAPI)   
+install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/SelectiveEvent.h DESTINATION /usr/include/CommonAPI-${PACKAGE_VERSION}/CommonAPI)    
+install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/SerializableStruct.h DESTINATION /usr/include/CommonAPI-${PACKAGE_VERSION}/CommonAPI)        
+install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/SerializableVariant.h DESTINATION /usr/include/CommonAPI-${PACKAGE_VERSION}/CommonAPI)       
+install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/SerializableVariant.hpp DESTINATION /usr/include/CommonAPI-${PACKAGE_VERSION}/CommonAPI)     
+install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/ServicePublisher.h DESTINATION /usr/include/CommonAPI-${PACKAGE_VERSION}/CommonAPI)  
+install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/ServicePublisher.hpp DESTINATION /usr/include/CommonAPI-${PACKAGE_VERSION}/CommonAPI)        
+install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/Stub.h DESTINATION /usr/include/CommonAPI-${PACKAGE_VERSION}/CommonAPI)      
+install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/types.h DESTINATION /usr/include/CommonAPI-${PACKAGE_VERSION}/CommonAPI)     
+install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/utils.h DESTINATION /usr/include/CommonAPI-${PACKAGE_VERSION}/CommonAPI)     
+
 
-install(TARGETS CommonAPI
-       LIBRARY DESTINATION /usr/lib
-       ARCHIVE DESTINATION lib/static
-       COMPONENT base)