Skip to content

Commit 84a1ed5

Browse files
Move ros-workspace test to catkin build scripts.
The ros_workspace package is a plain CMake (as opposed to an ament_cmake) package and thus uses the catkin build scripts rather than the ament_cmake build scripts.
1 parent 4e92309 commit 84a1ed5

File tree

4 files changed

+19
-19
lines changed

4 files changed

+19
-19
lines changed

vinca/templates/bld_ament_cmake.bat.in

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -39,12 +39,3 @@ if errorlevel 1 exit 1
3939

4040
cmake --build . --config Release --target install
4141
if errorlevel 1 exit 1
42-
43-
if "%PKG_NAME%" == "ros-@(ros_distro)-ros-workspace" (
44-
:: Copy the [de]activate scripts to %PREFIX%\etc\conda\[de]activate.d.
45-
:: This will allow them to be run on environment activation.
46-
for %%F in (activate deactivate) DO (
47-
if not exist %PREFIX%\etc\conda\%%F.d mkdir %PREFIX%\etc\conda\%%F.d
48-
copy %RECIPE_DIR%\%%F.bat %PREFIX%\etc\conda\%%F.d\%PKG_NAME%_%%F.bat
49-
)
50-
)

vinca/templates/bld_catkin.bat.in

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,3 +59,12 @@ if "%PKG_NAME%" == "ros-@(ros_distro)-catkin" (
5959
copy %RECIPE_DIR%\%%F.bat %PREFIX%\etc\conda\%%F.d\%PKG_NAME%_%%F.bat
6060
)
6161
)
62+
63+
if "%PKG_NAME%" == "ros-@(ros_distro)-ros-workspace" (
64+
:: Copy the [de]activate scripts to %PREFIX%\etc\conda\[de]activate.d.
65+
:: This will allow them to be run on environment activation.
66+
for %%F in (activate deactivate) DO (
67+
if not exist %PREFIX%\etc\conda\%%F.d mkdir %PREFIX%\etc\conda\%%F.d
68+
copy %RECIPE_DIR%\%%F.bat %PREFIX%\etc\conda\%%F.d\%PKG_NAME%_%%F.bat
69+
)
70+
)

vinca/templates/build_ament_cmake.sh.in

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -30,13 +30,3 @@ cmake \
3030
$SRC_DIR/$PKG_NAME/src/work
3131

3232
cmake --build . --config Release --target install
33-
34-
if [ "${PKG_NAME}" == "ros-@(ros_distro)-ros-workspace" ]; then
35-
# Copy the [de]activate scripts to $PREFIX/etc/conda/[de]activate.d.
36-
# This will allow them to be run on environment activation.
37-
for CHANGE in "activate" "deactivate"
38-
do
39-
mkdir -p "${PREFIX}/etc/conda/${CHANGE}.d"
40-
cp "${RECIPE_DIR}/${CHANGE}.sh" "${PREFIX}/etc/conda/${CHANGE}.d/${PKG_NAME}_${CHANGE}.sh"
41-
done
42-
fi

vinca/templates/build_catkin.sh.in

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,3 +89,13 @@ if [ "${PKG_NAME}" == "ros-@(ros_distro)-catkin" ]; then
8989
done
9090
fi
9191
fi
92+
93+
if [ "${PKG_NAME}" == "ros-@(ros_distro)-ros-workspace" ]; then
94+
# Copy the [de]activate scripts to $PREFIX/etc/conda/[de]activate.d.
95+
# This will allow them to be run on environment activation.
96+
for CHANGE in "activate" "deactivate"
97+
do
98+
mkdir -p "${PREFIX}/etc/conda/${CHANGE}.d"
99+
cp "${RECIPE_DIR}/${CHANGE}.sh" "${PREFIX}/etc/conda/${CHANGE}.d/${PKG_NAME}_${CHANGE}.sh"
100+
done
101+
fi

0 commit comments

Comments
 (0)