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.

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

building: fix the references to nested resources in multipackage #5606

Merged
merged 2 commits into from Mar 16, 2021

Commits on Mar 8, 2021

  1. tests: extend the multipackage tests with nested resources

    Extend the multipackage test to verify references to nested resources
    (data files and extensions) within the shared package in the
    multipackage mode. For nested extension, the psutil package is used
    (as it contains one).
    
    Refactor the test scripts to use a common test function from a
    package to avoid duplicating test code.
    
    The extended tests shows that multipackage currently does not
    properly handle resources that are collected in subdirectories of
    _MEIPASS instead of _MEIPASS itself.
    rokm committed Mar 8, 2021
    Copy the full SHA
    c0c8bd1 View commit details
    Browse the repository at this point in the history
  2. building: fix the references to nested resources in multipackage

    Fix MERGE() to properly set references to nested resources, i.e.,
    with their full shared-package-relative path instead of just basename
    (e.g., path/to/shared/pkg:rel/path/to/file as opposed to just
    path/to/shared/pkg:file). The latter breaks any resources
    (data files, extensions/shared libraries, etc.) that are
    located in sub-directories of the shared package.
    rokm committed Mar 8, 2021
    Copy the full SHA
    9956aa0 View commit details
    Browse the repository at this point in the history