From f895ec50f7f9c55105c2622e64b59e39df4b0440 Mon Sep 17 00:00:00 2001 From: JazzyNico Date: Mon, 28 Dec 2009 14:53:22 +0100 Subject: [PATCH] Add bzr revision in the About screen --- src/Makefile.am | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index 30d1e5f42..cbd22144d 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -226,20 +226,18 @@ inkview_LDADD = $(all_libs) libinkversion_a_SOURCES = inkscape-version.cpp inkscape-version.h if USE_SVN_VERSION -inkscape_version_deps = $(top_srcdir)/.svn/entries +inkscape_version_deps = $(top_srcdir)/.bzr/branch/last-revision endif -# If this is an SVN snapshot build, regenerate this file every time -# someone updates the SVN working directory. +# If this is an BZR snapshot build, regenerate this file every time +# someone updates the BZR working directory. inkscape-version.cpp: $(inkscape_version_deps) - VER_PREFIX="$(VERSION)"; \ - if test -x "$(srcdir)/.svn" -a ! -z `which svn`; then \ - VER_SVNREV=" r`LANG=en svn info $(srcdir) | sed -n -e '/^Revision:/s/Revision: \(.*\)/\1/p'`"; \ - if test ! -z "`svn status -q $(srcdir)`"; then \ - VER_CUSTOM=" custom"; \ - fi; \ + VER_PREFIX="$(VERSION)";\ + VER_BZRREV=" r`bzr log -r '-1..' | sed -n -e '/^revno:/s/revno: \(.*\)/\1/p'`"; \ + if test ! -z "`bzr status -S -V $(srcdir)`"; then \ + VER_CUSTOM=" custom"; \ fi; \ - VERSION="$$VER_PREFIX$$VER_SVNREV$$VER_CUSTOM"; \ + VERSION="$$VER_PREFIX$$VER_BZRREV$$VER_CUSTOM"; \ echo "namespace Inkscape { " \ "char const *version_string = \"$$VERSION\"; " \ "}" > inkscape-version.new.cpp; \ -- 2.30.2