procyberian/gimp
2
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/gimp.git synced 2025-07-03 17:33:25 +00:00
Code Issues 1 Projects 1 Releases Packages Wiki Activity Actions

meson: Fix dist script

Browse source
This commit is contained in:
Jan Tojnar 2022-02-25 16:11:21 +01:00 • committed by Jehan
parent 3279bb3351
commit 0c7a980bc1
2 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
meson.build
View file

@ -1476,7 +1476,8 @@ has_version_h = run_command('python3', '-c',
'import sys,os; sys.exit(0 if os.path.exists("git-version.h") else 1)' 'import sys,os; sys.exit(0 if os.path.exists("git-version.h") else 1)'
).returncode() == 0 ).returncode() == 0
if is_git_repository or not has_version_h generate_version_h = is_git_repository or not has_version_h
if generate_version_h
gitversion_h1 = vcs_tag( gitversion_h1 = vcs_tag(
input : 'app/git-version.h.in', input : 'app/git-version.h.in',
output: 'git-version.h.in.1', output: 'git-version.h.in.1',
@ -1647,7 +1648,7 @@ custom_target('Changelog',
build_by_default: false, build_by_default: false,
) )
meson.add_dist_script('meson_dist_script.sh') meson.add_dist_script('meson_dist_script.sh', generate_version_h ? gitversion_h.full_path() : gitversion_h)
################################################################################ ################################################################################

2
meson_dist_script.sh
View file

@ -3,4 +3,4 @@
cp -f 'INSTALL' "${MESON_DIST_ROOT}" cp -f 'INSTALL' "${MESON_DIST_ROOT}"
# rm -f "${MESON_DIST_ROOT}/INSTALL.in" # rm -f "${MESON_DIST_ROOT}/INSTALL.in"
cp 'git-version.h' "${MESON_DIST_ROOT}" cp "$1" "${MESON_DIST_ROOT}"