Skip to content
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

[21564] [21666] Change xsd files installation directory to share/fastdds and remove icons on windows uninstall #5140

Merged
merged 5 commits into from
Oct 3, 2024
Merged

[21564] [21666] Change xsd files installation directory to share/fastdds and remove icons on windows uninstall #5140

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3b20a42
Refs #21366: Change xsd installation directory to .../share/fastdds
Mario-DL Aug 6, 2024
ac18b8a
TMP commit for testing
Mario-DL Oct 2, 2024
db9f0df
Refs #21564: Remove redundant installation of xsd file again
Mario-DL Oct 2, 2024
89fe096
Refs #21564: Change expected xsd installation path
Mario-DL Oct 2, 2024
a9f671f
Revert "TMP commit for testing"
Mario-DL Oct 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -579,12 +579,12 @@ install(FILES ${PROJECT_SOURCE_DIR}/LICENSE

# Install xml validators
install(FILES ${PROJECT_SOURCE_DIR}/resources/xsd/fastdds_profiles.xsd
DESTINATION ${DATA_INSTALL_DIR}
DESTINATION ${DATA_INSTALL_DIR}/fastdds
COMPONENT xsd
)

install(FILES ${PROJECT_SOURCE_DIR}/resources/xsd/fastdds_static_discovery.xsd
DESTINATION ${DATA_INSTALL_DIR}
DESTINATION ${DATA_INSTALL_DIR}/fastdds
COMPONENT xsd
)

Expand Down
2 changes: 1 addition & 1 deletion tools/fastdds/xml_ci/parser.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,4 +108,4 @@ def xsd_dir(self):
"""
tool_path = Path(os.path.dirname(os.path.realpath(__file__)))
# We assume the schema path is relative to our installation path
return tool_path / '../../../share/fastdds_profiles.xsd'
return tool_path / '../../../share/fastdds/fastdds_profiles.xsd'
6 changes: 0 additions & 6 deletions tools/fds/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,12 +101,6 @@ install(EXPORT ${PROJECT_NAME}-targets
COMPONENT cmake
)

# export xsd schema
install(FILES ../../resources/xsd/fastdds_profiles.xsd
DESTINATION ${DATA_INSTALL_DIR}
COMPONENT cmake
)

# symlink creation requires:
# - install( CODE using generator expressions (legacy code is provided for all cmake versions)
# - on windows privileges to create symlinks (a .bat file is provided on unprivileged installations)
Expand Down
Loading