upd to noetic, cmake vars, python

2 files changed, 54 insertions, 58 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 6db11038cfd0..90f8a1fa796c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,4 +1,4 @@
-pkgbase = ros-melodic-moveit-core
+pkgbase = ros-noetic-moveit-core
 	pkgdesc = ROS - Core libraries used by MoveIt!.
 	pkgver = 1.0.2
 	pkgrel = 4
@@ -11,30 +11,30 @@ pkgbase = ros-melodic-moveit-core
 	license = BSD
 	makedepends = cmake
 	makedepends = ros-build-tools
-	makedepends = ros-melodic-moveit-resources
-	makedepends = ros-melodic-angles
+	makedepends = ros-noetic-moveit-resources
+	makedepends = ros-noetic-angles
 	makedepends = pkg-config
-	depends = ros-melodic-eigen-stl-containers
-	depends = ros-melodic-geometric-shapes
-	depends = ros-melodic-geometry-msgs
-	depends = ros-melodic-kdl-parser
-	depends = ros-melodic-urdf
-	depends = ros-melodic-moveit-msgs
-	depends = ros-melodic-octomap
-	depends = ros-melodic-octomap-msgs
-	depends = ros-melodic-random-numbers
-	depends = ros-melodic-roslib
-	depends = ros-melodic-rostime
-	depends = ros-melodic-rosconsole
-	depends = ros-melodic-sensor-msgs
-	depends = ros-melodic-shape-msgs
-	depends = ros-melodic-srdfdom
-	depends = ros-melodic-std-msgs
-	depends = ros-melodic-tf2-eigen
-	depends = ros-melodic-tf2-geometry-msgs
-	depends = ros-melodic-trajectory-msgs
-	depends = ros-melodic-visualization-msgs
-	depends = ros-melodic-xmlrpcpp
+	depends = ros-noetic-eigen-stl-containers
+	depends = ros-noetic-geometric-shapes
+	depends = ros-noetic-geometry-msgs
+	depends = ros-noetic-kdl-parser
+	depends = ros-noetic-urdf
+	depends = ros-noetic-moveit-msgs
+	depends = ros-noetic-octomap
+	depends = ros-noetic-octomap-msgs
+	depends = ros-noetic-random-numbers
+	depends = ros-noetic-roslib
+	depends = ros-noetic-rostime
+	depends = ros-noetic-rosconsole
+	depends = ros-noetic-sensor-msgs
+	depends = ros-noetic-shape-msgs
+	depends = ros-noetic-srdfdom
+	depends = ros-noetic-std-msgs
+	depends = ros-noetic-tf2-eigen
+	depends = ros-noetic-tf2-geometry-msgs
+	depends = ros-noetic-trajectory-msgs
+	depends = ros-noetic-visualization-msgs
+	depends = ros-noetic-xmlrpcpp
 	depends = eigen
 	depends = urdfdom-headers
 	depends = assimp
@@ -42,8 +42,8 @@ pkgbase = ros-melodic-moveit-core
 	depends = boost
 	depends = urdfdom
 	depends = fcl
-	source = ros-melodic-moveit-core-1.0.2.tar.gz::https://github.com/ros-planning/moveit/archive/1.0.2.tar.gz
+	source = ros-noetic-moveit-core-1.0.2.tar.gz::https://github.com/ros-planning/moveit/archive/1.0.2.tar.gz
 	sha256sums = b8194308c57dbe34bbb729cfccb30d1113af3a54a90a2cfb49482142d1044ea4
 
-pkgname = ros-melodic-moveit-core
+pkgname = ros-noetic-moveit-core
 
diff --git a/PKGBUILD b/PKGBUILD
index f9258f97e985..88f0be9f26a1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,15 +2,15 @@
 pkgdesc="ROS - Core libraries used by MoveIt!."
 url='https://moveit.ros.org'
 
-pkgname='ros-melodic-moveit-core'
+pkgname='ros-noetic-moveit-core'
 pkgver='1.0.2'
 arch=('i686' 'x86_64' 'aarch64' 'armv7h' 'armv6h')
 pkgrel=4
 license=('BSD')
 
 ros_makedepends=(
-  ros-melodic-moveit-resources
-  ros-melodic-angles
+  ros-noetic-moveit-resources
+  ros-noetic-angles
 )
 
 makedepends=(
@@ -20,27 +20,27 @@ makedepends=(
 )
 
 ros_depends=(
-  ros-melodic-eigen-stl-containers
-  ros-melodic-geometric-shapes
-  ros-melodic-geometry-msgs
-  ros-melodic-kdl-parser
-  ros-melodic-urdf
-  ros-melodic-moveit-msgs
-  ros-melodic-octomap
-  ros-melodic-octomap-msgs
-  ros-melodic-random-numbers
-  ros-melodic-roslib
-  ros-melodic-rostime
-  ros-melodic-rosconsole
-  ros-melodic-sensor-msgs
-  ros-melodic-shape-msgs
-  ros-melodic-srdfdom
-  ros-melodic-std-msgs
-  ros-melodic-tf2-eigen
-  ros-melodic-tf2-geometry-msgs
-  ros-melodic-trajectory-msgs
-  ros-melodic-visualization-msgs
-  ros-melodic-xmlrpcpp
+  ros-noetic-eigen-stl-containers
+  ros-noetic-geometric-shapes
+  ros-noetic-geometry-msgs
+  ros-noetic-kdl-parser
+  ros-noetic-urdf
+  ros-noetic-moveit-msgs
+  ros-noetic-octomap
+  ros-noetic-octomap-msgs
+  ros-noetic-random-numbers
+  ros-noetic-roslib
+  ros-noetic-rostime
+  ros-noetic-rosconsole
+  ros-noetic-sensor-msgs
+  ros-noetic-shape-msgs
+  ros-noetic-srdfdom
+  ros-noetic-std-msgs
+  ros-noetic-tf2-eigen
+  ros-noetic-tf2-geometry-msgs
+  ros-noetic-trajectory-msgs
+  ros-noetic-visualization-msgs
+  ros-noetic-xmlrpcpp
 )
 
 depends=(
@@ -70,23 +70,19 @@ prepare() {
 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}
-
-  export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:/opt/ros/melodic/lib64/pkgconfig
+  export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:/opt/ros/noetic/lib64/pkgconfig
 
   # 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
 }