Skip to content

Fixes to flatpak-cargo-generator #405

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 3 commits into from
Apr 6, 2024
Merged

Fixes to flatpak-cargo-generator #405

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0b06028
cargo: Use recursion for `target.cfg(…)`
zecakeh Apr 5, 2024
e791634
cargo: Support workspace build-dependencies
zecakeh Apr 5, 2024
8514ac2
cargo: Merge workspace features with crate features
zecakeh Apr 5, 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
17 changes: 11 additions & 6 deletions cargo/flatpak-cargo-generator.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,14 +118,13 @@ def fetch_git_repo(git_url: str, commit: str) -> str:

def update_workspace_keys(pkg, workspace):
for key, item in pkg.items():
# target.cfg(..).dependencies should reference root dependencies table from workspace
# Recurse for keys under target.cfg(..)
if key == 'target':
for target in item.values():
if 'dependencies' in target:
update_workspace_keys(target['dependencies'], workspace.get('dependencies', None))
update_workspace_keys(target, workspace)
continue;
# dev-dependencies should reference root dependencies table from workspace
elif key == 'dev-dependencies':
# dev-dependencies and build-dependencies should reference root dependencies table from workspace
elif key == 'dev-dependencies' or key == 'build-dependencies':
update_workspace_keys(item, workspace.get('dependencies', None))
continue;

Expand All @@ -137,7 +136,13 @@ def update_workspace_keys(pkg, workspace):
if 'workspace' in item:
if isinstance(workspace_item, dict):
del item['workspace']
item.update(workspace_item)

for dep_key, workspace_value in workspace_item.items():
# features are additive
if dep_key == 'features' and 'features' in item:
item['features'] += workspace_value
else:
item[dep_key] = workspace_value
elif len(item) > 1:
del item['workspace']
item.update({ 'version': workspace_item })
Expand Down