upd to noetic, cmake vars, python

2 files changed, 33 insertions, 40 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e8ee303659e1..6064afac87d1 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,4 +1,4 @@
-pkgbase = ros-melodic-easy-markers
+pkgbase = ros-noetic-easy-markers
 	pkgdesc = ROS - Python library to assist in publishing markers easily.
 	pkgver = 0.2.4
 	pkgrel = 2
@@ -7,21 +7,21 @@ pkgbase = ros-melodic-easy-markers
 	license = BSD
 	makedepends = cmake
 	makedepends = ros-build-tools
-	makedepends = ros-melodic-tf
-	makedepends = ros-melodic-interactive-markers
-	makedepends = ros-melodic-catkin
-	makedepends = ros-melodic-roslib
-	makedepends = ros-melodic-geometry-msgs
-	makedepends = ros-melodic-visualization-msgs
-	makedepends = ros-melodic-rospy
-	depends = ros-melodic-tf
-	depends = ros-melodic-interactive-markers
-	depends = ros-melodic-roslib
-	depends = ros-melodic-geometry-msgs
-	depends = ros-melodic-visualization-msgs
-	depends = ros-melodic-rospy
-	source = ros-melodic-easy-markers-0.2.4.tar.gz::https://github.com/DLu/wu_ros_tools/archive/0.2.4.tar.gz
+	makedepends = ros-noetic-tf
+	makedepends = ros-noetic-interactive-markers
+	makedepends = ros-noetic-catkin
+	makedepends = ros-noetic-roslib
+	makedepends = ros-noetic-geometry-msgs
+	makedepends = ros-noetic-visualization-msgs
+	makedepends = ros-noetic-rospy
+	depends = ros-noetic-tf
+	depends = ros-noetic-interactive-markers
+	depends = ros-noetic-roslib
+	depends = ros-noetic-geometry-msgs
+	depends = ros-noetic-visualization-msgs
+	depends = ros-noetic-rospy
+	source = ros-noetic-easy-markers-0.2.4.tar.gz::https://github.com/DLu/wu_ros_tools/archive/0.2.4.tar.gz
 	sha256sums = fd0bb39a69302dae5ccfd565277209719a4199644fc8265a2ae7ccedd92c004a
 
-pkgname = ros-melodic-easy-markers
+pkgname = ros-noetic-easy-markers
 
diff --git a/PKGBUILD b/PKGBUILD
index ed0cff2f42eb..3124233bdf2b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,32 +3,32 @@
 pkgdesc="ROS - Python library to assist in publishing markers easily."
 url='https://wiki.ros.org/easy_markers'
 
-pkgname='ros-melodic-easy-markers'
+pkgname='ros-noetic-easy-markers'
 pkgver='0.2.4'
 arch=('any')
 pkgrel=2
 license=('BSD')
 
-ros_makedepends=(ros-melodic-tf
-  ros-melodic-interactive-markers
-  ros-melodic-catkin
-  ros-melodic-roslib
-  ros-melodic-geometry-msgs
-  ros-melodic-visualization-msgs
-  ros-melodic-rospy)
+ros_makedepends=(ros-noetic-tf
+  ros-noetic-interactive-markers
+  ros-noetic-catkin
+  ros-noetic-roslib
+  ros-noetic-geometry-msgs
+  ros-noetic-visualization-msgs
+  ros-noetic-rospy)
 makedepends=('cmake' 'ros-build-tools'
   ${ros_makedepends[@]})
 
-ros_depends=(ros-melodic-tf
-  ros-melodic-interactive-markers
-  ros-melodic-roslib
-  ros-melodic-geometry-msgs
-  ros-melodic-visualization-msgs
-  ros-melodic-rospy)
+ros_depends=(ros-noetic-tf
+  ros-noetic-interactive-markers
+  ros-noetic-roslib
+  ros-noetic-geometry-msgs
+  ros-noetic-visualization-msgs
+  ros-noetic-rospy)
 depends=(${ros_depends[@]})
 
 # Git version (e.g. for debugging)
-# _tag=release/melodic/easy_markers/${pkgver}-${_pkgver_patch}
+# _tag=release/noetic/easy_markers/${pkgver}-${_pkgver_patch}
 # _dir=${pkgname}
 # source=("${_dir}"::"git+https://github.com/wu-robotics/wu_ros_tools.git"#tag=${_tag})
 # sha256sums=('SKIP')
@@ -41,24 +41,17 @@ sha256sums=('fd0bb39a69302dae5ccfd565277209719a4199644fc8265a2ae7ccedd92c004a')
 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
 }