svn commit: r1378123 - in /incubator/bloodhound/trunk/trac: setup.py trac/TRAC_VERSION trac/env.py trac/web/chrome.py

[gj...@apache.org]

Author: gjm
Date: Tue Aug 28 13:11:46 2012
New Revision: 1378123

URL: http://svn.apache.org/viewvc?rev=1378123&view=rev
Log:
trac: custom modifications to show more appropriate info about trac revisions in bloodhound - not intended for consideration by trac - towards #157 (from olemis)

Added:
    incubator/bloodhound/trunk/trac/trac/TRAC_VERSION
Modified:
    incubator/bloodhound/trunk/trac/setup.py
    incubator/bloodhound/trunk/trac/trac/env.py
    incubator/bloodhound/trunk/trac/trac/web/chrome.py

Modified: incubator/bloodhound/trunk/trac/setup.py
URL: http://svn.apache.org/viewvc/incubator/bloodhound/trunk/trac/setup.py?rev=1378123&r1=1378122&r2=1378123&view=diff
==============================================================================
--- incubator/bloodhound/trunk/trac/setup.py (original)
+++ incubator/bloodhound/trunk/trac/setup.py Tue Aug 28 13:11:46 2012
@@ -87,7 +87,8 @@ facilities.
                  'htdocs/css/jquery-ui/*.*',
                  'htdocs/css/jquery-ui/images/*.*',
                  'htdocs/guide/*', 'locale/*/LC_MESSAGES/messages.mo',
-                 'locale/*/LC_MESSAGES/tracini.mo'],
+                 'locale/*/LC_MESSAGES/tracini.mo',
+                 'TRAC_VERSION'],
         'trac.wiki': ['default-pages/*'],
         'trac.ticket': ['workflows/*.ini'],
     },

Added: incubator/bloodhound/trunk/trac/trac/TRAC_VERSION
URL: http://svn.apache.org/viewvc/incubator/bloodhound/trunk/trac/trac/TRAC_VERSION?rev=1378123&view=auto
==============================================================================
--- incubator/bloodhound/trunk/trac/trac/TRAC_VERSION (added)
+++ incubator/bloodhound/trunk/trac/trac/TRAC_VERSION Tue Aug 28 13:11:46 2012
@@ -0,0 +1 @@
+0.13dev-r11046 
\ No newline at end of file

Modified: incubator/bloodhound/trunk/trac/trac/env.py
URL: http://svn.apache.org/viewvc/incubator/bloodhound/trunk/trac/trac/env.py?rev=1378123&r1=1378122&r2=1378123&view=diff
==============================================================================
--- incubator/bloodhound/trunk/trac/trac/env.py (original)
+++ incubator/bloodhound/trunk/trac/trac/env.py Tue Aug 28 13:11:46 2012
@@ -19,6 +19,7 @@
 from __future__ import with_statement
 
 import os.path
+import pkg_resources 
 import setuptools
 import sys
 from urlparse import urlsplit
@@ -283,7 +284,8 @@ class Environment(Component, ComponentMa
 
     def get_system_info(self):
         from trac import core, __version__ as VERSION
-        yield 'Trac', get_pkginfo(core).get('version', VERSION)
+        yield 'Trac', pkg_resources.resource_string('trac', 'TRAC_VERSION')
+        yield 'Bloodhound Trac', get_pkginfo(core).get('version', VERSION)
         yield 'Python', sys.version
         yield 'setuptools', setuptools.__version__
         from trac.util.datefmt import pytz

Modified: incubator/bloodhound/trunk/trac/trac/web/chrome.py
URL: http://svn.apache.org/viewvc/incubator/bloodhound/trunk/trac/trac/web/chrome.py?rev=1378123&r1=1378122&r2=1378123&view=diff
==============================================================================
--- incubator/bloodhound/trunk/trac/trac/web/chrome.py (original)
+++ incubator/bloodhound/trunk/trac/trac/web/chrome.py Tue Aug 28 13:11:46 2012
@@ -823,7 +823,7 @@ class Chrome(Component):
     def populate_data(self, req, data):
         d = self._default_context_data.copy()
         d['trac'] = {
-            'version': VERSION,
+            'version': pkg_resources.resource_string('trac', 'TRAC_VERSION'),
             'homepage': 'http://trac.edgewall.org/', # FIXME: use setup data
         }