upd to noetic, cmake vars, python

2 files changed, 30 insertions, 34 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 17fde243b78a..97c5265675eb 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,4 +1,4 @@
-pkgbase = ros-melodic-moveit-ros-warehouse
+pkgbase = ros-noetic-moveit-ros-warehouse
 	pkgdesc = ROS - Components of MoveIt connecting to MongoDB.
 	pkgver = 1.0.2
 	pkgrel = 2
@@ -11,19 +11,19 @@ pkgbase = ros-melodic-moveit-ros-warehouse
 	license = BSD
 	makedepends = cmake
 	makedepends = ros-build-tools
-	makedepends = ros-melodic-tf
-	makedepends = ros-melodic-warehouse-ros
-	makedepends = ros-melodic-roscpp
-	makedepends = ros-melodic-moveit-ros-planning
-	makedepends = ros-melodic-rosconsole
-	makedepends = ros-melodic-catkin
-	depends = ros-melodic-warehouse-ros
-	depends = ros-melodic-roscpp
-	depends = ros-melodic-moveit-ros-planning
-	depends = ros-melodic-rosconsole
-	depends = ros-melodic-tf
-	source = ros-melodic-moveit-ros-warehouse-1.0.2.tar.gz::https://github.com/ros-planning/moveit/archive/1.0.2.tar.gz
+	makedepends = ros-noetic-tf
+	makedepends = ros-noetic-warehouse-ros
+	makedepends = ros-noetic-roscpp
+	makedepends = ros-noetic-moveit-ros-planning
+	makedepends = ros-noetic-rosconsole
+	makedepends = ros-noetic-catkin
+	depends = ros-noetic-warehouse-ros
+	depends = ros-noetic-roscpp
+	depends = ros-noetic-moveit-ros-planning
+	depends = ros-noetic-rosconsole
+	depends = ros-noetic-tf
+	source = ros-noetic-moveit-ros-warehouse-1.0.2.tar.gz::https://github.com/ros-planning/moveit/archive/1.0.2.tar.gz
 	sha256sums = b8194308c57dbe34bbb729cfccb30d1113af3a54a90a2cfb49482142d1044ea4
 
-pkgname = ros-melodic-moveit-ros-warehouse
+pkgname = ros-noetic-moveit-ros-warehouse
 
diff --git a/PKGBUILD b/PKGBUILD
index 720c2fd91f56..68fdea9aeec4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,30 +2,30 @@
 pkgdesc="ROS - Components of MoveIt connecting to MongoDB."
 url='https://moveit.ros.org'
 
-pkgname='ros-melodic-moveit-ros-warehouse'
+pkgname='ros-noetic-moveit-ros-warehouse'
 pkgver='1.0.2'
 arch=('i686' 'x86_64' 'aarch64' 'armv7h' 'armv6h')
 pkgrel=2
 license=('BSD')
 
-ros_makedepends=(ros-melodic-tf
-  ros-melodic-warehouse-ros
-  ros-melodic-roscpp
-  ros-melodic-moveit-ros-planning
-  ros-melodic-rosconsole
-  ros-melodic-catkin)
+ros_makedepends=(ros-noetic-tf
+  ros-noetic-warehouse-ros
+  ros-noetic-roscpp
+  ros-noetic-moveit-ros-planning
+  ros-noetic-rosconsole
+  ros-noetic-catkin)
 makedepends=('cmake' 'ros-build-tools'
   ${ros_makedepends[@]})
 
-ros_depends=(ros-melodic-warehouse-ros
-  ros-melodic-roscpp
-  ros-melodic-moveit-ros-planning
-  ros-melodic-rosconsole
-  ros-melodic-tf)
+ros_depends=(ros-noetic-warehouse-ros
+  ros-noetic-roscpp
+  ros-noetic-moveit-ros-planning
+  ros-noetic-rosconsole
+  ros-noetic-tf)
 depends=(${ros_depends[@]})
 
 # Git version (e.g. for debugging)
-# _tag=release/melodic/moveit_ros_warehouse/${pkgver}-${_pkgver_patch}
+# _tag=release/noetic/moveit_ros_warehouse/${pkgver}-${_pkgver_patch}
 # _dir=${pkgname}
 # source=("${_dir}"::"git+https://github.com/ros-gbp/moveit-release.git"#tag=${_tag})
 # sha256sums=('43d6173332d19c008103c4f1fb1a114f8fab9d1010c717f4efe24e88e2b32a28')
@@ -38,21 +38,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 \
+        -DCMAKE_INSTALL_PREFIX=/opt/ros/noetic \
+        -DPYTHON_EXECUTABLE=/usr/bin/python \
         -DSETUPTOOLS_DEB_LAYOUT=OFF
   make
 }