Skip to content

Restructure directories add 2.3.4 #8561

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

Merged
merged 12 commits into from
Jan 6, 2022
Merged

Restructure directories add 2.3.4 #8561

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
c28fca5
rename all folder to 2.3.X
dotChris90 Dec 28, 2021
88cd408
add 2.3.4 and adding better tests
dotChris90 Dec 28, 2021
993e4cc
exclude Macos
dotChris90 Dec 28, 2021
9df42ac
typo
dotChris90 Dec 28, 2021
83c2f67
increase to 30s
dotChris90 Dec 28, 2021
adcf538
rename back to all
dotChris90 Dec 28, 2021
6f95d42
Mac requires environment variables
dotChris90 Dec 29, 2021
4eb083d
removed again to check test now works on mac
dotChris90 Dec 29, 2021
569d01a
because conan internal functions shall not be used
dotChris90 Dec 29, 2021
94b78b5
just try execution on mac os
dotChris90 Dec 29, 2021
10df994
just eval assert on linux .... because windows sometimes error
dotChris90 Dec 29, 2021
cb98c69
simplify test according to PR commits
dotChris90 Jan 3, 2022
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
8 changes: 7 additions & 1 deletion recipes/fast-dds/all/conandata.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,16 @@ sources:
"2.3.3":
url: "https://github.com/eProsima/Fast-DDS/archive/refs/tags/v2.3.3.tar.gz"
sha256: "5EBF27D810C6AB68EEF7D42937CD421D85E50509AE96883239979A1B3A2F4F82"
"2.3.4":
url: "https://github.com/eProsima/Fast-DDS/archive/refs/tags/v2.3.4.tar.gz"
sha256: "B1B2322DE0CA55A16495666E3FBDA8ACA32B888BBFAECDA29F2FFC4B072EF7AC"
patches:
"2.3.2":
- base_path: "source_subfolder"
patch_file: "patches/2.3.2-0001-fix-find-asio-and-tinyxml2.patch"
"2.3.3":
- base_path: "source_subfolder"
patch_file: "patches/2.3.3-0001-fix-find-asio-and-tinyxml2.patch"
patch_file: "patches/2.3.X-0001-fix-find-asio-and-tinyxml2.patch"
"2.3.4":
- base_path: "source_subfolder"
patch_file: "patches/2.3.X-0001-fix-find-asio-and-tinyxml2.patch"
1 change: 0 additions & 1 deletion recipes/fast-dds/all/conanfile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,6 @@ def validate(self):
# linking dynamic '*.dll' and static MT runtime
raise ConanInvalidConfiguration("Mixing a dll {} library with a static runtime is a bad idea".format(self.name))


Copy link
Contributor

@SpaceIm SpaceIm Jan 5, 2022 •
edited
Loading

Choose a reason for hiding this comment

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

This modification in conanfile is unnecessary. Remove it and CI could detect a bump.

Copy link
Contributor

Choose a reason for hiding this comment

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

I dont think the bot can since there is a patch... Unless it got wicked smart (there's some smart people on the Conan team)

Copy link
Contributor

@SpaceIm SpaceIm Jan 5, 2022 •
edited
Loading

Choose a reason for hiding this comment

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

it can, thanks to:

    def export_sources(self):
        self.copy("CMakeLists.txt")
        for patch in self.conan_data.get("patches", {}).get(self.version, []):
            self.copy(patch["patch_file"])

therefore, RREV of other versions is not modified even with a patch in the new version, so the bot can detect a bump (it relies on RREV) if there are no modifications in conanfile or other files in export_sources of these versions.

Copy link
Contributor

Choose a reason for hiding this comment

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

🤯 I'll need to improve my bot then! Thanks for the news

def build(self):
self._patch_sources()
cmake = self._configure_cmake()
Expand Down
28 changes: 28 additions & 0 deletions recipes/fast-dds/all/patches/2.3.X-0001-fix-find-asio-and-tinyxml2.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8a9cb0209..400c681e7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -225,8 +225,8 @@ if(NOT BUILD_SHARED_LIBS)
endif()

eprosima_find_package(fastcdr REQUIRED)
-eprosima_find_thirdparty(Asio asio VERSION 1.10.8)
-eprosima_find_thirdparty(TinyXML2 tinyxml2)
+eprosima_find_thirdparty(asio REQUIRED)
+eprosima_find_thirdparty(tinyxml2 REQUIRED)

find_package(foonathan_memory REQUIRED)
message(STATUS "Found foonathan_memory: ${foonathan_memory_DIR}")
diff --git a/src/cpp/CMakeLists.txt b/src/cpp/CMakeLists.txt
index d26915242..f00e36ea6 100644
--- a/src/cpp/CMakeLists.txt
+++ b/src/cpp/CMakeLists.txt
@@ -456,7 +456,7 @@ elseif(NOT EPROSIMA_INSTALLER)
# Link library to external libraries.
target_link_libraries(${PROJECT_NAME} ${PRIVACY} fastcdr foonathan_memory
${CMAKE_THREAD_LIBS_INIT} ${CMAKE_DL_LIBS}
- ${TINYXML2_LIBRARY}
+ tinyxml2::tinyxml2
$<$<BOOL:${LINK_SSL}>:OpenSSL::SSL$<SEMICOLON>OpenSSL::Crypto$<$<BOOL:${WIN32}>:$<SEMICOLON>crypt32.lib>>
$<$<BOOL:${WIN32}>:iphlpapi$<SEMICOLON>Shlwapi>
${THIRDPARTY_BOOST_LINK_LIBS}
2 changes: 2 additions & 0 deletions recipes/fast-dds/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,5 @@ versions:
folder: all
"2.3.3":
folder: all
"2.3.4":
folder: all