upd to noetic, cmake vars, python

2 files changed, 41 insertions, 45 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 2ac3a004ec28..a68f9b173026 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,4 +1,4 @@
-pkgbase = ros-melodic-rotors-gazebo-plugins
+pkgbase = ros-noetic-rotors-gazebo-plugins
 	pkgdesc = ROS - The rotors_gazebo_plugins package
 	pkgver = 2.2.3
 	pkgrel = 1
@@ -11,29 +11,29 @@ pkgbase = ros-melodic-rotors-gazebo-plugins
 	license = ASL 2.0
 	makedepends = cmake
 	makedepends = ros-build-tools
-	makedepends = ros-melodic-catkin
-	makedepends = ros-melodic-cmake-modules
-	makedepends = ros-melodic-cv-bridge
-	makedepends = ros-melodic-gazebo-plugins
-	makedepends = ros-melodic-gazebo-ros
-	makedepends = ros-melodic-geometry-msgs
-	makedepends = ros-melodic-mavros
-	makedepends = ros-melodic-mav-msgs
-	makedepends = ros-melodic-octomap-msgs
-	makedepends = ros-melodic-octomap-ros
-	makedepends = ros-melodic-octomap
-	makedepends = ros-melodic-rosbag
-	makedepends = ros-melodic-roscpp
-	makedepends = ros-melodic-rotors-comm
-	makedepends = ros-melodic-rotors-control
-	makedepends = ros-melodic-std-srvs
-	makedepends = ros-melodic-tf
+	makedepends = ros-noetic-catkin
+	makedepends = ros-noetic-cmake-modules
+	makedepends = ros-noetic-cv-bridge
+	makedepends = ros-noetic-gazebo-plugins
+	makedepends = ros-noetic-gazebo-ros
+	makedepends = ros-noetic-geometry-msgs
+	makedepends = ros-noetic-mavros
+	makedepends = ros-noetic-mav-msgs
+	makedepends = ros-noetic-octomap-msgs
+	makedepends = ros-noetic-octomap-ros
+	makedepends = ros-noetic-octomap
+	makedepends = ros-noetic-rosbag
+	makedepends = ros-noetic-roscpp
+	makedepends = ros-noetic-rotors-comm
+	makedepends = ros-noetic-rotors-control
+	makedepends = ros-noetic-std-srvs
+	makedepends = ros-noetic-tf
 	makedepends = gazebo
 	makedepends = google-glog
 	makedepends = protobuf
 	makedepends = yaml-cpp
-	source = ros-melodic-rotors-gazebo-plugins-2.2.3.tar.gz::https://github.com/ethz-asl/rotors_simulator/archive/2.2.3.tar.gz
+	source = ros-noetic-rotors-gazebo-plugins-2.2.3.tar.gz::https://github.com/ethz-asl/rotors_simulator/archive/2.2.3.tar.gz
 	sha256sums = 46e6be40ebd08ba41a4a532c1774228d240d11aa39ad82f9ab50e445dc4a6f20
 
-pkgname = ros-melodic-rotors-gazebo-plugins
+pkgname = ros-noetic-rotors-gazebo-plugins
 
diff --git a/PKGBUILD b/PKGBUILD
index 6edb1c173776..7ddf52b4643b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,30 +3,30 @@
 pkgdesc="ROS - The rotors_gazebo_plugins package"
 url='https://wiki.ros.org/rotors_gazebo_plugins'
 
-pkgname='ros-melodic-rotors-gazebo-plugins'
+pkgname='ros-noetic-rotors-gazebo-plugins'
 pkgver='2.2.3'
 arch=('i686' 'x86_64' 'aarch64' 'armv7h' 'armv6h')
 pkgrel=1
 license=('ASL 2.0')
 
 ros_makedepends=(
-    ros-melodic-catkin
-    ros-melodic-cmake-modules
-    ros-melodic-cv-bridge
-    ros-melodic-gazebo-plugins
-    ros-melodic-gazebo-ros
-    ros-melodic-geometry-msgs
-    ros-melodic-mavros
-    ros-melodic-mav-msgs
-    ros-melodic-octomap-msgs
-    ros-melodic-octomap-ros
-    ros-melodic-octomap
-    ros-melodic-rosbag
-    ros-melodic-roscpp
-    ros-melodic-rotors-comm
-    ros-melodic-rotors-control
-    ros-melodic-std-srvs
-    ros-melodic-tf
+    ros-noetic-catkin
+    ros-noetic-cmake-modules
+    ros-noetic-cv-bridge
+    ros-noetic-gazebo-plugins
+    ros-noetic-gazebo-ros
+    ros-noetic-geometry-msgs
+    ros-noetic-mavros
+    ros-noetic-mav-msgs
+    ros-noetic-octomap-msgs
+    ros-noetic-octomap-ros
+    ros-noetic-octomap
+    ros-noetic-rosbag
+    ros-noetic-roscpp
+    ros-noetic-rotors-comm
+    ros-noetic-rotors-control
+    ros-noetic-std-srvs
+    ros-noetic-tf
 )
 
 makedepends=(
@@ -53,21 +53,17 @@ sha256sums=('46e6be40ebd08ba41a4a532c1774228d240d11aa39ad82f9ab50e445dc4a6f20')
 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
 }