[Gnash-commit] /srv/bzr/gnash/trunk r11100: Change how bzrversion gets it's values so it doesn't have to make a connection

[rob]

------------------------------------------------------------
revno: 11100
committer: address@hidden
branch nick: trunk
timestamp: Sat 2009-06-13 11:10:58 -0600
message:
  Change how bzrversion gets it's values so it doesn't have to make a connection
  to the repository each time. This speeds up creating the bzrversion 
  considerably, and works better as well if bzr isn't installed.
modified:
  Makefile.am

=== modified file 'Makefile.am'
--- a/Makefile.am       2009-06-11 17:14:37 +0000
+++ b/Makefile.am       2009-06-13 17:10:58 +0000
@@ -144,19 +144,19 @@
 CLEANFILES += bzrversion.h
 BUILT_SOURCES = bzrversion.h
 bzrversion.h: Makefile.in
-       @status=`cd $(srcdir) && bzr version-info --custom --template={revno}`; 
\
-       if test $${status} -gt 0; then \
+       @status=`which bzr 2>&1 | grep -c " no bz"`; \
+       if test x"$${status}" = x"0"; then \
           echo "Generating bzrversion.h"; \
           $(RM) -f bzrversion.h; \
-          (cd $(srcdir) && bzr version-info --custom --template='static const 
char *BRANCH_REVNO  = "{revno}";\nstatic const char *BRANCH_NICK = 
"{branch_nick}";\n') > bzrversion.h; \
-       else \
-         if test -e bzrversion.h; then \
-           echo "Using existing bzrversion.h"; \
-       else \
-           echo "Generating bzrversion.h"; \
-           echo -e 'static const char *BRANCH_REVNO  = '\"${NOW}\"';\nstatic 
const char *BRANCH_NICK = "none";\n' > bzrversion.h; \
-         fi; \
-       fi
+          revno=`(cd $(srcdir) && bzr revno)`; \
+          nick=`basename $(top_srcdir)`; \
+       else \
+          revno="${NOW}"; \
+          nick="none"; \
+       fi; \
+       echo "Generating bzrversion.h"; \
+       echo "static const char *BRANCH_REVNO  = \"$${revno}\";" > 
bzrversion.h; \
+       echo "static const char *BRANCH_NICK = \"$${nick}\";" >> bzrversion.h;
 
 BRANCH_REVNO  = `grep "REVNO" bzrversion.h | cut -d '"' -f 2`
 BRANCH_NICK   = `grep "NICK" bzrversion.h | cut -d '"' -f 2`