Commit upstream/0.7.18+git20190826.461cd3c - ros-catkin

+4

-2

.travis.yml less more

0	0	language: python
1	1	python:
2		- "2.7_with_system_site_packages"
3		- "3.4_with_system_site_packages"
	2	- "2.7"
	3	- "3.5"
	4	virtualenv:
	5	system_site_packages: true
4	6	# command to install dependencies
5	7	install:
6	8	- pip install argparse catkin-pkg empy mock nose

+3

-0

bin/catkin_make_isolated less more

56	56	pkg.add_argument('--pkg', nargs='+', metavar='PKGNAME', dest='packages',
57	57	help="Process only specific packages "
58	58	"(only after catkin_make_isolated has been invoked before with the same install flag)")
	59	pkg.add_argument('--ignore-pkg', nargs='+', metavar='PKGNAME', dest='ignore_packages',
	60	help="Ignore specific packages.")
59	61	pkg.add_argument('--from-pkg', metavar='PKGNAME', dest='from_package',
60	62	help='Restart catkin_make_isolated at the given package continuing from there '
61	63	'(do not change CMake arguments, add/move/remove packages or toggle the install flag when '

145	147	force_cmake=opts.force_cmake,
146	148	colorize=not opts.no_color,
147	149	build_packages=opts.packages or ([] if opts.from_package is None else [opts.from_package]),
	150	ignore_packages=opts.ignore_packages,
148	151	quiet=opts.quiet,
149	152	cmake_args=cmake_args,
150	153	make_args=opts.make_args,

+3

-2

cmake/all.cmake less more

57	57	set(CATKIN_WORKSPACES "")
58	58	foreach(path ${CMAKE_PREFIX_PATH})
59	59	if(EXISTS "${path}/.catkin")
60		list(FIND CATKIN_WORKSPACES ${path} _index)
	60	file(TO_CMAKE_PATH "${path}" cmake_path)
	61	list(FIND CATKIN_WORKSPACES ${cmake_path} _index)
61	62	if(_index EQUAL -1)
62		list(APPEND CATKIN_WORKSPACES ${path})
	63	list(APPEND CATKIN_WORKSPACES ${cmake_path})
63	64	endif()
64	65	endif()
65	66	endforeach()

+2

-1

cmake/catkin_install_python.cmake less more

49	49
50	50	get_filename_component(name "${file}" NAME)
51	51	add_python_executable(SCRIPT_NAME ${name}
52		TARGET_NAME ${name}_executable_install_python
	52	# prefix with project name to avoid collisions across packages
	53	TARGET_NAME ${PROJECT_NAME}_${name}_exec_install_python
53	54	DESTINATION "${ARG_DESTINATION}")
54	55	elseif(NOT ARG_OPTIONAL)
55	56	message(FATAL_ERROR "catkin_install_python() called with non-existing file '${file}'.")

+4

-2

cmake/catkin_libraries.cmake less more

136	136	get_target_property(${lib}_imported ${lib} IMPORTED)
137	137	if(${${lib}_type} STREQUAL "INTERFACE_LIBRARY")
138	138	get_target_property(${lib}_interface_link_libraries ${lib} INTERFACE_LINK_LIBRARIES)
139		catkin_replace_imported_library_targets(${lib}_resolved_libs ${${lib}_interface_link_libraries})
140		list(APPEND result ${${lib}_resolved_libs})
	139	if(${${lib}_interface_link_libraries})
	140	catkin_replace_imported_library_targets(${lib}_resolved_libs ${${lib}_interface_link_libraries})
	141	list(APPEND result ${${lib}_resolved_libs})
	142	endif()
141	143	elseif(${${lib}_imported})
142	144	set(imported_libraries) # empty list
143	145	get_target_property(${lib}_imported_location ${lib} IMPORTED_LOCATION)

+4

-2

cmake/catkin_python_setup.cmake less more

153	153	@ONLY)
154	154
155	155	add_python_executable(SCRIPT_NAME ${name}
156		TARGET_NAME ${name}_executable_devel
	156	# prefix with project name to avoid collisions across packages
	157	TARGET_NAME ${PROJECT_NAME}_${name}_exec_devel
157	158	DESTINATION ${CATKIN_DEVEL_PREFIX}/${CATKIN_GLOBAL_BIN_DESTINATION})
158	159
159	160	add_python_executable(SCRIPT_NAME ${name}
160		TARGET_NAME ${name}_executable_install
	161	# prefix with project name to avoid collisions across packages
	162	TARGET_NAME ${PROJECT_NAME}_${name}_exec_install
161	163	DESTINATION ${CATKIN_GLOBAL_BIN_DESTINATION})
162	164	endforeach()
163	165	endfunction()

