make sure variables are generated for sh shells as well - catkin uses these.

Author: stonier

CMakeLists.txt

@@ -14,6 +14,7 @@ catkin_package(CFG_EXTRAS rosjava.cmake)
 
 catkin_python_setup()
 catkin_add_env_hooks(15.rosjava SHELLS bash DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/env-hooks)
+catkin_add_env_hooks(15.rosjava SHELLS sh DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/env-hooks)
 
 ##############################################################################
 # Project Settings

env-hooks/15.rosjava.bash.em

@@ -1,13 +1,12 @@
 #!/bin/bash
 
 @[if DEVELSPACE]@
-export ROS_MAVEN_PATH=`python @(CMAKE_CURRENT_SOURCE_DIR)/generate_ros_maven_path.py`
-export ROS_MAVEN_DEPLOYMENT_PATH=`python @(CMAKE_CURRENT_SOURCE_DIR)/generate_ros_maven_path.py --deployment-repository`
-mkdir -p @(CATKIN_DEVEL_PREFIX)/share/gradle
-export GRADLE_USER_HOME=@(CATKIN_DEVEL_PREFIX)/share/gradle
+export ROS_MAVEN_PATH=`python @(CMAKE_CURRENT_SOURCE_DIR)/generate_environment_variables.py --maven-path`
+export ROS_MAVEN_DEPLOYMENT_PATH=`python @(CMAKE_CURRENT_SOURCE_DIR)/generate_environment_variables.py --maven-deployment-repository`
+export GRADLE_USER_HOME=`python @(CMAKE_CURRENT_SOURCE_DIR)/generate_environment_variables.py --gradle-user-home`
+mkdir -p ${GRADLE_USER_HOME}
 @[else]@
-export ROS_MAVEN_PATH=`python @(CMAKE_INSTALL_PREFIX)/share/rosjava_build_tools/generate_ros_maven_path.py`
-export ROS_MAVEN_DEPLOYMENT_PATH=`python @(CMAKE_INSTALL_PREFIX)/share/rosjava_build_tools/generate_ros_maven_path.py --deployment-repository`
+export ROS_MAVEN_PATH=`python @(CMAKE_INSTALL_PREFIX)/share/rosjava_build_tools/generate_environment_variables.py --maven-path`
+export ROS_MAVEN_DEPLOYMENT_PATH=`python @(CMAKE_INSTALL_PREFIX)/share/rosjava_build_tools/generate_environment_variables.py --maven-deployment-repository`
 @[end if]@
 
-

env-hooks/15.rosjava.sh.em

@@ -0,0 +1,11 @@
+#!/bin/sh
+
+@[if DEVELSPACE]@
+export ROS_MAVEN_PATH=`python @(CMAKE_CURRENT_SOURCE_DIR)/generate_environment_variables.py --maven-path`
+export ROS_MAVEN_DEPLOYMENT_PATH=`python @(CMAKE_CURRENT_SOURCE_DIR)/generate_environment_variables.py --maven-deployment-repository`
+export GRADLE_USER_HOME=`python @(CMAKE_CURRENT_SOURCE_DIR)/generate_environment_variables.py --gradle-user-home`
+mkdir -p ${GRADLE_USER_HOME}
+@[else]@
+export ROS_MAVEN_PATH=`python @(CMAKE_INSTALL_PREFIX)/share/rosjava_build_tools/generate_environment_variables.py --maven-path`
+export ROS_MAVEN_DEPLOYMENT_PATH=`python @(CMAKE_INSTALL_PREFIX)/share/rosjava_build_tools/generate_environment_variables.py --maven-deployment-repository`
+@[end if]@

generate_ros_maven_path.py renamed to generate_environment_variables.py

@@ -7,7 +7,10 @@
 
 def parse_arguments():
     parser = argparse.ArgumentParser(description='Generate environment variables for the rosjava maven environment.')
-    parser.add_argument('-d', '--deployment-repository', action='store_true', help='Return the current devel workspace maven directory.')
+    cmd_group = parser.add_mutually_exclusive_group()
+    cmd_group.add_argument('-d', '--maven-deployment-repository', action='store_true', help='Return the current devel workspace maven directory.')
+    cmd_group.add_argument('-m', '--maven-path', action='store_true', help='Generate maven path across all chained workspcaes.')
+    cmd_group.add_argument('-g', '--gradle-user-home', action='store_true', help='Generate the local gradle user home in the current devel workspace (share/gradle).')
     args = parser.parse_args()
     return args
 
@@ -26,9 +29,14 @@ def get_workspaces(environ):
 if __name__ == '__main__':
     args = parse_arguments()
     workspaces = get_workspaces(dict(os.environ))
-    if args.deployment_repository:
+    if args.maven_deployment_repository:
         # assuming one value exists here
         print os.path.join(workspaces[0], 'share', 'maven')
-    else:
+    elif args.maven_path:
         maven_repository_paths = [os.path.join(path, 'share', 'maven') for path in workspaces]
         print os.pathsep.join(maven_repository_paths)
+    elif args.gradle_user_home:
+        # assuming one value exists here
+        print os.path.join(workspaces[0], 'share', 'gradle')
+    else:
+        print "Nothing to see here - please provide one of the valid command switches."