Skip to content

Commit

Permalink
now the 24.04 docker build is working
Browse files Browse the repository at this point in the history
  • Loading branch information
lucasw committed Jul 15, 2024
1 parent 67ab583 commit 70bc0a8
Show file tree
Hide file tree
Showing 4 changed files with 21 additions and 8 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,10 @@ COPY git_clone.sh $SRC/ros_from_src
# RUN ROS_CONSOLE=$ROSCONSOLE $SRC/ros_from_src/git_clone.sh
RUN $SRC/ros_from_src/git_clone.sh

COPY env.sh underlay_ws
COPY build.sh $SRC/ros_from_src
RUN $SRC/ros_from_src/build.sh

COPY env.sh $SRC/ros_from_src
COPY catkin.sh $SRC/ros_from_src
RUN $SRC/ros_from_src/catkin.sh

Expand Down
12 changes: 9 additions & 3 deletions build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,10 @@ echo $PYTHONPATH0
OPT_PYTHONPATH1=$DEST/local/lib/python$PYTHON_MAJOR_VERSION.$PYTHON_MINOR_VERSION/dist-packages/
mkdir -p $OPT_PYTHONPATH1
echo $PYTHONPATH1
export PYTHONPATH=$PYTHONPATH:$OPT_PYTHONPATH0:$OPT_PYTHONPATH1
echo PYTHONPATH=$PYTHONPATH:$OPT_PYTHONPATH0:$OPT_PYTHONPATH1

ROS_DEST=$DEST source $WS/../env.sh

# export PYTHONPATH=$PYTHONPATH:$OPT_PYTHONPATH0:$OPT_PYTHONPATH1

# catkin_pkg
cd $WS/catkin_pkg
Expand All @@ -44,7 +46,6 @@ ls -l $OPT_PYTHONPATH0/catkin_pkg* || ls -l $OPT_PYTHONPATH1/catkin_pkg*
python -c "import catkin_pkg; print(catkin_pkg.__version__)"
python -c "from catkin_pkg.package import parse_package"


# osrf pycommon
cd $WS/osrf_pycommon
# TODO(lucasw) install to $DEST
Expand Down Expand Up @@ -107,6 +108,8 @@ cd $BUILD/rospack
cmake $WS/rospack -DCATKIN_BUILD_BINARY_PACKAGE=ON -DCMAKE_INSTALL_PREFIX=$DEST -DPYTHON_EXECUTABLE=/usr/bin/python -DSETUPTOOLS_DEB_LAYOUT=OFF -Dcmake_modules_DIR=$DEST/share/cmake_modules/cmake/
make
make install
ls -l $DEST/lib
rospack help

# genmsg
mkdir -p $BUILD/genmsg
Expand Down Expand Up @@ -148,6 +151,9 @@ python3 setup.py install --prefix=$DEST --record install_manifest.txt --single-v
rosdep init || true
rosdep update

touch $WS/rosdep/test/CATKIN_IGNORE
touch $WS/catkin_pkg/test/CATKIN_IGNORE

# TODO(lucasw) already have a copy of this but needs to be in the workspace
# find / | grep setup.bash
# find / | grep catkin-config.cmake
8 changes: 7 additions & 1 deletion catkin.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
#!/bin/bash
set -e
set -x

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

WS=`pwd`/underlay_ws/src
echo $WS
Expand All @@ -10,6 +14,8 @@ echo "#####################"
pwd
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
Expand Down
7 changes: 4 additions & 3 deletions env.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
#!/usr/bin/bash
# source ros_from_src/env.sh
export ROS_DEST=`pwd`/ros
# export PATH=$PATH:$ROS_DEST/bin
# ROS_DEST=`pwd`/ros source ros_from_src/env.sh
# export ROS_DEST=`pwd`/ros
export PATH=$PATH:$ROS_DEST/bin
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$ROS_DEST/lib
# export PATH=$PATH:$ROS_DEST/local/bin

# python --version | awk '{print $2}' | cut -d'.' -f1
Expand Down

0 comments on commit 70bc0a8

Please sign in to comment.