Skip to content
This repository has been archived by the owner on Nov 9, 2022. It is now read-only.

respect read-only source space #37

Closed
wants to merge 6 commits into from
Closed

respect read-only source space #37

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
d986374
set project-dir to build space
fmessmer Jul 30, 2018
905fce8
set project-cache-dir to build space
fmessmer Jul 30, 2018
70fdb03
simplify macros
fmessmer Jul 30, 2018
ce9a37f
Merge pull request #1 from mojin-robotics/fix_travis
fmessmer Jul 30, 2018
4da3ba6
preserve ROS_MAVEN_DEPLOYMENT_REPOSITORY if already set and part of w…
fmessmer Sep 20, 2018
f4c4383
Merge pull request #3 from fmessmer/preserve_ROS_MAVEN_DEPLOYMENT_REP…
fmessmer Sep 22, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions cmake/rosjava.cmake.em
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,8 +86,8 @@ macro(catkin_rosjava_setup)
###################################
add_custom_target(gradle-${PROJECT_NAME} ALL
#COMMAND ${ROSJAVA_ENV} ${CATKIN_ENV} "env" "|" "grep" "ROS"
COMMAND ${ROSJAVA_ENV} ${CATKIN_ENV} ${${PROJECT_NAME}_gradle_BINARY} ${gradle_options} ${gradle_tasks}
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
COMMAND ${ROSJAVA_ENV} ${CATKIN_ENV} ${${PROJECT_NAME}_gradle_BINARY} ${gradle_options} --project-dir ${CMAKE_CURRENT_SOURCE_DIR} --project-cache-dir ${PROJECT_BINARY_DIR}/.gradle -PbuildDir=${PROJECT_BINARY_DIR} ${gradle_tasks}
WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
VERBATIM
COMMENT "Gradling tasks for ${PROJECT_NAME}"
)
Expand All @@ -110,7 +110,7 @@ macro(catkin_rosjava_setup)
endif()
add_custom_target(gradle-clean-${PROJECT_NAME}
COMMAND ${CATKIN_ENV} ${${PROJECT_NAME}_gradle_BINARY} clean
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
COMMENT "Cleaning gradle project for ${PROJECT_NAME}"
)
add_dependencies(gradle-clean gradle-clean-${PROJECT_NAME})
Expand All @@ -132,8 +132,8 @@ macro(catkin_android_setup)
endif()
add_custom_target(gradle-${PROJECT_NAME}
ALL
COMMAND ${ROSJAVA_ENV} ${CATKIN_ENV} ${${PROJECT_NAME}_gradle_BINARY} ${gradle_tasks}
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
COMMAND ${ROSJAVA_ENV} ${CATKIN_ENV} ${${PROJECT_NAME}_gradle_BINARY} --project-dir ${CMAKE_CURRENT_SOURCE_DIR} --project-cache-dir ${PROJECT_BINARY_DIR}/.gradle -PbuildDir=${PROJECT_BINARY_DIR} ${gradle_tasks}
WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
VERBATIM
)
catkin_package_xml()
Expand All @@ -148,7 +148,7 @@ macro(catkin_android_setup)
endif()
add_custom_target(gradle-clean-${PROJECT_NAME}
COMMAND ${CATKIN_ENV} ${${PROJECT_NAME}_gradle_BINARY} clean
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
)
add_dependencies(gradle-clean gradle-clean-${PROJECT_NAME})
endmacro()
Expand Down
6 changes: 5 additions & 1 deletion generate_environment_variables.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,12 @@ def get_environment_variable(environ, key):
repo = get_environment_variable(environment_variables, 'ROS_MAVEN_DEPLOYMENT_REPOSITORY')
if repo is None:
repo = os.path.join(workspaces[0], 'share', 'maven')
else:
else: #ROS_MAVEN_DEPLOYMENT_REPOSITORY is already set
if repo in [os.path.join(w, 'share', 'maven') for w in workspaces]:
# ROS_MAVEN_DEPLOYMENT_REPOSITORY is part of workspace chain
pass
else:
# ROS_MAVEN_DEPLOYMENT_REPOSITORY is NOT part of workspace chain, set to top-most workspace
repo = os.path.join(workspaces[0], 'share', 'maven')
print(repo)
elif args.maven_repository:
Expand Down