From a9be3440c68ff6dab1e9da216f96f97d5e1ff27a Mon Sep 17 00:00:00 2001 From: Thierry Parmentelat Date: Fri, 22 Oct 2010 15:56:20 +0200 Subject: [PATCH] fixed GetVersion's tag (now code_tag) and add code_url --- Makefile | 3 ++- sfa.spec | 4 ++-- sfa/util/version.py.in | 4 +++- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 40c89caf..c122cf3d 100644 --- a/Makefile +++ b/Makefile @@ -16,13 +16,14 @@ uninstall: python-uninstall tests-uninstall .PHONY: all install clean uninstall VERSIONTAG=should-be-redefined-by-specfile +SCMURL=should-be-redefined-by-specfile ########## python: version version: sfa/util/version.py sfa/util/version.py: sfa/util/version.py.in - sed -e "s,@VERSIONTAG@,$(VERSIONTAG),g" sfa/util/version.py.in > $@ + sed -e "s,@VERSIONTAG@,$(VERSIONTAG),g" -e "s,@SCMURL@,$(SCMURL),g" sfa/util/version.py.in > $@ xmlbuilder-install: cd xmlbuilder-0.9 && python setup.py install --root=$(DESTDIR) && cd - diff --git a/sfa.spec b/sfa.spec index 522742ed..22169d2b 100644 --- a/sfa.spec +++ b/sfa.spec @@ -102,11 +102,11 @@ Provides some binary unit tests in /usr/share/sfa/tests %setup -q %build -make VERSION=%{version}-%{taglevel} +make VERSIONTAG="%{version}-%{taglevel}" SCMURL="%{SCMURL}" %install rm -rf $RPM_BUILD_ROOT -make install VERSION=%{version}-%{taglevel} DESTDIR="$RPM_BUILD_ROOT" +make VERSIONTAG="%{version}-%{taglevel}" SCMURL="%{SCMURL}" install DESTDIR="$RPM_BUILD_ROOT" %clean rm -rf $RPM_BUILD_ROOT diff --git a/sfa/util/version.py.in b/sfa/util/version.py.in index a4edc93e..37a1ab02 100644 --- a/sfa/util/version.py.in +++ b/sfa/util/version.py.in @@ -1,11 +1,13 @@ ### updated by the toplevel Makefile version_tag="@VERSIONTAG@" +scm_url="@SCMURL@" import socket def version_core (more): core = { 'geni_api':1, 'sfa' : 1, - 'tag' : version_tag, + 'code_tag' : version_tag, + 'code_url' : scm_url, 'hostname' : socket.gethostname(), } core.update(more) -- 2.43.0