+0

-2

cmake/interrogate_setup_dot_py.py less more

0		#!/usr/bin/env python
1
2	0	# Software License Agreement (BSD License)
3	1	#
4	2	# Copyright (c) 2012, Willow Garage, Inc.

+0

-2

cmake/order_paths.py less more

0		#!/usr/bin/env python
1
2	0	from __future__ import print_function
3	1
4	2	from argparse import ArgumentParser

+0

-2

cmake/parse_package_xml.py less more

0		#!/usr/bin/env python
1
2	0	# Software License Agreement (BSD License)
3	1	#
4	2	# Copyright (c) 2012, Willow Garage, Inc.

+12

-0

cmake/platform/windows.cmake less more

47	47	set_target_properties(${ARGV0}
48	48	PROPERTIES
49	49	RUNTIME_OUTPUT_DIRECTORY ${CATKIN_DEVEL_PREFIX}/${CATKIN_GLOBAL_BIN_DESTINATION}
	50	RUNTIME_OUTPUT_DIRECTORY_DEBUG ${CATKIN_DEVEL_PREFIX}/${CATKIN_GLOBAL_BIN_DESTINATION}
	51	RUNTIME_OUTPUT_DIRECTORY_RELEASE ${CATKIN_DEVEL_PREFIX}/${CATKIN_GLOBAL_BIN_DESTINATION}
	52	RUNTIME_OUTPUT_DIRECTORY_MINSIZEREL ${CATKIN_DEVEL_PREFIX}/${CATKIN_GLOBAL_BIN_DESTINATION}
	53	RUNTIME_OUTPUT_DIRECTORY_RELWITHDEBINFO ${CATKIN_DEVEL_PREFIX}/${CATKIN_GLOBAL_BIN_DESTINATION}
50	54	LIBRARY_OUTPUT_DIRECTORY ${CATKIN_DEVEL_PREFIX}/${CATKIN_PACKAGE_LIB_DESTINATION}
	55	LIBRARY_OUTPUT_DIRECTORY_DEBUG ${CATKIN_DEVEL_PREFIX}/${CATKIN_PACKAGE_LIB_DESTINATION}
	56	LIBRARY_OUTPUT_DIRECTORY_RELEASE ${CATKIN_DEVEL_PREFIX}/${CATKIN_PACKAGE_LIB_DESTINATION}
	57	LIBRARY_OUTPUT_DIRECTORY_MINSIZEREL ${CATKIN_DEVEL_PREFIX}/${CATKIN_PACKAGE_LIB_DESTINATION}
	58	LIBRARY_OUTPUT_DIRECTORY_RELWITHDEBINFO ${CATKIN_DEVEL_PREFIX}/${CATKIN_PACKAGE_LIB_DESTINATION}
51	59	ARCHIVE_OUTPUT_DIRECTORY ${CATKIN_DEVEL_PREFIX}/${CATKIN_PACKAGE_LIB_DESTINATION}
	60	ARCHIVE_OUTPUT_DIRECTORY_DEBUG ${CATKIN_DEVEL_PREFIX}/${CATKIN_PACKAGE_LIB_DESTINATION}
	61	ARCHIVE_OUTPUT_DIRECTORY_RELEASE ${CATKIN_DEVEL_PREFIX}/${CATKIN_PACKAGE_LIB_DESTINATION}
	62	ARCHIVE_OUTPUT_DIRECTORY_MINSIZEREL ${CATKIN_DEVEL_PREFIX}/${CATKIN_PACKAGE_LIB_DESTINATION}
	63	ARCHIVE_OUTPUT_DIRECTORY_RELWITHDEBINFO ${CATKIN_DEVEL_PREFIX}/${CATKIN_PACKAGE_LIB_DESTINATION}
52	64	)
53	65	endif()
54	66	endfunction()

