upd to noetic, cmake vars, python

2 files changed, 33 insertions, 37 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 0c106ce03866..bc4ec3084019 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,4 +1,4 @@
-pkgbase = ros-melodic-geometric-shapes
+pkgbase = ros-noetic-geometric-shapes
 	pkgdesc = ROS - This package contains generic definitions of geometric shapes and bodies.
 	pkgver = 0.6.1
 	pkgrel = 3
@@ -11,32 +11,32 @@ pkgbase = ros-melodic-geometric-shapes
 	license = BSD
 	makedepends = cmake
 	makedepends = ros-build-tools
-	makedepends = ros-melodic-resource-retriever
-	makedepends = ros-melodic-eigen-stl-containers
-	makedepends = ros-melodic-catkin
-	makedepends = ros-melodic-octomap
-	makedepends = ros-melodic-shape-msgs
-	makedepends = ros-melodic-random-numbers
-	makedepends = ros-melodic-visualization-msgs
+	makedepends = ros-noetic-resource-retriever
+	makedepends = ros-noetic-eigen-stl-containers
+	makedepends = ros-noetic-catkin
+	makedepends = ros-noetic-octomap
+	makedepends = ros-noetic-shape-msgs
+	makedepends = ros-noetic-random-numbers
+	makedepends = ros-noetic-visualization-msgs
 	makedepends = qhull
 	makedepends = assimp
 	makedepends = eigen3
 	makedepends = boost
 	makedepends = console-bridge
 	makedepends = pkg-config
-	depends = ros-melodic-resource-retriever
-	depends = ros-melodic-eigen-stl-containers
-	depends = ros-melodic-octomap
-	depends = ros-melodic-shape-msgs
-	depends = ros-melodic-random-numbers
-	depends = ros-melodic-visualization-msgs
+	depends = ros-noetic-resource-retriever
+	depends = ros-noetic-eigen-stl-containers
+	depends = ros-noetic-octomap
+	depends = ros-noetic-shape-msgs
+	depends = ros-noetic-random-numbers
+	depends = ros-noetic-visualization-msgs
 	depends = assimp
 	depends = boost
 	depends = eigen3
 	depends = console-bridge
 	depends = qhull
-	source = ros-melodic-geometric-shapes-0.6.1.tar.gz::https://github.com/ros-planning/geometric_shapes/archive/0.6.1.tar.gz
+	source = ros-noetic-geometric-shapes-0.6.1.tar.gz::https://github.com/ros-planning/geometric_shapes/archive/0.6.1.tar.gz
 	sha256sums = 768ecbd9bf8501a844b358026d6ae1db5d4d70d1958f47f5ca64c1ee7bd20b8c
 
-pkgname = ros-melodic-geometric-shapes
+pkgname = ros-noetic-geometric-shapes
 
diff --git a/PKGBUILD b/PKGBUILD
index 37331b9c0c52..caf25b8907bd 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,19 +3,19 @@
 pkgdesc="ROS - This package contains generic definitions of geometric shapes and bodies."
 url='http://wiki.ros.org/geometric_shapes'
 
-pkgname='ros-melodic-geometric-shapes'
+pkgname='ros-noetic-geometric-shapes'
 pkgver='0.6.1'
 arch=('i686' 'x86_64' 'aarch64' 'armv7h' 'armv6h')
 pkgrel=3
 license=('BSD')
 
-ros_makedepends=(ros-melodic-resource-retriever
-  ros-melodic-eigen-stl-containers
-  ros-melodic-catkin
-  ros-melodic-octomap
-  ros-melodic-shape-msgs
-  ros-melodic-random-numbers
-  ros-melodic-visualization-msgs)
+ros_makedepends=(ros-noetic-resource-retriever
+  ros-noetic-eigen-stl-containers
+  ros-noetic-catkin
+  ros-noetic-octomap
+  ros-noetic-shape-msgs
+  ros-noetic-random-numbers
+  ros-noetic-visualization-msgs)
 makedepends=('cmake' 'ros-build-tools'
   ${ros_makedepends[@]}
   qhull
@@ -25,12 +25,12 @@ makedepends=('cmake' 'ros-build-tools'
   console-bridge
   pkg-config)
 
-ros_depends=(ros-melodic-resource-retriever
-  ros-melodic-eigen-stl-containers
-  ros-melodic-octomap
-  ros-melodic-shape-msgs
-  ros-melodic-random-numbers
-  ros-melodic-visualization-msgs)
+ros_depends=(ros-noetic-resource-retriever
+  ros-noetic-eigen-stl-containers
+  ros-noetic-octomap
+  ros-noetic-shape-msgs
+  ros-noetic-random-numbers
+  ros-noetic-visualization-msgs)
 depends=(${ros_depends[@]}
   assimp
   boost
@@ -45,21 +45,17 @@ sha256sums=('768ecbd9bf8501a844b358026d6ae1db5d4d70d1958f47f5ca64c1ee7bd20b8c')
 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
 }