Author: duncan
Date: Sun Jun 3 10:15:30 2007
New Revision: 9641
Modified:
branches/rel-1/freevo/autogen.sh
branches/rel-1/freevo/setup.py
branches/rel-1/freevo/src/main.py
Log:
Added subversion revision to splash screen
Modified: branches/rel-1/freevo/autogen.sh
==============================================================================
--- branches/rel-1/freevo/autogen.sh (original)
+++ branches/rel-1/freevo/autogen.sh Sun Jun 3 10:15:30 2007
@@ -5,9 +5,16 @@
# Dirk Meyer <[EMAIL PROTECTED]>
# $Id$
+revision() {
+ echo -n generating revision.py
+ rev=$(svn info --revision=HEAD | sed -n '/Revision:/s/Revision:
*\([0-9]*\)/\1/p')
+ echo "__revision__ = ${rev}" > src/revision.py
+ echo " ${rev}"
+}
+
gen_i18n() {
- for file in `find i18n -name freevo.po`; do
- out=`echo $file | sed 's/\.po$/.mo/'`
+ for file in $(find i18n -name freevo.po); do
+ out=$(echo $file | sed 's/\.po$/.mo/')
echo generating $out
msgfmt -o $out $file 2> /dev/null
done
@@ -34,6 +41,9 @@
nodocs)
gen_i18n
;;
+ revision)
+ revision
+ ;;
howto)
howto
;;
@@ -45,6 +55,7 @@
echo " <default> - Generate translations and generate Howto"
;;
*)
+ revision
gen_i18n
howto
;;
Modified: branches/rel-1/freevo/setup.py
==============================================================================
--- branches/rel-1/freevo/setup.py (original)
+++ branches/rel-1/freevo/setup.py Sun Jun 3 10:15:30 2007
@@ -108,12 +108,26 @@
# check if everything is in place
-if (not os.path.isdir('./Docs/installation/html')) and \
- (len(sys.argv) < 2 or sys.argv[1].lower() not in ('i18n', '--help',
'--help-commands')):
- print 'Docs/howto not found. Looks like you are using the CVS version'
- print 'of Freevo. Please run ./autogen.sh first'
- sys.exit(0)
+if (len(sys.argv) < 2 or sys.argv[1].lower() not in ('i18n', '--help',
'--help-commands')):
+ if os.path.isdir('.svn'):
+ try:
+ from subprocess import Popen, PIPE
+ p1 = Popen(["svn", "info", "--revision=HEAD"], stdout=PIPE)
+ p2 = Popen(["sed", "-n", "/Revision:/s/Revision:
*\([0-9]*\)/\\1/p"], stdin=p1.stdout, stdout=PIPE)
+ revision = p2.communicate()[0]
+ fh = open('src/revision.py', 'w')
+ try:
+ fh.write('__revision__ = \'%s\'\n' % revision.strip('\n'))
+ finally:
+ fh.close()
+ except Exception, e:
+ print e
+
+ if (not os.path.isdir('./Docs/installation/html')):
+ print 'Docs/howto not found. Please run ./autogen.sh'
+ sys.exit(0)
+import revision
# only add files not in share and src
data_files = []
Modified: branches/rel-1/freevo/src/main.py
==============================================================================
--- branches/rel-1/freevo/src/main.py (original)
+++ branches/rel-1/freevo/src/main.py Sun Jun 3 10:15:30 2007
@@ -422,8 +422,13 @@
# prepare the skin
skin.prepare()
- # Fire up splashscreen and load the plugins
v = '%s' % version.__version__
+ try:
+ import freevo.revision
+ v = v.replace('-svn', ' r%s' % freevo.revision.__revision__)
+ except ImportError:
+ pass
+ # Fire up splashscreen and load the plugins
splash = Splashscreen(_('Starting Freevo-%s, please wait ...') % v)
skin.register('splashscreen', ('screen', splash))
plugin.init(splash.progress)
-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
Freevo-cvslog mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
