[devel/ros-bond-core] Update to 1.7.14

Changes since 1.7.12: only WIN32 related changes.
severin-lemaignan · Aug 18, 2014 · 68bcc3b · 68bcc3b
1 parent e191f35
commit 68bcc3b
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 38 deletions.
diff --git a/devel/ros-bond-core/Makefile b/devel/ros-bond-core/Makefile
@@ -4,7 +4,7 @@
 
 ROS_PKG=	bond_core
 ROS_METAPKG=	yes
-ROS_VERSION=	1.7.12
+ROS_VERSION=	1.7.14
 
 CATEGORIES=	devel
 ROS_COMMENT=	process termination detection

diff --git a/devel/ros-bond-core/PLIST b/devel/ros-bond-core/PLIST
@@ -1,4 +1,4 @@
-@comment Fri Jun 28 21:22:31 CEST 2013
+@comment Wed Aug 13 15:57:01 CEST 2014
 include/bond/Constants.h
 include/bond/Status.h
 include/bondcpp/BondSM_sm.h
@@ -11,46 +11,23 @@ include/test_bond/TestBondResponse.h
 lib/libbondcpp.so
 lib/pkgconfig/bond.pc
 lib/pkgconfig/bondcpp.pc
+lib/pkgconfig/bondpy.pc
 lib/pkgconfig/smclib.pc
 lib/pkgconfig/test_bond.pc
 ${PYTHON_SITELIB}/bond/__init__.py
-${PYTHON_SITELIB}/bond/${PYTHON_PYCACHE}/__init__${PYTHON_TAG}.pyc
-${PYTHON_SITELIB}/bond/${PYTHON_PYCACHE}/__init__${PYTHON_TAG}.pyo
 ${PYTHON_SITELIB}/bond/msg/_Constants.py
-${PYTHON_SITELIB}/bond/msg/${PYTHON_PYCACHE}/_Constants${PYTHON_TAG}.pyc
-${PYTHON_SITELIB}/bond/msg/${PYTHON_PYCACHE}/_Constants${PYTHON_TAG}.pyo
 ${PYTHON_SITELIB}/bond/msg/_Status.py
-${PYTHON_SITELIB}/bond/msg/${PYTHON_PYCACHE}/_Status${PYTHON_TAG}.pyc
-${PYTHON_SITELIB}/bond/msg/${PYTHON_PYCACHE}/_Status${PYTHON_TAG}.pyo
 ${PYTHON_SITELIB}/bond/msg/__init__.py
-${PYTHON_SITELIB}/bond/msg/${PYTHON_PYCACHE}/__init__${PYTHON_TAG}.pyc
-${PYTHON_SITELIB}/bond/msg/${PYTHON_PYCACHE}/__init__${PYTHON_TAG}.pyo
 ${PYTHON_SITELIB}/bondpy-${PKGVERSION}-py${PYTHON_VERSION}.egg-info
 ${PYTHON_SITELIB}/bondpy/BondSM_sm.py
-${PYTHON_SITELIB}/bondpy/${PYTHON_PYCACHE}/BondSM_sm${PYTHON_TAG}.pyc
-${PYTHON_SITELIB}/bondpy/${PYTHON_PYCACHE}/BondSM_sm${PYTHON_TAG}.pyo
 ${PYTHON_SITELIB}/bondpy/__init__.py
-${PYTHON_SITELIB}/bondpy/${PYTHON_PYCACHE}/__init__${PYTHON_TAG}.pyc
-${PYTHON_SITELIB}/bondpy/${PYTHON_PYCACHE}/__init__${PYTHON_TAG}.pyo
 ${PYTHON_SITELIB}/bondpy/bondpy.py
-${PYTHON_SITELIB}/bondpy/${PYTHON_PYCACHE}/bondpy${PYTHON_TAG}.pyc
-${PYTHON_SITELIB}/bondpy/${PYTHON_PYCACHE}/bondpy${PYTHON_TAG}.pyo
 ${PYTHON_SITELIB}/smclib-${PKGVERSION}-py${PYTHON_VERSION}.egg-info
 ${PYTHON_SITELIB}/smclib/__init__.py
-${PYTHON_SITELIB}/smclib/${PYTHON_PYCACHE}/__init__${PYTHON_TAG}.pyc
-${PYTHON_SITELIB}/smclib/${PYTHON_PYCACHE}/__init__${PYTHON_TAG}.pyo
 ${PYTHON_SITELIB}/smclib/statemap.py
-${PYTHON_SITELIB}/smclib/${PYTHON_PYCACHE}/statemap${PYTHON_TAG}.pyc
-${PYTHON_SITELIB}/smclib/${PYTHON_PYCACHE}/statemap${PYTHON_TAG}.pyo
 ${PYTHON_SITELIB}/test_bond/__init__.py
-${PYTHON_SITELIB}/test_bond/${PYTHON_PYCACHE}/__init__${PYTHON_TAG}.pyc
-${PYTHON_SITELIB}/test_bond/${PYTHON_PYCACHE}/__init__${PYTHON_TAG}.pyo
 ${PYTHON_SITELIB}/test_bond/srv/_TestBond.py
-${PYTHON_SITELIB}/test_bond/srv/${PYTHON_PYCACHE}/_TestBond${PYTHON_TAG}.pyc
-${PYTHON_SITELIB}/test_bond/srv/${PYTHON_PYCACHE}/_TestBond${PYTHON_TAG}.pyo
 ${PYTHON_SITELIB}/test_bond/srv/__init__.py
