[10173] Use absolute paths when loading XML files #4751

Mario-DL · 2024-05-03T09:12:28Z

Description

This PR forwards a refactor from the work in #1657 to master.
In addition, it solves a name collision error with the variable name INTERFACE. When importing windows.h a 2275 error : illegal use of this type as an expression was caused

@Mergifyio backport 2.14.x 2.13.x 2.10.x 2.6.x

Contributor Checklist

Commit messages follow the project guidelines.
The code follows the style guidelines of this project.
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
Any new/modified methods have been properly documented using Doxygen.
N/A Any new configuration API has an equivalent XML API (with the corresponding XSD extension)
Changes are ABI compatible.
Changes are API compatible.
N/A New feature has been added to the versions.md file (if applicable).
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.

Mario-DL · 2024-05-14T08:14:49Z

@richiprosima please test_3 this

Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>

elianalf · 2024-05-20T12:22:33Z

@richiprosima please test_3 this

fastdds/log instead of fastrtps Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>

Mario-DL · 2024-05-21T14:38:05Z

@richiprosima please test_3 this

JesusPoderoso

LGTM with green CI

EduPonz · 2024-05-22T12:36:32Z

@Mergifyio backport 2.14.x 2.13.x 2.10.x 2.6.x

mergify · 2024-05-22T12:36:53Z

backport 2.14.x 2.13.x 2.10.x 2.6.x

✅ Backports have been created

#4828 [10173] Use absolute paths when loading XML files (backport #4751) has been created for branch 2.14.x but encountered conflicts
#4829 [10173] Use absolute paths when loading XML files (backport #4751) has been created for branch 2.13.x but encountered conflicts
#4830 [10173] Use absolute paths when loading XML files (backport #4751) has been created for branch 2.10.x but encountered conflicts
#4831 [10173] Use absolute paths when loading XML files (backport #4751) has been created for branch 2.6.x but encountered conflicts

* Refs #10173: Add XMLLoadFile unittest Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> * Refs #10173: Use absolute paths when loading XML files Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> * Refs #10173: Fix windows.h INTERFACE name collision Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> * Refs #10173: Avoid MINMAX windows warning as error in unittests Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> * Refs #10173: Use DEFAULT_FASTDDS_PROFILES for windows Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> * Refs #10173: Enable internal debug in test Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> * Refs #10173: Force log info in the test Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> * Refs #10173: Correct windows FASTDDS_DEFAULT PROFILES env and include fastdds/log instead of fastrtps Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> --------- Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> (cherry picked from commit 0919ff2) # Conflicts: # src/cpp/rtps/xmlparser/XMLParser.cpp # src/cpp/rtps/xmlparser/XMLProfileManager.cpp

* Refs #10173: Add XMLLoadFile unittest Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> * Refs #10173: Use absolute paths when loading XML files Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> * Refs #10173: Fix windows.h INTERFACE name collision Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> * Refs #10173: Avoid MINMAX windows warning as error in unittests Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> * Refs #10173: Use DEFAULT_FASTDDS_PROFILES for windows Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> * Refs #10173: Enable internal debug in test Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> * Refs #10173: Force log info in the test Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> * Refs #10173: Correct windows FASTDDS_DEFAULT PROFILES env and include fastdds/log instead of fastrtps Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> --------- Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> (cherry picked from commit 0919ff2) # Conflicts: # include/fastrtps/xmlparser/XMLParserCommon.h # src/cpp/rtps/xmlparser/XMLParser.cpp # src/cpp/rtps/xmlparser/XMLParserCommon.cpp # src/cpp/rtps/xmlparser/XMLProfileManager.cpp

* Refs #10173: Add XMLLoadFile unittest Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> * Refs #10173: Use absolute paths when loading XML files Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> * Refs #10173: Fix windows.h INTERFACE name collision Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> * Refs #10173: Avoid MINMAX windows warning as error in unittests Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> * Refs #10173: Use DEFAULT_FASTDDS_PROFILES for windows Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> * Refs #10173: Enable internal debug in test Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> * Refs #10173: Force log info in the test Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> * Refs #10173: Correct windows FASTDDS_DEFAULT PROFILES env and include fastdds/log instead of fastrtps Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> --------- Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> (cherry picked from commit 0919ff2) # Conflicts: # include/fastrtps/xmlparser/XMLParserCommon.h # src/cpp/rtps/xmlparser/XMLParser.cpp # src/cpp/rtps/xmlparser/XMLParserCommon.cpp # src/cpp/rtps/xmlparser/XMLProfileManager.cpp # test/unittest/xmlparser/CMakeLists.txt

