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

Support @optional and @extensibility annotations [19390] #208

Merged
merged 50 commits into from
Sep 12, 2023
Merged

Support @optional and @extensibility annotations [19390] #208

merged 50 commits into from
Sep 12, 2023

Conversation

richiware
Copy link
Member

@richiware richiware commented Jul 27, 2023 •
edited
Loading

@JLBuenoLopez JLBuenoLopez mentioned this pull request Aug 21, 2023
Closed
1 task
@JLBuenoLopez JLBuenoLopez linked an issue Aug 21, 2023 that may be closed by this pull request
bitset implementation #211
Closed
1 task
@richiware
Refs #18687. Optional integration
ee1505c 
Signed-off-by: Ricardo González Moreno <[email protected]>
@richiware
Refs #18687. Add optionals
3881a06 
Signed-off-by: Ricardo González Moreno <[email protected]>
@richiware
Refs #18687. Move fixed_string to fastcdr
9d48c43 
Signed-off-by: Ricardo González Moreno <[email protected]>
@richiware
Refs #18687. Support new deserialization of fixed_string
07a3f5d 
Signed-off-by: Ricardo González Moreno <[email protected]>
@richiware
Refs #18687. Update maxSerializedSize to support xcdr
aca1704 
Signed-off-by: Ricardo González Moreno <[email protected]>
@richiware
Refs #18687. Adding test for optionals
4aa67ad 
Signed-off-by: Ricardo González Moreno <[email protected]>
@richiware
Refs #18687. Supporting basic optionals
45e8148 
Signed-off-by: Ricardo González Moreno <[email protected]>
@richiware
Refs #18687. Remove serialized size calculation
b808c62 
Signed-off-by: Ricardo González Moreno <[email protected]>
@richiware
Refs #18687. Fixes
5dec543 
Signed-off-by: Ricardo González Moreno <[email protected]>
@richiware
Refs #18687. Add mutables.
479ed6e 
Signed-off-by: Ricardo González Moreno <[email protected]>
@richiware
Refs #18687. Improve integration with fastdds
795e7b6 
Signed-off-by: Ricardo González Moreno <[email protected]>
@richiware
Refs #18687. Remove calculate_serialized_size from the type
aef8cb7 
Signed-off-by: Ricardo González Moreno <[email protected]>
@richiware
Refs #18687. Remove serialize and deserialize functions from type
dec3e5a 
Signed-off-by: Ricardo González Moreno <[email protected]>
@richiware
Refs #18687. Remove key functions from type
9ef11be 
Signed-off-by: Ricardo González Moreno <[email protected]>
@richiware
Refs #18687. Fix compilation error
c04a377 
Signed-off-by: Ricardo González Moreno <[email protected]>
@richiware
Refs #18687. Fix max serialized calculation
cdd4485 
Signed-off-by: Ricardo González Moreno <[email protected]>
@richiware
Refs #18687. Update to new API
fff39ba 
Signed-off-by: Ricardo González Moreno <[email protected]>
@richiware
Refs #18687. Fix bitset cdr size calculation
305b251 
Signed-off-by: Ricardo González Moreno <[email protected]>
@richiware
Refs #18687. Fix wchar_t
9e43d11 
Signed-off-by: Ricardo González Moreno <[email protected]>
@richiware
Refs #18687. Fix bitset
f694051 
Signed-off-by: Ricardo González Moreno <[email protected]>
@richiware
Refs #18687. Export serialize functions on windows
96386fb 
Signed-off-by: Ricardo González Moreno <[email protected]>
@richiware
Refs #18687. Fixes after rebase
3b0c8df 
Signed-off-by: Ricardo González Moreno <[email protected]>
@richiware
Refs #18687. Fix bitset inheritance
daf7e5b 
Signed-off-by: Ricardo González Moreno <[email protected]>
@richiware
Refs #18687. Fix windows linkage error
cc7ff1a 
Signed-off-by: Ricardo González Moreno <[email protected]>
@richiware
Refs #18687. Fix windows linkage error
da1ffb5 
Signed-off-by: Ricardo González Moreno <[email protected]>
@richiware
Refs #18687. Stringtemplate 4
37a9225 
Signed-off-by: Ricardo González Moreno <[email protected]>
@richiware
Refs #18687. Feature select a group of tests.
8ce53f2 
Signed-off-by: Ricardo González Moreno <[email protected]>
@richiware
Refs #18687. Updated idl files for testing
e60c4ad 
Signed-off-by: Ricardo González Moreno <[email protected]>
@richiware
Refs #18687. Fix swig generated files
34d0f25 
Signed-off-by: Ricardo González Moreno <[email protected]>
@JLBuenoLopez JLBuenoLopez modified the milestones: v2.6.0, v3.0.0 Sep 7, 2023
@richiware
Refs #18687. Improve github action
e51754d 
Signed-off-by: Ricardo González Moreno <[email protected]>
JLBuenoLopez
JLBuenoLopez reviewed Sep 7, 2023
View reviewed changes
Copy link
Contributor

