Skip to content

Commit adfa935

Browse files
fmauchfmauch
authored
Rename package to ur_client_library (UniversalRobots#7)
* Renamed package to ur_client_library * Name actual library urcl
1 parent 54202aa commit adfa935

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

77 files changed

+183
-183
lines changed

‎CMakeLists.txt

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
cmake_minimum_required(VERSION 2.8.12)
2-
project(ur_lib)
2+
project(ur_client_library)
33

44
set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/CMakeModules/" ${CMAKE_MODULE_PATH})
55

@@ -18,7 +18,7 @@ include(DefineCXX11CompilerFlag)
1818
DEFINE_CXX_11_COMPILER_FLAG(CXX11_FLAG)
1919
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -pedantic")
2020

21-
add_library(ur_lib SHARED
21+
add_library(urcl SHARED
2222
src/comm/tcp_socket.cpp
2323
src/comm/server.cpp
2424
src/primary/primary_package.cpp
@@ -42,31 +42,31 @@ add_library(ur_lib SHARED
4242
src/ur/tool_communication.cpp
4343
src/rtde/rtde_writer.cpp
4444
)
45-
add_library(ur_lib::ur_lib ALIAS ur_lib)
46-
target_compile_options(ur_lib PRIVATE -Wall -Wextra -Wno-unused-parameter)
47-
target_compile_options(ur_lib PUBLIC ${CXX11_FLAG})
48-
target_include_directories( ur_lib PUBLIC
45+
add_library(ur_client_library::urcl ALIAS urcl)
46+
target_compile_options(urcl PRIVATE -Wall -Wextra -Wno-unused-parameter)
47+
target_compile_options(urcl PUBLIC ${CXX11_FLAG})
48+
target_include_directories( urcl PUBLIC
4949
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
5050
$<INSTALL_INTERFACE:include>
5151
${Boost_INCLUDE_DIRS}
5252
)
5353

5454
find_package(Threads REQUIRED)
5555
if(THREADS_HAVE_PTHREAD_ARG)
56-
target_compile_options(ur_lib PUBLIC "-pthread")
56+
target_compile_options(urcl PUBLIC "-pthread")
5757
endif()
5858
if(CMAKE_THREAD_LIBS_INIT)
59-
target_link_libraries(ur_lib PUBLIC "${CMAKE_THREAD_LIBS_INIT}")
59+
target_link_libraries(urcl PUBLIC "${CMAKE_THREAD_LIBS_INIT}")
6060
endif()
6161

6262
find_package(console_bridge)
6363
if(console_bridge_FOUND)
6464
message(STATUS "Building with ROS logging support")
6565
add_definitions( -DROS_BUILD )
66-
target_include_directories( ur_lib PRIVATE
66+
target_include_directories( urcl PRIVATE
6767
${console_bridge_INCLUDE_DIRS}
6868
)
69-
target_link_libraries(ur_lib INTERFACE console_bridge)
69+
target_link_libraries(urcl INTERFACE console_bridge)
7070
else()
7171
message(STATUS "Building without ROS logging support")
7272
endif()
@@ -82,25 +82,25 @@ else()
8282
endif()
8383

8484

85-
target_link_libraries(ur_lib INTERFACE ${Boost_Libraries})
85+
target_link_libraries(urcl INTERFACE ${Boost_Libraries})
8686

8787
add_subdirectory(examples)
8888

8989
include(GNUInstallDirs)
90-
install(TARGETS ur_lib EXPORT ur_lib_targets
90+
install(TARGETS urcl EXPORT urcl_targets
9191
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
9292
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
9393
)
9494
install(DIRECTORY include/ DESTINATION include)
9595

96-
install(EXPORT ur_lib_targets
97-
DESTINATION lib/cmake/ur_lib
98-
FILE ur_libTargets.cmake
99-
NAMESPACE ur_lib::)
96+
install(EXPORT urcl_targets
97+
DESTINATION lib/cmake/ur_client_library
98+
FILE urclTargets.cmake
99+
NAMESPACE ur_client_library::)
100100

101101
include(CMakePackageConfigHelpers)
102-
write_basic_package_version_file(${CMAKE_CURRENT_BINARY_DIR}/ur_libConfigVersion.cmake VERSION 0.0.3
102+
write_basic_package_version_file(${CMAKE_CURRENT_BINARY_DIR}/ur_client_libraryConfigVersion.cmake VERSION 0.0.3
103103
COMPATIBILITY SameMajorVersion)
104-
install(FILES ur_libConfig.cmake
105-
DESTINATION lib/cmake/ur_lib)
104+
install(FILES ur_client_libraryConfig.cmake
105+
DESTINATION lib/cmake/ur_client_library)
106106

‎README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#ur_lib
1+
# Universal Robots Client Library
22

33
A C++ library for accessing Universal Robots interfaces. With this library C++-based drivers can be
44
implemented in order to create external applications leveraging the versatility of Universal Robots

‎examples/CMakeLists.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
cmake_minimum_required(VERSION 2.8.12)
22
project(ur_driver_examples)
33

4-
#find_package(ur_lib REQUIRED)
4+
#find_package(ur_client_library REQUIRED)
55

66
##
77
## Check C++11 support / enable global pedantic and Wall
@@ -13,9 +13,9 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -pedantic")
1313
add_executable(driver_example
1414
full_driver.cpp)
1515
target_compile_options(driver_example PUBLIC ${CXX11_FLAG})
16-
target_link_libraries(driver_example ur_lib::ur_lib)
16+
target_link_libraries(driver_example ur_client_library::urcl)
1717

1818
add_executable(rtde_client_example
1919
rtde_client.cpp)
2020
target_compile_options(rtde_client_example PUBLIC ${CXX11_FLAG})
21-
target_link_libraries(rtde_client_example ur_lib::ur_lib)
21+
target_link_libraries(rtde_client_example ur_client_library::urcl)

‎examples/full_driver.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@
2828
*/
2929
//----------------------------------------------------------------------
3030

31-
#include <ur_lib/ur/ur_driver.h>
32-
#include <ur_lib/types.h>
31+
#include <ur_client_library/ur/ur_driver.h>
32+
#include <ur_client_library/types.h>
3333

3434
#include <iostream>
3535
#include <memory>

‎examples/rtde_client.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
*/
1313
//----------------------------------------------------------------------
1414

15-
#include <ur_lib/rtde/rtde_client.h>
15+
#include <ur_client_library/rtde/rtde_client.h>
1616

1717
#include <iostream>
1818
#include <memory>

‎include/ur_lib/comm/bin_parser.h renamed to ‎include/ur_client_library/comm/bin_parser.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@
2929
#include <cstring>
3030
#include <string>
3131
#include <memory>
32-
#include "ur_lib/log.h"
33-
#include "ur_lib/types.h"
34-
#include "ur_lib/exceptions.h"
32+
#include "ur_client_library/log.h"
33+
#include "ur_client_library/types.h"
34+
#include "ur_client_library/exceptions.h"
3535

3636
namespace ur_driver
3737
{

‎include/ur_lib/comm/package.h renamed to ‎include/ur_client_library/comm/package.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
#ifndef UR_RTDE_DRIVER_PACKAGE_H_INCLUDED
2828
#define UR_RTDE_DRIVER_PACKAGE_H_INCLUDED
2929

30-
#include "ur_lib/comm/bin_parser.h"
30+
#include "ur_client_library/comm/bin_parser.h"
3131

3232
namespace ur_driver
3333
{

‎include/ur_lib/comm/package_serializer.h renamed to ‎include/ur_client_library/comm/package_serializer.h

File renamed without changes.

‎include/ur_lib/comm/parser.h renamed to ‎include/ur_client_library/comm/parser.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@
2020

2121
#pragma once
2222
#include <vector>
23-
#include "ur_lib/comm/bin_parser.h"
24-
#include "ur_lib/comm/package.h"
23+
#include "ur_client_library/comm/bin_parser.h"
24+
#include "ur_client_library/comm/package.h"
2525

2626
namespace ur_driver
2727
{

‎include/ur_lib/comm/pipeline.h renamed to ‎include/ur_client_library/comm/pipeline.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@
2020

2121
#pragma once
2222

23-
#include "ur_lib/comm/package.h"
24-
#include "ur_lib/log.h"
25-
#include "ur_lib/queue/readerwriterqueue.h"
23+
#include "ur_client_library/comm/package.h"
24+
#include "ur_client_library/log.h"
25+
#include "ur_client_library/queue/readerwriterqueue.h"
2626
#include <atomic>
2727
#include <chrono>
2828
#include <thread>

‎include/ur_lib/comm/producer.h renamed to ‎include/ur_client_library/comm/producer.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@
2020

2121
#pragma once
2222
#include <chrono>
23-
#include "ur_lib/comm/pipeline.h"
24-
#include "ur_lib/comm/parser.h"
25-
#include "ur_lib/comm/stream.h"
26-
#include "ur_lib/comm/package.h"
27-
#include "ur_lib/exceptions.h"
23+
#include "ur_client_library/comm/pipeline.h"
24+
#include "ur_client_library/comm/parser.h"
25+
#include "ur_client_library/comm/stream.h"
26+
#include "ur_client_library/comm/package.h"
27+
#include "ur_client_library/exceptions.h"
2828

2929
namespace ur_driver
3030
{

‎include/ur_lib/comm/reverse_interface.h renamed to ‎include/ur_client_library/comm/reverse_interface.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@
2828
#ifndef UR_RTDE_DRIVER_REVERSE_INTERFACE_H_INCLUDED
2929
#define UR_RTDE_DRIVER_REVERSE_INTERFACE_H_INCLUDED
3030

31-
#include "ur_lib/comm/server.h"
32-
#include "ur_lib/types.h"
31+
#include "ur_client_library/comm/server.h"
32+
#include "ur_client_library/types.h"
3333
#include <cstring>
3434
#include <endian.h>
3535

‎include/ur_lib/comm/script_sender.h renamed to ‎include/ur_client_library/comm/script_sender.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@
2929
#ifndef UR_RTDE_DRIVER_SCRIPT_SENDER_H_INCLUDED
3030
#define UR_RTDE_DRIVER_SCRIPT_SENDER_H_INCLUDED
3131

32-
#include "ur_lib/comm/server.h"
33-
#include "ur_lib/log.h"
32+
#include "ur_client_library/comm/server.h"
33+
#include "ur_client_library/log.h"
3434

3535
namespace ur_driver
3636
{

‎include/ur_lib/comm/server.h renamed to ‎include/ur_client_library/comm/server.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
#include <cstdlib>
2727
#include <mutex>
2828
#include <string>
29-
#include "ur_lib/comm/tcp_socket.h"
29+
#include "ur_client_library/comm/tcp_socket.h"
3030

3131
namespace ur_driver
3232
{

‎include/ur_lib/comm/shell_consumer.h renamed to ‎include/ur_client_library/comm/shell_consumer.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@
2828
#ifndef UR_RTDE_DRIVER_SHELL_CONSUMER_H_INCLUDED
2929
#define UR_RTDE_DRIVER_SHELL_CONSUMER_H_INCLUDED
3030

31-
#include "ur_lib/log.h"
32-
#include "ur_lib/comm/pipeline.h"
33-
#include "ur_lib/comm/package.h"
31+
#include "ur_client_library/log.h"
32+
#include "ur_client_library/comm/pipeline.h"
33+
#include "ur_client_library/comm/package.h"
3434

3535
namespace ur_driver
3636
{

‎include/ur_lib/comm/stream.h renamed to ‎include/ur_client_library/comm/stream.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@
2525
#include <atomic>
2626
#include <mutex>
2727
#include <string>
28-
#include "ur_lib/log.h"
29-
#include "ur_lib/comm/tcp_socket.h"
28+
#include "ur_client_library/log.h"
29+
#include "ur_client_library/comm/tcp_socket.h"
3030

3131
namespace ur_driver
3232
{

‎include/ur_lib/comm/tcp_socket.h renamed to ‎include/ur_client_library/comm/tcp_socket.h

File renamed without changes.

‎include/ur_lib/exceptions.h renamed to ‎include/ur_client_library/exceptions.h

File renamed without changes.

‎include/ur_lib/log.h renamed to ‎include/ur_client_library/log.h

File renamed without changes.

‎include/ur_lib/primary/abstract_primary_consumer.h renamed to ‎include/ur_client_library/primary/abstract_primary_consumer.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,10 @@
2828
#ifndef UR_ROBOT_DRIVER_ABSTRACT_PRIMARY_CONSUMER_H_INCLUDED
2929
#define UR_ROBOT_DRIVER_ABSTRACT_PRIMARY_CONSUMER_H_INCLUDED
3030

31-
#include "ur_lib/log.h"
32-
#include "ur_lib/comm/pipeline.h"
33-
#include "ur_lib/primary/robot_message/version_message.h"
34-
#include "ur_lib/primary/robot_state/kinematics_info.h"
31+
#include "ur_client_library/log.h"
32+
#include "ur_client_library/comm/pipeline.h"
33+
#include "ur_client_library/primary/robot_message/version_message.h"
34+
#include "ur_client_library/primary/robot_state/kinematics_info.h"
3535

3636
namespace ur_driver
3737
{

‎include/ur_lib/primary/package_header.h renamed to ‎include/ur_client_library/primary/package_header.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
#include <inttypes.h>
3333
#include <cstddef>
3434
#include <endian.h>
35-
#include "ur_lib/types.h"
35+
#include "ur_client_library/types.h"
3636

3737
namespace ur_driver
3838
{

‎include/ur_lib/primary/primary_package.h renamed to ‎include/ur_client_library/primary/primary_package.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@
2828
#ifndef UR_RTDE_DRIVER_PRIMARY_PACKAGE_H_INCLUDED
2929
#define UR_RTDE_DRIVER_PRIMARY_PACKAGE_H_INCLUDED
3030

31-
#include "ur_lib/primary/package_header.h"
32-
#include "ur_lib/comm/package.h"
31+
#include "ur_client_library/primary/package_header.h"
32+
#include "ur_client_library/comm/package.h"
3333

3434
namespace ur_driver
3535
{

‎include/ur_lib/primary/primary_parser.h renamed to ‎include/ur_client_library/primary/primary_parser.h

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,14 @@
2020

2121
#pragma once
2222
#include <vector>
23-
#include "ur_lib/comm/bin_parser.h"
24-
#include "ur_lib/comm/pipeline.h"
25-
#include "ur_lib/comm/parser.h"
26-
#include "ur_lib/primary/package_header.h"
27-
#include "ur_lib/primary/robot_state.h"
28-
#include "ur_lib/primary/robot_message.h"
29-
#include "ur_lib/primary/robot_state/kinematics_info.h"
30-
#include "ur_lib/primary/robot_message/version_message.h"
23+
#include "ur_client_library/comm/bin_parser.h"
24+
#include "ur_client_library/comm/pipeline.h"
25+
#include "ur_client_library/comm/parser.h"
26+
#include "ur_client_library/primary/package_header.h"
27+
#include "ur_client_library/primary/robot_state.h"
28+
#include "ur_client_library/primary/robot_message.h"
29+
#include "ur_client_library/primary/robot_state/kinematics_info.h"
30+
#include "ur_client_library/primary/robot_message/version_message.h"
3131

3232
namespace ur_driver
3333
{

‎include/ur_lib/primary/robot_message.h renamed to ‎include/ur_client_library/primary/robot_message.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
#ifndef UR_RTDE_DRIVER_ROBOT_MESSAGE_H_INCLUDED
2929
#define UR_RTDE_DRIVER_ROBOT_MESSAGE_H_INCLUDED
3030

31-
#include "ur_lib/primary/primary_package.h"
31+
#include "ur_client_library/primary/primary_package.h"
3232

3333
namespace ur_driver
3434
{

‎include/ur_lib/primary/robot_message/version_message.h renamed to ‎include/ur_client_library/primary/robot_message/version_message.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
#ifndef UR_RTDE_DRIVER_VERSION_MESSAGE_H_INCLUDED
2929
#define UR_RTDE_DRIVER_VERSION_MESSAGE_H_INCLUDED
3030

31-
#include "ur_lib/primary/robot_message.h"
31+
#include "ur_client_library/primary/robot_message.h"
3232

3333
namespace ur_driver
3434
{

‎include/ur_lib/primary/robot_state.h renamed to ‎include/ur_client_library/primary/robot_state.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@
2828
#ifndef UR_RTDE_DRIVER_ROBOT_STATE_H_INCLUDED
2929
#define UR_RTDE_DRIVER_ROBOT_STATE_H_INCLUDED
3030

31-
#include "ur_lib/primary/primary_package.h"
32-
#include "ur_lib/primary/package_header.h"
31+
#include "ur_client_library/primary/primary_package.h"
32+
#include "ur_client_library/primary/package_header.h"
3333

3434
namespace ur_driver
3535
{

‎include/ur_lib/primary/robot_state/kinematics_info.h renamed to ‎include/ur_client_library/primary/robot_state/kinematics_info.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@
2828
#ifndef UR_RTDE_DRIVER_KINEMATICS_INFO_H_INCLUDED
2929
#define UR_RTDE_DRIVER_KINEMATICS_INFO_H_INCLUDED
3030

31-
#include "ur_lib/types.h"
32-
#include "ur_lib/primary/robot_state.h"
31+
#include "ur_client_library/types.h"
32+
#include "ur_client_library/primary/robot_state.h"
3333
namespace ur_driver
3434
{
3535
namespace primary_interface

‎include/ur_lib/queue/LICENSE.md renamed to ‎include/ur_client_library/queue/LICENSE.md

File renamed without changes.

‎include/ur_lib/queue/atomicops.h renamed to ‎include/ur_client_library/queue/atomicops.h

File renamed without changes.

‎include/ur_lib/queue/readerwriterqueue.h renamed to ‎include/ur_client_library/queue/readerwriterqueue.h

File renamed without changes.

‎include/ur_lib/rtde/control_package_pause.h renamed to ‎include/ur_client_library/rtde/control_package_pause.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
#ifndef UR_RTDE_DRIVER_CONTROL_PACKAGE_PAUSE_H_INCLUDED
2929
#define UR_RTDE_DRIVER_CONTROL_PACKAGE_PAUSE_H_INCLUDED
3030

31-
#include "ur_lib/rtde/rtde_package.h"
31+
#include "ur_client_library/rtde/rtde_package.h"
3232

3333
namespace ur_driver
3434
{

‎include/ur_lib/rtde/control_package_setup_inputs.h renamed to ‎include/ur_client_library/rtde/control_package_setup_inputs.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030

3131
#include <vector>
3232

33-
#include "ur_lib/rtde/rtde_package.h"
33+
#include "ur_client_library/rtde/rtde_package.h"
3434

3535
namespace ur_driver
3636
{

‎include/ur_lib/rtde/control_package_setup_outputs.h renamed to ‎include/ur_client_library/rtde/control_package_setup_outputs.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@
3030

3131
#include <vector>
3232

33-
#include "ur_lib/rtde/rtde_package.h"
34-
#include "ur_lib/rtde/package_header.h"
33+
#include "ur_client_library/rtde/rtde_package.h"
34+
#include "ur_client_library/rtde/package_header.h"
3535

3636
namespace ur_driver
3737
{

‎include/ur_lib/rtde/control_package_start.h renamed to ‎include/ur_client_library/rtde/control_package_start.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
#ifndef UR_RTDE_DRIVER_CONTROL_PACKAGE_START_H_INCLUDED
2929
#define UR_RTDE_DRIVER_CONTROL_PACKAGE_START_H_INCLUDED
3030

31-
#include "ur_lib/rtde/rtde_package.h"
31+
#include "ur_client_library/rtde/rtde_package.h"
3232

3333
namespace ur_driver
3434
{

0 commit comments

Comments
 (0)