Re: [Powertop] [PATCH v1 2/3] configure.ac: version strings from git describe

[-- Attachment #1: Type: text/plain, Size: 2378 bytes --]



On Sat, Aug 6, 2016 at 4:53 AM, Magnus Fromreide <magfr(a)lysator.liu.se> wrote:
> On Fri, Aug 05, 2016 at 12:27:20PM -0700, Joe Konno wrote:
>> From: Joe Konno <joe.konno(a)intel.com>
>>
>> There are two version strings we need during runtime: a long version
>> (for reports and --version), and a short version for the ncurses UI. Use
>> a utility script to generate those strings (version-long and
>> version-short) which will be cat'ed by configure and bundled when 'make
>> dist' is run.
>>
>> Signed-off-by: Joe Konno <joe.konno(a)intel.com>
>
> What happens if I build this from a distributed package, i.e.
>
> ./configure
> make dist
> ta xzf powertop-version.tar.gz
> cd powertop-version
> ./configure
> make
>
> This would normally create a package with no git version info so the version
> scripts couldn't work.
>
> This could obviously be regarded as an unsupported case but if so then I think
> it should be said so explicitly.
Version script is called from autogen, configure just uses already generated files (which are in dist tarball), so there is no problem (since it is expected that autogen is called within git repo). If one wants to support case of autogen-out-of-git-repo, he should add version script to dist and modify it like this:

---8<---
#!/bin/sh

: "${LONG_VERSION_PATH=version-long}"
: "${SHORT_VERSION_PATH=version-short}"
: "${DIST_SUFFIX=-dist}"

LONG=$(cat "${LONG_VERSION_PATH}" 2>/dev/null)
SHORT=$(cat "${SHORT_VERSION_PATH}" 2>/dev/null)

git branch > /dev/null 2>&1
if [ "$?" = "0" ]; then
	LONG=$(git describe --abbrev=7 --tags --always --dirty 2> /dev/null)
	SHORT=\"$(git describe --tags --abbrev=0 2> /dev/null)\"
else
	[ -z "$LONG" -a -n "$SHORT" ] && LONG="${SHORT}"
	[ -z "$SHORT" -a -n "$LONG" ] && SHORT="${LONG}"

	if [ -z "$SHORT" -a -z "$LONG" ]
	then
		SHORT="${SHORT_VERSION-unknown}"
		LONG="${LONG_VERSION-unknown}"
	fi

	LONG="${LONG%${DIST_SUFFIX}}${DIST_SUFFIX}"
	SHORT="${SHORT%${DIST_SUFFIX}}${DIST_SUFFIX}"
fi

echo $LONG  > "${LONG_VERSION_PATH}"
echo $SHORT > "${SHORT_VERSION_PATH}"
--->8---

Two main points here — reading cached values at the start of the script and adding a dist prefix in order to signalize that this is out-of-repo configuration.

-- 
Eugene "eSyr" Syromyatnikov
mailto:evgSyr(a)gmail.com
xmpp:eSyr(a)jabber.{ru|org}