From 511bcc3d4a5b96489cc7ac35db3c9aefae47a8d4 Mon Sep 17 00:00:00 2001 From: Kei Okada Date: Tue, 28 Jul 2015 00:36:11 +0900 Subject: [PATCH] force catkin init; befire catkin build --- jsk.rosbuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jsk.rosbuild b/jsk.rosbuild index 592d60197..07e8e616a 100755 --- a/jsk.rosbuild +++ b/jsk.rosbuild @@ -255,7 +255,7 @@ function compile-pkg { if [ -e ${ROS_INSTALLDIR}_parent/src ]; then $COMMAND source /opt/ros/$DISTRIBUTION/setup.sh # - (cd ${ROS_INSTALLDIR}_parent && LC_ALL=C $COMMAND catkin build --no-status) + (cd ${ROS_INSTALLDIR}_parent && LC_ALL=C $COMMAND catkin init -w . && LC_ALL=C $COMMAND catkin build --no-status) if [ "`grep -c ${ROS_INSTALLDIR}_parent/devel/share ${ROS_INSTALLDIR}_parent/devel/.catkin`" == 0 ] ; then echo -n ";${ROS_INSTALLDIR}_parent/devel/share" >> ${ROS_INSTALLDIR}_parent/devel/.catkin echo "** force add ${ROS_INSTALLDIR}_parent/devel/share to ROS_PACKAGE_PATH" @@ -271,7 +271,7 @@ function compile-pkg { env | grep ROS # do compile - (cd $ROS_INSTALLDIR && LC_ALL=C $COMMAND catkin build --no-status $PACKAGES) + (cd $ROS_INSTALLDIR && LC_ALL=C $COMMAND catkin init -w . && LC_ALL=C $COMMAND catkin build --no-status $PACKAGES) ## load setup.sh $COMMAND source ${ROS_INSTALLDIR}/devel/setup.sh $COMMAND rospack profile