Commit 1f9af065aaada52601514d75e4ce5ab8136f7ea1 - ros-resource-retriever

Imported Upstream version 1.12.2 Jochen Sprickerhof 7 years ago

5 changed file(s) with 28 addition(s) and 4 deletion(s). Raw diff Collapse all Expand all

+19

-0

CHANGELOG.rst less more

0	0	^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
1	1	Changelog for package resource_retriever
2	2	^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
	3
	4	1.12.2 (2016-06-10)
	5	-------------------
	6	* fix failing build due to cmake error (`#6 <https://github.com/ros/resource_retriever/issues/6>`_)
	7	* Contributors: Jackie Kay
	8
	9	1.12.1 (2016-06-10)
	10	-------------------
	11	* Fix warnings in test (`#5 <https://github.com/ros/resource_retriever/issues/5>`_)
	12	add spaces around ROS_PACKAGE_NAME
	13	* Merge pull request `#4 <https://github.com/ros/resource_retriever/issues/4>`_ from DLu/kinetic-devel
	14	Add c++11 flag
	15	* Contributors: David V. Lu!!, Jackie Kay, Steven Peters
	16
	17	1.12.0 (2016-03-23)
	18	-------------------
	19	* resource_retriever: adding missing dep
	20	Using the python resource_retriever requires the `python-urlgrabber` system dependency: http://rosindex.github.io/d/python-urlgrabber/
	21	* Contributors: Jonathan Bohren
3	22
4	23	1.11.6 (2014-11-30)
5	24	-------------------

-1

CMakeLists.txt less more

0	0	cmake_minimum_required(VERSION 2.8.3)
1	1	project(resource_retriever)
	2
	3	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
2	4
3	5	find_package(catkin REQUIRED COMPONENTS rosconsole roslib)
4	6

10	12
11	13	include_directories(include)
12	14
13		find_package(catkin REQUIRED COMPONENTS rosconsole roslib)
	15
14	16	include_directories(${catkin_INCLUDE_DIRS})
15	17	link_directories(${catkin_LIBRARY_DIRS})
16	18

-0

include/resource_retriever/retriever.h less more

77	77	MemoryResource get(const std::string& url);
78	78
79	79	private:
	80	Retriever(const Retriever & ret) = delete;
	81
80	82	CURL* curl_handle_;
81	83	};
82	84

-1

package.xml less more

0	0	<package>
1	1	<name>resource_retriever</name>
2		<version>1.11.6</version>
	2	<version>1.12.2</version>
3	3	<description>
4	4	This package retrieves data from url-format files such as http://,
5	5	ftp://, package:// file://, etc., and loads the data into memory.

27	27	<run_depend>curl</run_depend>
28	28	<run_depend>rosconsole</run_depend>
29	29	<run_depend>roslib</run_depend>
	30	<run_depend>python-urlgrabber</run_depend>
30	31
31	32	</package>

-2

test/test.cpp less more

44	44	try
45	45	{
46	46	Retriever r;
47		MemoryResource res = r.get("package://"ROS_PACKAGE_NAME"/test/test.txt");
	47	MemoryResource res = r.get("package://" ROS_PACKAGE_NAME "/test/test.txt");
48	48
49	49	ASSERT_EQ(res.size, 1);
50	50	ASSERT_EQ(res.data[0], 'A');

72	72	fclose(f);
73	73
74	74	Retriever r;
75		MemoryResource res = r.get("package://"ROS_PACKAGE_NAME"/test/large_file.dat");
	75	MemoryResource res = r.get("package://" ROS_PACKAGE_NAME "/test/large_file.dat");
76	76
77	77	ASSERT_EQ(res.size, 1024102450);
78	78	}