upd to noetic, cmake vars, python

2 files changed, 18 insertions, 25 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a8998d20c187..4153204832f5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,4 +1,4 @@
-pkgbase = ros-melodic-joystick-drivers
+pkgbase = ros-noetic-joystick-drivers
 	pkgdesc = ROS - This metapackage depends on packages for interfacing common joysticks and human input devices with ROS.
 	pkgver = 1.13.0
 	pkgrel = 1
@@ -7,13 +7,13 @@ pkgbase = ros-melodic-joystick-drivers
 	license = BSD
 	makedepends = cmake
 	makedepends = ros-build-tools
-	makedepends = ros-melodic-catkin
-	depends = ros-melodic-wiimote
-	depends = ros-melodic-joy
-	depends = ros-melodic-ps3joy
-	depends = ros-melodic-spacenav-node
-	source = ros-melodic-joystick-drivers-1.13.0.tar.gz::https://github.com/ros-drivers/joystick_drivers/archive/1.13.0.tar.gz
+	makedepends = ros-noetic-catkin
+	depends = ros-noetic-wiimote
+	depends = ros-noetic-joy
+	depends = ros-noetic-ps3joy
+	depends = ros-noetic-spacenav-node
+	source = ros-noetic-joystick-drivers-1.13.0.tar.gz::https://github.com/ros-drivers/joystick_drivers/archive/1.13.0.tar.gz
 	sha256sums = bfe0633623f4dc917524198aaea10b1c4603881e736dafb7b652f1af60922ad7
 
-pkgname = ros-melodic-joystick-drivers
+pkgname = ros-noetic-joystick-drivers
 
diff --git a/PKGBUILD b/PKGBUILD
index bc66d529a5a5..247e202989cc 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,24 +3,24 @@
 pkgdesc="ROS - This metapackage depends on packages for interfacing common joysticks and human input devices with ROS."
 url='https://www.wiki.ros.org/joystick_drivers'
 
-pkgname='ros-melodic-joystick-drivers'
+pkgname='ros-noetic-joystick-drivers'
 pkgver='1.13.0'
 arch=('any')
 pkgrel=1
 license=('BSD')
 
-ros_makedepends=(ros-melodic-catkin)
+ros_makedepends=(ros-noetic-catkin)
 makedepends=('cmake' 'ros-build-tools'
   ${ros_makedepends[@]})
 
-ros_depends=(ros-melodic-wiimote
-  ros-melodic-joy
-  ros-melodic-ps3joy
-  ros-melodic-spacenav-node)
+ros_depends=(ros-noetic-wiimote
+  ros-noetic-joy
+  ros-noetic-ps3joy
+  ros-noetic-spacenav-node)
 depends=(${ros_depends[@]})
 
 # Git version (e.g. for debugging)
-# _tag=release/melodic/joystick_drivers/${pkgver}-${_pkgver_patch}
+# _tag=release/noetic/joystick_drivers/${pkgver}-${_pkgver_patch}
 # _dir=${pkgname}
 # source=("${_dir}"::"git+https://github.com/ros-gbp/joystick_drivers-release.git"#tag=${_tag})
 # sha256sums=('SKIP')
@@ -33,24 +33,17 @@ sha256sums=('bfe0633623f4dc917524198aaea10b1c4603881e736dafb7b652f1af60922ad7')
 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 \
-        -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
 }