upd to noetic, cmake vars, python

2 files changed, 14 insertions, 21 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 7433a1af2dab..977531fa20b5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,4 +1,4 @@
-pkgbase = ros-melodic-moveit-resources
+pkgbase = ros-noetic-moveit-resources
 	pkgdesc = ROS - Resources used for MoveIt! testing.
 	pkgver = 0.6.4
 	pkgrel = 2
@@ -7,11 +7,11 @@ pkgbase = ros-melodic-moveit-resources
 	license = BSD
 	makedepends = cmake
 	makedepends = ros-build-tools
-	makedepends = ros-melodic-catkin
-	depends = ros-melodic-joint-state-publisher
-	depends = ros-melodic-robot-state-publisher
-	source = ros-melodic-moveit-resources-0.6.4.tar.gz::https://github.com/ros-planning/moveit_resources/archive/0.6.4.tar.gz
+	makedepends = ros-noetic-catkin
+	depends = ros-noetic-joint-state-publisher
+	depends = ros-noetic-robot-state-publisher
+	source = ros-noetic-moveit-resources-0.6.4.tar.gz::https://github.com/ros-planning/moveit_resources/archive/0.6.4.tar.gz
 	sha256sums = 6d050a7511f930ca2e2080bcfa379134687eaa24010e2a2cb350dd827de099f1
 
-pkgname = ros-melodic-moveit-resources
+pkgname = ros-noetic-moveit-resources
 
diff --git a/PKGBUILD b/PKGBUILD
index 19d836b5a304..5a65428b7ba5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,22 +2,22 @@
 pkgdesc="ROS - Resources used for MoveIt! testing."
 url='https://moveit.ros.org'
 
-pkgname='ros-melodic-moveit-resources'
+pkgname='ros-noetic-moveit-resources'
 pkgver='0.6.4'
 arch=('any')
 pkgrel=2
 license=('BSD')
 
-ros_makedepends=(ros-melodic-catkin)
+ros_makedepends=(ros-noetic-catkin)
 makedepends=('cmake' 'ros-build-tools'
   ${ros_makedepends[@]})
 
-ros_depends=(ros-melodic-joint-state-publisher
-  ros-melodic-robot-state-publisher)
+ros_depends=(ros-noetic-joint-state-publisher
+  ros-noetic-robot-state-publisher)
 depends=(${ros_depends[@]})
 
 # Git version (e.g. for debugging)
-# _tag=release/melodic/moveit_resources/${pkgver}-${_pkgver_patch}
+# _tag=release/noetic/moveit_resources/${pkgver}-${_pkgver_patch}
 # _dir=${pkgname}
 # source=("${_dir}"::"git+https://github.com/ros-gbp/moveit_resources-release.git"#tag=${_tag})
 # sha256sums=('d98d7e113ff2313fdbc0799a2abf4dc39f462bf7dc904b9b9584cbe241883ab6')
@@ -30,24 +30,17 @@ sha256sums=('6d050a7511f930ca2e2080bcfa379134687eaa24010e2a2cb350dd827de099f1')
 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
 }