Re: make dist using git archive

On Mon Jan 22, 2024 at 1:31 AM CST, Peter Eisentraut wrote:
> From 4b128faca90238d0a0bb6949a8050c2501d1bd67 Mon Sep 17 00:00:00 2001
> From: Peter Eisentraut <peter(at)eisentraut(dot)org>
> Date: Sat, 20 Jan 2024 21:54:36 +0100
> Subject: [PATCH v0] make dist uses git archive
>
> ---
> GNUmakefile.in | 34 ++++++++++++----------------------
> meson.build | 38 ++++++++++++++++++++++++++++++++++++++
> 2 files changed, 50 insertions(+), 22 deletions(-)
>
> diff --git a/GNUmakefile.in b/GNUmakefile.in
> index eba569e930e..3e04785ada2 100644
> --- a/GNUmakefile.in
> +++ b/GNUmakefile.in
> @@ -87,29 +87,19 @@ update-unicode: | submake-generated-headers submake-libpgport
> distdir = postgresql-$(VERSION)
> dummy = =install=
>
> +GIT = git
> +
> dist: $(distdir).tar.gz $(distdir).tar.bz2
> - rm -rf $(distdir)
> -
> -$(distdir).tar: distdir
> - $(TAR) chf $@ $(distdir)
> -
> -.INTERMEDIATE: $(distdir).tar
> -
> -distdir-location:
> - @echo $(distdir)
> -
> -distdir:
> - rm -rf $(distdir)* $(dummy)
> - for x in `cd $(top_srcdir) && find . \( -name CVS -prune \) -o \( -name .git -prune \) -o -print`; do \
> - file=`expr X$$x : 'X\./\(.*\)'`; \
> - if test -d "$(top_srcdir)/$$file" ; then \
> - mkdir "$(distdir)/$$file" && chmod 777 "$(distdir)/$$file"; \
> - else \
> - ln "$(top_srcdir)/$$file" "$(distdir)/$$file" >/dev/null 2>&1 \
> - || cp "$(top_srcdir)/$$file" "$(distdir)/$$file"; \
> - fi || exit; \
> - done
> - $(MAKE) -C $(distdir) distclean
> +
> +.PHONY: check-dirty-index
> +check-dirty-index:
> + $(GIT) diff-index --quiet HEAD
> +
> +$(distdir).tar.gz: check-dirty-index
> + $(GIT) archive --format tar.gz --prefix $(distdir)/ HEAD -o $@
> +
> +$(distdir).tar.bz2: check-dirty-index
> + $(GIT) -c tar.tar.bz2.command='$(BZIP2) -c' archive --format tar.bz2 --prefix $(distdir)/ HEAD -o $@
>
> distcheck: dist
> rm -rf $(dummy)
> diff --git a/meson.build b/meson.build
> index c317144b6bc..f0d870c5192 100644
> --- a/meson.build
> +++ b/meson.build
> @@ -3347,6 +3347,44 @@ run_target('help',
>
>
>
> +###############################################################
> +# Distribution archive
> +###############################################################
> +
> +git = find_program('git', required: false, native: true, disabler: true)
> +bzip2 = find_program('bzip2', required: false, native: true, disabler: true)

This doesn't need to be a disabler. git is fine as-is. See later
comment. Disablers only work like you are expecting when they are used
like how git is used. Once you call a method like .path(), all bets are
off.

> +distdir = meson.project_name() + '-' + meson.project_version()
> +
> +check_dirty_index = run_target('check-dirty-index',
> + command: [git, 'diff-index', '--quiet', 'HEAD'])

Seems like you might want to add -C here too?

> +
> +tar_gz = custom_target('tar.gz',
> + build_always_stale: true,
> + command: [git, '-C', '@SOURCE_ROOT@', 'archive',
> + '--format', 'tar.gz',
> + '--prefix', distdir + '/',
> + '-o', '@BUILD_ROOT@/@OUTPUT@',
> + 'HEAD', '.'],
> + install: false,
> + output: distdir + '.tar.gz',
> +)
> +
> +tar_bz2 = custom_target('tar.bz2',
> + build_always_stale: true,
> + command: [git, '-C', '@SOURCE_ROOT@', '-c', 'tar.tar.bz2.command=' + bzip2.path() + ' -c', 'archive',
> + '--format', 'tar.bz2',
> + '--prefix', distdir + '/',

- '-o', '@BUILD_ROOT@/@OUTPUT@',
+ '-o', join_paths(meson.build_root(), '@OUTPUT@'),

This will generate the tarballs in the build directory. Do the same for
the previous target. Tested locally.

> + 'HEAD', '.'],
> + install: false,
> + output: distdir + '.tar.bz2',
> +)

The bz2 target should be wrapped in an `if bzip2.found()`. It is
possible for git to be found, but not bzip2. I might also define the bz2
command out of line. Also, you may want to add
these programs to meson_options.txt for overriding, even though the
"meson-ic" way is to use a machine file.

> +
> +alias_target('pgdist', [check_dirty_index, tar_gz, tar_bz2])

Are you intending for the check_dirty_index target to prohibit the other
two targets from running? Currently that is not the case. If it is what
you intend, use a stamp file or something to indicate a relationship.
Alternatively, inline the git diff-index into the other commands. These
might also do better as external scripts. It would reduce duplication
between the autotools and Meson builds.

> +
> +
> +
> ###############################################################
> # The End, The End, My Friend
> ###############################################################

I am not really following why we can't use the builtin Meson dist
command. The only difference from my testing is it doesn't use
a --prefix argument.

--
Tristan Partin
Neon (https://neon.tech)