upd to noetic, cmake vars, python

2 files changed, 13 insertions, 20 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 29f20c8c5a8a..b3e859eded7d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,4 +1,4 @@
-pkgbase = ros-melodic-dynamic-edt-3d
+pkgbase = ros-noetic-dynamic-edt-3d
 	pkgdesc = ROS - The dynamicEDT3D library implements an inrementally updatable Euclidean distance transform (EDT) in 3D.
 	pkgver = 1.9.0
 	pkgrel = 2
@@ -7,11 +7,11 @@ pkgbase = ros-melodic-dynamic-edt-3d
 	license = BSD
 	makedepends = cmake
 	makedepends = ros-build-tools
-	makedepends = ros-melodic-octomap
-	depends = ros-melodic-octomap
-	depends = ros-melodic-catkin
-	source = ros-melodic-dynamic-edt-3d-1.9.0.tar.gz::https://github.com/OctoMap/octomap/archive/v1.9.0.tar.gz
+	makedepends = ros-noetic-octomap
+	depends = ros-noetic-octomap
+	depends = ros-noetic-catkin
+	source = ros-noetic-dynamic-edt-3d-1.9.0.tar.gz::https://github.com/OctoMap/octomap/archive/v1.9.0.tar.gz
 	sha256sums = 5f81c9a8cbc9526b2e725251cd3a829e5222a28201b394314002146d8b9214dd
 
-pkgname = ros-melodic-dynamic-edt-3d
+pkgname = ros-noetic-dynamic-edt-3d
 
diff --git a/PKGBUILD b/PKGBUILD
index d31a88f23aa8..25359c821b1e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,23 +3,23 @@
 pkgdesc="ROS - The dynamicEDT3D library implements an inrementally updatable Euclidean distance transform (EDT) in 3D."
 url='https://octomaphub.io'
 
-pkgname='ros-melodic-dynamic-edt-3d'
+pkgname='ros-noetic-dynamic-edt-3d'
 pkgver='1.9.0'
 _pkgver_patch=1
 arch=('any')
 pkgrel=2
 license=('BSD')
 
-ros_makedepends=(ros-melodic-octomap)
+ros_makedepends=(ros-noetic-octomap)
 makedepends=('cmake' 'ros-build-tools'
   ${ros_makedepends[@]})
 
-ros_depends=(ros-melodic-octomap
-  ros-melodic-catkin)
+ros_depends=(ros-noetic-octomap
+  ros-noetic-catkin)
 depends=(${ros_depends[@]})
 
 # Git version (e.g. for debugging)
-# _tag=release/melodic/dynamic_edt_3d/${pkgver}-${_pkgver_patch}
+# _tag=release/noetic/dynamic_edt_3d/${pkgver}-${_pkgver_patch}
 # _dir=${pkgname}
 # source=("${_dir}"::"git+https://github.com/ros-gbp/octomap-release.git"#tag=${_tag})
 # sha256sums=('SKIP')
@@ -32,24 +32,17 @@ sha256sums=('5f81c9a8cbc9526b2e725251cd3a829e5222a28201b394314002146d8b9214dd')
 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 2 ${srcdir}/${_dir}
-
   # Build project
   cmake ${srcdir}/${_dir} \
-        -DCMAKE_BUILD_TYPE=Release \
         -DCATKIN_BUILD_BINARY_PACKAGE=ON \
-        -DCMAKE_INSTALL_PREFIX=/opt/ros/melodic \
+        -DCMAKE_INSTALL_PREFIX=/opt/ros/noetic \
         -DPYTHON_EXECUTABLE=/usr/bin/python2 \
-        -DPYTHON_INCLUDE_DIR=/usr/include/python2.7 \
-        -DPYTHON_LIBRARY=/usr/lib/libpython2.7.so \
-        -DPYTHON_BASENAME=-python2.7 \
         -DSETUPTOOLS_DEB_LAYOUT=OFF
   make
 }