Skip to content

[23094] Escape folder separator in generated CMakeLists.txt #466

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
Merged
merged 4 commits into from
May 5, 2025
Merged

[23094] Escape folder separator in generated CMakeLists.txt #466

merged 4 commits into from
May 5, 2025

Conversation

MiguelCompany
Copy link
Member

@MiguelCompany MiguelCompany commented Apr 25, 2025 •
edited by richiware
Loading

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.

@MiguelCompany
Refs #23041. Simplify direct conversions.
7d1623c 
Signed-off-by: Miguel Company <miguelcompany@eprosima.com>
@MiguelCompany
Refs #23041. Escape paths converting backward slashes into forward ones.
265c03b 
Signed-off-by: Miguel Company <miguelcompany@eprosima.com>
@MiguelCompany MiguelCompany added this to the v4.1.0 milestone Apr 25, 2025
@MiguelCompany MiguelCompany requested a review from richiware April 25, 2025 11:19
@github-actions github-actions bot added the ci-pending PR which CI is running label Apr 25, 2025
@MiguelCompany MiguelCompany changed the title Escape folder separator in generated CMakeLists.txt [23094] Escape folder separator in generated CMakeLists.txt Apr 25, 2025
richiware
richiware requested changes May 5, 2025
View reviewed changes
Copy link
Member

@richiware richiware left a comment

Choose a reason for hiding this comment

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

Still not working when using -python argument.

@MiguelCompany
Refs #23041. Apply changes to SwigCMake.stg.
688643e 
Signed-off-by: Miguel Company <miguelcompany@eprosima.com>
@MiguelCompany
Refs #23041. Escape swig interface file.
a8490bb 
Signed-off-by: Miguel Company <miguelcompany@eprosima.com>
@MiguelCompany
Copy link
Member Author

Still not working when using -python argument.

Done

@MiguelCompany MiguelCompany requested a review from richiware May 5, 2025 12:33
@MiguelCompany MiguelCompany merged commit 9bc63a8 into master May 5, 2025
4 checks passed
@MiguelCompany MiguelCompany deleted the bugfix/23041 branch May 5, 2025 14:21
@MiguelCompany
Copy link
Member Author

@Mergifyio backport 4.0.x 3.3.x

@mergify Mergify
Copy link

mergify bot commented May 5, 2025 •
edited
Loading

backport 4.0.x 3.3.x

✅ Backports have been created

mergify bot pushed a commit that referenced this pull request May 5, 2025
@MiguelCompany @mergify
Escape folder separator in generated CMakeLists.txt (#466)
98feee0 
* Refs #23041. Simplify direct conversions.

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

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

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

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

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

* Refs #23041. Escape swig interface file.

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

---------

Signed-off-by: Miguel Company <miguelcompany@eprosima.com>
(cherry picked from commit 9bc63a8)
mergify bot pushed a commit that referenced this pull request May 5, 2025
@MiguelCompany @mergify
Escape folder separator in generated CMakeLists.txt (#466)
06d187c 
* Refs #23041. Simplify direct conversions.

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

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

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

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

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

* Refs #23041. Escape swig interface file.

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

---------

Signed-off-by: Miguel Company <miguelcompany@eprosima.com>
(cherry picked from commit 9bc63a8)

# Conflicts:
#	src/main/java/com/eprosima/fastdds/fastddsgen.java
#	src/main/java/com/eprosima/fastdds/idl/templates/CMakeLists.stg
This was referenced May 5, 2025
Open
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@richiware richiware richiware approved these changes

Assignees
No one assigned
Labels
ci-pending PR which CI is running
Projects
None yet
Milestone
v4.1.0
Development

Successfully merging this pull request may close these issues.
2 participants
@MiguelCompany @richiware