upd to noetic, cmake vars, python

2 files changed, 25 insertions, 32 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a7a8fc462ec..f3663e4223c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,4 +1,4 @@
-pkgbase = ros-melodic-moveit-commander
+pkgbase = ros-noetic-moveit-commander
 	pkgdesc = ROS - Python interfaces to MoveIt.
 	pkgver = 1.0.2
 	pkgrel = 2
@@ -7,21 +7,21 @@ pkgbase = ros-melodic-moveit-commander
 	license = BSD
 	makedepends = cmake
 	makedepends = ros-build-tools
-	makedepends = ros-melodic-catkin
-	makedepends = ros-melodic-moveit-resources
+	makedepends = ros-noetic-catkin
+	makedepends = ros-noetic-moveit-resources
 	makedepends = python
 	makedepends = python-catkin-pkg
-	depends = ros-melodic-moveit-msgs
-	depends = ros-melodic-tf
-	depends = ros-melodic-geometry-msgs
-	depends = ros-melodic-rospy
-	depends = ros-melodic-moveit-ros-planning-interface
-	depends = ros-melodic-sensor-msgs
-	depends = ros-melodic-shape-msgs
+	depends = ros-noetic-moveit-msgs
+	depends = ros-noetic-tf
+	depends = ros-noetic-geometry-msgs
+	depends = ros-noetic-rospy
+	depends = ros-noetic-moveit-ros-planning-interface
+	depends = ros-noetic-sensor-msgs
+	depends = ros-noetic-shape-msgs
 	depends = python
 	depends = python-pyassimp
-	source = ros-melodic-moveit-commander-1.0.2.tar.gz::https://github.com/ros-planning/moveit/archive/1.0.2.tar.gz
+	source = ros-noetic-moveit-commander-1.0.2.tar.gz::https://github.com/ros-planning/moveit/archive/1.0.2.tar.gz
 	sha256sums = b8194308c57dbe34bbb729cfccb30d1113af3a54a90a2cfb49482142d1044ea4
 
-pkgname = ros-melodic-moveit-commander
+pkgname = ros-noetic-moveit-commander
 
diff --git a/PKGBUILD b/PKGBUILD
index 1aaf8926cc0..4165a813e87 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,26 +2,26 @@
 pkgdesc="ROS - Python interfaces to MoveIt."
 url='https://moveit.ros.org'
 
-pkgname='ros-melodic-moveit-commander'
+pkgname='ros-noetic-moveit-commander'
 pkgver='1.0.2'
 arch=('any')
 pkgrel=2
 license=('BSD')
 
-ros_makedepends=(ros-melodic-catkin
-  ros-melodic-moveit-resources)
+ros_makedepends=(ros-noetic-catkin
+  ros-noetic-moveit-resources)
 makedepends=('cmake' 'ros-build-tools'
   ${ros_makedepends[@]}
   python
   python-catkin-pkg)
 
-ros_depends=(ros-melodic-moveit-msgs
-  ros-melodic-tf
-  ros-melodic-geometry-msgs
-  ros-melodic-rospy
-  ros-melodic-moveit-ros-planning-interface
-  ros-melodic-sensor-msgs
-  ros-melodic-shape-msgs)
+ros_depends=(ros-noetic-moveit-msgs
+  ros-noetic-tf
+  ros-noetic-geometry-msgs
+  ros-noetic-rospy
+  ros-noetic-moveit-ros-planning-interface
+  ros-noetic-sensor-msgs
+  ros-noetic-shape-msgs)
 depends=(${ros_depends[@]}
   python
   python-pyassimp)
@@ -34,24 +34,17 @@ sha256sums=('b8194308c57dbe34bbb729cfccb30d1113af3a54a90a2cfb49482142d1044ea4')
 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 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 project
   cmake ${srcdir}/${_dir} \
-        -DCMAKE_BUILD_TYPE=Release \
         -DCATKIN_BUILD_BINARY_PACKAGE=ON \
-        -DCMAKE_INSTALL_PREFIX=/opt/ros/melodic \
-        -DPYTHON_EXECUTABLE=/usr/bin/python3 \
-        -DPYTHON_INCLUDE_DIR=/usr/include/python3.7m \
-        -DPYTHON_LIBRARY=/usr/lib/libpython3.7m.so \
-        -DPYTHON_BASENAME=-python3.7m \
+        -DCMAKE_INSTALL_PREFIX=/opt/ros/noetic \
+        -DPYTHON_EXECUTABLE=/usr/bin/python \
         -DSETUPTOOLS_DEB_LAYOUT=OFF
   make
 }