From 9ddbe4a0f02d38066dc0d2f234d3ddd491c67a4d Mon Sep 17 00:00:00 2001
From: Shingo Kitagawa <shingogo@hotmail.co.jp>
Date: Sat, 10 Jul 2021 21:45:14 +0900
Subject: [PATCH] update for noetic

---
 app_notifier/package.xml  | 5 +++--
 app_recorder/package.xml  | 5 +++--
 app_scheduler/package.xml | 7 +++++--
 app_scheduler/setup.py    | 4 +---
 app_uploader/package.xml  | 5 +++--
 5 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/app_notifier/package.xml b/app_notifier/package.xml
index 19fa167..51c16a9 100644
--- a/app_notifier/package.xml
+++ b/app_notifier/package.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<package format="2">
+<package format="3">
   <name>app_notifier</name>
   <version>0.0.0</version>
   <description>The app_notifier package</description>
@@ -8,7 +8,8 @@
   <license>BSD</license>
 
   <buildtool_depend>catkin</buildtool_depend>
-  <buildtool_depend>python-setuptools</buildtool_depend>
+  <buildtool_depend condition="$ROS_PYTHON_VERSION == 2">python-setuptools</buildtool_depend>
+  <buildtool_depend condition="$ROS_PYTHON_VERSION == 3">python3-setuptools</buildtool_depend>
   <exec_depend>actionlib</exec_depend>
   <exec_depend>app_manager</exec_depend>
   <exec_depend>rostwitter</exec_depend>
diff --git a/app_recorder/package.xml b/app_recorder/package.xml
index 399e709..7ddf28e 100644
--- a/app_recorder/package.xml
+++ b/app_recorder/package.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<package format="2">
+<package format="3">
   <name>app_recorder</name>
   <version>0.0.0</version>
   <description>The app_recorder package</description>
@@ -8,7 +8,8 @@
   <license>BSD</license>
 
   <buildtool_depend>catkin</buildtool_depend>
-  <buildtool_depend>python-setuptools</buildtool_depend>
+  <buildtool_depend condition="$ROS_PYTHON_VERSION == 2">python-setuptools</buildtool_depend>
+  <buildtool_depend condition="$ROS_PYTHON_VERSION == 3">python3-setuptools</buildtool_depend>
   <exec_depend>app_manager</exec_depend>
   <exec_depend>audio_play</exec_depend>
   <exec_depend>image_view</exec_depend>
diff --git a/app_scheduler/package.xml b/app_scheduler/package.xml
index 7e92973..7098887 100644
--- a/app_scheduler/package.xml
+++ b/app_scheduler/package.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<package format="2">
+<package format="3">
   <name>app_scheduler</name>
   <version>0.0.0</version>
   <description>The scheduler for app_manager package</description>
@@ -8,8 +8,11 @@
   <license>BSD</license>
 
   <buildtool_depend>catkin</buildtool_depend>
+  <buildtool_depend condition="$ROS_PYTHON_VERSION == 2">python-setuptools</buildtool_depend>
+  <buildtool_depend condition="$ROS_PYTHON_VERSION == 3">python3-setuptools</buildtool_depend>
   <exec_depend>app_manager</exec_depend>
-  <exec_depend>python-schedule</exec_depend>
+  <exec_depend condition="$ROS_PYTHON_VERSION == 2">python-schedule</exec_depend>
+  <exec_depend condition="$ROS_PYTHON_VERSION == 3">python3-schedule</exec_depend>
   <exec_depend>std_msgs</exec_depend>
 
   <export>
diff --git a/app_scheduler/setup.py b/app_scheduler/setup.py
index 66696ef..a0be37b 100644
--- a/app_scheduler/setup.py
+++ b/app_scheduler/setup.py
@@ -1,8 +1,6 @@
-#!/usr/bin/env python
-
 from catkin_pkg.python_setup import generate_distutils_setup
-from distutils.core import setup
 from setuptools import find_packages
+from setuptools import setup
 
 
 d = generate_distutils_setup(
diff --git a/app_uploader/package.xml b/app_uploader/package.xml
index c013ce4..af39b3b 100644
--- a/app_uploader/package.xml
+++ b/app_uploader/package.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<package format="2">
+<package format="3">
   <name>app_uploader</name>
   <version>0.0.0</version>
   <description>The app_uploader package</description>
@@ -8,7 +8,8 @@
   <license>BSD</license>
 
   <buildtool_depend>catkin</buildtool_depend>
-  <buildtool_depend>python-setuptools</buildtool_depend>
+  <buildtool_depend condition="$ROS_PYTHON_VERSION == 2">python-setuptools</buildtool_depend>
+  <buildtool_depend condition="$ROS_PYTHON_VERSION == 3">python3-setuptools</buildtool_depend>
   <exec_depend>app_manager</exec_depend>
   <exec_depend>gdrive_ros</exec_depend>