Skip to content
Snippets Groups Projects
Commit a8f1088e authored by Julian Cerruti's avatar Julian Cerruti Committed by GitHub
Browse files

Merge pull request #30 from adamantivm/publish-target

publishMavenJavaPublicationToMavenRepository -> publish
parents dc55637f 8c30d2a5
Branches
Tags
No related merge requests found
...@@ -173,8 +173,8 @@ def add_tasks_to_cmake_setup(tasks): ...@@ -173,8 +173,8 @@ def add_tasks_to_cmake_setup(tasks):
return return
rosjava_setup_string = result.group(0) rosjava_setup_string = result.group(0)
gradle_tasks = set([]) gradle_tasks = set([])
if rosjava_setup_string.find("publishMavenJavaPublicationToMavenRepository") == -1: if rosjava_setup_string.find("publish") == -1:
gradle_tasks.add("publishMavenJavaPublicationToMavenRepository") gradle_tasks.add("publish")
if rosjava_setup_string.find("installApp") == -1: if rosjava_setup_string.find("installApp") == -1:
gradle_tasks.add("installApp") gradle_tasks.add("installApp")
gradle_tasks |= set(tasks) gradle_tasks |= set(tasks)
...@@ -236,7 +236,7 @@ def create_rosjava_project(): ...@@ -236,7 +236,7 @@ def create_rosjava_project():
author = args.author author = args.author
create_rosjava_project_common(args, 'rosjava_project') create_rosjava_project_common(args, 'rosjava_project')
create_talker_listener_classes(project_name, 'rosjava_project', author) create_talker_listener_classes(project_name, 'rosjava_project', author)
add_tasks_to_cmake_setup(['installApp', 'publishMavenJavaPublicationToMavenRepository']) add_tasks_to_cmake_setup(['installApp', 'publish'])
def create_rosjava_library_project(): def create_rosjava_library_project():
...@@ -244,7 +244,7 @@ def create_rosjava_library_project(): ...@@ -244,7 +244,7 @@ def create_rosjava_library_project():
project_name = args.name[0] project_name = args.name[0]
create_rosjava_project_common(args, 'rosjava_library_project') create_rosjava_project_common(args, 'rosjava_library_project')
create_dummy_java_class(project_name) create_dummy_java_class(project_name)
add_tasks_to_cmake_setup(['publishMavenJavaPublicationToMavenRepository']) add_tasks_to_cmake_setup(['publish'])
def create_rosjava_msg_project(): def create_rosjava_msg_project():
...@@ -253,4 +253,4 @@ def create_rosjava_msg_project(): ...@@ -253,4 +253,4 @@ def create_rosjava_msg_project():
create_rosjava_project_common(args, 'rosjava_msg_project') create_rosjava_project_common(args, 'rosjava_msg_project')
add_catkin_generate_tree_command() add_catkin_generate_tree_command()
add_to_package_xml(project_name) add_to_package_xml(project_name)
add_tasks_to_cmake_setup(['publishMavenJavaPublicationToMavenRepository']) add_tasks_to_cmake_setup(['publish'])
...@@ -58,11 +58,11 @@ subprojects { ...@@ -58,11 +58,11 @@ subprojects {
Some useful tasks: Some useful tasks:
install: deploys jar's to MavenLocal() (i.e. ~/.m2/repository) install: deploys jar's to MavenLocal() (i.e. ~/.m2/repository)
publishMavenJavaPublicationToMavenRepository : deploys jar's to devel/share/maven publish : deploys jar's to devel/share/maven
installApp : assembles java apps in the _subproject_/build directories. installApp : assembles java apps in the _subproject_/build directories.
Note that these are dependent on the type of project (e.g. installApp is only valid for Note that these are dependent on the type of project (e.g. installApp is only valid for
java binary subprojects, while publishMavenJav... is only added once a subproject is included. java binary subprojects, while publish is only added once a subproject is included.
If you're using catkin_make, this is not important, since it will use the task list specified If you're using catkin_make, this is not important, since it will use the task list specified
in CMakeLists.txt in CMakeLists.txt
*/ */
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment