upd to noetic, cmake vars, python

2 files changed, 21 insertions, 25 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 49aa5ac35da7..12aad874031e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,4 +1,4 @@
-pkgbase = ros-melodic-swri-console
+pkgbase = ros-noetic-swri-console
 	pkgdesc = ROS - A rosout GUI viewer developed at Southwest Research Insititute as an alternative to rqt_console.
 	pkgver = 1.1.0
 	pkgrel = 3
@@ -11,19 +11,19 @@ pkgbase = ros-melodic-swri-console
 	license = BSD
 	makedepends = cmake
 	makedepends = ros-build-tools
-	makedepends = ros-melodic-rosgraph-msgs
-	makedepends = ros-melodic-roscpp
-	makedepends = ros-melodic-rosbag-storage
-	makedepends = ros-melodic-catkin
+	makedepends = ros-noetic-rosgraph-msgs
+	makedepends = ros-noetic-roscpp
+	makedepends = ros-noetic-rosbag-storage
+	makedepends = ros-noetic-catkin
 	makedepends = boost
 	makedepends = qt5-base
-	depends = ros-melodic-rosgraph-msgs
-	depends = ros-melodic-roscpp
-	depends = ros-melodic-rosbag-storage
+	depends = ros-noetic-rosgraph-msgs
+	depends = ros-noetic-roscpp
+	depends = ros-noetic-rosbag-storage
 	depends = boost
 	depends = qt5-base
-	source = ros-melodic-swri-console-1.1.0.tar.gz::https://github.com/swri-robotics/swri_console/archive/1.1.0.tar.gz
+	source = ros-noetic-swri-console-1.1.0.tar.gz::https://github.com/swri-robotics/swri_console/archive/1.1.0.tar.gz
 	sha256sums = da27e4f92247ce7016a4325ef7ffea0ed18fa6fe671ce0b7f17652778ce9481c
 
-pkgname = ros-melodic-swri-console
+pkgname = ros-noetic-swri-console
 
diff --git a/PKGBUILD b/PKGBUILD
index afc8fa08d9b8..3d91cc5f0db7 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,31 +3,31 @@
 pkgdesc="ROS - A rosout GUI viewer developed at Southwest Research Insititute as an alternative to rqt_console."
 url='http://ros.org/wiki/swri_console'
 
-pkgname='ros-melodic-swri-console'
+pkgname='ros-noetic-swri-console'
 pkgver='1.1.0'
 _pkgver_patch=0
 arch=('i686' 'x86_64' 'aarch64' 'armv7h' 'armv6h')
 pkgrel=3
 license=('BSD')
 
-ros_makedepends=(ros-melodic-rosgraph-msgs
-  ros-melodic-roscpp
-  ros-melodic-rosbag-storage
-  ros-melodic-catkin)
+ros_makedepends=(ros-noetic-rosgraph-msgs
+  ros-noetic-roscpp
+  ros-noetic-rosbag-storage
+  ros-noetic-catkin)
 makedepends=('cmake' 'ros-build-tools'
   ${ros_makedepends[@]}
   boost
   qt5-base)
 
-ros_depends=(ros-melodic-rosgraph-msgs
-  ros-melodic-roscpp
-  ros-melodic-rosbag-storage)
+ros_depends=(ros-noetic-rosgraph-msgs
+  ros-noetic-roscpp
+  ros-noetic-rosbag-storage)
 depends=(${ros_depends[@]}
   boost
   qt5-base)
 
 # Git version (e.g. for debugging)
-# _tag=release/melodic/swri_console/${pkgver}-${_pkgver_patch}
+# _tag=release/noetic/swri_console/${pkgver}-${_pkgver_patch}
 # _dir=${pkgname}
 # source=("${_dir}"::"git+https://github.com/swri-robotics-gbp/swri_console-release.git"#tag=${_tag})
 # sha256sums=('SKIP')
@@ -40,20 +40,16 @@ sha256sums=('da27e4f92247ce7016a4325ef7ffea0ed18fa6fe671ce0b7f17652778ce9481c')
 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