Skip to content

Commit

Permalink
making the base_repos.yaml smaller and running a limited catkin build…
Browse files Browse the repository at this point in the history
… on them, also will later build visualization and other repos
  • Loading branch information
lucasw committed Jul 17, 2024
1 parent 8573867 commit 44509d5
Show file tree
Hide file tree
Showing 8 changed files with 1,348 additions and 366 deletions.
13 changes: 13 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -39,5 +39,18 @@ RUN $SRC/ros_from_src/build.sh
COPY catkin.sh $SRC/ros_from_src
RUN $SRC/ros_from_src/catkin.sh

# WORKDIR $SRC/ros_from_src
RUN mkdir -p base_ws/src
COPY ubuntu_2404/base_repos.yaml base_ws/src
COPY ubuntu_2404/base_git_clone.sh $SRC/ros_from_src
# RUN ROS_CONSOLE=$ROSCONSOLE $SRC/ros_from_src/git_clone.sh
RUN $SRC/ros_from_src/base_git_clone.sh

COPY ubuntu_2404/dependencies.sh $SRC/ros_from_src/base_dependencies.sh
RUN $SRC/ros_from_src/base_dependencies.sh

COPY ubuntu_2404/base_catkin.sh $SRC/ros_from_src
RUN $SRC/ros_from_src/base_catkin.sh

WORKDIR $WS/..
# TODO(lucasw) run tests
2 changes: 1 addition & 1 deletion catkin.sh
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,6 @@ echo $LD_LIBRARY_PATH
rospack list

catkin build
source devel/setup.bash
source install/setup.bash
rospack list
# TODO(lucasw) run tests
25 changes: 25 additions & 0 deletions ubuntu_2404/base_catkin.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
#!/bin/bash
set -e
set -x

ls -l
ls -l ros/bin
ROS_DEST=`pwd`/ros source underlay_ws/env.sh

WS=`pwd`/base_ws/src
echo $WS

cd $WS/..
echo "#####################"
pwd
source ../underlay_ws/install/setup.bash
catkin init
catkin config --install --cmake-args -DCMAKE_BUILD_TYPE=Release -Wno-deprecated -DCATKIN_ENABLE_TESTING=False
echo $PATH
echo $LD_LIBRARY_PATH
rospack list

catkin build ros_comm
source install/setup.bash
rospack list
# TODO(lucasw) run tests
17 changes: 17 additions & 0 deletions ubuntu_2404/base_git_clone.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
#!/bin/bash
# TODO(lucasw) replace the below with submodules
# export PATH=$PATH:/usr/local/bin
set -e
set -x

WS=`pwd`/base_ws/src
echo $WS
mkdir $WS -p

# TODO(lucasw) replace these git clones with vcs
# packages that need to be cmake installed, and are ros packages in a catkin workspace
cd $WS
vcs import --input base_repos.yaml --retry 10

# ROSCONSOLE1=${ROSCONSOLE:-https://github.com/ros-o/rosconsole}
# git clone $ROSCONSOLE1
Loading

0 comments on commit 44509d5

Please sign in to comment.