upd to noetic, cmake vars, python

2 files changed, 33 insertions, 40 deletions

diff --git a/.SRCINFO b/.SRCINFO
index af10e3da0d96..d68c26bb2641 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,4 +1,4 @@
-pkgbase = ros-melodic-four-wheel-steering-controller
+pkgbase = ros-noetic-four-wheel-steering-controller
 	pkgdesc = ROS - Controller for a four wheel steering mobile base
 	pkgver = 0.15.0
 	pkgrel = 1
@@ -7,21 +7,21 @@ pkgbase = ros-melodic-four-wheel-steering-controller
 	license = BSD
 	makedepends = cmake
 	makedepends = ros-build-tools
-	makedepends = ros-melodic-catkin
-	makedepends = ros-melodic-controller-interface
-	makedepends = ros-melodic-nav-msgs
-	makedepends = ros-melodic-four-wheel-steering-msgs
-	makedepends = ros-melodic-realtime-tools
-	makedepends = ros-melodic-tf
-	makedepends = ros-melodic-urdf-geometry-parser
-	depends = ros-melodic-controller-interface
-	depends = ros-melodic-nav-msgs
-	depends = ros-melodic-four-wheel-steering-msgs
-	depends = ros-melodic-realtime-tools
-	depends = ros-melodic-tf
-	depends = ros-melodic-urdf-geometry-parser
-	source = ros-melodic-four-wheel-steering-controller-0.15.0.tar.gz::https://github.com/ros-controls/ros_controllers/archive/0.15.0.tar.gz
+	makedepends = ros-noetic-catkin
+	makedepends = ros-noetic-controller-interface
+	makedepends = ros-noetic-nav-msgs
+	makedepends = ros-noetic-four-wheel-steering-msgs
+	makedepends = ros-noetic-realtime-tools
+	makedepends = ros-noetic-tf
+	makedepends = ros-noetic-urdf-geometry-parser
+	depends = ros-noetic-controller-interface
+	depends = ros-noetic-nav-msgs
+	depends = ros-noetic-four-wheel-steering-msgs
+	depends = ros-noetic-realtime-tools
+	depends = ros-noetic-tf
+	depends = ros-noetic-urdf-geometry-parser
+	source = ros-noetic-four-wheel-steering-controller-0.15.0.tar.gz::https://github.com/ros-controls/ros_controllers/archive/0.15.0.tar.gz
 	sha256sums = 8c19481a28f394d5bf4372fb05a6c638fa2995614f9b0f82b8213ca32d15a4cf
 
-pkgname = ros-melodic-four-wheel-steering-controller
+pkgname = ros-noetic-four-wheel-steering-controller
 
diff --git a/PKGBUILD b/PKGBUILD
index 688968ef2186..86743a27a7e9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,28 +2,28 @@
 pkgdesc="ROS - Controller for a four wheel steering mobile base"
 url='https://wiki.ros.org/four_wheel_steering_controller'
 
-pkgname='ros-melodic-four-wheel-steering-controller'
+pkgname='ros-noetic-four-wheel-steering-controller'
 pkgver='0.15.0'
 arch=('any')
 pkgrel=1
 license=('BSD')
 
-ros_makedepends=(ros-melodic-catkin
-  ros-melodic-controller-interface
-  ros-melodic-nav-msgs
-  ros-melodic-four-wheel-steering-msgs
-  ros-melodic-realtime-tools
-  ros-melodic-tf
-  ros-melodic-urdf-geometry-parser)
+ros_makedepends=(ros-noetic-catkin
+  ros-noetic-controller-interface
+  ros-noetic-nav-msgs
+  ros-noetic-four-wheel-steering-msgs
+  ros-noetic-realtime-tools
+  ros-noetic-tf
+  ros-noetic-urdf-geometry-parser)
 makedepends=('cmake' 'ros-build-tools'
   ${ros_makedepends[@]})
 
-ros_depends=(ros-melodic-controller-interface
-  ros-melodic-nav-msgs
-  ros-melodic-four-wheel-steering-msgs
-  ros-melodic-realtime-tools
-  ros-melodic-tf
-  ros-melodic-urdf-geometry-parser)
+ros_depends=(ros-noetic-controller-interface
+  ros-noetic-nav-msgs
+  ros-noetic-four-wheel-steering-msgs
+  ros-noetic-realtime-tools
+  ros-noetic-tf
+  ros-noetic-urdf-geometry-parser)
 depends=(${ros_depends[@]})
 
 _dir="ros_controllers-${pkgver}/four_wheel_steering_controller"
@@ -33,24 +33,17 @@ sha256sums=('8c19481a28f394d5bf4372fb05a6c638fa2995614f9b0f82b8213ca32d15a4cf')
 build() {
   # Use ROS environment variables
   source /usr/share/ros-build-tools/clear-ros-env.sh
-  [ -f /opt/ros/melodic/setup.bash ] && source /opt/ros/melodic/setup.bash
+  [ -f /opt/ros/noetic/setup.bash ] && source /opt/ros/noetic/setup.bash
 
   # Create build directory
   [ -d ${srcdir}/build ] || mkdir ${srcdir}/build
   cd ${srcdir}/build
 
-  # Fix Python2/Python3 conflicts
-  /usr/share/ros-build-tools/fix-python-scripts.sh -v 3 ${srcdir}/${_dir}
-
   # Build project
   cmake ${srcdir}/${_dir} \
-        -DCMAKE_BUILD_TYPE=Release \
         -DCATKIN_BUILD_BINARY_PACKAGE=ON \
-        -DCMAKE_INSTALL_PREFIX=/opt/ros/melodic \
-        -DPYTHON_EXECUTABLE=/usr/bin/python3 \
-        -DPYTHON_INCLUDE_DIR=/usr/include/python3.7 \
-        -DPYTHON_LIBRARY=/usr/lib/libpython3.7.so \
-        -DPYTHON_BASENAME=-python3.7 \
+        -DCMAKE_INSTALL_PREFIX=/opt/ros/noetic \
+        -DPYTHON_EXECUTABLE=/usr/bin/python \
         -DSETUPTOOLS_DEB_LAYOUT=OFF
   make
 }