Skip to content

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented May 5, 2025

Description

Fixes a bug in Windows when generating CMakeLists.txt

@Mergifyio backport 4.0.x 3.3.x 2.5.x 2.1.x (not sure if all, only those supporting relative dir generation)

Contributor Checklist

  • Commit messages follow the project guidelines.

  • N/A: 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

    • Affects only Windows, where we currently have no CI
  • N/A: 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 #466 done by [Mergify](https://mergify.com).

* Refs #23041. Simplify direct conversions.

Signed-off-by: Miguel Company <[email protected]>

* Refs #23041. Escape paths converting backward slashes into forward ones.

Signed-off-by: Miguel Company <[email protected]>

* Refs #23041. Apply changes to `SwigCMake.stg`.

Signed-off-by: Miguel Company <[email protected]>

* Refs #23041. Escape swig interface file.

Signed-off-by: Miguel Company <[email protected]>

---------

Signed-off-by: Miguel Company <[email protected]>
(cherry picked from commit 9bc63a8)

# Conflicts:
#	src/main/java/com/eprosima/fastdds/fastddsgen.java
#	src/main/java/com/eprosima/fastdds/idl/templates/CMakeLists.stg
Copy link
Author

mergify bot commented May 5, 2025

Cherry-pick of 9bc63a8 has failed:

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

You are currently cherry-picking commit 9bc63a8.
  (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)

Changes to be committed:
	modified:   src/main/java/com/eprosima/fastdds/idl/templates/SwigCMake.stg
	modified:   src/main/java/com/eprosima/fastdds/solution/Project.java

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

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 5, 2025
@MiguelCompany MiguelCompany requested a review from richiprosima May 5, 2025 14:46
@MiguelCompany MiguelCompany added this to the v3.3.2 milestone May 5, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant