[BazelDeps][bugfix] Windows and shared libraries #17045
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
franramirez688
force-pushed
the
frm/bazeldeps_findlibs_bug
branch
from
9b6bafd to
e1ba1cc
Compare
franramirez688
commented
Sep 27, 2024
| (["mylibwin2"], True, | ||
| [('mylibwin2', True, '{base_folder}/bin/mylibwin2.dll', '{base_folder}/lib/mylibwin2.if.lib')]), | ||
| # Win + Mac + shared | ||
| (["mylibwin", "mylibmac"], True, [('mylibmac', True, '{base_folder}/bin/mylibmac.dylib', None), |
There was a problem hiding this comment.
This test did not make much sense. Removed.
franramirez688
commented
Sep 27, 2024
| ('mylibwin', True, '{base_folder}/bin/mylibwin.dll', | ||
| '{base_folder}/lib/mylibwin.lib')]), | ||
| # Linux + Mac + static | ||
| (["myliblin", "mylibmac"], False, [('mylibmac', False, '{base_folder}/lib/mylibmac.a', None), |
There was a problem hiding this comment.
The same reason
franramirez688
commented
Sep 27, 2024
| dep = MagicMock() | ||
| dep.options.get_safe.return_value = is_shared | ||
| dep.ref.name = "my_pkg" | ||
| found_libs = _get_libs(dep, cpp_info) |
There was a problem hiding this comment.
This has not changed but has improved and simplified.
memsharded
approved these changes
Sep 27, 2024
| interface_lib_paths[lib_] = formatted_path | ||
| else: | ||
| lib_paths[lib_] = formatted_path | ||
| name, ext = file_name.split('.', maxsplit=1) # ext could be .if.lib |
There was a problem hiding this comment.
Dont we want name, ext = file_name.rsplit(".", 1) to get just the very last extension?
There was a problem hiding this comment.
Nope, I need the other one. The difference is:
# libs = ["mylib"]
# file_name = "mylib.if.lib"
name, ext = file_name.rsplit(".", 1) # mylib.if
name, ext = file_name.split(".", 1) # mylib -> I want this oneThere was a problem hiding this comment.
The very last extension at this point is not important. The only important thing is to check if it's a dll.
czoido
approved these changes
Sep 27, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Changelog: Bugfix: BazelDeps did not find DLL files as Conan does not model them in the Windows platform.
Docs: omit
Close: #16691