Merge pull request #1051 from k-okada/1049

force catkin init; befire catkin build
jsk-ros-pkg · Jul 30, 2015 · c1acb10 · c1acb10
2 parents aa5d1a9 + 511bcc3
commit c1acb10
Showing 1 changed file with 2 additions and 2 deletions.
diff --git 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