Skip to content

Commit 5934acd

Browse files
alvinkrebsalexcamposruizfgallegosalidofgarandaManuelJNunez
authored
IRONSIDE-763 -- follow the 7.3.0 merge to develop with a develop merge to master. (#682)
* Add dynamic_data_skip_serialization example (#642) Add dynamic_data_skip_serialization example for C++11 and Python. This is an upcoming feature in Connext DDS 7.3.0. * Fix Web Integration Service library api example by using the webserver_option() function instead of the old document_root() function * Fix formatting * COMMUNITY-81 | Move GH Actions CI to Jenkins (#650) * COMMUNITY-81: move GH Actions CI to Jenkins * COMMUNITY-81: refactor Jenkinsfile * COMMUNITY-81: update dockerfile name * COMMUNITY-81: install python dependencies * COMMUNITY-81: use pip3 instead of pip * COMMUNITY-81: use pip3 instead of pip * COMMUNITY-81: change connextdds installation path * COMMUNITY-81: change timeout * #651 #655: Fix overflow and eof issue * filter-out removed files from linux_format.py fix #633 (#663) * execute linters on release branches as well fixes #665 (#666) * CORE-13335: Fix examples that assume invalid data cannot be ALIVE (cherry picked from commit b89cfb8) * CORE-13335: Fix linting errors (cherry picked from commit 320539c) * CORE-13335: Apply lint patch file (cherry picked from commit 2a6219a) * CORE-13335: PR feedback (cherry picked from commit e2a1cbf) * CORE-13335: Apply lint patch (cherry picked from commit ada2dca) * Improve documentation in Recording examples so the CMake command always works (#667) * Improve documentation in Recording examples so the CMake command always works * Remove trailing spaces --------- Co-authored-by: Francisco Gallego Salido <[email protected]> * Remove status badge from README fixes #659 (#660) * Fix Routing Service file adapter examples * ROUTING-1182: adding cross-compilation instructions where missing for Infrastructure Services * Update VERSION for release/7.3.0 fix #677 (#678) * Use new property names and values in the lightweight and cds examples (#672) (#679) * Use new property names in the lightweight and cds examples * schema url updates * Fix linting * #fix IRONSIDE-763 -- change version to 7.3.0 in csproj files, and update README ... (#680) (#681) --------- Co-authored-by: Alex Campos <[email protected]> Co-authored-by: Francisco Gallego Salido <[email protected]> Co-authored-by: Fernando García Aranda <[email protected]> Co-authored-by: Manuel Jesús Núñez Ruiz <[email protected]> Co-authored-by: Antonio Lopez <[email protected]> Co-authored-by: lulivi <[email protected]> Co-authored-by: Sam Raeburn <[email protected]> Co-authored-by: Francisco Gallego Salido <[email protected]> Co-authored-by: Sam <[email protected]> Co-authored-by: Juan Luis Jimenez Simon <[email protected]> Co-authored-by: Luis Colmenero <[email protected]>
1 parent 900c593 commit 5934acd

File tree

46 files changed

+1287
-60
lines changed

Some content is hidden

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

46 files changed

+1287
-60
lines changed

‎.github/workflows/lint_markdown.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,15 @@ on:
99
branches:
1010
- master
1111
- develop
12+
- release/*
1213
paths:
1314
- '**/*.md'
1415

1516
pull_request:
1617
branches:
1718
- master
1819
- develop
20+
- release/*
1921
paths:
2022
- '**/*.md'
2123

‎.github/workflows/lint_python.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,15 @@ on:
99
branches:
1010
- master
1111
- develop
12+
- release/*
1213
paths:
1314
- '**/*.py'
1415

1516
pull_request:
1617
branches:
1718
- master
1819
- develop
20+
- release/*
1921
paths:
2022
- '**/*.py'
2123

‎.github/workflows/lint_source.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ on:
99
branches:
1010
- master
1111
- develop
12+
- release/*
1213
paths:
1314
- '**/*.[ch]x?x?'
1415
- '**/*.java'

‎README.md‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
# rticonnextdds-examples
22

3-
[![Build and run static analysis](https://github.com/rticommunity/rticonnextdds-examples/actions/workflows/build.yml/badge.svg?branch=master)](https://github.com/rticommunity/rticonnextdds-examples/actions/workflows/build.yml)
4-
53
This repository includes examples on how to use specific features of RTI
64
Connext DDS.
75

@@ -16,9 +14,10 @@ for further information about how to contribute with new examples to this reposi
1614
The examples contained in the
1715
[master](https://github.com/rticommunity/rticonnextdds-examples/tree/master)
1816
branch of this repository have been built and tested against RTI Connext DDS
19-
7.2.0. If you need examples that have been built and tested against older
17+
7.3.0. If you need examples that have been built and tested against older
2018
versions of RTI Connext DDS, please check out the appropriate branch:
2119

20+
- [release/7.2.0](https://github.com/rticommunity/rticonnextdds-examples/tree/release/7.2.0)
2221
- [release/7.1.0](https://github.com/rticommunity/rticonnextdds-examples/tree/release/7.1.0)
2322
- [release/7.0.0](https://github.com/rticommunity/rticonnextdds-examples/tree/release/7.0.0)
2423
- [release/6.1.1](https://github.com/rticommunity/rticonnextdds-examples/tree/release/6.1.1)

‎VERSION‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
7.2.0
1+
7.3.0

‎examples/cloud_discovery_service/library_api/c++11/README.md‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,30 @@ you want to link against. For example:
112112
cmake -DCONNEXTDDS_ARCH=x64Linux3gcc5.4.0 ..
113113
```
114114

115+
### Cross-compilation
116+
117+
When you need to cross-compile the example, the above
118+
command will not work, the assigned compiler won't be the cross-compiler and
119+
errors may happen when linking against the cross-compiled Connext binaries.
120+
To fix this, you have to create a file with the architecture name and call
121+
CMake with a specific flag called ``-DCMAKE_TOOLCHAIN_FILE``.
122+
An example of the file to create with the toolchain settings (e.g. for an
123+
ARM architectures):
124+
125+
```cmake
126+
set(CMAKE_SYSTEM_NAME Linux)
127+
set(toolchain_path "<path to>/arm-bcm2708/gcc-linaro-arm-linux-gnueabihf-raspbian")
128+
set(CMAKE_C_COMPILER "${toolchain_path}/bin/arm-linux-gnueabihf-gcc")
129+
set(CMAKE_CXX_COMPILER "${toolchain_path}/bin/arm-linux-gnueabihf-g++")
130+
```
131+
132+
Then you can call CMake like this:
133+
134+
```bash
135+
cmake -DCONNEXTDDS_DIR=<connext dir> -DCMAKE_TOOLCHAIN_FILE=<toolchain file created above>
136+
-DCONNEXTDDS_ARCH=<connext architecture> ..
137+
```
138+
115139
### CMake Build Infrastructure
116140

117141
The `CMakeListst.txt` script that builds this example uses a generic CMake

‎examples/cloud_discovery_service/library_api/c/README.md‎

Lines changed: 25 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,9 +112,33 @@ you want to link against. For example:
112112
cmake -DCONNEXTDDS_ARCH=x64Linux3gcc5.4.0 ..
113113
```
114114

115+
### Cross-compilation
116+
117+
When you need to cross-compile the example, the above
118+
command will not work, the assigned compiler won't be the cross-compiler and
119+
errors may happen when linking against the cross-compiled Connext binaries.
120+
To fix this, you have to create a file with the architecture name and call
121+
CMake with a specific flag called ``-DCMAKE_TOOLCHAIN_FILE``.
122+
An example of the file to create with the toolchain settings (e.g. for an
123+
ARM architectures):
124+
125+
```cmake
126+
set(CMAKE_SYSTEM_NAME Linux)
127+
set(toolchain_path "<path to>/arm-bcm2708/gcc-linaro-arm-linux-gnueabihf-raspbian")
128+
set(CMAKE_C_COMPILER "${toolchain_path}/bin/arm-linux-gnueabihf-gcc")
129+
set(CMAKE_CXX_COMPILER "${toolchain_path}/bin/arm-linux-gnueabihf-g++")
130+
```
131+
132+
Then you can call CMake like this:
133+
134+
```bash
135+
cmake -DCONNEXTDDS_DIR=<connext dir> -DCMAKE_TOOLCHAIN_FILE=<toolchain file created above>
136+
-DCONNEXTDDS_ARCH=<connext architecture> ..
137+
```
138+
115139
### CMake Build Infrastructure
116140

117-
The `CMakeListst.txt` script that builds this example uses a generic CMake
141+
The `CMakeLists.txt` script that builds this example uses a generic CMake
118142
function called `connextdds_add_example` that defines all the necessary constructs
119143
to:
120144

‎examples/connext_dds/asynchronous_publication/cs/AsyncPublicationExample.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
</PropertyGroup>
77

88
<ItemGroup>
9-
<PackageReference Include="Rti.ConnextDds.Extra" Version="7.2.0" />
9+
<PackageReference Include="Rti.ConnextDds.Extra" Version="7.3.0" />
1010
<PackageReference Include="System.CommandLine" Version="2.0.0-beta1.21308.1"/>
1111
</ItemGroup>
1212

‎examples/connext_dds/custom_flow_controller/cs/FlowControllerExample.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
</PropertyGroup>
77

88
<ItemGroup>
9-
<PackageReference Include="Rti.ConnextDds.Extra" Version="7.2.0" />
9+
<PackageReference Include="Rti.ConnextDds.Extra" Version="7.3.0" />
1010
<PackageReference Include="System.CommandLine" Version="2.0.0-beta1.21308.1"/>
1111
</ItemGroup>
1212

‎examples/connext_dds/dynamic_data_sequences/cs/DynamicDataSequencesExample.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
</PropertyGroup>
77

88
<ItemGroup>
9-
<PackageReference Include="Rti.ConnextDds" Version="7.2.0" />
9+
<PackageReference Include="Rti.ConnextDds" Version="7.3.0" />
1010
<PackageReference Include="System.CommandLine" Version="2.0.0-beta1.21308.1"/>
1111
</ItemGroup>
1212

0 commit comments

Comments
 (0)