Merge pull request #942 from JdeRobot/941

[fix #941]Renamed samples to examples

cmake/cpack_metainfo/drivers.cmake

@@ -4,6 +4,11 @@ SET(CPACK_COMPONENT_ARDRONE-SERVER_DESCRIPTION
  Manual page http://jderobot.org/index.php/Drivers#ardrone_server
  Home page https://jderobot.org")
 
+SET(CPACK_DEBIAN_BASIC-SERVER_PACKAGE_DEPENDS "jderobot-easyice,  jderobot-interfaces, jderobot-colorspaces")
+SET(CPACK_COMPONENT_BASIC-SERVER_DESCRIPTION  
+"An example of the most basic server made for JdeRobot based on ICE communications. 
+ Home page https://jderobot.org") 
+
 SET(CPACK_DEBIAN_CAMERASERVER_DEPENDS "jderobot-easyice, jderobot-util, jderobot-interfaces, jderobot-logger, jderobot-ns, jderobot-colorspaces")
 SET(CPACK_COMPONENT_CAMERASERVER_DESCRIPTION  
 "Generic server for RGB cameras. 

cmake/cpack_metainfo/tools.cmake

@@ -70,6 +70,12 @@ SET(CPACK_COMPONENT_NAVIGATORCAMERA_DESCRIPTION
  Manual Page http://jderobot.org/index.php/Tools#NavigatorCamera
  Home page https://jderobot.org")
 
+SET(CPACK_DEBIAN_OPENCVDEMO_PACKAGE_DEPENDS "jderobot-easyice, jderobot-parallelice, jderobot-util, jderobot-interfaces, jderobot-resourcelocator, jderobot-colorspaces")
+SET(CPACK_COMPONENT_OPENCVDEMO_DESCRIPTION  
+"An example of a tool made for image treatment using OpenCV.
+ Manual Page http://jderobot.org/index.php/Tools#NavigatorCamera
+ Home page https://jderobot.org")
+
 SET(CPACK_DEBIAN_RECORDER2_PACKAGE_DEPENDS "jderobot-easyice, jderobot-util, jderobot-interfaces, jderobot-ns, jderobot-colorspaces")
 SET(CPACK_COMPONENT_RECORDER2_DESCRIPTION  
 "Tool for record logs of robots sensors and actuators.

cmake/cpackit.cmake

@@ -135,6 +135,7 @@ configure_file(${MAKE_PACKAGE_CONFIG_DIR}/jderobot-deps-dev.info.in ${CMAKE_BINA
 configure_file(${MAKE_PACKAGE_CONFIG_DIR}/jderobot-libs.info.in ${CMAKE_BINARY_DIR}/jderobot-libs_${PACKAGE_VERSION}_all.info)
 configure_file(${MAKE_PACKAGE_CONFIG_DIR}/jderobot-tools.info.in ${CMAKE_BINARY_DIR}/jderobot-tools_${PACKAGE_VERSION}_all.info)
 configure_file(${MAKE_PACKAGE_CONFIG_DIR}/jderobot-drivers.info.in ${CMAKE_BINARY_DIR}/jderobot-drivers_${PACKAGE_VERSION}_all.info)
+configure_file(${MAKE_PACKAGE_CONFIG_DIR}/jderobot-examples.info.in ${CMAKE_BINARY_DIR}/jderobot-drivers_${PACKAGE_VERSION}_all.info)
 configure_file(${MAKE_PACKAGE_CONFIG_DIR}/jderobot-zeroc-ice-python.info.in ${CMAKE_BINARY_DIR}/jderobot-zeroc-ice-python_${PACKAGE_VERSION}_all.info)
 
 execute_process(

scripts/metapackages/jderobot-examples.info.in

@@ -0,0 +1,17 @@
+Package: ${PROJECT_NAME}-examples
+Version: ${PACKAGE_VERSION}
+Architecture: all
+Provides: ${PROJECT_NAME}-examples
+Conflicts: ${PROJECT_NAME}-examples
+Replaces: ${PROJECT_NAME}-examples
+Section: net
+Priority: extra
+Size: 0
+Installed-Size: 0
+Depends: jderobot-basic-component, jderobot-basic-component-python, jderobot-basic-server, jderobot-opencvdemo
+Maintainer: Francisco Perez <f.perez475@gmail.com>
+Homepage: http://jderobot.org
+Description: Metapackage that gathers all the examples of JdeRobot framework.
+ Jderobot is a software development suite for robotics applications.
+ Get it from https://github.com/JdeRobot/JdeRobot.git
+

scripts/metapackages/jderobot.info.in

@@ -8,7 +8,7 @@ Priority: extra
 Section: net
 Size: 0
 Installed-Size: 0
-Depends: ${PACKAGE_DEPENDS}, jderobot-tools, jderobot-libs, jderobot-drivers, jderobot-interfaces, jderobot-types
+Depends: ${PACKAGE_DEPENDS}, jderobot-tools, jderobot-libs, jderobot-drivers, jderobot-interfaces, jderobot-types, jderobot-examples
 Maintainer: Francisco Perez <f.perez475@gmail.com>
 Homepage: http://jderobot.org
 Description: Metapackage that gathers all libraries required by JdeRobot framework, and install the proyect for execution only.

src/CMakeLists.txt

@@ -3,4 +3,4 @@ add_subdirectory (${CMAKE_CURRENT_SOURCE_DIR}/types)
 add_subdirectory (${CMAKE_CURRENT_SOURCE_DIR}/libs)
 add_subdirectory (${CMAKE_CURRENT_SOURCE_DIR}/tools)
 add_subdirectory (${CMAKE_CURRENT_SOURCE_DIR}/drivers)
-add_subdirectory (${CMAKE_CURRENT_SOURCE_DIR}/samples)
+add_subdirectory (${CMAKE_CURRENT_SOURCE_DIR}/examples)

src/samples/basic_server/CMakeLists.txt → src/examples/basic_server/CMakeLists.txt

@@ -31,7 +31,7 @@ TARGET_LINK_LIBRARIES(basic_server
 
 install(TARGETS basic_server
     DESTINATION ${CMAKE_INSTALL_PREFIX}/bin/
-    COMPONENT samples
+    COMPONENT basic-server
     )
 
-INSTALL (FILES ${CMAKE_CURRENT_SOURCE_DIR}/basic_server.cfg DESTINATION ${CMAKE_INSTALL_PREFIX}/share/jderobot/conf COMPONENT samples)
+INSTALL (FILES ${CMAKE_CURRENT_SOURCE_DIR}/basic_server.cfg DESTINATION ${CMAKE_INSTALL_PREFIX}/share/jderobot/conf COMPONENT basic-server)

src/samples/opencvdemo/CMakeLists.txt → src/examples/opencvdemo/CMakeLists.txt

@@ -38,8 +38,8 @@ TARGET_LINK_LIBRARIES(opencvdemo
 
 install(TARGETS opencvdemo
     DESTINATION ${CMAKE_INSTALL_PREFIX}/bin/
-    COMPONENT samples
+    COMPONENT opencvdemo
     )
 
-INSTALL (FILES ${CMAKE_CURRENT_SOURCE_DIR}/opencvdemo.glade DESTINATION ${CMAKE_INSTALL_PREFIX}/share/jderobot/glade COMPONENT samples)
-INSTALL (FILES ${CMAKE_CURRENT_SOURCE_DIR}/opencvdemo.cfg DESTINATION ${CMAKE_INSTALL_PREFIX}/share/jderobot/conf COMPONENT samples)
+INSTALL (FILES ${CMAKE_CURRENT_SOURCE_DIR}/opencvdemo.glade DESTINATION ${CMAKE_INSTALL_PREFIX}/share/jderobot/glade COMPONENT opencvdemo)
+INSTALL (FILES ${CMAKE_CURRENT_SOURCE_DIR}/opencvdemo.cfg DESTINATION ${CMAKE_INSTALL_PREFIX}/share/jderobot/conf COMPONENT opencvdemo)