Skip to content
This repository was archived by the owner on Feb 21, 2021. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions cmake/cpack_metainfo/drivers.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
6 changes: 6 additions & 0 deletions cmake/cpack_metainfo/tools.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
1 change: 1 addition & 0 deletions cmake/cpackit.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
17 changes: 17 additions & 0 deletions scripts/metapackages/jderobot-examples.info.in
Original file line number Diff line number Diff line change
@@ -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

2 changes: 1 addition & 1 deletion scripts/metapackages/jderobot.info.in
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion src/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Original file line number Diff line number Diff line change
Expand Up @@ -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)