Merge pull request #9 from nuclearsandwich/ros-workspace-build-type

Move ros-workspace test to catkin build scripts.

Author: wolfv

vinca/templates/bld_ament_cmake.bat.in

@@ -39,12 +39,3 @@ if errorlevel 1 exit 1
 
 cmake --build . --config Release --target install
 if errorlevel 1 exit 1
-
-if "%PKG_NAME%" == "ros-@(ros_distro)-ros-workspace" (
-    :: Copy the [de]activate scripts to %PREFIX%\etc\conda\[de]activate.d.
-    :: This will allow them to be run on environment activation.
-    for %%F in (activate deactivate) DO (
-        if not exist %PREFIX%\etc\conda\%%F.d mkdir %PREFIX%\etc\conda\%%F.d
-        copy %RECIPE_DIR%\%%F.bat %PREFIX%\etc\conda\%%F.d\%PKG_NAME%_%%F.bat
-    )
-)

vinca/templates/bld_catkin.bat.in

@@ -59,3 +59,12 @@ if "%PKG_NAME%" == "ros-@(ros_distro)-catkin" (
         copy %RECIPE_DIR%\%%F.bat %PREFIX%\etc\conda\%%F.d\%PKG_NAME%_%%F.bat
     )
 )
+
+if "%PKG_NAME%" == "ros-@(ros_distro)-ros-workspace" (
+    :: Copy the [de]activate scripts to %PREFIX%\etc\conda\[de]activate.d.
+    :: This will allow them to be run on environment activation.
+    for %%F in (activate deactivate) DO (
+        if not exist %PREFIX%\etc\conda\%%F.d mkdir %PREFIX%\etc\conda\%%F.d
+        copy %RECIPE_DIR%\%%F.bat %PREFIX%\etc\conda\%%F.d\%PKG_NAME%_%%F.bat
+    )
+)

vinca/templates/build_ament_cmake.sh.in

@@ -30,13 +30,3 @@ cmake \
     $SRC_DIR/$PKG_NAME/src/work
 
 cmake --build . --config Release --target install
-
-if [ "${PKG_NAME}" == "ros-@(ros_distro)-ros-workspace" ]; then
-    # Copy the [de]activate scripts to $PREFIX/etc/conda/[de]activate.d.
-    # This will allow them to be run on environment activation.
-    for CHANGE in "activate" "deactivate"
-    do
-        mkdir -p "${PREFIX}/etc/conda/${CHANGE}.d"
-        cp "${RECIPE_DIR}/${CHANGE}.sh" "${PREFIX}/etc/conda/${CHANGE}.d/${PKG_NAME}_${CHANGE}.sh"
-    done
-fi

vinca/templates/build_catkin.sh.in

@@ -89,3 +89,13 @@ if [ "${PKG_NAME}" == "ros-@(ros_distro)-catkin" ]; then
        done
    fi
 fi
+
+if [ "${PKG_NAME}" == "ros-@(ros_distro)-ros-workspace" ]; then
+    # Copy the [de]activate scripts to $PREFIX/etc/conda/[de]activate.d.
+    # This will allow them to be run on environment activation.
+    for CHANGE in "activate" "deactivate"
+    do
+        mkdir -p "${PREFIX}/etc/conda/${CHANGE}.d"
+        cp "${RECIPE_DIR}/${CHANGE}.sh" "${PREFIX}/etc/conda/${CHANGE}.d/${PKG_NAME}_${CHANGE}.sh"
+    done
+fi