+1

-1

cmake/templates/local_setup.bat.in less more

1	1	REM generated from catkin/cmake/template/local_setup.bat.in
2	2
3	3	set _CATKIN_SETUP_DIR=@SETUP_DIR@
4		call %_CATKIN_SETUP_DIR%/setup.sh --extend --local
	4	call %_CATKIN_SETUP_DIR%/setup.bat --extend --local
5	5	set _CATKIN_SETUP_DIR=

+1

-1

cmake/templates/script.py.in less more

0		#!/usr/bin/env python
	0	#!@PYTHON_EXECUTABLE@
1	1	# -- coding: utf-8 --
2	2	# generated from catkin/cmake/template/script.py.in
3	3	# creates a relay to a python script source file, acting as that file.

+0

-2

cmake/test/download_checkmd5.py less more

0		#!/usr/bin/env python
1
2	0	from __future__ import print_function
3	1	import errno
4	2	import os

+6

-3

cmake/test/gtest.cmake less more

279	279	#In googletest 1.8, gmock and gtest where merged inside googletest
280	280	#In this case, including gmock builds gmock twice, so instead we need to include googletest
281	281	#which will include gtest and gmock once
282		set(_global_base_dir "${src_path}/googletest")
283		if(EXISTS "${_global_base_dir}/CMakeLists.txt")
284		set(${base_dir} ${_global_base_dir} PARENT_SCOPE)
	282	if(_gtest_found)
	283	get_filename_component(_gtest_base_dir_realpath ${_gtest_base_dir} REALPATH)
	284	get_filename_component(_global_base_dir ${_gtest_base_dir_realpath} PATH)
	285	if(EXISTS "${_global_base_dir}/CMakeLists.txt")
	286	set(${base_dir} ${_global_base_dir} PARENT_SCOPE)
	287	endif()
285	288	endif()
286	289	endfunction()
287	290

+0

-2

cmake/test/remove_test_results.py less more

0		#!/usr/bin/env python
1
2	0	from __future__ import print_function
3	1
4	2	import argparse

+0

-2

cmake/test/run_tests.py less more

0		#!/usr/bin/env python
1
2	0	from __future__ import print_function
3	1
4	2	import argparse

+17

-11

package.xml less more

0	0	<?xml version="1.0"?>
1		<package format="2">
	1	<?xml-model
	2	href="http://download.ros.org/schema/package_format3.xsd"
	3	schematypens="http://www.w3.org/2001/XMLSchema"?>
	4	<package format="3">
2	5	<name>catkin</name>
3	6	<version>0.7.18</version>
4	7	<description>Low-level build system macros and infrastructure for ROS.</description>
5	8	<maintainer email="dthomas@osrfoundation.org">Dirk Thomas</maintainer>
6	9	<license>BSD</license>
7	10
8		<url type="website">http://www.ros.org/wiki/catkin</url>
	11	<url type="website">http://wiki.ros.org/catkin</url>
9	12	<url type="bugtracker">https://github.com/ros/catkin/issues</url>
10	13	<url type="repository">https://github.com/ros/catkin</url>
11	14

14	17	<author>Brian Gerkey</author>
15	18	<author>Dirk Thomas</author>
16	19
	20	<depend condition="$ROS_PYTHON_VERSION == 2">python-argparse</depend>
	21	<depend condition="$ROS_PYTHON_VERSION == 2" version_gt="0.4.3">python-catkin-pkg</depend>
	22	<depend condition="$ROS_PYTHON_VERSION == 3" version_gt="0.4.3">python3-catkin-pkg</depend>
	23	<depend condition="$ROS_PYTHON_VERSION == 2">python-empy</depend>
	24	<depend condition="$ROS_PYTHON_VERSION == 3">python3-empy</depend>
	25
