Updating package structure.

.gitignore

@@ -1,8 +1,14 @@
 # ROS files and directories
-build
-devel
-src
-.catkin_workspace
+external/build
+external/devel
+external/src
+external/build_isolated
+external/devel_isolated
+external/install_isolated
+internal/build
+internal/devel
+internal/src
+*.catkin_workspace
 
 # Swap files
 *.swp

external/blam-external.rosinstall

@@ -0,0 +1,4 @@
+- git:
+    local-name: gtsam_ros
+    uri: [email protected]:erik-nelson/gtsam_ros.git
+    version: master

blam.rosinstall → internal/blam-internal.rosinstall

@@ -1,44 +1,44 @@
 - git:
     local-name: geometry_utils
     uri: [email protected]:erik-nelson/geometry_utils.git
-    version: develop
+    version: master
 - git:
     local-name: parameter_utils
     uri: [email protected]:erik-nelson/parameter_utils.git
-    version: develop
+    version: master
 - git:
     local-name: measurement_synchronizer
     uri: [email protected]:erik-nelson/measurement_synchronizer.git
-    version: develop
+    version: master
 - git:
     local-name: point_cloud_filter
     uri: [email protected]:erik-nelson/point_cloud_filter.git
-    version: develop
+    version: master
 - git:
     local-name: point_cloud_localization
     uri: [email protected]:erik-nelson/point_cloud_localization.git
-    version: develop
+    version: master
 - git:
     local-name: point_cloud_mapper
     uri: [email protected]:erik-nelson/point_cloud_mapper.git
-    version: develop
+    version: master
 - git:
     local-name: point_cloud_odometry
     uri: [email protected]:erik-nelson/point_cloud_odometry.git
-    version: develop
+    version: master
 - git:
     local-name: point_cloud_visualizer
     uri: [email protected]:erik-nelson/point_cloud_visualizer.git
-    version: develop
+    version: master
 - git:
     local-name: blam_slam
     uri: [email protected]:erik-nelson/blam_slam.git
-    version: develop
+    version: master
 - git:
     local-name: blam_example
     uri: [email protected]:erik-nelson/blam_example.git
-    version: develop
+    version: master
 - git:
     local-name: laser_loop_closure
     uri: [email protected]:erik-nelson/laser_loop_closure.git
-    version: develop
+    version: master

update

@@ -2,12 +2,25 @@
 
 TOP_DIR="$(cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 
-cd ${TOP_DIR}
-echo 'Creating the ROS workspace'
-if [ ! -d "${TOP_DIR}/src" ]; then
+# Compile third party packages.
+cd ${TOP_DIR}/external
+echo 'Creating a ROS workspace for third party packages.'
+if [ ! -d "./src" ]; then
   wstool init src
 fi
-wstool merge -t src blam.rosinstall
+wstool merge -t src blam-external.rosinstall
+wstool up -t src
+catkin_make_isolated --install --cmake-args -DCMAKE_BUILD_TYPE=Release
+touch ${TOP_DIR}/external/install_isolated/.catkin
+source ${TOP_DIR}/external/install_isolated/setup.bash
+
+# Compile BLAM packages.
+cd ${TOP_DIR}/internal
+echo 'Creating a ROS workspace for BLAM packages.'
+if [ ! -d "./src" ]; then
+  wstool init src
+fi
+wstool merge -t src blam-internal.rosinstall
 wstool up -t src
 catkin_make --cmake-args -DCMAKE_BUILD_TYPE=Release
-source ${TOP_DIR}/devel/setup.bash
+source ${TOP_DIR}/internal/devel/setup.bash --extend

workon

@@ -1,4 +1,5 @@
 #!/bin/bash
 
 TOP_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-source ${TOP_DIR}/devel/setup.bash --extend
+source ${TOP_DIR}/external/install_isolated/setup.bash
+source ${TOP_DIR}/internal/devel/setup.bash --extend