upd to noetic, cmake vars, python

2 files changed, 39 insertions, 43 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e878a6cacecd..4a298c4bffc6 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,4 +1,4 @@
-pkgbase = ros-melodic-diagnostic-aggregator
+pkgbase = ros-noetic-diagnostic-aggregator
 	pkgdesc = ROS - diagnostic_aggregator.
 	pkgver = 1.9.3
 	pkgrel = 3
@@ -11,24 +11,24 @@ pkgbase = ros-melodic-diagnostic-aggregator
 	license = BSD
 	makedepends = cmake
 	makedepends = ros-build-tools
-	makedepends = ros-melodic-bondcpp
-	makedepends = ros-melodic-xmlrpcpp
-	makedepends = ros-melodic-rostest
-	makedepends = ros-melodic-diagnostic-msgs
-	makedepends = ros-melodic-bondpy
-	makedepends = ros-melodic-catkin
-	makedepends = ros-melodic-roscpp
-	makedepends = ros-melodic-rospy
-	makedepends = ros-melodic-pluginlib
-	depends = ros-melodic-bondcpp
-	depends = ros-melodic-xmlrpcpp
-	depends = ros-melodic-diagnostic-msgs
-	depends = ros-melodic-bondpy
-	depends = ros-melodic-roscpp
-	depends = ros-melodic-rospy
-	depends = ros-melodic-pluginlib
-	source = ros-melodic-diagnostic-aggregator-1.9.3.tar.gz::https://github.com/ros/diagnostics/archive/1.9.3.tar.gz
+	makedepends = ros-noetic-bondcpp
+	makedepends = ros-noetic-xmlrpcpp
+	makedepends = ros-noetic-rostest
+	makedepends = ros-noetic-diagnostic-msgs
+	makedepends = ros-noetic-bondpy
+	makedepends = ros-noetic-catkin
+	makedepends = ros-noetic-roscpp
+	makedepends = ros-noetic-rospy
+	makedepends = ros-noetic-pluginlib
+	depends = ros-noetic-bondcpp
+	depends = ros-noetic-xmlrpcpp
+	depends = ros-noetic-diagnostic-msgs
+	depends = ros-noetic-bondpy
+	depends = ros-noetic-roscpp
+	depends = ros-noetic-rospy
+	depends = ros-noetic-pluginlib
+	source = ros-noetic-diagnostic-aggregator-1.9.3.tar.gz::https://github.com/ros/diagnostics/archive/1.9.3.tar.gz
 	sha256sums = 3b2d3bb7bb333b8685fa084e086c00a044803dac41ff58351161440931d23550
 
-pkgname = ros-melodic-diagnostic-aggregator
+pkgname = ros-noetic-diagnostic-aggregator
 
diff --git a/PKGBUILD b/PKGBUILD
index ac36a0e4d06a..0dfc8bbe1de0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 pkgdesc="ROS - diagnostic_aggregator."
 url='https://www.wiki.ros.org/diagnostic_aggregator'
 
-pkgname='ros-melodic-diagnostic-aggregator'
+pkgname='ros-noetic-diagnostic-aggregator'
 pkgver='1.9.3'
 _pkgver_patch=0
 arch=('i686' 'x86_64' 'aarch64' 'armv7h' 'armv6h')
@@ -11,15 +11,15 @@ pkgrel=3
 license=('BSD')
 
 ros_makedepends=(
-	ros-melodic-bondcpp
-	ros-melodic-xmlrpcpp
-	ros-melodic-rostest
-	ros-melodic-diagnostic-msgs
-	ros-melodic-bondpy
-	ros-melodic-catkin
-	ros-melodic-roscpp
-	ros-melodic-rospy
-	ros-melodic-pluginlib
+	ros-noetic-bondcpp
+	ros-noetic-xmlrpcpp
+	ros-noetic-rostest
+	ros-noetic-diagnostic-msgs
+	ros-noetic-bondpy
+	ros-noetic-catkin
+	ros-noetic-roscpp
+	ros-noetic-rospy
+	ros-noetic-pluginlib
 )
 
 makedepends=(
@@ -29,13 +29,13 @@ makedepends=(
 )
 
 ros_depends=(
-	ros-melodic-bondcpp
-	ros-melodic-xmlrpcpp
-	ros-melodic-diagnostic-msgs
-	ros-melodic-bondpy
-	ros-melodic-roscpp
-	ros-melodic-rospy
-	ros-melodic-pluginlib
+	ros-noetic-bondcpp
+	ros-noetic-xmlrpcpp
+	ros-noetic-diagnostic-msgs
+	ros-noetic-bondpy
+	ros-noetic-roscpp
+	ros-noetic-rospy
+	ros-noetic-pluginlib
 )
 
 depends=(
@@ -49,21 +49,17 @@ sha256sums=('3b2d3bb7bb333b8685fa084e086c00a044803dac41ff58351161440931d23550')
 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
 }