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

Fix python generated files with Fast CDR v1 [19915] #257

Merged
merged 3 commits into from
Nov 14, 2023
Merged

Fix python generated files with Fast CDR v1 [19915] #257

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3cf0573
Refs #19760. Fix python generated files
richiware Nov 14, 2023
f60706e
Refs #19760. Improve CI
richiware Nov 14, 2023
2c9dd80
Refs #19760. Fix error with swig and literal constants in array size
richiware Nov 14, 2023
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
10 changes: 10 additions & 0 deletions .github/fastddsgen.meta
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"names":
{
"fastdds_python": {
"cmake-args": [
"-DBUILD_TESTING=ON"
]
}
}
}
2 changes: 1 addition & 1 deletion .github/workflows/ci.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ jobs:
- name: Build workspace
run: |
cmake --version
colcon build --event-handlers=console_direct+ --mixin rel-with-deb-info ccache
colcon build --event-handlers=console_direct+ --mixin rel-with-deb-info ccache --metas src/fastddsgen/.github/fastddsgen.meta

- name: Test fastddsgen with fastcdr v1
if: startsWith(matrix.fastcdr_version, '1')
Expand Down
15 changes: 12 additions & 3 deletions src/main/java/com/eprosima/fastcdr/idl/templates/TypesSwigInterface.stg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,9 @@ $definitions; separator="\n"$

// Include the class interfaces
%include "$ctx.filename$.h"
$if(ctx.cdr_both)$
%include "$ctx.filename$v1.h"
$endif$

// Include the corresponding TopicDataType
%include "$ctx.filename$PubSubTypes.i"
Expand Down Expand Up @@ -155,6 +158,9 @@ $endif$

member_getters(struct_name, member) ::= <<
$if(member.annotationOptional)$
#if FASTCDR_VERSION_MAJOR == 1
%ignore $struct_name$::$member.name$($member.typecode.cppTypename$&&);
#else
%ignore eprosima::fastcdr::optional::value;
%ignore eprosima::fastcdr::optional::reset;
%template($member.typecode.noScopedCppTypename$Opt) eprosima::fastcdr::optional<$member.typecode.cppTypename$>;
Expand All @@ -167,9 +173,12 @@ $if(member.annotationOptional)$
*\$self = value;
}
}
%ignore $struct_name$::$member.name$(eprosima::fastcdr::optional<$member.typecode.cppTypename$>&&);
#endif
$else$
%ignore $struct_name$::$member.name$($member.typecode.cppTypename$&&);
$endif$

%ignore $struct_name$::$member.name$($member.typecode.cppTypename$&&);

// Overloaded getter methods shadow each other and are equivalent in python
// Const accesors produced constant enums instead of arrays/dictionaries when used
Expand All @@ -182,9 +191,9 @@ $elseif(member.typecode.isMapType)$
%template($member.typecode.keyTypeCode.name$_$member.typecode.valueTypeCode.cppTypename$_map) std::map<$if(member.typecode.keyTypeCode.isEnumType)$enum $endif$$member.typecode.keyTypeCode.cppTypename$,$if(member.typecode.valueTypeCode.isEnumType)$enum $endif$$member.typecode.valueTypeCode.cppTypename$>;
$elseif(member.typecode.isType_f)$
%ignore $struct_name$::$member.name$() const;
%template($member.typecode.contentTypeCode.noScopedCppTypename$_$member.typecode.evaluatedDimensions$_array) std::array<$if(member.typecode.contentTypeCode.isEnumType)$enum $endif$$member.typecode.contentTypeCode.cppTypename$,$member.typecode.dimensions$>;
%template($member.typecode.contentTypeCode.noScopedCppTypename$_$member.typecode.evaluatedDimensions$_array) std::array<$if(member.typecode.contentTypeCode.isEnumType)$enum $endif$$member.typecode.contentTypeCode.cppTypename$,$member.typecode.evaluatedDimensions$>;
$if(member.typecode.contentTypeCode.primitive)$
%extend std::array<$if(member.typecode.contentTypeCode.isEnumType)$enum $endif$$member.typecode.contentTypeCode.cppTypename$, $member.typecode.dimensions$>
%extend std::array<$if(member.typecode.contentTypeCode.isEnumType)$enum $endif$$member.typecode.contentTypeCode.cppTypename$, $member.typecode.evaluatedDimensions$>
{
const $if(member.typecode.contentTypeCode.isEnumType)$enum $endif$$member.typecode.contentTypeCode.cppTypename$* get_buffer() const
{
Expand Down