Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bump version number to 2.0.0 #58

Merged
merged 14 commits into from
Mar 5, 2021
Merged

Bump version number to 2.0.0 #58

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
5546891
Bump version number to 2.0.0
jamoralp Jan 22, 2021
d42e2d2
Fix tests
pablogs9 Jan 26, 2021
af01ced
Launch CI
pablogs9 Jan 27, 2021
e0712d9
Revert "Launch CI"
pablogs9 Jan 27, 2021
6599de2
Use stl container (#60)
jamoralp Jan 27, 2021
c12165a
Add integration test for client to agent ping (#61)
jamoralp Feb 3, 2021
8f35a71
Add continous fragment mode tests (#59)
pablogs9 Feb 5, 2021
be82729
Refactor platform XRCE (#63)
pablogs9 Feb 9, 2021
cf35a52
Update dockerfile
pablogs9 Feb 10, 2021
fe469a4
Add custom transports tests (#66)
pablogs9 Mar 2, 2021
b7c8f30
Delete old CLI agent library flag (#68)
jamoralp Mar 2, 2021
3502034
Client minor API changes (#69)
pablogs9 Mar 3, 2021
2c9669f
Update coverage flags
pablogs9 Mar 3, 2021
97266a5
Bump version number to 2.0.0 (#70)
pablogs9 Mar 4, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,12 @@ if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
set_property(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS "Debug" "Release" "MinSizeRel" "RelWithDebInfo")
endif()

project(microxrcedds VERSION "1.3.1")
project(microxrcedds VERSION "2.0.0")

set(_client_tag develop)
set(_client_version 2.0.0)
set(_agent_tag develop)
set(_gen_tag develop)
set(_gen_tag master)

###############################################################################
# Build options.
Expand Down Expand Up @@ -150,6 +151,9 @@ if(UXRCE_ENABLE_AGENT)
-DLIB_INSTALL_DIR:PATH=${LIB_INSTALL_DIR}
-DDATA_INSTALL_DIR:PATH=${DATA_INSTALL_DIR}
-DUAGENT_BUILD_TESTS:BOOL=${UXRCE_BUILD_TESTS}
-DUAGENT_P2P_CLIENT_TAG:STRING=${_client_tag}
-DUAGENT_P2P_CLIENT_VERSION:STRING=${_client_version}
-DUAGENT_BUILD_EXECUTABLE:BOOL=OFF
-DUAGENT_ISOLATED_INSTALL:BOOL=OFF
-DGTEST_INDIVIDUAL:BOOL=ON
DEPENDS
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ RUN cd /uxrce/build && \
-DCMAKE_INSTALL_PREFIX=../install \
-DUXRCE_BUILD_EXAMPLES=ON \
.. &&\
make && make install
make -j $(nproc) && make install

# Prepare Micro XRCE-DDS artifacts
RUN cd /uxrce && \
Expand Down
8 changes: 4 additions & 4 deletions ci/linux/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,10 @@ include(ExternalProject)
include(CheckCCompilerFlag)
include(CheckCXXCompilerFlag)

set(_c_flags "-fwrapv -fprofile-arcs -ftest-coverage")
set(_cxx_flags "-fwrapv -fprofile-arcs -ftest-coverage")
set(_exe_linker_flags "-fprofile-arcs -ftest-coverage")
set(_shared_linker_flags "-fprofile-arcs -ftest-coverage")
set(_c_flags "-fwrapv -fprofile-arcs -ftest-coverage --coverage -fno-inline -fno-inline-small-functions -fno-default-inline")
set(_cxx_flags "-fwrapv -fprofile-arcs -ftest-coverage --coverage -fno-inline -fno-inline-small-functions -fno-default-inline")
set(_exe_linker_flags "-fprofile-arcs -ftest-coverage --coverage -fno-inline -fno-inline-small-functions -fno-default-inline")
set(_shared_linker_flags "-fprofile-arcs -ftest-coverage --coverage -fno-inline -fno-inline-small-functions -fno-default-inline")

check_cxx_compiler_flag("-fprofile-abs-path" _have_fprofile_abs_path)
if(_have_fprofile_abs_path)
Expand Down
1 change: 1 addition & 0 deletions test/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,4 +46,5 @@ add_subdirectory(test/interaction_client)
add_subdirectory(test/client_agent)
add_subdirectory(test/publisher_subscriber)
add_subdirectory(test/discovery)
add_subdirectory(test/custom_transports)
#add_subdirectory(test/shapes_demo) TODO (julibert): fix client and agent paths.
3 changes: 1 addition & 2 deletions test/profiling/publisher/main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,7 @@ int main(int args, char** argv)

// Transport
uxrUDPTransport transport;
uxrUDPPlatform udp_platform;
if(!uxr_init_udp_transport(&transport, &udp_platform, UXR_IPv4, "127.0.0.1", "2020"))
if(!uxr_init_udp_transport(&transport, UXR_IPv4, "127.0.0.1", "2020"))
{
printf("Error at create transport.\n");
return 1;
Expand Down
3 changes: 1 addition & 2 deletions test/profiling/subscriber/main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,7 @@ int main(int args, char** argv)

// Transport
uxrUDPTransport transport;
uxrUDPPlatform udp_platform;
if(!uxr_init_udp_transport(&transport, &udp_platform, UXR_IPv4, "127.0.0.1", "2020"))
if(!uxr_init_udp_transport(&transport, UXR_IPv4, "127.0.0.1", "2020"))
{
printf("Error at create transport.\n");
return 1;
Expand Down
Loading