Skip to content

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

Merged
cferreiragonz merged 2 commits into3.3.xfrom
mergify/bp/3.3.x/pr-474
May 20, 2025
Merged

[23150] Apply user template to included IDL files (backport #472)#475
cferreiragonz merged 2 commits into3.3.xfrom
mergify/bp/3.3.x/pr-474

Conversation

@mergify
Copy link

@mergify mergify bot commented May 20, 2025

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.

This is an automatic backport of pull request #474 done by [Mergify](https://mergify.com).

* 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
Copy link
Author

mergify bot commented May 20, 2025

Cherry-pick of fbb0672 has failed:

On branch mergify/bp/3.3.x/pr-474
Your branch is up to date with 'origin/3.3.x'.

You are currently cherry-picking commit fbb0672.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   src/main/java/com/eprosima/fastdds/fastddsgen.java

no changes added to commit (use "git add" and/or "git commit -a")

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@mergify mergify bot added the conflicts label May 20, 2025
@cferreiragonz cferreiragonz added this to the v3.3.2 milestone May 20, 2025
@cferreiragonz cferreiragonz changed the title [23150] Apply user template to included IDL files (backport #472) (backport #474) [23150] Apply user template to included IDL files (backport #472) May 20, 2025
Signed-off-by: cferreiragonz <carlosferreira@eprosima.com>
@cferreiragonz cferreiragonz added ci-pending PR which CI is running and removed conflicts labels May 20, 2025
@cferreiragonz cferreiragonz removed the request for review from richiprosima May 20, 2025 10:05
@cferreiragonz cferreiragonz removed the request for review from richiprosima May 20, 2025 14:26
@cferreiragonz cferreiragonz merged commit 0f643a5 into 3.3.x May 20, 2025
7 checks passed
@cferreiragonz cferreiragonz deleted the mergify/bp/3.3.x/pr-474 branch May 20, 2025 14:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

ci-pending PR which CI is running

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant