[catkin] 01/07: Merging from master
Leopold Palomo-Avellaneda
leo at alaxarxa.net
Fri Jan 16 09:37:04 UTC 2015
This is an automated email from the git hooks/post-receive script.
lepalom-guest pushed a commit to branch debian-robotics
in repository catkin.
commit 9e50facdffab639296b87eed02bff9f7f32181f4
Merge: edfce9e a46008c
Author: Leopold Palomo-Avellaneda <leopold.palomo at upc.edu>
Date: Tue Dec 9 09:06:14 2014 +0100
Merging from master
.travis.yml | 11 ++
CHANGELOG.rst | 108 ++++++++++++
CMakeLists.txt | 3 -
bin/CMakeLists.txt | 24 ---
bin/catkin_find | 2 +-
bin/catkin_init_workspace | 4 +-
bin/catkin_make | 91 ++++++----
bin/catkin_make_isolated | 51 ++++--
bin/catkin_package_version | 2 +-
bin/catkin_prepare_release | 13 +-
bin/catkin_test_results | 6 +-
bin/catkin_topological_order | 10 +-
cmake/all.cmake | 36 ++--
cmake/atomic_configure_file.cmake | 9 +
cmake/catkinConfig.cmake.in | 81 +++++----
cmake/catkin_add_env_hooks.cmake | 2 +-
cmake/catkin_generate_environment.cmake | 26 +--
cmake/catkin_install_python.cmake | 55 ++++++
cmake/catkin_libraries.cmake | 159 +++++++++++++++++
cmake/catkin_package.cmake | 130 ++++++--------
cmake/catkin_python_setup.cmake | 33 +++-
cmake/catkin_workspace.cmake | 5 +-
cmake/em/order_packages.cmake.em | 4 +-
cmake/empy.cmake | 2 +-
cmake/env-hooks/05.catkin_make.bash | 4 +-
cmake/env-hooks/05.catkin_make_isolated.bash | 4 +-
cmake/interrogate_setup_dot_py.py | 23 ++-
cmake/list_append_deduplicate.cmake | 16 ++
cmake/list_append_unique.cmake | 5 +-
cmake/python.cmake | 37 +++-
cmake/python_version.py | 45 -----
cmake/string_starts_with.cmake | 22 +++
cmake/templates/_setup_util.py | 2 +-
cmake/templates/_setup_util.py.in | 59 ++++---
cmake/templates/env-hook.context.py.in | 2 +
cmake/templates/env.sh.in | 5 +-
cmake/templates/order_packages.context.py.in | 1 +
cmake/templates/pkgConfig.cmake.in | 98 ++++++-----
cmake/templates/python_distutils_install.sh.in | 1 -
cmake/templates/relay.py.in | 4 +
cmake/templates/setup.bash.in | 2 +-
cmake/templates/setup.sh.in | 14 ++
cmake/templates/setup.zsh.in | 2 +-
cmake/test/catkin_download_test_data.cmake | 2 +-
cmake/test/download_checkmd5.py | 100 ++++++++++-
cmake/test/gtest.cmake | 42 +++--
cmake/test/nosetests.cmake | 2 +
cmake/test/run_tests.py | 8 +-
cmake/toplevel.cmake | 25 ++-
debian/changelog | 24 ++-
...EFAULT_PATH-and-NO_CMAKE_FIND_ROOT_PATH-f.patch | 31 ++++
debian/patches/series | 1 +
debian/rules | 2 +
debian/source.lintian-overrides | 2 +
doc/adv_user_guide/adv_user_guide.rst | 1 -
doc/adv_user_guide/underlay.rst | 130 --------------
doc/conf.py | 18 +-
doc/dev_guide/api/index.rst | 1 -
doc/dev_guide/api/python_version.rst | 7 -
doc/dev_guide/generated_cmake_api.rst | 194 ++++++++++++++++++++-
doc/howto/{ => format1}/building_executables.rst | 0
doc/howto/{ => format1}/building_libraries.rst | 0
doc/howto/{ => format1}/building_msgs.rst | 0
.../{ => format1}/catkin_library_dependencies.rst | 0
doc/howto/{ => format1}/catkin_overview.rst | 25 +--
doc/howto/{ => format1}/cpp_msg_dependencies.rst | 0
doc/howto/{ => format1}/downloading_test_data.rst | 0
.../{ => format1}/dynamic_reconfiguration.rst | 0
doc/howto/{ => format1}/gtest_configuration.rst | 2 +-
doc/howto/{ => format1}/index.rst | 24 +--
doc/howto/{ => format1}/installing_cmake.rst | 0
doc/howto/{ => format1}/installing_other.rst | 0
doc/howto/{ => format1}/installing_python.rst | 23 +--
.../{ => format1}/python_module_dependencies.rst | 0
.../{ => format1}/python_nose_configuration.rst | 2 +-
doc/howto/{ => format1}/rostest_configuration.rst | 0
doc/howto/format1/run_tests.rst | 44 +++++
.../{ => format1}/system_library_dependencies.rst | 10 +-
doc/howto/{ => format2}/building_executables.rst | 18 +-
doc/howto/{ => format2}/building_libraries.rst | 45 +++--
doc/howto/{ => format2}/building_msgs.rst | 25 ++-
doc/howto/format2/catkin_library_dependencies.rst | 137 +++++++++++++++
doc/howto/{ => format2}/catkin_overview.rst | 44 ++---
doc/howto/{ => format2}/cpp_msg_dependencies.rst | 20 +--
doc/howto/{ => format2}/downloading_test_data.rst | 6 +-
.../{ => format2}/dynamic_reconfiguration.rst | 28 ++-
doc/howto/{ => format2}/gtest_configuration.rst | 10 +-
doc/howto/{ => format2}/index.rst | 45 +++--
doc/howto/{ => format2}/installing_cmake.rst | 4 +-
doc/howto/{ => format2}/installing_other.rst | 4 +-
doc/howto/{ => format2}/installing_python.rst | 42 ++---
doc/howto/format2/migrating_from_format_1.rst | 99 +++++++++++
doc/howto/format2/python_module_dependencies.rst | 50 ++++++
.../{ => format2}/python_nose_configuration.rst | 10 +-
doc/howto/format2/rostest_configuration.rst | 55 ++++++
doc/howto/format2/run_tests.rst | 44 +++++
.../{ => format2}/system_library_dependencies.rst | 102 ++++++-----
doc/howto/index.rst | 76 ++------
doc/index.rst | 36 ++--
package.xml | 6 +-
python/catkin/builder.py | 89 ++++++++--
python/catkin/environment_cache.py | 4 +-
python/catkin/find_in_workspaces.py | 23 ++-
python/catkin/init_workspace.py | 3 +
python/catkin/package_version.py | 2 +-
python/catkin/tidy_xml.py | 20 ++-
setup.py | 12 +-
test/local_tests/test_with_mock_workspace.py | 3 +-
test/unit_tests/test_builder.py | 6 +-
test/unit_tests/test_catkin_make_isolated.py | 55 +++++-
test/unit_tests/test_download_md5.py | 3 +-
test/unit_tests/test_environment_cache.py | 2 +-
test/unit_tests/test_interrogate_setup.py | 50 ++++--
test/unit_tests/test_order_packages_cmake_em.py | 3 +-
test/unit_tests/test_run_tests.py | 4 +-
test/unit_tests/test_setup_util.py | 98 +++++------
test/unit_tests/test_terminal_color.py | 15 +-
test/unit_tests/test_test_results.py | 5 +-
test/unit_tests/test_tidy_xml.py | 11 +-
119 files changed, 2287 insertions(+), 960 deletions(-)
diff --cc cmake/catkinConfig.cmake.in
index d694ed8,2183ce8..c222f7b
--- a/cmake/catkinConfig.cmake.in
+++ b/cmake/catkinConfig.cmake.in
@@@ -54,40 -56,49 +56,47 @@@ endif(
math(EXPR _CATKIN_FIND_ "${_CATKIN_FIND_} + 1")
# find all components
- foreach(component ${catkin_FIND_COMPONENTS})
- string(TOLOWER "${component}" component_lower)
- # skip catkin since it does not make sense as a component
- if(NOT ${component_lower} STREQUAL "catkin")
-
- # get search paths from CMAKE_PREFIX_PATH (which includes devel space)
- set(paths "")
- foreach(path ${CMAKE_PREFIX_PATH})
- if(IS_DIRECTORY ${path}/share/${component}/cmake)
- list(APPEND paths ${path}/share/${component}/cmake)
+ if(catkin_FIND_COMPONENTS)
+ foreach(component ${catkin_FIND_COMPONENTS})
+ string(TOLOWER "${component}" component_lower)
+ # skip catkin since it does not make sense as a component
+ if(NOT ${component_lower} STREQUAL "catkin")
+
+ # get search paths from CMAKE_PREFIX_PATH (which includes devel space)
+ set(paths "")
+ foreach(path ${CMAKE_PREFIX_PATH})
+ if(IS_DIRECTORY ${path}/share/${component}/cmake)
+ list(APPEND paths ${path}/share/${component}/cmake)
+ endif()
+ endforeach()
+
+ # find package component
+ if(catkin_FIND_REQUIRED)
- find_package(${component} REQUIRED NO_MODULE PATHS ${paths}
- NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH)
++ find_package(${component} REQUIRED NO_MODULE PATHS ${paths})
++
+ elseif(catkin_FIND_QUIETLY)
- find_package(${component} QUIET NO_MODULE PATHS ${paths}
- NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH)
++ find_package(${component} QUIET NO_MODULE PATHS ${paths})
+ else()
- find_package(${component} NO_MODULE PATHS ${paths}
- NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH)
++ find_package(${component} NO_MODULE PATHS ${paths})
endif()
- endforeach()
-
- # find package component
- if(catkin_FIND_REQUIRED)
- find_package(${component} REQUIRED NO_MODULE PATHS ${paths}
- NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH)
- elseif(catkin_FIND_QUIETLY)
- find_package(${component} QUIET NO_MODULE PATHS ${paths}
- NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH)
- else()
- find_package(${component} NO_MODULE PATHS ${paths}
- NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH)
- endif()
- # append component-specific variables to catkin_* variables
- list_append_unique(catkin_INCLUDE_DIRS ${${component}_INCLUDE_DIRS})
- list_append_unique(catkin_LIBRARIES ${${component}_LIBRARIES})
- list_append_unique(catkin_LIBRARY_DIRS ${${component}_LIBRARY_DIRS})
- list(APPEND catkin_EXPORTED_TARGETS ${${component}_EXPORTED_TARGETS})
- endif()
- endforeach()
- list_insert_in_workspace_order(catkin_INCLUDE_DIRS ${catkin_INCLUDE_DIRS})
- list_insert_in_workspace_order(catkin_LIBRARY_DIRS ${catkin_LIBRARY_DIRS})
+ # append component-specific variables to catkin_* variables
+ list_append_unique(catkin_INCLUDE_DIRS ${${component}_INCLUDE_DIRS})
+
+ # merge build configuration keywords with library names to correctly deduplicate
+ catkin_pack_libraries_with_build_configuration(catkin_LIBRARIES ${catkin_LIBRARIES})
+ catkin_pack_libraries_with_build_configuration(_libraries ${${component}_LIBRARIES})
+ list_append_deduplicate(catkin_LIBRARIES ${_libraries})
+ # undo build configuration keyword merging after deduplication
+ catkin_unpack_libraries_with_build_configuration(catkin_LIBRARIES ${catkin_LIBRARIES})
+
+ list_append_unique(catkin_LIBRARY_DIRS ${${component}_LIBRARY_DIRS})
+ list(APPEND catkin_EXPORTED_TARGETS ${${component}_EXPORTED_TARGETS})
+ endif()
+ endforeach()
+ list_insert_in_workspace_order(catkin_INCLUDE_DIRS ${catkin_INCLUDE_DIRS})
+ list_insert_in_workspace_order(catkin_LIBRARY_DIRS ${catkin_LIBRARY_DIRS})
+ endif()
# add dummy target to catkin_EXPORTED_TARGETS if empty
if(NOT catkin_EXPORTED_TARGETS)
diff --cc debian/changelog
index ef140c5,e037824..7d28873
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,15 +1,25 @@@
- catkin (0.5.77-1+drp70+1) wheezy-robotics; urgency=low
-catkin (0.5.89-1) UNRELEASED; urgency=low
++catkin (0.5.89-1) wheezy-robotics; urgency=low
-- [ Thomas Moulard ]
-- * Initial release. (Closes: #729048)
++ [ Jochen Sprickerhof ]
++ * Imported Upstream version 0.5.89
++
++ [ Leopold Palomo-Avellaneda ]
++ * Rebuild for drp.
++
++ -- Leopold Palomo-Avellaneda <leo at alaxarxa.net> Tue, 09 Dec 2014 08:55:44 +0100
+
- [ Leopold Palomo ]
++catkin (0.5.77-1+drp70+1) wheezy-robotics; urgency=low
+
+ [ Leopold Palomo-Avellaneda ]
+ * Rebuild for drp.
+
- -- Leopold Palomo-Avellaneda <leo at alaxarxa.net> Thu, 14 Nov 2013 09:43:57 +0100
++ [ Leopold Palomo-Avellaneda ]
+ * Imported Upstream version 0.5.77
+ * Modified the build-depends field
+ * Changed Vcs fields
+ * Error in the dependencies about catking-pkg
+
- [ Jochen Sprickerhof ]
- * Imported Upstream version 0.5.89
++ [ Thomas Moulard ]
++ * Initial release. (Closes: #729048)
+
+ -- Thomas Moulard <thomas.moulard at gmail.com> Wed, 19 Jun 2013 11:28:40 +0900
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/ros/catkin.git
More information about the debian-science-commits
mailing list