fix
This commit is contained in:
parent
0247d56aab
commit
e24dfed805
@ -161,19 +161,19 @@ cd ..
|
|||||||
cd ..
|
cd ..
|
||||||
|
|
||||||
# for colcon build tools
|
# for colcon build tools
|
||||||
cd build_tools
|
#cd build_tools
|
||||||
export BUILD_WORSPCE=$PWD
|
#export BUILD_WORSPCE=$PWD
|
||||||
./colcon/colcon-core/bin/colcon build --paths colcon/* --merge-install
|
#./colcon/colcon-core/bin/colcon build --paths colcon/* --merge-install
|
||||||
source install/local_setup.sh
|
#source install/local_setup.sh
|
||||||
cd ..
|
#cd ..
|
||||||
|
|
||||||
# for workspace
|
# for workspace
|
||||||
cd workspace
|
#cd workspace
|
||||||
colcon build --merge-install
|
#colcon build --merge-install
|
||||||
cp ../install_dependence.sh install/
|
#cp ../install_dependence.sh install/
|
||||||
cp -r ../build_tools/install/bin install/
|
#cp -r ../build_tools/install/bin install/
|
||||||
cp -r ../build_tools/install/lib install/
|
#cp -r ../build_tools/install/lib install/
|
||||||
cp -r ../build_tools/install/share install/
|
#cp -r ../build_tools/install/share install/
|
||||||
|
|
||||||
####
|
####
|
||||||
# for unit test 循环拷贝所有的东西
|
# for unit test 循环拷贝所有的东西
|
||||||
@ -184,20 +184,20 @@ cp -r ../build_tools/install/share install/
|
|||||||
# 对install内部的变量名称进行替换
|
# 对install内部的变量名称进行替换
|
||||||
#
|
#
|
||||||
####
|
####
|
||||||
SRC_PATH=$PWD/install
|
#SRC_PATH=$PWD/install
|
||||||
DST_PATH=/opt/ros/foxy
|
#DST_PATH=/opt/ros/foxy
|
||||||
sed -i "s:${SRC_PATH}:${DST_PATH}:g" `grep -rIln "${SRC_PATH}" install/*`
|
#sed -i "s:${SRC_PATH}:${DST_PATH}:g" `grep -rIln "${SRC_PATH}" install/*`
|
||||||
|
|
||||||
SRC_PATH=$BUILD_WORSPCE/install
|
#SRC_PATH=$BUILD_WORSPCE/install
|
||||||
DST_PATH=/opt/ros/foxy
|
#DST_PATH=/opt/ros/foxy
|
||||||
sed -i "s:${SRC_PATH}:${DST_PATH}:g" `grep -rIln "${SRC_PATH}" install/*`
|
#sed -i "s:${SRC_PATH}:${DST_PATH}:g" `grep -rIln "${SRC_PATH}" install/*`
|
||||||
|
|
||||||
####
|
####
|
||||||
# install
|
# install
|
||||||
#
|
#
|
||||||
####
|
####
|
||||||
mkdir -p %{buildroot}/opt/ros/foxy/
|
#mkdir -p %{buildroot}/opt/ros/foxy/
|
||||||
cp -r install/* %{buildroot}/opt/ros/foxy/
|
#cp -r install/* %{buildroot}/opt/ros/foxy/
|
||||||
|
|
||||||
###for debug
|
###for debug
|
||||||
#mkdir -p %{buildroot}/opt/ros/foxy/log
|
#mkdir -p %{buildroot}/opt/ros/foxy/log
|
||||||
@ -205,7 +205,6 @@ cp -r install/* %{buildroot}/opt/ros/foxy/
|
|||||||
|
|
||||||
%files
|
%files
|
||||||
%defattr(-,root,root)
|
%defattr(-,root,root)
|
||||||
/opt/ros/foxy/*
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
* Sat Nov 19 2022 openEuler Buildteam <hanhaomin008@126.com> - 0.9.2-2
|
* Sat Nov 19 2022 openEuler Buildteam <hanhaomin008@126.com> - 0.9.2-2
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user