adding smarts to the message artifact catkin api.

Author: stonier

CMakeLists.txt

@@ -17,7 +17,9 @@ find_package(catkin REQUIRED COMPONENTS genmsg)
 
 catkin_package(
   CATKIN_DEPENDS genmsg
-  CFG_EXTRAS genjava-extras.cmake
+  CFG_EXTRAS
+    genjava-extras.cmake
+    genjava-catkin-api.cmake
 )
 
 catkin_python_setup()

cmake/genjava-catkin-api.cmake.em

@@ -0,0 +1,53 @@
+@[if DEVELSPACE]@
+# location of scripts in develspace
+  set(GENJAVA_BIN_DIR "@(CMAKE_CURRENT_SOURCE_DIR)/scripts")
+@[else]@
+  set(GENJAVA_BIN_DIR "${GENJAVA_DIR}/../../../@(CATKIN_PACKAGE_BIN_DESTINATION)")
+@[end if]@
+
+set(GENJAVA_BIN ${GENJAVA_BIN_DIR}/genjava_message_artifacts)
+set(genjava_INSTALL_DIR "maven/org/ros/rosjava_messages")
+
+include(CMakeParseArguments)
+
+# Api for a a catkin metapackage rolls rosjava messages for
+# its dependencies. Accepts a list of package names attached
+# to the PACKAGES arg (similar to the genmsg
+# 'generate_messages' api.
+#
+#   generate_rosjava_messages(
+#     PACKAGES
+#         std_msgs
+#         geometry_msgs
+#   )
+macro(generate_rosjava_messages)
+  if( ${ARGC} EQUAL 0 )
+    return() # Nothing to do (no packages specified)
+  else()
+    cmake_parse_arguments(ARG "" "" "PACKAGES" ${ARGN})
+  endif()
+  if(ARG_UNPARSED_ARGUMENTS)
+    message(FATAL_ERROR "generate_rosjava_messages() called with unused arguments: ${ARG_UNPARSED_ARGUMENTS}")
+  endif()
+  set(ROS_GRADLE_VERBOSE $ENV{ROS_GRADLE_VERBOSE})
+  if(ROS_GRADLE_VERBOSE)
+      set(verbosity "--verbosity")
+  else()
+      set(verbosity "")
+  endif()
+  string(REPLACE ";" " " package_list "${ARG_PACKAGES}")
+  add_custom_target(${PROJECT_NAME}_rosjava_messages
+    ALL
+    COMMAND ${CATKIN_ENV} ${PYTHON_EXECUTABLE} ${GENJAVA_BIN}
+        ${verbosity}
+        -o ${CMAKE_CURRENT_BINARY_DIR}
+        -p ${ARG_PACKAGES} # this has to be a list argument so it separates each arg (not a single string!)
+    WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+    COMMENT "Compiling rosjava message artifacts for [${package_list}]"
+  )
+  foreach(pkg ${ARG_PACKAGES})
+    message(STATUS "Additional clean file.......${CMAKE_CURRENT_BINARY_DIR}/${pkg}/build.gradle")
+    set_directory_properties(PROPERTY ADDITIONAL_MAKE_CLEAN_FILES ${CMAKE_CURRENT_BINARY_DIR}/${pkg}/build.gradle)
+    add_dependencies(${PROJECT_NAME}_rosjava_messages ${pkg}_generate_messages)
+  endforeach()
+endmacro()

scripts/CMakeLists.txt

@@ -2,7 +2,10 @@
 # Installs
 ##############################################################################
 
+# Rosrunnable installation of scripts
 catkin_install_python(
-    PROGRAMS genjava_gradle_project.py
-    DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION}
-)
+  PROGRAMS 
+    genjava_gradle_project.py
+    genjava_message_artifacts
+  DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION}
+)