-${PYTHON_SITELIB}/test_bond/srv/${PYTHON_PYCACHE}/__init__${PYTHON_TAG}.pyc
-${PYTHON_SITELIB}/test_bond/srv/${PYTHON_PYCACHE}/__init__${PYTHON_TAG}.pyo
 share/bond/cmake/bond-msg-extras.cmake
 share/bond/cmake/bond-msg-paths.cmake
 share/bond/cmake/bondConfig-version.cmake
@@ -62,6 +39,9 @@ share/bond_core/package.xml
 share/bondcpp/cmake/bondcppConfig-version.cmake
 share/bondcpp/cmake/bondcppConfig.cmake
 share/bondcpp/package.xml
+share/bondpy/cmake/bondpyConfig-version.cmake
+share/bondpy/cmake/bondpyConfig.cmake
+share/bondpy/package.xml
 share/common-lisp/ros/bond/msg/Constants.lisp
 share/common-lisp/ros/bond/msg/Status.lisp
 share/common-lisp/ros/bond/msg/_package.lisp

diff --git a/devel/ros-bond-core/depend.mk b/devel/ros-bond-core/depend.mk
@@ -18,18 +18,18 @@ SYSTEM_PREFIX.ros-bond-core?=	${SYSTEM_PREFIX.ros-base}
 DEPEND_USE+=			ros-bond-core
 ROS_DEPEND_USE+=		ros-bond-core
 
-DEPEND_ABI.ros-bond-core?=	ros-bond-core>=1.6
+DEPEND_ABI.ros-bond-core?=	ros-bond-core>=1.7
 DEPEND_DIR.ros-bond-core?=	../../devel/ros-bond-core
 
-DEPEND_ABI.ros-bond-core.fuerte?=	ros-bond-core>=1.6<1.7
 DEPEND_ABI.ros-bond-core.groovy?=	ros-bond-core>=1.7<1.8
 DEPEND_ABI.ros-bond-core.hydro?=	ros-bond-core>=1.7<1.8
+DEPEND_ABI.ros-bond-core.indigo?=	ros-bond-core>=1.7<1.8
 
 SYSTEM_SEARCH.ros-bond-core=\
   'include/bondcpp/bond.h'						\
   'lib/libbondcpp.so'							\
   '${PYTHON_SYSLIBSEARCH}/bondpy/__init__.py'				\
-  'share/bondcpp/${ROS_STACKAGE}:/<version>/s/[^0-9.]//gp'			\
+  'share/bondcpp/package.xml:/<version>/s/[^0-9.]//gp'			\
   'lib/pkgconfig/bond.pc:/Version/s/[^0-9.]//gp'			\
   'lib/pkgconfig/bondcpp.pc:/Version/s/[^0-9.]//gp'
 

diff --git a/devel/ros-bond-core/distinfo b/devel/ros-bond-core/distinfo
@@ -1,4 +1,4 @@
-SHA1 (ros/bond_core-1.7.12.tar.gz) = b380ac3e5a92de4304a7cafb75dca80b9c770431
-RMD160 (ros/bond_core-1.7.12.tar.gz) = 667e23b1785791c73bf2ebe732ab3561a66c9d06
-Size (ros/bond_core-1.7.12.tar.gz) = 25044 bytes
-SHA1 (patch-aa) = 7218bafa2c84879ebbe6cedaacc5736fedc20e59
+SHA1 (ros/bond_core/1.7.14.tar.gz) = d0c212576f4bd922b6c39bc0dad1856a827b2cb8
+RMD160 (ros/bond_core/1.7.14.tar.gz) = a7bdf9a51c4938adee672f236d19dc853f93bbea
+Size (ros/bond_core/1.7.14.tar.gz) = 25329 bytes
+SHA1 (patch-aa) = 700ebfc781f93fbb936247315287d794c117acd6
diff --git a/devel/ros-bond-core/patches/patch-aa b/devel/ros-bond-core/patches/patch-aa
@@ -1,6 +1,6 @@
 --- bondcpp/CMakeLists.txt.orig	2013-06-06 21:11:16.000000000 +0200
 +++ bondcpp/CMakeLists.txt	2013-06-28 21:20:02.000000000 +0200
-@@ -3,15 +3,18 @@
+@@ -3,9 +3,12 @@
 
  find_package(Boost REQUIRED)
  find_package(catkin REQUIRED bond roscpp smclib)
@@ -11,22 +11,26 @@
  include_directories(include ${catkin_INCLUDE_DIRS})
 +link_directories(${UUID_LIBRARY_DIRS})
 
+ if(WIN32)
+   set(UUID_LIB "Rpcrt4")
+@@ -15,9 +18,9 @@
+
  catkin_package(
    INCLUDE_DIRS include
--  LIBRARIES ${PROJECT_NAME} uuid
+-  LIBRARIES ${PROJECT_NAME} ${UUID_LIB}
 +  LIBRARIES ${PROJECT_NAME}
    CATKIN_DEPENDS bond roscpp smclib
 -  DEPENDS Boost
 +  DEPENDS Boost uuid
  )
 
  add_library(${PROJECT_NAME}
-@@ -19,7 +22,7 @@
+@@ -25,7 +28,7 @@
    src/bond.cpp
    src/BondSM_sm.cpp
  )
--target_link_libraries(${PROJECT_NAME} uuid ${catkin_LIBRARIES} ${BOOST_LIBRARIES})
+-target_link_libraries(${PROJECT_NAME} ${UUID_LIB} ${catkin_LIBRARIES} ${BOOST_LIBRARIES})
 +target_link_libraries(${PROJECT_NAME} ${UUID_LIBRARIES} ${catkin_LIBRARIES} ${BOOST_LIBRARIES})
+
  if(catkin_EXPORTED_TARGETS)
    add_dependencies(${PROJECT_NAME} ${catkin_EXPORTED_TARGETS})
- endif()