Skip to content

Commit

Permalink
Release 1.4.0
Browse files Browse the repository at this point in the history
Version 1.4.0 includes a first stable version of communication interfaces.
  • Loading branch information
domire8 authored Jul 20, 2023
2 parents eb7794a + c4a4697 commit f17881f
Show file tree
Hide file tree
Showing 8 changed files with 37 additions and 11 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build-release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
tag: ${{ steps.parse-tag.outputs.tag }}
steps:
- uses: actions/checkout@v3
- uses: aica-technology/.github/.github/actions/docker-tag-from-git@v0.5.0
- uses: aica-technology/.github/.github/actions/docker-tag-from-git@v0.6.1
id: parse-tag

build:
Expand Down
12 changes: 12 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,24 @@

Release Versions:

- [1.4.0](#140)
- [1.3.0](#130)
- [1.2.0](#120)
- [1.1.0](#110)
- [1.0.0](#100)
- [0.2.0](#020)
- [0.1.0](#010)

## 1.4.0

Version 1.4.0 includes a first stable version of communication interfaces.

## 1.3.0

Version 1.3.0 introduces the first version of the communication_interfaces library, which is a more standalone and
versatile alternative of network_interfaces for socket communication. It doesn't have dependencies on control libraries
or clproto. Additionally, the release includes automated builds for the CI.

## 1.2.0

Version 1.2.0 is an update to support the latest release of
Expand Down
4 changes: 2 additions & 2 deletions cpp/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
cmake_minimum_required(VERSION 3.15)

set (NETWORK_INTERFACES_VERSION 1.2.0)
set (NETWORK_INTERFACES_VERSION 1.4.0)
project(network_interfaces VERSION ${NETWORK_INTERFACES_VERSION})

option(BUILD_TESTING "Build tests." OFF)
Expand Down Expand Up @@ -40,7 +40,7 @@ include(FindPkgConfig)

add_project_dependency(control_libraries 7.0.0 REQUIRED COMPONENTS state_representation)
add_project_dependency(clproto 7.0.0 REQUIRED)
if (NOT ${cppzmq_FOUND}) # provided by parent CMakeLists.txt (if used)
if (NOT cppzmq_POPULATED) # provided by parent CMakeLists.txt (if used)
add_project_dependency(cppzmq 4.7.1 REQUIRED)
endif()

Expand Down
2 changes: 1 addition & 1 deletion python/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

setuptools.setup(
name="network_interfaces",
version="1.2.0",
version="1.4.0",
description="This package implements network interfaces of AICA",
maintainer="Dominic Reber",
maintainer_email="dominic@aica.tech",
Expand Down
23 changes: 18 additions & 5 deletions source/communication_interfaces/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
cmake_minimum_required(VERSION 3.15)

set(COMMUNICATION_INTERFACES_VERSION 0.0.1)
set(COMMUNICATION_INTERFACES_VERSION 0.0.2)
project(communication_interfaces VERSION ${COMMUNICATION_INTERFACES_VERSION})

option(BUILD_TESTING "Build tests." OFF)
Expand Down Expand Up @@ -38,12 +38,10 @@ include(GNUInstallDirs)
include(CMakePackageConfigHelpers)
include(FindPkgConfig)

if (NOT ${cppzmq_FOUND}) # provided by parent CMakeLists.txt (if used)
if (NOT cppzmq_POPULATED) # provided by parent CMakeLists.txt (if used)
add_project_dependency(cppzmq 4.7.1 REQUIRED)
endif()

include_directories(include)

add_library(${PROJECT_NAME} SHARED
${PROJECT_SOURCE_DIR}/src/sockets/UDPSocket.cpp
${PROJECT_SOURCE_DIR}/src/sockets/UDPClient.cpp
Expand All @@ -55,7 +53,10 @@ add_library(${PROJECT_NAME} SHARED
${PROJECT_SOURCE_DIR}/src/sockets/TCPSocket.cpp
${PROJECT_SOURCE_DIR}/src/sockets/TCPClient.cpp
${PROJECT_SOURCE_DIR}/src/sockets/TCPServer.cpp)
target_include_directories(${PROJECT_NAME} PUBLIC include)
target_include_directories(${PROJECT_NAME} PUBLIC
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
)
target_link_libraries(${PROJECT_NAME} PUBLIC cppzmq)

install(DIRECTORY include/ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
Expand All @@ -74,6 +75,18 @@ if(BUILD_TESTING)
add_test(NAME test_${PROJECT_NAME} COMMAND test_${PROJECT_NAME})
endif()

# export the target and its associated config (includes, linked libraries, etc)
install(TARGETS ${PROJECT_NAME}
EXPORT ${PROJECT_NAME}Targets
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
)
install(EXPORT ${PROJECT_NAME}Targets
FILE ${PROJECT_NAME}Targets.cmake
DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}
)

# generate the version file for the config file
write_basic_package_version_file(
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
@PACKAGE_INIT@

include(CMakeFindDependencyMacro)
find_dependency(cppzmq)
find_dependency(cppzmq)
include(${CMAKE_CURRENT_LIST_DIR}/communication_interfacesTargets.cmake)
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ ZMQSubscriber::ZMQSubscriber(ZMQSocketConfiguration configuration) : ZMQSocket(s

void ZMQSubscriber::open() {
this->socket_ = std::make_shared<zmq::socket_t>(*this->config_.context, ZMQ_SUB);
this->open_socket();
this->socket_->set(zmq::sockopt::conflate, 1);
this->socket_->set(zmq::sockopt::subscribe, "");
this->open_socket();
}

bool ZMQSubscriber::send_bytes(const std::string&) {
Expand Down
Empty file modified source/install.sh
100644 → 100755
Empty file.

0 comments on commit f17881f

Please sign in to comment.