Skip to content
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

Jump to bottom

Support packaging cairo-plugins #1605

Merged
merged 52 commits into from
Oct 14, 2024
Merged

Support packaging cairo-plugins #1605

merged 52 commits into from
Oct 14, 2024

Commits on Sep 17, 2024

  1. Add cargo action for packaging

    @DelevoXDG
    DelevoXDG committed Sep 17, 2024
    Configuration menu
    Copy the full SHA
    4569059 View commit details
    Browse the repository at this point in the history

  2. Skip Cargo.toml when sourcing files for recipe

    @DelevoXDG
    DelevoXDG committed Sep 17, 2024
    Configuration menu
    Copy the full SHA
    058a698 View commit details
    Browse the repository at this point in the history

  3. Add conversion from Target to TomlTarget with external params

    @DelevoXDG
    DelevoXDG committed Sep 17, 2024
    Configuration menu
    Copy the full SHA
    bcdeaaf View commit details
    Browse the repository at this point in the history

  4. Support cairo plugin in manifest normalization

    @DelevoXDG
    DelevoXDG committed Sep 17, 2024
    Configuration menu
    Copy the full SHA
    1ba6c14 View commit details
    Browse the repository at this point in the history

  5. Update toml manifest target collection to handle cairo plugin target

    @DelevoXDG
    DelevoXDG committed Sep 17, 2024
    Configuration menu
    Copy the full SHA
    b9904ba View commit details
    Browse the repository at this point in the history

Commits on Sep 18, 2024

  1. Add initial support for packaging plugins 

    - Allow package with `[cairo-plugin]` target to be packaged
- Run `cargo package` to build + normalize `Cargo.toml`
- Add normalized and original `Cargo.toml` to the package archive
- Add `get_cargo_package_name` helper to read package name from `Cargo.toml`
  - TODO: consider sharing duplicated logic in `check_corelib_version`
    @DelevoXDG
    DelevoXDG committed Sep 18, 2024
    Configuration menu
    Copy the full SHA
    2e8fc39 View commit details
    Browse the repository at this point in the history

Commits on Sep 19, 2024

  1. Fix no_lib_target test; Rename to no_target

    @DelevoXDG
    DelevoXDG committed Sep 19, 2024
    Configuration menu
    Copy the full SHA
    67b5a2a View commit details
    Browse the repository at this point in the history

  2. Move CairoPluginProjectBuilder to utils/scarb-test-support/

    @DelevoXDG
    DelevoXDG committed Sep 19, 2024
    Configuration menu
    Copy the full SHA
    343810d View commit details
    Browse the repository at this point in the history

Commits on Sep 24, 2024

  1. Retrieve name+version from Cargo.toml for path resolution 

    Don't use version as used in Scarb.toml, use the one in Cargo.toml instead to ensure path can be resolved
    @DelevoXDG
    DelevoXDG committed Sep 24, 2024
    Configuration menu
    Copy the full SHA
    623357a View commit details
    Browse the repository at this point in the history

  2. Allow packaging via Cargo without verification

    @DelevoXDG
    DelevoXDG committed Sep 24, 2024
    Configuration menu
    Copy the full SHA
    7d8001c View commit details
    Browse the repository at this point in the history

  3. Format

    @DelevoXDG
    DelevoXDG committed Sep 24, 2024
    Configuration menu
    Copy the full SHA
    428b99f View commit details
    Browse the repository at this point in the history

  4. Specify dependency version in CairoPluginProjectBuilder

    @DelevoXDG
    DelevoXDG committed Sep 24, 2024
    Configuration menu
    Copy the full SHA
    f1f94d1 View commit details
    Browse the repository at this point in the history

Commits on Sep 25, 2024

  1. Revert "Allow packaging via Cargo without verification" 

    This reverts commit 7d8001c.
    @DelevoXDG
    DelevoXDG committed Sep 25, 2024
    Configuration menu
    Copy the full SHA
    869a0be View commit details
    Browse the repository at this point in the history

  2. Fix missing whitespace in cairo_plugin_project_builder.rs

    @DelevoXDG
    DelevoXDG committed Sep 25, 2024
    Configuration menu
    Copy the full SHA
    fd676e3 View commit details
    Browse the repository at this point in the history

  3. Add plugin packaging basic test

    @DelevoXDG
    DelevoXDG committed Sep 25, 2024
    Configuration menu
    Copy the full SHA
    9f64c1b View commit details
    Browse the repository at this point in the history

  4. Skip Scarb.lock when packaging

    @DelevoXDG
    DelevoXDG committed Sep 25, 2024
    Configuration menu
    Copy the full SHA
    662768c View commit details
    Browse the repository at this point in the history

  5. Pass relevant arguments to Cargo actions 

    - Pass `--offline` for all cmds
- Pass `--no-metadata`, `--verify`, `--allow-dirty` for `package`
    @DelevoXDG
    DelevoXDG committed Sep 25, 2024
    Configuration menu
    Copy the full SHA
    bdcf32b View commit details
    Browse the repository at this point in the history

  6. Deduplicate --offline flag addition

    @DelevoXDG
    DelevoXDG committed Sep 25, 2024
    Configuration menu
    Copy the full SHA
    ade5aab View commit details
    Browse the repository at this point in the history

  7. Move cairo_plugin packaging test

    @DelevoXDG
    DelevoXDG committed Sep 25, 2024
    Configuration menu
    Copy the full SHA
    b7cfd68 View commit details
    Browse the repository at this point in the history

  8. Allow checking that target and package are builtin

    @DelevoXDG
    DelevoXDG committed Sep 25, 2024
    Configuration menu
    Copy the full SHA
    20acc00 View commit details
    Browse the repository at this point in the history

  9. Don't cargo package and don't verify builtin plugins

    @DelevoXDG
    DelevoXDG committed Sep 25, 2024
    Configuration menu
    Copy the full SHA
    ab9a86d View commit details
    Browse the repository at this point in the history

  10. Add test for packing builtin cairo plugins

    @DelevoXDG
    DelevoXDG committed Sep 25, 2024
    Configuration menu
    Copy the full SHA
    be9fd63 View commit details
    Browse the repository at this point in the history

  11. Simplify cairo-plugin, lib, and builtin checks

    @DelevoXDG
    DelevoXDG committed Sep 25, 2024
    Configuration menu
    Copy the full SHA
    13a0929 View commit details
    Browse the repository at this point in the history

  12. Normalize cairo-plugin in a typed manner; Skip builtin = false

    @DelevoXDG
    DelevoXDG committed Sep 25, 2024
    Configuration menu
    Copy the full SHA
    656a61a View commit details
    Browse the repository at this point in the history

  13. Remove Target.to_toml_target

    @DelevoXDG
    DelevoXDG committed Sep 25, 2024
    Configuration menu
    Copy the full SHA
    5b5941b View commit details
    Browse the repository at this point in the history

  14. Format

    @DelevoXDG
    DelevoXDG committed Sep 25, 2024
    Configuration menu
    Copy the full SHA
    8559e17 View commit details
    Browse the repository at this point in the history

Commits on Sep 26, 2024

  1. Merge branch 'main' into zdobnikau/1527-package-cairo-plugins

    @DelevoXDG
    DelevoXDG committed Sep 26, 2024
    Configuration menu
    Copy the full SHA
    d210532 View commit details
    Browse the repository at this point in the history

  2. Fix test after merge

    @DelevoXDG
    DelevoXDG committed Sep 26, 2024
    Configuration menu
    Copy the full SHA
    cdb2ce0 View commit details
    Browse the repository at this point in the history

Commits on Sep 27, 2024

  1. Update cargo package related methods name 

    - `fetch_package` -> `fetch_crate`
- `package_package` -> `package_crate`
    @DelevoXDG
    DelevoXDG committed Sep 27, 2024
    Configuration menu
    Copy the full SHA
    8464751 View commit details
    Browse the repository at this point in the history

Commits on Sep 29, 2024

  1. Move is_builtin method to fn

    @DelevoXDG
    DelevoXDG committed Sep 29, 2024
    Configuration menu
    Copy the full SHA
    af8dc5b View commit details
    Browse the repository at this point in the history

  2. Remove source path

    @DelevoXDG
    DelevoXDG committed Sep 29, 2024
    Configuration menu
    Copy the full SHA
    523c30f View commit details
    Browse the repository at this point in the history

  3. Change Cargo manifest path resolution to extract version from `cargo … 

    …metadata`
    @DelevoXDG
    DelevoXDG committed Sep 29, 2024
    Configuration menu
    Copy the full SHA
    6a157d2 View commit details
    Browse the repository at this point in the history

  4. Move Cargo manifest path resolution to compilation.rs

    @DelevoXDG
    DelevoXDG committed Sep 29, 2024
    Configuration menu
    Copy the full SHA
    cc1c388 View commit details
    Browse the repository at this point in the history

  5. Refactor Cargo manifest path resolution 

    In line with other compilation functions
    @DelevoXDG
    DelevoXDG committed Sep 29, 2024
    Configuration menu
    Copy the full SHA
    50296a8 View commit details
    Browse the repository at this point in the history

  6. Merge branch 'main' into zdobnikau/1527-package-cairo-plugins

    @DelevoXDG
    DelevoXDG committed Sep 29, 2024
    Configuration menu
    Copy the full SHA
    fa8d26f View commit details
    Browse the repository at this point in the history

  7. Update shared_lib_path to fetch package name from Cargo manifest

    @DelevoXDG
    DelevoXDG committed Sep 29, 2024
    Configuration menu
    Copy the full SHA
    688dcd0 View commit details
    Browse the repository at this point in the history

Commits on Oct 9, 2024

  1. Simplify error help message for missing target

    @DelevoXDG
    DelevoXDG committed Oct 9, 2024
    Configuration menu
    Copy the full SHA
    dec41e2 View commit details
    Browse the repository at this point in the history

  2. Emit warning on cargo / scarb name and version mismatch

    @DelevoXDG
    DelevoXDG committed Oct 9, 2024
    Configuration menu
    Copy the full SHA
    c5d6cff View commit details
    Browse the repository at this point in the history

  3. Use name of cdylib target in shared_lib_path 

    Instead of just Cargo manifest package name
    @DelevoXDG
    DelevoXDG committed Oct 9, 2024
    Configuration menu
    Copy the full SHA
    838993c View commit details
    Browse the repository at this point in the history

  4. Run cargo metadata at package root 

    Let cargo worry about specifics of manifest path
    @DelevoXDG
    DelevoXDG committed Oct 9, 2024
    Configuration menu
    Copy the full SHA
    2bf0149 View commit details
    Browse the repository at this point in the history

  5. Format

    @DelevoXDG
    DelevoXDG committed Oct 9, 2024
    Configuration menu
    Copy the full SHA
    c02dceb View commit details
    Browse the repository at this point in the history

  6. Move is_builtin(target)

    @DelevoXDG
    DelevoXDG committed Oct 9, 2024
    Configuration menu
    Copy the full SHA
    32c5b7f View commit details
    Browse the repository at this point in the history

  7. Format

    @DelevoXDG
    DelevoXDG committed Oct 9, 2024
    Configuration menu
    Copy the full SHA
    bdc9954 View commit details
    Browse the repository at this point in the history

Commits on Oct 10, 2024

  1. Return Result instead of panic; Fix error messages style

    @DelevoXDG
    DelevoXDG committed Oct 10, 2024
    Configuration menu
    Copy the full SHA
    de1ac69 View commit details
    Browse the repository at this point in the history

  2. Add warning on package name mismatch in get_cargo_library_name

    @DelevoXDG
    DelevoXDG committed Oct 10, 2024
    Configuration menu
    Copy the full SHA
    f58b098 View commit details
    Browse the repository at this point in the history

  3. Update warning message 

    Signed-off-by: Maksim Zdobnikau <[email protected]>
    @DelevoXDG
    DelevoXDG authored Oct 10, 2024
    Configuration menu
    Copy the full SHA
    618f064 View commit details
    Browse the repository at this point in the history

  4. Format

    @DelevoXDG
    DelevoXDG committed Oct 10, 2024
    Configuration menu
    Copy the full SHA
    fb62138 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'zdobnikau/1527-package-cairo-plugins' of https://github… 

    ….com/software-mansion/scarb into zdobnikau/1527-package-cairo-plugins
    @DelevoXDG
    DelevoXDG committed Oct 10, 2024
    Configuration menu
    Copy the full SHA
    83b3c09 View commit details
    Browse the repository at this point in the history

  6. Remove unnecessary whitespace in the warning

    @DelevoXDG
    DelevoXDG committed Oct 10, 2024
    Configuration menu
    Copy the full SHA
    405e48a View commit details
    Browse the repository at this point in the history

  7. Update test to match new warning msg

    @DelevoXDG
    DelevoXDG committed Oct 10, 2024
    Configuration menu
    Copy the full SHA
    ed39105 View commit details
    Browse the repository at this point in the history

  8. Update shared_lib_path to return Result<Utf8PathBuf> 

    Add context instead of panicking
    @DelevoXDG
    DelevoXDG committed Oct 10, 2024
    Configuration menu
    Copy the full SHA
    e44a218 View commit details
    Browse the repository at this point in the history

Commits on Oct 14, 2024

  1. Apply suggestions from code review 

    Signed-off-by: maciektr <[email protected]>
    @maciektr
    maciektr authored Oct 14, 2024
    Configuration menu
    Copy the full SHA
    8019bdc View commit details
    Browse the repository at this point in the history