upd to noetic, cmake vars, python

2 files changed, 37 insertions, 41 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 5b234d743dae..22ca934926ae 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,4 +1,4 @@
-pkgbase = ros-melodic-interactive-markers
+pkgbase = ros-noetic-interactive-markers
 	pkgdesc = ROS - 3D interactive marker communication library for RViz and similar tools.
 	pkgver = 1.11.4
 	pkgrel = 3
@@ -11,23 +11,23 @@ pkgbase = ros-melodic-interactive-markers
 	license = BSD
 	makedepends = cmake
 	makedepends = ros-build-tools
-	makedepends = ros-melodic-rostest
-	makedepends = ros-melodic-catkin
-	makedepends = ros-melodic-tf
-	makedepends = ros-melodic-std-msgs
-	makedepends = ros-melodic-rosconsole
-	makedepends = ros-melodic-roscpp
-	makedepends = ros-melodic-visualization-msgs
-	makedepends = ros-melodic-rospy
-	depends = ros-melodic-rostest
-	depends = ros-melodic-tf
-	depends = ros-melodic-std-msgs
-	depends = ros-melodic-rosconsole
-	depends = ros-melodic-roscpp
-	depends = ros-melodic-visualization-msgs
-	depends = ros-melodic-rospy
-	source = ros-melodic-interactive-markers-1.11.4.tar.gz::https://github.com/ros-visualization/interactive_markers/archive/1.11.4.tar.gz
+	makedepends = ros-noetic-rostest
+	makedepends = ros-noetic-catkin
+	makedepends = ros-noetic-tf
+	makedepends = ros-noetic-std-msgs
+	makedepends = ros-noetic-rosconsole
+	makedepends = ros-noetic-roscpp
+	makedepends = ros-noetic-visualization-msgs
+	makedepends = ros-noetic-rospy
+	depends = ros-noetic-rostest
+	depends = ros-noetic-tf
+	depends = ros-noetic-std-msgs
+	depends = ros-noetic-rosconsole
+	depends = ros-noetic-roscpp
+	depends = ros-noetic-visualization-msgs
+	depends = ros-noetic-rospy
+	source = ros-noetic-interactive-markers-1.11.4.tar.gz::https://github.com/ros-visualization/interactive_markers/archive/1.11.4.tar.gz
 	sha256sums = 33319252510cae10a8a2e2af5ac104f33ebb0b2f5ae8d9ab9649b5dc9ee34a7a
 
-pkgname = ros-melodic-interactive-markers
+pkgname = ros-noetic-interactive-markers
 
diff --git a/PKGBUILD b/PKGBUILD
index 5f912576239a..057af5247174 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 pkgdesc="ROS - 3D interactive marker communication library for RViz and similar tools."
 url='https://wiki.ros.org/interactive_markers'
 
-pkgname='ros-melodic-interactive-markers'
+pkgname='ros-noetic-interactive-markers'
 pkgver='1.11.4'
 _pkgver_patch=0
 arch=('i686' 'x86_64' 'aarch64' 'armv7h' 'armv6h')
@@ -11,14 +11,14 @@ pkgrel=3
 license=('BSD')
 
 ros_makedepends=(
-	ros-melodic-rostest
-	ros-melodic-catkin
-	ros-melodic-tf
-	ros-melodic-std-msgs
-	ros-melodic-rosconsole
-	ros-melodic-roscpp
-	ros-melodic-visualization-msgs
-	ros-melodic-rospy
+	ros-noetic-rostest
+	ros-noetic-catkin
+	ros-noetic-tf
+	ros-noetic-std-msgs
+	ros-noetic-rosconsole
+	ros-noetic-roscpp
+	ros-noetic-visualization-msgs
+	ros-noetic-rospy
 )
 
 makedepends=(
@@ -28,13 +28,13 @@ makedepends=(
 )
 
 ros_depends=(
-	ros-melodic-rostest
-	ros-melodic-tf
-	ros-melodic-std-msgs
-	ros-melodic-rosconsole
-	ros-melodic-roscpp
-	ros-melodic-visualization-msgs
-	ros-melodic-rospy
+	ros-noetic-rostest
+	ros-noetic-tf
+	ros-noetic-std-msgs
+	ros-noetic-rosconsole
+	ros-noetic-roscpp
+	ros-noetic-visualization-msgs
+	ros-noetic-rospy
 )
 
 depends=(
@@ -48,21 +48,17 @@ sha256sums=('33319252510cae10a8a2e2af5ac104f33ebb0b2f5ae8d9ab9649b5dc9ee34a7a')
 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 the 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 the project.
 	cmake ${srcdir}/${_dir} \
-		-DCMAKE_BUILD_TYPE=Release \
 		-DCATKIN_BUILD_BINARY_PACKAGE=ON \
-		-DCMAKE_INSTALL_PREFIX=/opt/ros/melodic \
-		-DPYTHON_EXECUTABLE=/usr/bin/python3 \
+		-DCMAKE_INSTALL_PREFIX=/opt/ros/noetic \
+		-DPYTHON_EXECUTABLE=/usr/bin/python \
 		-DSETUPTOOLS_DEB_LAYOUT=OFF
 	make
 }