only set gradle user home when making a binary.

Author: stonier

cmake/rosjava.cmake.em

@@ -50,11 +50,9 @@ macro(_rosjava_env)
     else()
         set(ROSJAVA_ENV "ROS_MAVEN_DEPLOYMENT_REPOSITORY=${ROS_MAVEN_DEPLOYMENT_REPOSITORY}")
     endif()
-    set(ROSJAVA_GRADLE_USER_HOME $ENV{GRADLE_USER_HOME})
-    if(NOT ROSJAVA_GRADLE_USER_HOME)
+    # The build farm won't let you access /root/.gradle, so redirect it somewhere practical here.
+    if(DEFINED CATKIN_BUILD_BINARY_PACKAGE)
       list(APPEND ROSJAVA_ENV "GRADLE_USER_HOME=${CATKIN_DEVEL_PREFIX}/${CATKIN_GLOBAL_GRADLE_DESTINATION}")
-    else()
-      list(APPEND ROSJAVA_ENV "GRADLE_USER_HOME=${ROSJAVA_GRADLE_USER_HOME}")
     endif()
 endmacro()
 
@@ -67,14 +65,13 @@ macro(catkin_rosjava_setup)
     _rosjava_env()
     find_gradle()
     if( ${ARGC} EQUAL 0 )
-      # Note : COMMAND is a list of variables, so these need to be a list, not a single string
-      set(gradle_tasks "install;installApp;uploadArchives")
+      # Note : COMMAND is a list of variables (semi-colon separated)
+      set(gradle_tasks "publishMavenJavaPublicationToMavenRepository") # old targets "install;installApp;uploadArchives"
     else()
       set(gradle_tasks ${ARGV})
     endif()
     add_custom_target(gradle-${PROJECT_NAME}
         ALL
-        COMMAND ${ROSJAVA_ENV} ${CATKIN_ENV} "env" "|" "grep" "GRADLE" 
         COMMAND ${ROSJAVA_ENV} ${CATKIN_ENV} "env" "|" "grep" "ROS" 
         COMMAND ${ROSJAVA_ENV} ${CATKIN_ENV} ${${PROJECT_NAME}_gradle_BINARY} ${gradle_tasks} 
         WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}

env-hooks/15.rosjava.bash.em

@@ -8,4 +8,3 @@ SCRIPT=@(CMAKE_INSTALL_PREFIX)/share/rosjava_build_tools/generate_environment_va
 
 export ROS_MAVEN_PATH=`python ${SCRIPT} --maven-path`
 export ROS_MAVEN_DEPLOYMENT_REPOSITORY=`python ${SCRIPT} --maven-deployment-repository`
-export GRADLE_USER_HOME=`python ${SCRIPT} --gradle-user-home`

env-hooks/15.rosjava.sh.em

@@ -8,4 +8,3 @@ SCRIPT=@(CMAKE_INSTALL_PREFIX)/share/rosjava_build_tools/generate_environment_va
 
 export ROS_MAVEN_PATH=`python ${SCRIPT} --maven-path`
 export ROS_MAVEN_DEPLOYMENT_REPOSITORY=`python ${SCRIPT} --maven-deployment-repository`
-export GRADLE_USER_HOME=`python ${SCRIPT} --gradle-user-home`