Re: [gentoo-catalyst] [PATCH] Makefile: Fix PACKAGE_VERSION extraction

[Brian Dolbec <dolsen@gentoo.org>]

On Sat, 22 Feb 2014 11:37:36 -0800
"W. Trevor King" <wking@tremily.us> wrote:

> The old method grepped for __version__ in catalyst.  That broke with
> 24c5352 (Initial rearrangement of the python directories, 2013-01-10),
> which moved catalyst to bin/catalyst, kept the __version__ in
> bin/catalyst, and added a new __version__ in catalyst/main.py.  Then
> 46b261e (setup.py: Add disutils-based packaging, 2013-06-05)
> consolidated the __version__ definitions in catalyst/__init__.py,
> removing them from bin/catalyst and catalyst/main.py.  This patch
> adjusts the Makefile, invoking Python to extract catalyst.__version__
> instead of grepping through the file that defines it.
> ---
> This patch is in git://tremily.us/catalyst.git setup-py as 575419c.
> 
>  Makefile | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/Makefile b/Makefile
> index 98accbe..757113c 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -1,7 +1,7 @@
>  # Copyright (C) 2011 Sebastian Pipping <sebastian@pipping.org>
>  # Licensed under GPL v2 or later
>  
> -PACKAGE_VERSION = `fgrep '__version__=' catalyst | sed 's|^__version__="\(.*\)"$$|\1|'`
> +PACKAGE_VERSION = $(shell PYTHONPATH=. python -c 'import catalyst; print(catalyst.__version__)')
>  MAN_PAGE_SOURCES = $(wildcard doc/*.?.txt)
>  MAN_PAGES = $(patsubst doc/%.txt,files/%,$(MAN_PAGE_SOURCES))
>  MAN_PAGE_INCLUDES = doc/subarches.generated.txt doc/targets.generated.txt

looks fine, added and queued up right after the setup.py commit.

In git pending branch.

-- 
Brian Dolbec <dolsen>