@JLBuenoLopez JLBuenoLopez left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Only a couple of new suggestions and I have kept unresolved some suggestions that I think that have been overlooked.

.github/workflows/ci.yaml Show resolved Hide resolved
src/main/java/com/eprosima/fastdds/idl/templates/TypesCdrAuxHeader.stg Outdated Show resolved Hide resolved
@richiware
Copy link
Member Author

Ci passed in this action.

richiware and others added 2 commits September 7, 2023 12:24
@richiware @JLBuenoLopez
Update src/main/java/com/eprosima/fastdds/idl/templates/TypesCdrAuxHe…
f64d0e0 
…ader.stg

Co-authored-by: José Luis Bueno López <[email protected]>
Signed-off-by: Ricardo González Moreno <[email protected]>
@richiware
Refs #18687. Apply suggestion
a0f3883 
Signed-off-by: Ricardo González Moreno <[email protected]>
@richiware
Refs #18687. Make work again custom stg
c0dc732 
Signed-off-by: Ricardo González Moreno <[email protected]>
@richiware richiware force-pushed the feature/xcdr branch 5 times, most recently from 0404bc4 to 425dc33 Compare September 8, 2023 10:37
@richiware
Refs #18687. Fix CI
91f79e0 
Signed-off-by: Ricardo González Moreno <[email protected]>
@richiware
Copy link
Member Author

richiware commented Sep 8, 2023 •
edited
Loading

CI passed in this action ✅

@richiware
Refs #18687. Fix VS template
7e57393 
Signed-off-by: Ricardo González <[email protected]>
@richiware
Refs #18687. Fix test on windows
478a280 
Signed-off-by: Ricardo González <[email protected]>
@richiware
Copy link
Member Author

CI passed in this action ✅

@richiware
Refs #18687. Add custom stg example
c72270a 
Signed-off-by: Ricardo González Moreno <[email protected]>
@richiware
Copy link
Member Author

Ci passed in this action ✅

JLBuenoLopez
JLBuenoLopez suggested changes Sep 12, 2023
View reviewed changes
Copy link
Contributor

@JLBuenoLopez JLBuenoLopez left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There is still one template which has not been updated to ST4: src/main/java/com/eprosima/fastdds/idl/templates/makefile.stg. This template is only generated with the -example option using any of the *Linux* platforms. Those platforms are not going to be supported so maybe we can remove this code. I am OK if it is done in a follow-up PR.

resources/Custom.stg Show resolved Hide resolved
@richiware
Refs #18687. Add copyright to custom stg
c0c98c5 
Signed-off-by: Ricardo González Moreno <[email protected]>
JLBuenoLopez
JLBuenoLopez approved these changes Sep 12, 2023
View reviewed changes
Copy link
Contributor

@JLBuenoLopez JLBuenoLopez left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@richiware richiware merged commit e9c578a into master Sep 12, 2023
1 of 5 checks passed
@richiware richiware deleted the feature/xcdr branch September 12, 2023 08:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jwillemsen jwillemsen jwillemsen left review comments

@JLBuenoLopez JLBuenoLopez JLBuenoLopez approved these changes

Assignees
No one assigned
Labels
doc-pending
Projects
None yet
Milestone
v3.0.0
Development

Successfully merging this pull request may close these issues.

Use virtual or override, not both bitset implementation
3 participants
@richiware @jwillemsen @JLBuenoLopez