On Mon, Jan 13, 2025 at 12:51:59PM -0500, Eli Schwartz wrote: > On 1/13/25 12:42 PM, Junio C Hamano wrote: > > Patrick Steinhardt <ps@xxxxxx> writes: > > > >> - We can pull the default version out of GIT-VERSION-GEN and move it > >> into its own file. This likely requires some adjustments for scripts > >> that bump the version, but allows Meson to read the version from > >> that file trivially. > >> > >> The last option is a proper solution and quite trivial to implement, and > >> adapting scripts should be a one-time event. Refactor GIT-VERSION-GEN > >> accordingly. > > > > It is not clear what "proper" is. It smells like we are bending an > > established work flow element to placate a tool that is not willing > > to cooperate, which is very much unwelcome. > > > If I understand correctly, the constraint is that it should work on > Windows, which means there is a bootstrap issue regarding detection of > an "sh" command for running ./GIT-VERSION-GEN > > Proper simply means it works reliably on all supported targets. Yeah, exactly, that's the issue. We could of course try to use GIT-VERSION-GEN anyway and just fall back to an empty string if the command wasn't found. We don't use the project version anyway, so it's only a cosmetic problem. And it's more accurate than extracting DEF_VER, too. > > Compared to that, grepping for "^DEF_VER=" in the file may be less > > yucky. > > Or for the sake of Windows portability, grep_version.py? I don't want to make Python an explicit dependency for building Git, and due to Muon it isn't even with the Meson build infra. Patrick
