From db20a6a850cdc91f422b33f94afe7825e7b63ba4 Mon Sep 17 00:00:00 2001 From: Sebastian Meyer zu Borgsen <semeyerz@techfak.uni-bielefeld.de> Date: Thu, 16 Mar 2017 14:20:34 +0100 Subject: [PATCH] changed maven repo as citk required it to be share/repository --- CMakeLists.txt | 2 +- cmake/rosjava.cmake.em | 2 +- generate_environment_variables.py | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 9eb1255..f19637c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -48,4 +48,4 @@ if(NOT ROS_MAVEN_DEPLOYMENT_REPOSITORY) endif() file(WRITE ${ROS_MAVEN_DEPLOYMENT_REPOSITORY}/rospack_nosubdirs "") install(FILES ${ROS_MAVEN_DEPLOYMENT_REPOSITORY}/rospack_nosubdirs - DESTINATION ${CATKIN_GLOBAL_SHARE_DESTINATION}/maven) + DESTINATION ${ROS_MAVEN_DEPLOYMENT_REPOSITORY}) diff --git a/cmake/rosjava.cmake.em b/cmake/rosjava.cmake.em index b867f5b..b59faf5 100644 --- a/cmake/rosjava.cmake.em +++ b/cmake/rosjava.cmake.em @@ -2,7 +2,7 @@ # Utilities ############################################################################## -set(CATKIN_GLOBAL_MAVEN_DESTINATION ${CATKIN_GLOBAL_SHARE_DESTINATION}/maven CACHE PATH "path to which maven artifacts are deployed in your workspace") +set(CATKIN_GLOBAL_MAVEN_DESTINATION ${CATKIN_GLOBAL_SHARE_DESTINATION}/repository CACHE PATH "path to which maven artifacts are deployed in your workspace") #TODO: make path configurable! set(CATKIN_GLOBAL_GRADLE_DESTINATION ${CATKIN_GLOBAL_SHARE_DESTINATION}/gradle CACHE PATH "path to which gradle configuration and artifacts are deployed in your workspace") # Scans down directories till it finds the gradle wrapper. diff --git a/generate_environment_variables.py b/generate_environment_variables.py index 5d8f4ce..8aa944a 100755 --- a/generate_environment_variables.py +++ b/generate_environment_variables.py @@ -44,10 +44,10 @@ if __name__ == '__main__': if args.maven_deployment_repository: repo = get_environment_variable(environment_variables, 'ROS_MAVEN_DEPLOYMENT_REPOSITORY') if repo is None: - repo = os.path.join(workspaces[0], 'share', 'maven') + repo = os.path.join(workspaces[0], 'share', 'repository') #TODO: make configurable! else: - if repo in [os.path.join(w, 'share', 'maven') for w in workspaces]: - repo = os.path.join(workspaces[0], 'share', 'maven') + if repo in [os.path.join(w, 'share', 'repository') for w in workspaces]: #TODO: make configurable! + repo = os.path.join(workspaces[0], 'share', 'repository') #TODO: make configurable! print(repo) elif args.maven_repository: repo = get_environment_variable(environment_variables, 'ROS_MAVEN_REPOSITORY') @@ -55,7 +55,7 @@ if __name__ == '__main__': repo = 'https://github.com/rosjava/rosjava_mvn_repo/raw/master' print(repo) elif args.maven_path: - new_maven_paths = [os.path.join(path, 'share', 'maven') for path in workspaces] + new_maven_paths = [os.path.join(path, 'share', 'repository') for path in workspaces] #TODO: make configurable! maven_paths = get_environment_variable(environment_variables, 'ROS_MAVEN_PATH') if maven_paths is None: maven_paths = new_maven_paths -- GitLab