meson: create full dist tarball with autoconf artifacts included #100
Conversation
|
Failures on both MacOS and Windows... For those, |
Right, good point... we added windows CI as part of adding meson support! For macOS, the CI runs
If you run the autogen logic (really just autoreconf) in the dist root for meson, then the files it creates get included in meson's |
eli-schwartz
force-pushed
the
meson-dist
branch
from
63c6de5
to
904868f
Compare
|
Looks good to me, but probably best if @sergiopasra has a look too, to see whether this now is all OK. |
meson.build
Outdated
| @@ -39,3 +39,7 @@ import('pkgconfig').generate( | |||
| name: 'Erfa', | |||
| description: 'Essential Routines for Fundamental Astronomy', | |||
| ) | |||
|
|
|||
| if build_machine.system() != 'windows' | |||
There was a problem hiding this comment.
Sorry I didn't have the time to look all details, but my question is: is the dist package supposed to be platform independent? I assume that we are talking about a source distribution.
In this case the file should be included in any case, including on windows platforms, correct?
There was a problem hiding this comment.
In theory yes, in practice autotools wasn't actually supported on Windows and can't generate a configure script there.
So the choices are probably:
- run build and test on Windows CI but not dist
- create different dists on Windows vs on other platforms.
I'm okay with either approach, so I can switch to the former.
There was a problem hiding this comment.
In theory yes, in practice autotools wasn't actually supported on Windows and can't generate a configure script there.
OK understood.
I think that as soon as we distribute the complete source package (the one generated on unix) it is fine to keep the dist workflow also on windows.
... please feel free to proceed as you prefer.
There was a problem hiding this comment.
Let's drop the distcheck on Windows.
Requires autotools installed to run `meson dist`. This won't work on Windows, which erfa only supports via meson. A full distcheck isn't needed there.
eli-schwartz
force-pushed
the
meson-dist
branch
from
904868f
to
e86d6d9
Compare
| # 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 |
There was a problem hiding this comment.
I think we can just bump our meson version requirement (I seem to be on 1.2.3 myself).
There was a problem hiding this comment.
That's an option, but it does mean Debian Oldstable and Ubuntu 20.04 LTS users, for example, would not be able to use the version of meson installed via apt and would have to manually acquire an updated meson.
I don't like to assume what range of userbase a project wishes to support. I'll go with whatever makes you happy. (And it was easy for me to do, anyway.) :)
There was a problem hiding this comment.
Oops, missed that last comment... no point changing it now any more! We'll just get it whenever we next look at this.
|
OK, let's get this in. Thanks @eli-schwartz! |
No description provided.