From 6f64de8964db6c2289cd9a3d618fe10e961157aa Mon Sep 17 00:00:00 2001 From: Benjamin Maidel Date: Tue, 23 Jan 2018 20:08:14 +0100 Subject: [PATCH 1/2] added action message generation --- .../internal/message/GenerateInterfaces.java | 21 +++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/message_generation/src/main/java/org/ros/internal/message/GenerateInterfaces.java b/message_generation/src/main/java/org/ros/internal/message/GenerateInterfaces.java index 64a16c89..33f23cdf 100644 --- a/message_generation/src/main/java/org/ros/internal/message/GenerateInterfaces.java +++ b/message_generation/src/main/java/org/ros/internal/message/GenerateInterfaces.java @@ -142,6 +142,27 @@ public void generate(File outputDirectory, Collection packages, for (File directory : packagePath) { topicDefinitionFileProvider.addDirectory(directory); serviceDefinitionFileProvider.addDirectory(directory); + + //ugly hack for action definitions + String dir = directory.getAbsolutePath(); + String actionDir = dir + "/action"; + File actionFile = new File(actionDir); + if(actionFile.exists()) { + int idx = dir.indexOf("src"); + if(idx >= 0){ + String subDir = dir.substring(idx); + dir = dir.replace(subDir,"devel/share/"); + String[] splits = directory.getAbsolutePath().split("/"); + if(splits.length >0){ + dir += splits[splits.length-1]; + File newFileDir = new File(dir); + if(newFileDir.exists()){ + topicDefinitionFileProvider.addDirectory(newFileDir); + } + } + } + } + } topicDefinitionFileProvider.update(); serviceDefinitionFileProvider.update(); From 62c4f7bdbcde8d45212150f72c1426b0819fd48b Mon Sep 17 00:00:00 2001 From: fmessmer Date: Mon, 30 Jul 2018 13:26:44 +0200 Subject: [PATCH 2/2] fix rosjava tasks and install tag --- CMakeLists.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f4f90e62..f706bc20 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -11,7 +11,7 @@ project(rosjava_bootstrap) find_package(catkin REQUIRED rosjava_build_tools) -catkin_rosjava_setup(publish installDist) +catkin_rosjava_setup(publish install) catkin_package() @@ -19,5 +19,5 @@ catkin_package() # Installation ############################################################################## -install(DIRECTORY ${CATKIN_DEVEL_PREFIX}/${CATKIN_GLOBAL_MAVEN_DESTINATION}/org/ros/rosjava_bootstrap/ - DESTINATION ${CATKIN_GLOBAL_MAVEN_DESTINATION}/org/ros/rosjava_bootstrap) +install(DIRECTORY ${ROS_MAVEN_DEPLOYMENT_REPOSITORY}/org/ros/rosjava_bootstrap + DESTINATION ${CATKIN_GLOBAL_MAVEN_DESTINATION}/org/ros)