expose sface version in 'configure' window

diff --git a/Makefile b/Makefile
index 94c7a29..02e7246 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,16 @@
 # 
 
 ##########
 # 
 
 ##########

-all:
+all: version build
+
+VERSIONTAG=should-be-redefined-by-specfile
+SCMURL=should-be-redefined-by-specfile
+
+version: sface/version.py
+sface/version.py: sface/version.py.in
+       sed -e "s,@VERSIONTAG@,$(VERSIONTAG),g" -e "s,@SCMURL@,$(SCMURL),g" sface/version.py.in > $@
+
+build: version

        python setup.py build
 
 install: 
        python setup.py build
 
 install: 


@@ -12,8 +21,7 @@ install:
                     --install-scripts=$(DESTDIR)/$(bindir) \
                     --install-data=$(DESTDIR)/$(datadir)
 
                     --install-scripts=$(DESTDIR)/$(bindir) \
                     --install-data=$(DESTDIR)/$(datadir)
 

-

 tags:
        find . '(' -name '*.py' -o -name Makefile ')' | xargs etags
 
 tags:
        find . '(' -name '*.py' -o -name Makefile ')' | xargs etags
 

-.PHONY: tags
+.PHONY: all version build install tags

diff --git a/sface.spec b/sface.spec
index 57a8b27..9cd44c3 100644 (file)
--- a/sface.spec
+++ b/sface.spec
@@ -41,7 +41,7 @@ the slice's RSpec with an XML pretty printer.
 %setup -q
 
 %build
 %setup -q
 
 %build

-make
+make VERSIONTAG="%{version}-%{taglevel}" SCMURL="%{SCMURL}"

 
 %install
 rm -rf $RPM_BUILD_ROOT
 
 %install
 rm -rf $RPM_BUILD_ROOT

diff --git a/sface/screens/configscreen.py b/sface/screens/configscreen.py
index ef732f5..23e0635 100644 (file)
--- a/sface/screens/configscreen.py
+++ b/sface/screens/configscreen.py
@@ -6,9 +6,13 @@ from sface.config import config
 from sface.screens.sfascreen import SfaScreen
 
 from sfa.util.version import version_core
 from sface.screens.sfascreen import SfaScreen
 
 from sfa.util.version import version_core

+from sface.version import version_dict

 
 static_labels = {
 
 static_labels = {

-    'slice' :  "local SFA version : %s" % version_core()['code_tag'],
+    'slice' :  [ 
+        "Sface version : %s" % version_dict()['code_tag'], 
+        "based on (local) SFA libs version : %s" % version_core()['code_tag'],
+        ] ,

     'registry': "usual port for registry: 12345",
     'slicemgr': ["usual port for slice manager: 12347","usual port for aggregate: 12346"],
 }        
     'registry': "usual port for registry: 12345",
     'slicemgr': ["usual port for slice manager: 12347","usual port for aggregate: 12346"],
 }