From: "W. Trevor King" <wking@tremily.us>
To: gentoo-catalyst@lists.gentoo.org
Cc: "W. Trevor King" <wking@tremily.us>
Subject: [gentoo-catalyst] [PATCH] Makefile: Fix PACKAGE_VERSION extraction
Date: Sat, 22 Feb 2014 11:37:36 -0800 [thread overview]
Message-ID: <575419cef3b2b642000683bf2cae049b069d0b75.1393097745.git.wking@tremily.us> (raw)
In-Reply-To: <1389491218-1488-2-git-send-email-dolsen@gentoo.org>
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
--
1.8.5.2.8.g0f6c0d1
next prev parent reply other threads:[~2014-02-22 19:39 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-01-12 1:46 [gentoo-catalyst] Re-organize the python structure Brian Dolbec
2014-01-12 1:46 ` [gentoo-catalyst] [PATCH 1/5] Initial rearrangement of the python directories Brian Dolbec
2014-01-12 20:25 ` Brian Dolbec
2014-02-22 17:10 ` W. Trevor King
2014-02-22 18:40 ` Brian Dolbec
2014-02-22 19:37 ` W. Trevor King [this message]
2014-02-22 21:46 ` [gentoo-catalyst] [PATCH] Makefile: Fix PACKAGE_VERSION extraction Brian Dolbec
2014-01-12 1:46 ` [gentoo-catalyst] [PATCH 2/5] Move catalyst_support, builder, catalyst_lock out of modules, into the catalyst namespace Brian Dolbec
2014-01-12 1:46 ` [gentoo-catalyst] [PATCH 3/5] Rename the modules subpkg to targets, to better reflect what it contains Brian Dolbec
2014-01-12 1:46 ` [gentoo-catalyst] [PATCH 4/5] Move catalyst.conf and catalystrc to an etc/ directory Brian Dolbec
2014-01-12 1:46 ` [gentoo-catalyst] [PATCH 5/5] setup.py: Add disutils-based packaging Brian Dolbec
2014-01-12 2:11 ` [gentoo-catalyst] " W. Trevor King
2014-01-12 3:36 ` Brian Dolbec
2014-01-22 5:10 ` [gentoo-catalyst] Re-organize the python structure W. Trevor King
2014-01-22 15:49 ` Rick "Zero_Chaos" Farina
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=575419cef3b2b642000683bf2cae049b069d0b75.1393097745.git.wking@tremily.us \
--to=wking@tremily.us \
--cc=gentoo-catalyst@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox