-
Notifications
You must be signed in to change notification settings - Fork 69
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.
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
ENH: support shared libraries on Windows when explicitly enabled #551
Open
dnicolodi
wants to merge
2
commits into
mesonbuild:main
Choose a base branch
from
dnicolodi:shared-libs-win32
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
Original file line number | Diff line number | Diff line change | ||||
---|---|---|---|---|---|---|
|
@@ -311,10 +311,12 @@ | |||||
metadata: Metadata, | ||||||
manifest: Dict[str, List[Tuple[pathlib.Path, str]]], | ||||||
limited_api: bool, | ||||||
shared_libs_win32: bool, | ||||||
) -> None: | ||||||
self._metadata = metadata | ||||||
self._manifest = manifest | ||||||
self._limited_api = limited_api | ||||||
self._shared_libs_win32 = shared_libs_win32 | ||||||
|
||||||
@property | ||||||
def _has_internal_libs(self) -> bool: | ||||||
|
@@ -430,6 +432,9 @@ | |||||
|
||||||
if self._has_internal_libs: | ||||||
if _is_native(origin): | ||||||
if sys.platform == 'win32' and not self._shared_libs_win32: | ||||||
raise NotImplementedError(f'Bundling libraries in wheel is not supported on {sys.platform}') | ||||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This should mention the configuration option? |
||||||
|
||||||
# When an executable, libray, or Python extension module is | ||||||
# dynamically linked to a library built as part of the project, | ||||||
# Meson adds a library load path to it pointing to the build | ||||||
|
@@ -566,6 +571,7 @@ | |||||
scheme = _table({ | ||||||
'meson': _string_or_path, | ||||||
'limited-api': _bool, | ||||||
'shared-libs-win32': _bool, | ||||||
'args': _table({ | ||||||
name: _strings for name in _MESON_ARGS_KEYS | ||||||
}), | ||||||
|
@@ -757,6 +763,10 @@ | |||||
if not value: | ||||||
self._limited_api = False | ||||||
|
||||||
# Shared library support on Windows requires collaboration | ||||||
# from the package, make sure the developpers aknowledge this. | ||||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
|
||||||
self._shared_libs_win32 = pyproject_config.get('shared-libs-win32', False) | ||||||
|
||||||
def _run(self, cmd: Sequence[str]) -> None: | ||||||
"""Invoke a subprocess.""" | ||||||
# Flush the line to ensure that the log line with the executed | ||||||
|
@@ -920,13 +930,13 @@ | |||||
def wheel(self, directory: Path) -> pathlib.Path: | ||||||
"""Generates a wheel in the specified directory.""" | ||||||
self.build() | ||||||
builder = _WheelBuilder(self._metadata, self._manifest, self._limited_api) | ||||||
builder = _WheelBuilder(self._metadata, self._manifest, self._limited_api, self._shared_libs_win32) | ||||||
return builder.build(directory) | ||||||
|
||||||
def editable(self, directory: Path) -> pathlib.Path: | ||||||
"""Generates an editable wheel in the specified directory.""" | ||||||
self.build() | ||||||
builder = _EditableWheelBuilder(self._metadata, self._manifest, self._limited_api) | ||||||
builder = _EditableWheelBuilder(self._metadata, self._manifest, self._limited_api, self._shared_libs_win32) | ||||||
return builder.build(directory, self._source_dir, self._build_dir, self._build_command, self._editable_verbose) | ||||||
|
||||||
|
||||||
|
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
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
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
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This doesn't seem to explain (or link to something that explains) what sort of "collaboration" is needed.