From d15c5813eaf78cf871e55a3cf17f72a4a959d8db Mon Sep 17 00:00:00 2001
From: Leroy Ruegemer <lruegeme@techfak.uni-bielefeld.de>
Date: Mon, 8 Mar 2021 12:18:15 +0100
Subject: [PATCH] Do not generate ROS_MAVEN_REPOSITORY anymore
---
env-hooks/15.rosjava.bash.em | 2 +-
env-hooks/15.rosjava.sh.em | 2 +-
generate_environment_variables.py | 2 +-
package.xml | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/env-hooks/15.rosjava.bash.em b/env-hooks/15.rosjava.bash.em
index 95fe7cc..b0e39a1 100644
--- a/env-hooks/15.rosjava.bash.em
+++ b/env-hooks/15.rosjava.bash.em
@@ -8,6 +8,6 @@ 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 ROS_MAVEN_REPOSITORY="`python ${SCRIPT} --maven-repository`"
+#export ROS_MAVEN_REPOSITORY="`python ${SCRIPT} --maven-repository`"
export ROS_LOCAL_MAVEN_REPOSITORY="`python ${SCRIPT} --local-maven-repository`"
export ROS_MAVEN_SETTING_XML_CONTENT="`python ${SCRIPT} --create-maven-settings`"
diff --git a/env-hooks/15.rosjava.sh.em b/env-hooks/15.rosjava.sh.em
index bb125d8..8e2f07c 100644
--- a/env-hooks/15.rosjava.sh.em
+++ b/env-hooks/15.rosjava.sh.em
@@ -8,6 +8,6 @@ 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 ROS_MAVEN_REPOSITORY="`python ${SCRIPT} --maven-repository`"
+#export ROS_MAVEN_REPOSITORY="`python ${SCRIPT} --maven-repository`"
export ROS_LOCAL_MAVEN_REPOSITORY="`python ${SCRIPT} --local-maven-repository`"
export ROS_MAVEN_SETTING_XML_CONTENT="`python ${SCRIPT} --create-maven-settings`"
\ No newline at end of file
diff --git a/generate_environment_variables.py b/generate_environment_variables.py
index 843cc95..b4f475a 100755
--- a/generate_environment_variables.py
+++ b/generate_environment_variables.py
@@ -10,7 +10,7 @@ def parse_arguments():
parser = argparse.ArgumentParser(description='Generate environment variables for the rosjava maven environment.')
cmd_group = parser.add_mutually_exclusive_group()
cmd_group.add_argument('-d', '--maven-deployment-repository', action='store_true', help='Return the current devel workspace maven directory.')
- cmd_group.add_argument('-r', '--maven-repository', action='store_true', help='The url to the external ros maven repository.')
+ #cmd_group.add_argument('-r', '--maven-repository', action='store_true', help='The url to the external ros maven repository.')
cmd_group.add_argument('-m', '--maven-path', action='store_true', help='Generate maven path across all chained workspcaes.')
cmd_group.add_argument('-g', '--gradle-user-home', action='store_true', help='Generate the local gradle user home in the current devel workspace (share/gradle).')
cmd_group.add_argument('-l', '--local-maven-repository', action='store_true', help='Generate the local maven cache in the current devel workspace (share/maven).')
diff --git a/package.xml b/package.xml
index def002a..02c354e 100644
--- a/package.xml
+++ b/package.xml
@@ -1,6 +1,6 @@
<package>
<name>rosjava_build_tools</name>
- <version>0.4.1</version>
+ <version>0.4.2</version>
<description>
Simple tools and catkin modules for rosjava development.
</description>
--
GitLab