WebSVN – pub – Path Comparison – / – /relevation/branches Rev 605 and /relevation/branches Rev 606

Ignore whitespace Rev 605 → Rev 606

 /relevation/branches/1.3/devtools/relver.bash
 ,0 → 1,25
+#!/bin/bash
+# $Id$
+# Quick and dirty script to retrieve the script version
+# (which is otherwise composed at runtime)
+# This scripts avoid having the same runtime requirements for package
+# creation
+r="$(dirname "$0")/../src/relevation.py"
+rel=$(grep '^RELEASE' $r | tail -1)
+verinfo=$(grep '^__version_info__' $r | head -1)
+verinfo_pre=$(grep '__version_info__ +=' $r | head -1 | sed 's/^[[:space:]]*//')
+ver=$(grep '^__version__' $r | head -1)
+python <<EOF
+$rel
+$verinfo
+release=''
+if not RELEASE:
+        $verinfo_pre
+        release=' [DEBUG]'
+$ver
+print "%s%s" % ( __version__, release )
+EOF
 Property changes:
 Added: svn:executable
 +*
 \ No newline at end of property
 Added: svn:keywords
 +Rev Id Date
 \ No newline at end of property

 /relevation/branches/1.3/GNUmakefile
 ,7 → 4,7
 DESTDIR:=
 PKG=relevation
-VERSION=$(shell python ./src/relevation.py --version 2>/dev/null | head -1 | awk '{ print $$3 }')
+VERSION=$(shell bash devtools/relver.bash 2>/dev/null | awk '{ print $$1 }')
 PKGVER=$(PKG)-$(VERSION)
 PACKAGER:=$(shell finger -lp `echo $USER` 2>/dev/null | head -n1 | cut -d: -f3)
 ifeq ($(PACKAGER),)
 ,7 → 119,7
 is_release:
         # Only allowed if RELEASE
-        python ./src/relevation.py --version 2>/dev/null | head -1 | grep -q -v 'DEBUG'
+        bash devtools/relver.bash | grep -q -v 'DEBUG'
 package_copy:
         @# Make a temporary copy to package