Merge pull request #7 from fmessmer/test_noetic

test noetic

Author: fmessmer

CMakeLists.txt

@@ -32,7 +32,7 @@ install(
     DESTINATION ${CATKIN_PACKAGE_PYTHON_DESTINATION}/gradle
   )
 
-install(
+catkin_install_python(
     PROGRAMS generate_environment_variables.py
     DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}
     )

env-hooks/15.rosjava.bash.em

@@ -6,6 +6,12 @@ SCRIPT=@(CMAKE_CURRENT_SOURCE_DIR)/generate_environment_variables.py
 SCRIPT=@(CMAKE_INSTALL_PREFIX)/share/rosjava_build_tools/generate_environment_variables.py
 @[end if]@
 
-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`"
+if command -v python 1>/dev/null; then PYTHON_EXECUTABLE=python
+elif command -v python3 1>/dev/null; then PYTHON_EXECUTABLE=python3
+elif command -v python2 1>/dev/null; then PYTHON_EXECUTABLE=python2
+else PYTHON_EXECUTABLE=python
+fi
+
+export ROS_MAVEN_PATH="`${PYTHON_EXECUTABLE} ${SCRIPT} --maven-path`"
+export ROS_MAVEN_DEPLOYMENT_REPOSITORY="`${PYTHON_EXECUTABLE} ${SCRIPT} --maven-deployment-repository`"
+export ROS_MAVEN_REPOSITORY="`${PYTHON_EXECUTABLE} ${SCRIPT} --maven-repository`"

env-hooks/15.rosjava.sh.em

@@ -6,6 +6,12 @@ SCRIPT=@(CMAKE_CURRENT_SOURCE_DIR)/generate_environment_variables.py
 SCRIPT=@(CMAKE_INSTALL_PREFIX)/share/rosjava_build_tools/generate_environment_variables.py
 @[end if]@
 
-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`"
+if command -v python 1>/dev/null; then PYTHON_EXECUTABLE=python
+elif command -v python3 1>/dev/null; then PYTHON_EXECUTABLE=python3
+elif command -v python2 1>/dev/null; then PYTHON_EXECUTABLE=python2
+else PYTHON_EXECUTABLE=python
+fi
+
+export ROS_MAVEN_PATH="`${PYTHON_EXECUTABLE} ${SCRIPT} --maven-path`"
+export ROS_MAVEN_DEPLOYMENT_REPOSITORY="`${PYTHON_EXECUTABLE} ${SCRIPT} --maven-deployment-repository`"
+export ROS_MAVEN_REPOSITORY="`${PYTHON_EXECUTABLE} ${SCRIPT} --maven-repository`"