upd to noetic, cmake vars, python

2 files changed, 22 insertions, 29 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 45bb5261ec32..c770f4fe2874 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,4 +1,4 @@
-pkgbase = ros-melodic-pcl-msgs
+pkgbase = ros-noetic-pcl-msgs
 	pkgdesc = ROS - Package containing PCL (Point Cloud Library)-related ROS messages.
 	pkgver = 0.2.0
 	pkgrel = 2
@@ -7,15 +7,15 @@ pkgbase = ros-melodic-pcl-msgs
 	license = BSD
 	makedepends = cmake
 	makedepends = ros-build-tools
-	makedepends = ros-melodic-catkin
-	makedepends = ros-melodic-message-generation
-	makedepends = ros-melodic-sensor-msgs
-	makedepends = ros-melodic-std-msgs
-	depends = ros-melodic-message-runtime
-	depends = ros-melodic-sensor-msgs
-	depends = ros-melodic-std-msgs
-	source = ros-melodic-pcl-msgs-0.2.0.tar.gz::https://github.com/ros-perception/pcl_msgs/archive/0.2.0.tar.gz
+	makedepends = ros-noetic-catkin
+	makedepends = ros-noetic-message-generation
+	makedepends = ros-noetic-sensor-msgs
+	makedepends = ros-noetic-std-msgs
+	depends = ros-noetic-message-runtime
+	depends = ros-noetic-sensor-msgs
+	depends = ros-noetic-std-msgs
+	source = ros-noetic-pcl-msgs-0.2.0.tar.gz::https://github.com/ros-perception/pcl_msgs/archive/0.2.0.tar.gz
 	sha256sums = d02be421db01d22f8555f616b3658682ee60a885cc3dc37668fbc28454f562f8
 
-pkgname = ros-melodic-pcl-msgs
+pkgname = ros-noetic-pcl-msgs
 
diff --git a/PKGBUILD b/PKGBUILD
index 4d0e3f2ef5ef..8905eacbfb3f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,27 +3,27 @@
 pkgdesc="ROS - Package containing PCL (Point Cloud Library)-related ROS messages."
 url='https://wiki.ros.org/pcl_msgs'
 
-pkgname='ros-melodic-pcl-msgs'
+pkgname='ros-noetic-pcl-msgs'
 pkgver='0.2.0'
 _pkgver_patch=0
 arch=('any')
 pkgrel=2
 license=('BSD')
 
-ros_makedepends=(ros-melodic-catkin
-  ros-melodic-message-generation
-  ros-melodic-sensor-msgs
-  ros-melodic-std-msgs)
+ros_makedepends=(ros-noetic-catkin
+  ros-noetic-message-generation
+  ros-noetic-sensor-msgs
+  ros-noetic-std-msgs)
 makedepends=('cmake' 'ros-build-tools'
   ${ros_makedepends[@]})
 
-ros_depends=(ros-melodic-message-runtime
-  ros-melodic-sensor-msgs
-  ros-melodic-std-msgs)
+ros_depends=(ros-noetic-message-runtime
+  ros-noetic-sensor-msgs
+  ros-noetic-std-msgs)
 depends=(${ros_depends[@]})
 
 # Git version (e.g. for debugging)
-# _tag=release/melodic/pcl_msgs/${pkgver}-${_pkgver_patch}
+# _tag=release/noetic/pcl_msgs/${pkgver}-${_pkgver_patch}
 # _dir=${pkgname}
 # source=("${_dir}"::"git+https://github.com/ros-gbp/pcl_msgs-release.git"#tag=${_tag})
 # sha256sums=('SKIP')
@@ -36,24 +36,17 @@ sha256sums=('d02be421db01d22f8555f616b3658682ee60a885cc3dc37668fbc28454f562f8')
 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=.cpython-37m \
+        -DCMAKE_INSTALL_PREFIX=/opt/ros/noetic \
+        -DPYTHON_EXECUTABLE=/usr/bin/python \
         -DSETUPTOOLS_DEB_LAYOUT=OFF
   make
 }