From 3b20a4224c7ab74469e963c9f5ee3cf668e5dd00 Mon Sep 17 00:00:00 2001 From: Mario Dominguez Date: Tue, 6 Aug 2024 14:04:22 +0200 Subject: [PATCH 1/5] Refs #21366: Change xsd installation directory to .../share/fastdds Signed-off-by: Mario Dominguez --- CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 2022f246096..0acce4b1b47 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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 ) From ac18b8ace20f4bf15636d09dbd543c4394bd3173 Mon Sep 17 00:00:00 2001 From: Mario Dominguez Date: Wed, 2 Oct 2024 09:28:20 +0200 Subject: [PATCH 2/5] TMP commit for testing Signed-off-by: Mario Dominguez --- fastdds.repos | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fastdds.repos b/fastdds.repos index d7f5829ec2c..1a9a7831331 100644 --- a/fastdds.repos +++ b/fastdds.repos @@ -10,7 +10,7 @@ repositories: fastdds: type: git url: https://github.com/eProsima/Fast-DDS.git - version: master + version: bugfix/xsd-installdir fastddsgen: type: git url: https://github.com/eProsima/Fast-DDS-Gen.git From db9f0df87bfb8211736e7ef7dc19844d78ef514e Mon Sep 17 00:00:00 2001 From: Mario Dominguez Date: Wed, 2 Oct 2024 10:03:46 +0200 Subject: [PATCH 3/5] Refs #21564: Remove redundant installation of xsd file again Signed-off-by: Mario Dominguez --- tools/fds/CMakeLists.txt | 6 ------ 1 file changed, 6 deletions(-) diff --git a/tools/fds/CMakeLists.txt b/tools/fds/CMakeLists.txt index 8e6008952a8..007033f63c1 100644 --- a/tools/fds/CMakeLists.txt +++ b/tools/fds/CMakeLists.txt @@ -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) From 89fe096aea9956703e539f1bc7c8e0c5d51e5c4d Mon Sep 17 00:00:00 2001 From: Mario Dominguez Date: Wed, 2 Oct 2024 10:04:14 +0200 Subject: [PATCH 4/5] Refs #21564: Change expected xsd installation path Signed-off-by: Mario Dominguez --- tools/fastdds/xml_ci/parser.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/fastdds/xml_ci/parser.py b/tools/fastdds/xml_ci/parser.py index df6a8d1c635..269aeb8bf1d 100644 --- a/tools/fastdds/xml_ci/parser.py +++ b/tools/fastdds/xml_ci/parser.py @@ -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' From a9f671fdbe62dbee7a68c9862786f22e27dc5749 Mon Sep 17 00:00:00 2001 From: Mario Dominguez Date: Thu, 3 Oct 2024 09:57:18 +0200 Subject: [PATCH 5/5] Revert "TMP commit for testing" This reverts commit ac18b8ace20f4bf15636d09dbd543c4394bd3173. --- fastdds.repos | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fastdds.repos b/fastdds.repos index 1a9a7831331..d7f5829ec2c 100644 --- a/fastdds.repos +++ b/fastdds.repos @@ -10,7 +10,7 @@ repositories: fastdds: type: git url: https://github.com/eProsima/Fast-DDS.git - version: bugfix/xsd-installdir + version: master fastddsgen: type: git url: https://github.com/eProsima/Fast-DDS-Gen.git