Merge pull request #6 from fmessmer/test_noetic

test noetic

Author: fmessmer

CMakeLists.txt

@@ -2,7 +2,7 @@
 # CMake
 ##############################################################################
 
-cmake_minimum_required(VERSION 2.8.3)
+cmake_minimum_required(VERSION 3.0.2)
 project(rosjava_build_tools)
 
 ##############################################################################

package.xml

@@ -1,4 +1,8 @@
-<package>
+<?xml version="1.0"?>
+<?xml-model
+  href="http://download.ros.org/schema/package_format3.xsd"
+  schematypens="http://www.w3.org/2001/XMLSchema"?>
+<package format="3">
   <name>rosjava_build_tools</name>
   <version>0.3.3</version>
   <description>
@@ -12,10 +16,10 @@
   <author>Daniel Stonier</author>
 
   <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>
 
-  <build_depend>java</build_depend>
-  <build_depend>ant</build_depend>
-  <run_depend>java</run_depend>
-  <run_depend>ant</run_depend>
-  <run_depend>catkin</run_depend>
+  <depend>ant</depend>
+  <depend>java</depend>
+  <exec_depend>catkin</exec_depend>
 </package>

setup.py

@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 
-from distutils.core import setup
+from setuptools import setup
 from catkin_pkg.python_setup import generate_distutils_setup
 
 d = generate_distutils_setup(

src/rosjava_build_tools/__init__.py

@@ -4,10 +4,10 @@
 # Imports
 ##############################################################################
 
-import console
-from create_package import init_android_package, init_rosjava_package
-from create_android_project import create_android_project
-from create_rosjava_project import create_rosjava_project, create_rosjava_msg_project, create_rosjava_library_project
-from utils import which
-from release import scrape_for_release_message_packages
-import catkin
+from rosjava_build_tools import console
+from rosjava_build_tools.create_package import init_android_package, init_rosjava_package
+from rosjava_build_tools.create_android_project import create_android_project
+from rosjava_build_tools.create_rosjava_project import create_rosjava_project, create_rosjava_msg_project, create_rosjava_library_project
+from rosjava_build_tools.utils import which
+from rosjava_build_tools.release import scrape_for_release_message_packages
+from rosjava_build_tools import catkin

src/rosjava_build_tools/create_android_project.py

@@ -11,11 +11,14 @@
 import argparse
 import subprocess
 import shutil
-import exceptions
+try:
+    import exceptions
+except ImportError:
+    import builtins as exceptions
 
 # local imports
-import utils
-import console
+from rosjava_build_tools import utils
+from rosjava_build_tools import console
 
 ##############################################################################
 # Methods

src/rosjava_build_tools/create_package.py

@@ -12,8 +12,8 @@
 from catkin_pkg.package_templates import create_package_xml, PackageTemplate
 
 # local imports
-import utils
-import console
+from rosjava_build_tools import utils
+from rosjava_build_tools import console
 
 ##############################################################################
 # Methods
@@ -87,7 +87,7 @@ def populate_repo(repo_path, package_type):
     author = utils.author_name()
     repo_name = os.path.basename(repo_path)
     templates = get_templates(package_type)
-    for filename, template in templates.iteritems():
+    for filename, template in templates.items():
         contents = instantiate_template(template, repo_name, author)
         try:
             p = os.path.abspath(os.path.join(repo_path, filename))

src/rosjava_build_tools/create_rosjava_project.py

@@ -13,8 +13,8 @@
 import xml.etree.ElementTree as ElementTree
 
 # local imports
-import utils
-import console
+from rosjava_build_tools import utils
+from rosjava_build_tools import console
 
 ##############################################################################
 # Methods

src/rosjava_build_tools/release.py

@@ -6,7 +6,7 @@
 
 import rosdistro
 import catkin_pkg
-from . import catkin
+from rosjava_build_tools import catkin
 
 ##############################################################################
 # Imports
@@ -18,7 +18,7 @@ def scrape_for_release_message_packages(track):
     index = rosdistro.get_index(url)
     cache = rosdistro.get_release_cache(index, 'kinetic')
     packages = []
-    for package_name, package_string in cache.package_xmls.iteritems():
+    for package_name, package_string in cache.package_xmls.items():
         package = catkin_pkg.package.parse_package_string(package_string)
         #print("  Name: %s" % package_name)
         #print("  Buildtool Depends %s" % package.build)

src/rosjava_build_tools/utils.py

@@ -8,7 +8,7 @@
 import sys
 import errno
 import pwd
-import console
+from rosjava_build_tools import console
 
 ##############################################################################
 # Methods