Skip to content

[23150] Apply user template to included IDL files (backport #472)#474

Merged
cferreiragonz merged 1 commit into4.0.xfrom
bp/4.0.x/472
May 20, 2025
Merged

[23150] Apply user template to included IDL files (backport #472)#474
cferreiragonz merged 1 commit into4.0.xfrom
bp/4.0.x/472

Conversation

@cferreiragonz
Copy link
Contributor

Description

This PR is backport of #472:
This PR adds the required logic to apply user templates to included IDL files.
If the output file name specified in -extrastg contains the character '@', the custom template will be also applied to included IDL files. The '@' will be replaced with the included file name.

Usage example:
-extrastg /path/to/template/Custom.stg @MyCustomTemplate.cpp

Above command will generate file: HelloWorldMyCustomTemplate.cpp in case HelloWorld.idl was included.

@Mergifyio backport 3.3.x 2.5.x

Contributor Checklist

  • Commit messages follow the project guidelines.
  • Tests that thoroughly check the new feature have been added/Regression tests checking the bug and its fix have been added; the added tests pass locally
  • New feature has been documented/Current behavior is correctly described in the documentation.
  • Applicable backports have been included in the description.

Reviewer Checklist

  • The PR has a milestone assigned.
  • The title and description correctly express the PR's purpose.
  • Check contributor checklist is correct.
  • Check CI results: changes do not issue any warning.
  • Check CI results: failing tests are unrelated with the changes.

* Refs #23150: Apply user template to included IDL files

Signed-off-by: cferreiragonz <carlosferreira@eprosima.com>

* Refs #23150: Apply Review

Signed-off-by: cferreiragonz <carlosferreira@eprosima.com>

---------

Signed-off-by: cferreiragonz <carlosferreira@eprosima.com>
@cferreiragonz cferreiragonz added this to the v4.0.5 milestone May 20, 2025
@cferreiragonz cferreiragonz changed the base branch from master to 4.0.x May 20, 2025 06:40
@cferreiragonz cferreiragonz requested review from richiprosima and removed request for richiprosima May 20, 2025 06:40
@github-actions github-actions bot added ci-pending PR which CI is running labels May 20, 2025
@cferreiragonz
Copy link
Contributor Author

@Mergifyio backport 3.3.x 2.5.x

@mergify
Copy link

mergify bot commented May 20, 2025

backport 3.3.x 2.5.x

✅ Backports have been created

Details

@cferreiragonz cferreiragonz added ready-to-merge Ready to be merged. CI and changes have been reviewed and approved. and removed ci-pending PR which CI is running labels May 20, 2025
@cferreiragonz cferreiragonz merged commit fbb0672 into 4.0.x May 20, 2025
4 checks passed
@cferreiragonz cferreiragonz deleted the bp/4.0.x/472 branch May 20, 2025 09:56
mergify bot pushed a commit that referenced this pull request May 20, 2025
* Refs #23150: Apply user template to included IDL files

* Refs #23150: Apply Review

---------

Signed-off-by: cferreiragonz <carlosferreira@eprosima.com>
(cherry picked from commit fbb0672)

# Conflicts:
#	src/main/java/com/eprosima/fastdds/fastddsgen.java
mergify bot pushed a commit that referenced this pull request May 20, 2025
* Refs #23150: Apply user template to included IDL files

* Refs #23150: Apply Review

---------

Signed-off-by: cferreiragonz <carlosferreira@eprosima.com>
(cherry picked from commit fbb0672)

# Conflicts:
#	src/main/java/com/eprosima/fastdds/fastddsgen.java
cferreiragonz added a commit that referenced this pull request May 20, 2025
* Apply user template to included IDL files (#472) (#474)

* Refs #23150: Apply user template to included IDL files

* Refs #23150: Apply Review

---------

Signed-off-by: cferreiragonz <carlosferreira@eprosima.com>
(cherry picked from commit fbb0672)

# Conflicts:
#	src/main/java/com/eprosima/fastdds/fastddsgen.java

* Fix Conflicts

Signed-off-by: cferreiragonz <carlosferreira@eprosima.com>

---------

Signed-off-by: cferreiragonz <carlosferreira@eprosima.com>
Co-authored-by: Carlos Ferreira González <carloos.499@gmail.com>
Co-authored-by: cferreiragonz <carlosferreira@eprosima.com>
MiguelCompany added a commit that referenced this pull request May 27, 2025
* Apply user template to included IDL files (#472) (#474)

* Refs #23150: Apply user template to included IDL files

* Refs #23150: Apply Review

---------

Signed-off-by: cferreiragonz <carlosferreira@eprosima.com>
(cherry picked from commit fbb0672)

# Conflicts:
#	src/main/java/com/eprosima/fastdds/fastddsgen.java

* Fix conflicts

Signed-off-by: Miguel Company <miguelcompany@eprosima.com>

---------

Signed-off-by: Miguel Company <miguelcompany@eprosima.com>
Co-authored-by: Carlos Ferreira González <carloos.499@gmail.com>
Co-authored-by: Miguel Company <miguelcompany@eprosima.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

ready-to-merge Ready to be merged. CI and changes have been reviewed and approved.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant