install gradle t share destination

.gitignore

@@ -2,6 +2,5 @@
 *.pyc
 
 # Package Files #
-*.jar
 *.war
 *.ear

CMakeLists.txt

@@ -23,13 +23,13 @@ catkin_add_env_hooks(15.rosjava SHELLS sh DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/
 # Have to install gradle here so we can retain executable permissions
 # If we do via setup.py with the data subsection, it loses permissions
 install(
-    PROGRAMS src/rosjava_build_tools/gradle/gradlew
-    DESTINATION ${CATKIN_PACKAGE_PYTHON_DESTINATION}/gradle
+    PROGRAMS gradle/gradlew
+    DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}/gradle
     )
 
 install(
-    DIRECTORY src/rosjava_build_tools/gradle/gradle
-    DESTINATION ${CATKIN_PACKAGE_PYTHON_DESTINATION}/gradle
+    DIRECTORY gradle/gradle
+    DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}/gradle
   )
 
 install(
@@ -44,7 +44,7 @@ install(
 
 set(ROS_MAVEN_DEPLOYMENT_REPOSITORY $ENV{ROS_MAVEN_DEPLOYMENT_REPOSITORY})
 if(NOT ROS_MAVEN_DEPLOYMENT_REPOSITORY)
-    set(ROS_MAVEN_DEPLOYMENT_REPOSITORY "${CATKIN_DEVEL_PREFIX}/${CATKIN_GLOBAL_SHARE_DESTINATION}/maven")
+    set(ROS_MAVEN_DEPLOYMENT_REPOSITORY "${CATKIN_DEVEL_PREFIX}/${CATKIN_GLOBAL_SHARE_DESTINATION}/repository")
 endif()
 file(WRITE ${ROS_MAVEN_DEPLOYMENT_REPOSITORY}/rospack_nosubdirs "")
 install(FILES ${ROS_MAVEN_DEPLOYMENT_REPOSITORY}/rospack_nosubdirs

gradle/Readme.md

+It is currently the gradle wrapper supporting gradle 4.6
+
+When creating the tarball, simply run the following command in any gradle projects root.
+
+> tar -cvzf gradle.tar.gz gradlew gradle gradle.properties

package.xml

 <package>
   <name>rosjava_build_tools</name>
-  <version>0.3.4</version>
+  <version>0.3.5</version>
   <description>
     Simple tools and catkin modules for rosjava development.
   </description>

src/rosjava_build_tools/create_package.py

@@ -100,7 +100,7 @@ def populate_repo(repo_path, package_type):
 
 
 def create_gradle_wrapper(repo_path):
-    gradle_binary = os.path.join(os.path.dirname(__file__), 'gradle', 'gradlew')
+    gradle_binary = os.path.join(os.path.dirname(__file__),'..', '..', '..', 'share', 'rosjava_build_tools', 'gradle', 'gradlew')
     cmd = [gradle_binary, '-p', repo_path, 'wrapper']
     console.pretty_print("Creating gradle wrapper: ", console.cyan)
     console.pretty_println("%s" % ' '.join(cmd), console.yellow)

src/rosjava_build_tools/gradle/Readme.md

-This is not installed, but it gets used to generate the gradle wrapper for a project.
-
-It is currently the gradle wrapper supporting gradle 4.6