17	26	<buildtool_depend>cmake</buildtool_depend>
18	27	<buildtool_export_depend>cmake</buildtool_export_depend>
19	28
20		<depend>python-argparse</depend>
21		<depend version_gt="0.4.3">python-catkin-pkg</depend>
22
23		<build_depend>python-empy</build_depend>
24
25	29	<build_export_depend>google-mock</build_export_depend>
26	30	<build_export_depend>gtest</build_export_depend>
27		<build_export_depend>python-empy</build_export_depend>
28		<build_export_depend>python-nose</build_export_depend>
	31	<build_export_depend condition="$ROS_PYTHON_VERSION == 2">python-nose</build_export_depend>
	32	<build_export_depend condition="$ROS_PYTHON_VERSION == 3">python3-nose</build_export_depend>
29	33
30		<test_depend>python-mock</test_depend>
31		<test_depend>python-nose</test_depend>
	34	<test_depend condition="$ROS_PYTHON_VERSION == 2">python-mock</test_depend>
	35	<test_depend condition="$ROS_PYTHON_VERSION == 3">python3-mock</test_depend>
	36	<test_depend condition="$ROS_PYTHON_VERSION == 2">python-nose</test_depend>
	37	<test_depend condition="$ROS_PYTHON_VERSION == 3">python3-nose</test_depend>
32	38
33	39	<export>
34	40	<rosdoc config="rosdoc.yaml"/>

+2

-1

python/catkin/builder.py less more

808	808	force_cmake=False,
809	809	colorize=True,
810	810	build_packages=None,
	811	ignore_packages=None,
811	812	quiet=False,
812	813	cmake_args=None,
813	814	make_args=None,

970	971	sys.exit('Packages not found in the workspace: %s' % ', '.join(unknown_packages))
971	972
972	973	# Report topological ordering
973		ordered_packages = topological_order_packages(packages)
	974	ordered_packages = topological_order_packages(packages, blacklisted=ignore_packages)
974	975	unknown_build_types = []
975	976	msg = []
976	977	msg.append('@{pf}~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~' + ('~' * len(str(len(ordered_packages)))))

+6

-1

python/catkin/init_workspace.py less more

32	32	from __future__ import print_function
33	33	import os
34	34	import shutil
	35	import sys
35	36	from catkin.workspace import get_source_paths, get_workspaces
36	37
37	38	def _symlink_or_copy(src, dst):

86	87	# look in to-be-initialized workspace first
87	88	src = os.path.join(workspace_dir, 'catkin', 'cmake', 'toplevel.cmake')
88	89	if os.path.isfile(src):
89		src_file_path = os.path.relpath(src, workspace_dir)
	90	if sys.platform == 'win32':
	91	# use absolute path on Windows due to lack of support for os.symlink
	92	src_file_path = src
	93	else:
	94	src_file_path = os.path.relpath(src, workspace_dir)
90	95	else:
91	96	checked.append(src)
92	97

+0

-2

setup.py less more

0		#!/usr/bin/env python
1
2	0	from distutils.core import setup
3	1	from catkin_pkg.python_setup import generate_distutils_setup
4	2

+1

-1

test/unit_tests/test_catkin_make_isolated.py less more

144	144	cmi = os.path.join(os.path.dirname(__file__), '..', '..', 'bin', 'catkin_make_isolated')
145	145	environ['CMAKE_PREFIX_PATH'] = os.path.join(ws_dir, 'install')
146	146	environ['PWD'] = src_dir
147		subprocess.check_output(' '.join([cmi, '-C', '..']), cwd=src_dir, env=environ, shell=True)
	147	subprocess.check_output(' '.join([sys.executable, cmi, '-C', '..']), cwd=src_dir, env=environ, shell=True)
148	148	except Exception as e:
149	149	error_msg = str(e)
150	150	finally: