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

Generate bdist ZIP members via Meson #199

Merged
merged 8 commits into from
Dec 4, 2023
Merged

Commits on Dec 2, 2023

  1. workflows: rename artifacts temporary directory

    We're about to use that name for something else.
    
    Signed-off-by: Benjamin Gilbert <[email protected]>
    bgilbert committed Dec 2, 2023
    Configuration menu
    Copy the full SHA
    c98d375 View commit details
    Browse the repository at this point in the history
  2. Set the Meson project version from the pkgver

    It's convenient for Meson to also know the version number.  Meson can
    retrieve the version number from a command, so implement one that reads
    an environment variable set by build.sh, with an autogenerated fallback
    in case Meson is invoked directly.
    
    Then have build.sh read the default version number from the same command,
    rather than calculating it independently.
    
    Signed-off-by: Benjamin Gilbert <[email protected]>
    bgilbert committed Dec 2, 2023
    Configuration menu
    Copy the full SHA
    7cfcbc0 View commit details
    Browse the repository at this point in the history
  3. Generate VERSIONS.md through Meson

    Meson knows what subprojects we're using in this build, which will vary
    by platform.  Rather than syncing that information back into build.sh,
    just generate VERSIONS.md from Meson.  For overridden subprojects that
    are Git repos, get the version string from `git describe`.
    
    Meson already has the compiler version string, so use that rather than
    fetching it from the compiler.  For Binutils we still need to fetch the
    version string directly.  Detect the linker command in Meson (specified in
    the cross file, with a fallback to PATH) and pass it via an environment
    variable so we don't need an explicit command-line argument.
    
    Also add support for detecting the Clang version for macOS.
    
    Give up on maintaining some sort of logical order for the dependency list,
    and sort alphabetically.  The order was always fairly arbitrary.
    
    Meson passes the MESONINTROSPECT env var to many external command
    invocations, giving the correct invocation of `meson introspect`.
    However, this doesn't happen for custom targets, so collect the value
    via a run_command() invocation and then pass it to the custom target.
    
    Set build_always_stale to ensure we don't package an out-of-date
    VERSIONS.md.
    
    Bump the minimum Meson version for `meson introspect --compilers` support.
    
    Signed-off-by: Benjamin Gilbert <[email protected]>
    bgilbert committed Dec 2, 2023
    Configuration menu
    Copy the full SHA
    77503f6 View commit details
    Browse the repository at this point in the history

Commits on Dec 3, 2023

  1. Add argparse wrapper to enable type-checking

    mypy assumes argparse.Namespace object attributes have type Any, but the
    types of arguments often matter for typechecking the program as a whole.
    Add a TypedArgs base class which can be subclassed to hold a typed field
    for each command-line argument, with validation wrappers that verify that
    the argument configuration passed to parser.add_argument() matches the
    corresponding field type.
    
    Also add a pre-commit check to ensure argparse isn't invoked directly.
    
    Signed-off-by: Benjamin Gilbert <[email protected]>
    bgilbert committed Dec 3, 2023
    Configuration menu
    Copy the full SHA
    fa71cbc View commit details
    Browse the repository at this point in the history
  2. Rename meson_options.txt to meson.options

    The latter is supported by Meson >= 1.1.0, which we're now requiring.
    
    Signed-off-by: Benjamin Gilbert <[email protected]>
    bgilbert committed Dec 3, 2023
    Configuration menu
    Copy the full SHA
    bf3ce6a View commit details
    Browse the repository at this point in the history
  3. Postprocess binaries in Meson

    Create split debuginfo and check exported symbols in Meson rather than in
    the build.sh wrapper.  Support all three platforms.  Link to debuginfo
    using a bare filename rather than an absolute path, causing gdb to enable
    directory search semantics for finding the debuginfo.  On Linux and macOS,
    also update the slidetool and JNI RPATHs to match the bdist directory
    layout.
    
    To do this, the Meson custom_target needs to be able to find the slidetool
    executable in the build directory.  Backport an OpenSlide commit to store
    the exe object in a Meson variable.
    
    Also add a Meson rule to copy openslide.jar to the artifacts directory,
    so build.sh only has to look for output artifacts in one place.
    
    Signed-off-by: Benjamin Gilbert <[email protected]>
    bgilbert committed Dec 3, 2023
    Configuration menu
    Copy the full SHA
    c438926 View commit details
    Browse the repository at this point in the history

Commits on Dec 4, 2023

  1. Add Meson object for OpenSlide import library

    Built import libraries cannot normally be referenced via a Meson object;
    they're just a side effect of building a DLL.  Add a custom target that
    copies the OpenSlide import library to a new location and returns a
    reference that can be used as an input to other artifacts.  Use that copy
    when building the bdist ZIP.
    
    Signed-off-by: Benjamin Gilbert <[email protected]>
    bgilbert committed Dec 4, 2023
    Configuration menu
    Copy the full SHA
    4eec3d9 View commit details
    Browse the repository at this point in the history
  2. Generate licenses directory through Meson

    Meson knows what subprojects we're using in this build, which will vary by
    platform.  Rather than syncing that information back into build.sh,
    generate the licenses directory from Meson.
    
    Set build_always_stale to ensure we don't package an out-of-date licenses
    directory.
    
    Signed-off-by: Benjamin Gilbert <[email protected]>
    bgilbert committed Dec 4, 2023
    Configuration menu
    Copy the full SHA
    c28fd04 View commit details
    Browse the repository at this point in the history