upd to noetic, cmake vars, python

2 files changed, 27 insertions, 31 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 732541112064..64838e109775 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,4 +1,4 @@
-pkgbase = ros-melodic-pid
+pkgbase = ros-noetic-pid
 	pkgdesc = ROS - Launch a PID control node.
 	pkgver = 0.0.24
 	pkgrel = 2
@@ -11,17 +11,17 @@ pkgbase = ros-melodic-pid
 	license = BSD
 	makedepends = cmake
 	makedepends = ros-build-tools
-	makedepends = ros-melodic-catkin
-	makedepends = ros-melodic-message-generation
-	makedepends = ros-melodic-roscpp
-	makedepends = ros-melodic-dynamic-reconfigure
-	makedepends = ros-melodic-std-msgs
-	depends = ros-melodic-message-runtime
-	depends = ros-melodic-roscpp
-	depends = ros-melodic-dynamic-reconfigure
-	depends = ros-melodic-std-msgs
-	source = ros-melodic-pid-0.0.24-0.tar.gz::https://github.com/AndyZe/pid-release/archive/release/melodic/pid/0.0.24-0.tar.gz
+	makedepends = ros-noetic-catkin
+	makedepends = ros-noetic-message-generation
+	makedepends = ros-noetic-roscpp
+	makedepends = ros-noetic-dynamic-reconfigure
+	makedepends = ros-noetic-std-msgs
+	depends = ros-noetic-message-runtime
+	depends = ros-noetic-roscpp
+	depends = ros-noetic-dynamic-reconfigure
+	depends = ros-noetic-std-msgs
+	source = ros-noetic-pid-0.0.24-0.tar.gz::https://github.com/AndyZe/pid-release/archive/release/noetic/pid/0.0.24-0.tar.gz
 	sha256sums = 4baac5e9ab0d98621a2820dcb7b76af518507666b7fc23ba7e117a8194366894
 
-pkgname = ros-melodic-pid
+pkgname = ros-noetic-pid
 
diff --git a/PKGBUILD b/PKGBUILD
index c864119ede63..de89d0c3d362 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,55 +3,51 @@
 pkgdesc="ROS - Launch a PID control node."
 url='https://wiki.ros.org/pid'
 
-pkgname='ros-melodic-pid'
+pkgname='ros-noetic-pid'
 pkgver='0.0.24'
 _pkgver_patch=0
 arch=('i686' 'x86_64' 'aarch64' 'armv7h' 'armv6h')
 pkgrel=2
 license=('BSD')
 
-ros_makedepends=(ros-melodic-catkin
-  ros-melodic-message-generation
-  ros-melodic-roscpp
-  ros-melodic-dynamic-reconfigure
-  ros-melodic-std-msgs)
+ros_makedepends=(ros-noetic-catkin
+  ros-noetic-message-generation
+  ros-noetic-roscpp
+  ros-noetic-dynamic-reconfigure
+  ros-noetic-std-msgs)
 makedepends=('cmake' 'ros-build-tools'
   ${ros_makedepends[@]})
 
-ros_depends=(ros-melodic-message-runtime
-  ros-melodic-roscpp
-  ros-melodic-dynamic-reconfigure
-  ros-melodic-std-msgs)
+ros_depends=(ros-noetic-message-runtime
+  ros-noetic-roscpp
+  ros-noetic-dynamic-reconfigure
+  ros-noetic-std-msgs)
 depends=(${ros_depends[@]})
 
 # Git version (e.g. for debugging)
-# _tag=release/melodic/pid/${pkgver}-${_pkgver_patch}
+# _tag=release/noetic/pid/${pkgver}-${_pkgver_patch}
 # _dir=${pkgname}
 # source=("${_dir}"::"git+https://github.com/AndyZe/pid-release.git"#tag=${_tag})
 # sha256sums=('SKIP')
 
 # Tarball version (faster download)
-_dir="pid-release-release-melodic-pid-${pkgver}-${_pkgver_patch}"
-source=("${pkgname}-${pkgver}-${_pkgver_patch}.tar.gz"::"https://github.com/AndyZe/pid-release/archive/release/melodic/pid/${pkgver}-${_pkgver_patch}.tar.gz")
+_dir="pid-release-release-noetic-pid-${pkgver}-${_pkgver_patch}"
+source=("${pkgname}-${pkgver}-${_pkgver_patch}.tar.gz"::"https://github.com/AndyZe/pid-release/archive/release/noetic/pid/${pkgver}-${_pkgver_patch}.tar.gz")
 sha256sums=('4baac5e9ab0d98621a2820dcb7b76af518507666b7fc23ba7e117a8194366894')
 
 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 \
         -DSETUPTOOLS_DEB_LAYOUT=OFF
   make