mirrors/foot
1
0
Fork 0
mirror of https://codeberg.org/dnkl/foot.git synced 2026-03-14 05:33:59 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

meson: run generate_version.sh in a C locale

Browse source 
Previously, only the date command inside the script was run with
LC_TIME=C.

But there’s no reason to be that conservative; we absolutely do not
want _anything_ in that script to generate locale dependent output.
This commit is contained in:
Daniel Eklöf 2021-08-25 19:12:45 +02:00
parent b8226fa14c
commit 88b2808dcd
No known key found for this signature in database
GPG key ID: 5BBD4992C116573F
2 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
generate-version.sh
View file

@ -17,7 +17,7 @@ if [ -d "${src_dir}/.git" ] && command -v git > /dev/null; then
git_branch=$(git rev-parse --abbrev-ref HEAD) git_branch=$(git rev-parse --abbrev-ref HEAD)
cd "${workdir}" cd "${workdir}"
new_version="${git_version} ($(env LC_TIME=C date "+%b %d %Y"), branch '${git_branch}')" new_version="${git_version} ($(date "+%b %d %Y"), branch '${git_branch}')"
else else
new_version="${default_version}" new_version="${default_version}"
extra="" extra=""

3
meson.build
View file

@ -130,12 +130,13 @@ foreach prot : wl_proto_xml
command: [wscanner_prog, 'private-code', '@INPUT@', '@OUTPUT@']) command: [wscanner_prog, 'private-code', '@INPUT@', '@OUTPUT@'])
endforeach endforeach
env = find_program('env', native: true)
generate_version_sh = files('generate-version.sh') generate_version_sh = files('generate-version.sh')
version = custom_target( version = custom_target(
'generate_version', 'generate_version',
build_always_stale: true, build_always_stale: true,
output: 'version.h', output: 'version.h',
command: [generate_version_sh, meson.project_version(), '@SOURCE_ROOT@', '@OUTPUT@']) command: [env, 'LC_ALL=C', generate_version_sh, meson.project_version(), '@SOURCE_ROOT@', '@OUTPUT@'])
common = static_library( common = static_library(
'common', 'common',