Skip to content

Commit

Permalink
Merge pull request #100 from eli-schwartz/meson-dist
Browse files Browse the repository at this point in the history
meson: create full dist tarball with autoconf artifacts included
  • Loading branch information
mhvk authored Dec 29, 2023
2 parents 9915ba3 + e86d6d9 commit df9f5c4
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 4 deletions.
4 changes: 1 addition & 3 deletions .github/workflows/ci_workflows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ jobs:
if [ "$RUNNER_OS" = Linux ]; then
sudo apt-get -y install meson ninja-build
else
brew install meson
brew install meson autoconf automake libtool
fi
- name: configure
Expand Down Expand Up @@ -90,5 +90,3 @@ jobs:
run: ninja -C builddir
- name: check
run: meson test -C builddir
- name: distcheck
run: meson dist -C builddir
10 changes: 9 additions & 1 deletion bootstrap.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,14 @@
#!/bin/sh

# ensure m4 dir exists
# if running from `meson dist`, make sure we run from the dist root
if [ -n "$MESON_PROJECT_DIST_ROOT" ]; then
cd "$MESON_PROJECT_DIST_ROOT"
# meson < 0.58
elif [ -n "$MESON_DIST_ROOT" ]; then
cd "$MESON_DIST_ROOT"
fi

# ensure m4 dir exists
mkdir -p m4
# ensure build-aux exists
mkdir -p build-aux
Expand Down
2 changes: 2 additions & 0 deletions meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -39,3 +39,5 @@ import('pkgconfig').generate(
name: 'Erfa',
description: 'Essential Routines for Fundamental Astronomy',
)

meson.add_dist_script('./bootstrap.sh')

0 comments on commit df9f5c4

Please sign in to comment.