upd to noetic, cmake vars, python

2 files changed, 31 insertions, 35 deletions

diff --git a/.SRCINFO b/.SRCINFO
index bdc92ee822ea..9e29d473885e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,4 +1,4 @@
-pkgbase = ros-melodic-test-diagnostic-aggregator
+pkgbase = ros-noetic-test-diagnostic-aggregator
 	pkgdesc = ROS - Basic diagnostic_aggregator tests are in the.
 	pkgver = 1.9.3
 	pkgrel = 3
@@ -11,20 +11,20 @@ pkgbase = ros-melodic-test-diagnostic-aggregator
 	license = BSD
 	makedepends = cmake
 	makedepends = ros-build-tools
-	makedepends = ros-melodic-diagnostic-msgs
-	makedepends = ros-melodic-rostest
-	makedepends = ros-melodic-catkin
-	makedepends = ros-melodic-roscpp
-	makedepends = ros-melodic-diagnostic-aggregator
-	makedepends = ros-melodic-rospy
-	makedepends = ros-melodic-pluginlib
-	depends = ros-melodic-diagnostic-msgs
-	depends = ros-melodic-roscpp
-	depends = ros-melodic-diagnostic-aggregator
-	depends = ros-melodic-rospy
-	depends = ros-melodic-pluginlib
-	source = ros-melodic-test-diagnostic-aggregator-1.9.3.tar.gz::https://github.com/ros/diagnostics/archive/1.9.3.tar.gz
+	makedepends = ros-noetic-diagnostic-msgs
+	makedepends = ros-noetic-rostest
+	makedepends = ros-noetic-catkin
+	makedepends = ros-noetic-roscpp
+	makedepends = ros-noetic-diagnostic-aggregator
+	makedepends = ros-noetic-rospy
+	makedepends = ros-noetic-pluginlib
+	depends = ros-noetic-diagnostic-msgs
+	depends = ros-noetic-roscpp
+	depends = ros-noetic-diagnostic-aggregator
+	depends = ros-noetic-rospy
+	depends = ros-noetic-pluginlib
+	source = ros-noetic-test-diagnostic-aggregator-1.9.3.tar.gz::https://github.com/ros/diagnostics/archive/1.9.3.tar.gz
 	sha256sums = 3b2d3bb7bb333b8685fa084e086c00a044803dac41ff58351161440931d23550
 
-pkgname = ros-melodic-test-diagnostic-aggregator
+pkgname = ros-noetic-test-diagnostic-aggregator
 
diff --git a/PKGBUILD b/PKGBUILD
index bad3ee4da536..e478895b3e19 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,20 +3,20 @@
 pkgdesc="ROS - Basic diagnostic_aggregator tests are in the."
 url='https://wiki.ros.org/test_diagnostic_aggregator'
 
-pkgname='ros-melodic-test-diagnostic-aggregator'
+pkgname='ros-noetic-test-diagnostic-aggregator'
 pkgver='1.9.3'
 arch=('i686' 'x86_64' 'aarch64' 'armv7h' 'armv6h')
 pkgrel=3
 license=('BSD')
 
 ros_makedepends=(
-	ros-melodic-diagnostic-msgs
-	ros-melodic-rostest
-	ros-melodic-catkin
-	ros-melodic-roscpp
-	ros-melodic-diagnostic-aggregator
-	ros-melodic-rospy
-	ros-melodic-pluginlib
+	ros-noetic-diagnostic-msgs
+	ros-noetic-rostest
+	ros-noetic-catkin
+	ros-noetic-roscpp
+	ros-noetic-diagnostic-aggregator
+	ros-noetic-rospy
+	ros-noetic-pluginlib
 )
 
 makedepends=(
@@ -26,11 +26,11 @@ makedepends=(
 )
 
 ros_depends=(
-	ros-melodic-diagnostic-msgs
-	ros-melodic-roscpp
-	ros-melodic-diagnostic-aggregator
-	ros-melodic-rospy
-	ros-melodic-pluginlib
+	ros-noetic-diagnostic-msgs
+	ros-noetic-roscpp
+	ros-noetic-diagnostic-aggregator
+	ros-noetic-rospy
+	ros-noetic-pluginlib
 )
 
 depends=(
@@ -44,21 +44,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
 }