The bzr handling code I added to gnc-svnversion turns out to fail when
the top revision isn't an imported svn version; this patch fixes this,
causing the revision returned to be the bzr revno. 

I noticed that the About box describes the output of gnc-svnversion as a
SVN revision number, which is now not necessarily true.  I'll see about
sending in a patch to generalize this to refer to whatever VCS is in
use.  Does anyone know if any code relies on the output of
gnc-svnversion being a number (in which case, it would already be broken
on a git revision id, I suppose)?

I also figured out how to build gnucash in a different directory; I've
added some details about this to the wiki page:
http://wiki.gnucash.org/wiki/Building

Jesse Weinstein
=== modified file 'util/gnc-svnversion'
--- util/gnc-svnversion	2010-02-20 00:32:17 +0000
+++ util/gnc-svnversion	2010-03-04 08:50:58 +0000
@@ -56,9 +56,9 @@
 
 if test -d "${real_srcdir}"/.bzr ;
 then
-    bzrhead=`bzr version-info "${real_srcdir}"` 
+    bzrhead=`(cd "${real_srcdir}"; bzr version-info --custom --template='{revno}\n')`
     if test $? = 0 ; then
-	echo "$bzrhead" | awk -F ':' '/revision-id/{print $5}'
+	echo "$bzrhead";
 	exit 0
     else
 	exit 1

_______________________________________________
gnucash-devel mailing list
[email protected]
https://lists.gnucash.org/mailman/listinfo/gnucash-devel

Reply via email to