* Use absolute paths when loading XML files (#4751) * Refs #10173: Add XMLLoadFile unittest Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> * Refs #10173: Use absolute paths when loading XML files Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> * Refs #10173: Fix windows.h INTERFACE name collision Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> * Refs #10173: Avoid MINMAX windows warning as error in unittests Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> * Refs #10173: Use DEFAULT_FASTDDS_PROFILES for windows Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> * Refs #10173: Enable internal debug in test Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> * Refs #10173: Force log info in the test Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> * Refs #10173: Correct windows FASTDDS_DEFAULT PROFILES env and include fastdds/log instead of fastrtps Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> --------- Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> (cherry picked from commit 0919ff2) # Conflicts: # include/fastrtps/xmlparser/XMLParserCommon.h # src/cpp/rtps/xmlparser/XMLParser.cpp # src/cpp/rtps/xmlparser/XMLParserCommon.cpp # src/cpp/rtps/xmlparser/XMLProfileManager.cpp * Refs #10173: Fix conflicts Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com> * Refs #10173: Fix mayor version conflicts Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com> * Fix conflicts Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> * Fix conflicts Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> * Avoid minmax warning in windows Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> --------- Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com> Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> Co-authored-by: Mario Domínguez López <116071334+Mario-DL@users.noreply.github.com> Co-authored-by: JesusPoderoso <jesuspoderoso@eprosima.com> Co-authored-by: Mario Dominguez <mariodominguez@eprosima.com>

* Use absolute paths when loading XML files (#4751) * Refs #10173: Add XMLLoadFile unittest Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> * Refs #10173: Use absolute paths when loading XML files Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> * Refs #10173: Fix windows.h INTERFACE name collision Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> * Refs #10173: Avoid MINMAX windows warning as error in unittests Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> * Refs #10173: Use DEFAULT_FASTDDS_PROFILES for windows Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> * Refs #10173: Enable internal debug in test Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> * Refs #10173: Force log info in the test Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> * Refs #10173: Correct windows FASTDDS_DEFAULT PROFILES env and include fastdds/log instead of fastrtps Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> --------- Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> (cherry picked from commit 0919ff2) # Conflicts: # src/cpp/rtps/xmlparser/XMLParser.cpp # src/cpp/rtps/xmlparser/XMLProfileManager.cpp * Fix conflicts Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> * Avoid minmax warning in windows Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> --------- Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> Co-authored-by: Mario Domínguez López <116071334+Mario-DL@users.noreply.github.com> Co-authored-by: Mario Dominguez <mariodominguez@eprosima.com>

* Use absolute paths when loading XML files (#4751) * Refs #10173: Add XMLLoadFile unittest Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> * Refs #10173: Use absolute paths when loading XML files Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> * Refs #10173: Fix windows.h INTERFACE name collision Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> * Refs #10173: Avoid MINMAX windows warning as error in unittests Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> * Refs #10173: Use DEFAULT_FASTDDS_PROFILES for windows Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> * Refs #10173: Enable internal debug in test Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> * Refs #10173: Force log info in the test Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> * Refs #10173: Correct windows FASTDDS_DEFAULT PROFILES env and include fastdds/log instead of fastrtps Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> --------- Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> (cherry picked from commit 0919ff2) # Conflicts: # include/fastrtps/xmlparser/XMLParserCommon.h # src/cpp/rtps/xmlparser/XMLParser.cpp # src/cpp/rtps/xmlparser/XMLParserCommon.cpp # src/cpp/rtps/xmlparser/XMLProfileManager.cpp # test/unittest/xmlparser/CMakeLists.txt * Fix conflicts Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> * Fix conflicts Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> * Avoid minmax warning in windows Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> --------- Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> Co-authored-by: Mario Domínguez López <116071334+Mario-DL@users.noreply.github.com> Co-authored-by: Mario Dominguez <mariodominguez@eprosima.com>

Mario-DL added this to the v2.14.1 milestone May 3, 2024

Mario-DL requested a review from JesusPoderoso May 3, 2024 09:14

github-actions bot added the ci-pending PR which CI is running label May 3, 2024

JesusPoderoso requested review from JesusPoderoso and removed request for JesusPoderoso May 6, 2024 06:31

Mario-DL force-pushed the feature/10173 branch from ed5782b to 5c7b334 Compare May 6, 2024 13:14

Mario-DL requested review from JesusPoderoso and removed request for JesusPoderoso May 6, 2024 13:25

EduPonz modified the milestones: v2.14.1, v2.14.2 May 7, 2024

Mario-DL force-pushed the feature/10173 branch 2 times, most recently from d029860 to bdeb700 Compare May 14, 2024 08:02

Mario-DL requested review from JesusPoderoso and removed request for JesusPoderoso May 14, 2024 08:14

EduPonz modified the milestones: v2.14.2, v3.0.0 May 16, 2024

Mario-DL force-pushed the feature/10173 branch from bdeb700 to a9b4033 Compare May 16, 2024 07:13

Mario-DL requested review from JesusPoderoso and removed request for JesusPoderoso May 16, 2024 07:13

Mario-DL added 5 commits May 17, 2024 12:44

Refs #10173: Add XMLLoadFile unittest

ea81960

Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>

Refs #10173: Use absolute paths when loading XML files

24a44a5

Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>

Refs #10173: Fix windows.h INTERFACE name collision

bb8dde1

Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>

Refs #10173: Avoid MINMAX windows warning as error in unittests

4261059

Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>

Refs #10173: Use DEFAULT_FASTDDS_PROFILES for windows

b51ce0a

Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>

Mario-DL force-pushed the feature/10173 branch from e5800c2 to ca7d613 Compare May 17, 2024 10:44

Refs #10173: Enable internal debug in test

7aad894

Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>

Mario-DL force-pushed the feature/10173 branch from ca7d613 to 7aad894 Compare May 20, 2024 06:38

Mario-DL requested review from JesusPoderoso and removed request for JesusPoderoso May 20, 2024 06:38

Refs #10173: Force log info in the test

bc8539d

Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>

Mario-DL requested review from JesusPoderoso and removed request for JesusPoderoso May 20, 2024 10:41

Refs #10173: Correct windows FASTDDS_DEFAULT PROFILES env and include

25b048d

fastdds/log instead of fastrtps Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>

Mario-DL requested review from JesusPoderoso and removed request for JesusPoderoso May 21, 2024 10:13

JesusPoderoso approved these changes May 21, 2024

View reviewed changes

elianalf added the ready-to-merge Ready to be merged. CI and changes have been reviewed and approved. label May 22, 2024

EduPonz merged commit 0919ff2 into master May 22, 2024
12 of 15 checks passed

EduPonz deleted the feature/10173 branch May 22, 2024 12:36

mergify bot mentioned this pull request May 22, 2024

[10173] Use absolute paths when loading XML files (backport #4751) #4828

Merged

12 tasks

This was referenced May 22, 2024

[10173] Use absolute paths when loading XML files (backport #4751) #4829

Merged

[10173] Use absolute paths when loading XML files (backport #4751) #4830

Merged

mergify bot mentioned this pull request May 22, 2024

[10173] Use absolute paths when loading XML files (backport #4751) #4831

Merged

12 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[10173] Use absolute paths when loading XML files #4751

[10173] Use absolute paths when loading XML files #4751

Mario-DL commented May 3, 2024 •

edited by EduPonz

Mario-DL commented May 14, 2024

elianalf commented May 20, 2024

Mario-DL commented May 21, 2024

JesusPoderoso left a comment

EduPonz commented May 22, 2024

mergify bot commented May 22, 2024 •

edited

[10173] Use absolute paths when loading XML files #4751

[10173] Use absolute paths when loading XML files #4751

Conversation

Mario-DL commented May 3, 2024 • edited by EduPonz

Description

Contributor Checklist

Reviewer Checklist

Mario-DL commented May 14, 2024

elianalf commented May 20, 2024

Mario-DL commented May 21, 2024

JesusPoderoso left a comment

Choose a reason for hiding this comment

EduPonz commented May 22, 2024

mergify bot commented May 22, 2024 • edited

✅ Backports have been created

Mario-DL commented May 3, 2024 •

edited by EduPonz

mergify bot commented May 22, 2024 •

edited