Skip to content

Commit

Permalink
[devel/ros-catkin] Update to catkin-0.5.67
Browse files Browse the repository at this point in the history
This is a major update from 0.4.5 (ros-fuerte) to 0.5.67 (ros-groovy),
featuring a massive rewrite. This version is not compatible with the previous.
See CHANGELOG.rst in the sources for the gory details.

Local patches fix issues regarding .pc files, introducing an incompatibility
with official binarary package until this is merged upstream. See:
 ros/catkin#444
 ros/catkin#445

Another local patch installs env.sh, setup.sh at al. in etc/ros instead of the
root prefix. Their functionality is unchanged, though.

While here, rename the package from catkin to ros-catkin, for consistency with
other ros packages and easier package management from the command line
(e.g. robotpkg_delete ros-\*) or in robotpkg.conf (e.g. PKG_OPTIONS.ros-%)
  • Loading branch information
Anthony Mallet committed Jun 25, 2013
1 parent f799697 commit a5b6c06
Show file tree
Hide file tree
Showing 21 changed files with 389 additions and 266 deletions.
2 changes: 1 addition & 1 deletion devel/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@

COMMENT= Software development tools

SUBDIR+= catkin
SUBDIR+= cortex-sdk
SUBDIR+= boost-build
SUBDIR+= boost-headers
Expand All @@ -24,6 +23,7 @@ SUBDIR+= log4cxx
SUBDIR+= mkdep
SUBDIR+= py-simpleparse
SUBDIR+= ros-core
SUBDIR+= ros-catkin
SUBDIR+= roscpp-core
SUBDIR+= swig

Expand Down
41 changes: 0 additions & 41 deletions devel/catkin/Makefile

This file was deleted.

126 changes: 0 additions & 126 deletions devel/catkin/PLIST

This file was deleted.

37 changes: 0 additions & 37 deletions devel/catkin/depend.mk

This file was deleted.

7 changes: 0 additions & 7 deletions devel/catkin/distinfo

This file was deleted.

12 changes: 0 additions & 12 deletions devel/catkin/patches/patch-aa

This file was deleted.

13 changes: 0 additions & 13 deletions devel/catkin/patches/patch-ab

This file was deleted.

17 changes: 0 additions & 17 deletions devel/catkin/patches/patch-ac

This file was deleted.

12 changes: 0 additions & 12 deletions devel/catkin/patches/patch-ad

This file was deleted.

File renamed without changes.
33 changes: 33 additions & 0 deletions devel/ros-catkin/Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
# robotpkg Makefile for: devel/catkin
# Created: Anthony Mallet on Sun, 15 Jul 2012
#

ROS_PKG= catkin
ROS_VERSION= 0.5.67

CATEGORIES= devel
ROS_COMMENT= low-level build system macros and infrastructure

include ../../meta-pkgs/ros-base/Makefile.common

CMAKE_ARGS+=-DGTEST_ROOT=${PREFIX.googletest}
CMAKE_ARGS+=-DNOSETESTS=${NOSETESTS}
CMAKE_ARGS+=-DCMAKE_PREFIX_PATH=${PREFIX}

SUBST_CLASSES+= py-interp
SUBST_FILES.py-interp+= bin/catkin_*
SUBST_FILES.py-interp+= cmake/*.py cmake/*/*.py cmake/*/*.py.in
SUBST_FILES.py-interp+= doc/*.py
SUBST_FILES.py-interp+= test/*/*.py

SUBST_CLASSES+= bash-interp
SUBST_FILES.bash-interp+= cmake/templates/*.bash.in

include ../../sysutils/py-catkin-pkg/depend.mk
include ../../mk/sysdep/bash.mk
include ../../mk/sysdep/cmake.mk
include ../../mk/sysdep/googletest.mk
include ../../mk/sysdep/py-argparse.mk
include ../../mk/sysdep/py-empy.mk
include ../../mk/sysdep/py-nose.mk
include ../../mk/robotpkg.mk
Loading

0 comments on commit a5b6c06

Please sign in to comment.