library and app rosjava templates, rosjava app-catkin integration.

Author: stonier

scripts/catkin_create_rosjava_library_project

@@ -0,0 +1,24 @@
+#!/usr/bin/env python
+
+"""This script creates the skeleton of a rosjava library project"""
+
+##############################################################################
+# Imports
+##############################################################################
+
+from __future__ import print_function
+import sys
+
+from rosjava_build_tools import create_rosjava_library_project
+import rosjava_build_tools.console as console
+
+##############################################################################
+# Main
+##############################################################################
+
+if __name__ == "__main__":
+    try:
+        sys.exit(create_rosjava_library_project())
+    except Exception as e:
+        console.logerror("%s : %s" % (str(e), type(e)))
+        sys.exit(1)

scripts/catkin_create_rosjava_msg_project

@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 
-"""This script creates the skeleton of an android library package"""
+"""This script creates the skeleton of a rosjava message project"""
 
 ##############################################################################
 # Imports

scripts/catkin_create_rosjava_pkg

@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 
-"""This script creates the skeleton of an rosjava repo"""
+"""This script creates the skeleton of a rosjava catkin package (typically an entire repo)"""
 
 ##############################################################################
 # Imports

scripts/catkin_create_rosjava_project

@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 
-"""This script creates the skeleton of an android library package"""
+"""This script creates the skeleton of a rosjava application project"""
 
 ##############################################################################
 # Imports

setup.py

@@ -11,11 +11,13 @@
              'scripts/catkin_create_android_library_project',
              'scripts/catkin_create_rosjava_pkg',
              'scripts/catkin_create_rosjava_project',
+             'scripts/catkin_create_rosjava_library_project',
              'scripts/catkin_create_rosjava_msg_project',
             ],
     package_data = {'rosjava_build_tools': [
            'templates/android_package/*',
            'templates/android_project/*',
+           'templates/rosjava_library_project/*',
            'templates/rosjava_msg_project/*',
            'templates/rosjava_package/*',
            'templates/rosjava_project/*',

src/rosjava_build_tools/__init__.py

@@ -7,6 +7,6 @@
 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
+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

src/rosjava_build_tools/create_rosjava_project.py

@@ -46,6 +46,10 @@ def instantiate_template(template, project_name, author):
     return template % locals()
 
 
+def instantiate_code_template(template, package_name, project_name, author):
+    return template % locals()
+
+
 def create_gradle_package_files(args, template_directory):
     '''
       This is almost a direct copy from catkin_create_pkg.
@@ -68,6 +72,27 @@ def create_gradle_package_files(args, template_directory):
         raise
 
 
+def create_talker_listener_classes(project_name, template_directory, author):
+    path = os.path.join(os.getcwd(), project_name.lower())
+    package_name = os.path.basename(os.getcwd())
+    java_package_path = os.path.join(path, 'src', 'main', 'java', 'com', 'github', package_name, project_name)
+    utils.mkdir_p(java_package_path)
+    try:
+        for template_name in ['Talker.java', 'Listener.java']:
+            filename = os.path.join(java_package_path, template_name)
+            template = utils.read_template_file(template_directory, template_name)
+            contents = instantiate_code_template(template, package_name, project_name, author)
+            try:
+                f = open(filename, 'w')
+                f.write(contents)
+                console.pretty_print('  File      : ', console.cyan)
+                console.pretty_println(template_name, console.yellow)
+            finally:
+                f.close()
+    except Exception:
+        raise
+
+
 def add_to_root_gradle_settings(name):
     '''
       Adds project name to the root level settings.gradle file.
@@ -126,9 +151,33 @@ def add_to_package_xml(name):
         package_xml.write(new_contents)
 
 
+def add_install_app_to_cmake_targets():
+    '''
+      Adds project name to build_depends in package.xml (should be same name as the ros msg package name).
+    '''
+    for rel_path in ['.', '..']:
+        cmakelists_txt_path = os.path.join(os.getcwd(), rel_path, 'CMakeLists.txt')
+        if os.path.isfile(cmakelists_txt_path):
+            break
+        else:
+            cmakelists_txt_path = None
+    if cmakelists_txt_path is None:
+        console.pretty_println("\nCouldn't find the root level CMakeLists.txt - not adding to the superproject.")
+        return
+    with open(cmakelists_txt_path, 'r') as cmakelists_txt:
+        console.pretty_print('  File      : ', console.cyan)
+        console.pretty_println('CMakeLists.txt (gradle task update)', console.yellow)
+        old_text = 'catkin_rosjava_setup(publishMavenJavaPublicationToMavenRepository)'
+        new_text = 'catkin_rosjava_setup(publishMavenJavaPublicationToMavenRepository installApp)'
+        new_contents = cmakelists_txt.read().replace(old_text, new_text)
+    with open(cmakelists_txt_path, 'w') as cmakelists_txt:
+        cmakelists_txt.write(new_contents)
+
+
 def create_dummy_java_class(project_name):
     path = os.path.join(os.getcwd(), project_name.lower())
-    java_package_path = os.path.join(path, 'src', 'main', 'java', 'com', 'github', 'rosjava', project_name)
+    package_name = os.path.basename(os.getcwd())
+    java_package_path = os.path.join(path, 'src', 'main', 'java', 'com', 'github', package_name, project_name)
     utils.mkdir_p(java_package_path)
     filename = os.path.join(java_package_path, 'Dude.java')
     java_class = "package com.github.rosjava.%s.Dude;\n" % project_name
@@ -170,12 +219,23 @@ def create_rosjava_project_common(args, template_directory):
 
 def create_rosjava_project():
     args = parse_arguments()
+    project_name = args.name[0]
+    author = args.author
     create_rosjava_project_common(args, 'rosjava_project')
-    create_dummy_java_class(args.name[0])
+    create_talker_listener_classes(project_name, 'rosjava_project', author)
+    add_install_app_to_cmake_targets()
+
+
+def create_rosjava_library_project():
+    args = parse_arguments()
+    project_name = args.name[0]
+    create_rosjava_project_common(args, 'rosjava_library_project')
+    create_dummy_java_class(project_name)
 
 
 def create_rosjava_msg_project():
     args = parse_arguments()
+    project_name = args.name[0]
     create_rosjava_project_common(args, 'rosjava_msg_project')
     add_catkin_generate_tree_command()
-    add_to_package_xml(args.name[0])
+    add_to_package_xml(project_name)

src/rosjava_build_tools/templates/android_package/build.gradle.in

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013 %(author)s
+ * Copyright (C) 2014 %(author)s
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of

src/rosjava_build_tools/templates/android_package/settings.gradle

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013 %(author)s
+ * Copyright (C) 2014 %(author)s
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of

src/rosjava_build_tools/templates/android_project/build.gradle.in

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013 %(author)s.
+ * Copyright (C) 2014 %(author)s.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of