upd to noetic, cmake vars, python

2 files changed, 27 insertions, 31 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c7c596d5d42b..bfbd5ffeed48 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,4 +1,4 @@
-pkgbase = ros-melodic-urdf
+pkgbase = ros-noetic-urdf
 	pkgdesc = ROS - This package contains a C++ parser for the Unified Robot Description Format (URDF), which is an XML format for representing a robot model.
 	pkgver = 1.13.1
 	pkgrel = 3
@@ -11,26 +11,26 @@ pkgbase = ros-melodic-urdf
 	license = BSD
 	makedepends = cmake
 	makedepends = ros-build-tools
-	makedepends = ros-melodic-urdf-parser-plugin
-	makedepends = ros-melodic-cmake-modules
-	makedepends = ros-melodic-catkin
-	makedepends = ros-melodic-rosconsole-bridge
-	makedepends = ros-melodic-roscpp
-	makedepends = ros-melodic-pluginlib
-	makedepends = ros-melodic-rostest
+	makedepends = ros-noetic-urdf-parser-plugin
+	makedepends = ros-noetic-cmake-modules
+	makedepends = ros-noetic-catkin
+	makedepends = ros-noetic-rosconsole-bridge
+	makedepends = ros-noetic-roscpp
+	makedepends = ros-noetic-pluginlib
+	makedepends = ros-noetic-rostest
 	makedepends = tinyxml
 	makedepends = tinyxml2
 	makedepends = urdfdom
 	makedepends = urdfdom-headers
-	depends = ros-melodic-rosconsole-bridge
-	depends = ros-melodic-pluginlib
-	depends = ros-melodic-roscpp
+	depends = ros-noetic-rosconsole-bridge
+	depends = ros-noetic-pluginlib
+	depends = ros-noetic-roscpp
 	depends = tinyxml
 	depends = tinyxml2
 	depends = urdfdom
 	depends = urdfdom-headers
-	source = ros-melodic-urdf-1.13.1.tar.gz::https://github.com/ros/urdf/archive/1.13.1.tar.gz
+	source = ros-noetic-urdf-1.13.1.tar.gz::https://github.com/ros/urdf/archive/1.13.1.tar.gz
 	sha256sums = 9959b9963a5c112f71995405e8aa6d4dcf634e9f38f061ed7577d3db449179d6
 
-pkgname = ros-melodic-urdf
+pkgname = ros-noetic-urdf
 
diff --git a/PKGBUILD b/PKGBUILD
index eac88cc03a5f..123f865ebeb2 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 pkgdesc="ROS - This package contains a C++ parser for the Unified Robot Description Format (URDF), which is an XML format for representing a robot model."
 url='https://wiki.ros.org/urdf'
 
-pkgname='ros-melodic-urdf'
+pkgname='ros-noetic-urdf'
 pkgver='1.13.1'
 _pkgver_patch=0
 arch=('i686' 'x86_64' 'aarch64' 'armv7h' 'armv6h')
@@ -11,13 +11,13 @@ pkgrel=3
 license=('BSD')
 
 ros_makedepends=(
-	ros-melodic-urdf-parser-plugin
-	ros-melodic-cmake-modules
-	ros-melodic-catkin
-	ros-melodic-rosconsole-bridge
-	ros-melodic-roscpp
-	ros-melodic-pluginlib
-	ros-melodic-rostest
+	ros-noetic-urdf-parser-plugin
+	ros-noetic-cmake-modules
+	ros-noetic-catkin
+	ros-noetic-rosconsole-bridge
+	ros-noetic-roscpp
+	ros-noetic-pluginlib
+	ros-noetic-rostest
 )
 
 makedepends=(
@@ -31,9 +31,9 @@ makedepends=(
 )
 
 ros_depends=(
-	ros-melodic-rosconsole-bridge
-	ros-melodic-pluginlib
-	ros-melodic-roscpp
+	ros-noetic-rosconsole-bridge
+	ros-noetic-pluginlib
+	ros-noetic-roscpp
 )
 
 depends=(
@@ -51,21 +51,17 @@ sha256sums=('9959b9963a5c112f71995405e8aa6d4dcf634e9f38f061ed7577d3db449179d6')
 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
 }