From: JazzyNico Date: Sat, 2 Jan 2010 10:03:58 +0000 (+0100) Subject: Inkscape version: replace svn check with bzr check X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=7a9c207116b53b2b5253bd878fa8432210b8e0c6;p=inkscape.git Inkscape version: replace svn check with bzr check --- diff --git a/acinclude.m4 b/acinclude.m4 index 61148f6b4..50ede11c2 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -1,4 +1,4 @@ m4_include([m4/ac_define_dir.m4]) m4_include([m4/ax_openmp.m4]) m4_include([m4/relaytool.m4]) -m4_include([m4/ink_svn_snapshot_build.m4]) +m4_include([m4/ink_bzr_snapshot_build.m4]) diff --git a/configure.ac b/configure.ac index 32990943b..136bb5c31 100644 --- a/configure.ac +++ b/configure.ac @@ -31,7 +31,7 @@ AM_PROG_AS AC_PROG_RANLIB AC_PROG_INTLTOOL(0.22) AC_HEADER_STDC -INK_SVN_SNAPSHOT_BUILD +INK_BZR_SNAPSHOT_BUILD dnl If automake 1.11 shave the output to look nice m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])]) diff --git a/m4/ink_bzr_snapshot_build.m4 b/m4/ink_bzr_snapshot_build.m4 new file mode 100644 index 000000000..4dc2df54f --- /dev/null +++ b/m4/ink_bzr_snapshot_build.m4 @@ -0,0 +1,14 @@ +# Check for BZR snapshot build +# (c) 2009 Krzysztof Kosiński +# Released under GNU GPL; see the file COPYING for more information + +AC_DEFUN([INK_BZR_SNAPSHOT_BUILD], +[ + AC_CACHE_CHECK([for BZR snapshot build], ink_cv_bzr_snapshot_build, + [ink_cv_bzr_snapshot_build=no + if which bzr > /dev/null && test -e $srcdir/.bzr/branch/last-revision; then + ink_cv_bzr_snapshot_build=yes + fi + ]) + AM_CONDITIONAL([USE_BZR_VERSION], [test "x$ink_cv_bzr_snapshot_build" = "xyes"]) +]) diff --git a/m4/ink_svn_snapshot_build.m4 b/m4/ink_svn_snapshot_build.m4 deleted file mode 100644 index 2c013eb60..000000000 --- a/m4/ink_svn_snapshot_build.m4 +++ /dev/null @@ -1,14 +0,0 @@ -# Check for SVN snapshot build -# (c) 2009 Krzysztof Kosiński -# Released under GNU GPL; see the file COPYING for more information - -AC_DEFUN([INK_SVN_SNAPSHOT_BUILD], -[ - AC_CACHE_CHECK([for SVN snapshot build], ink_cv_svn_snapshot_build, - [ink_cv_svn_snapshot_build=no - if which svn > /dev/null && test -e $srcdir/.svn/entries; then - ink_cv_svn_snapshot_build=yes - fi - ]) - AM_CONDITIONAL([USE_SVN_VERSION], [test "x$ink_cv_svn_snapshot_build" = "xyes"]) -]) diff --git a/src/Makefile.am b/src/Makefile.am index cbd22144d..15c7cb1b1 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -225,7 +225,7 @@ inkview_LDADD = $(all_libs) libinkversion_a_SOURCES = inkscape-version.cpp inkscape-version.h -if USE_SVN_VERSION +if USE_BZR_VERSION inkscape_version_deps = $(top_srcdir)/.bzr/branch/last-revision endif @@ -233,7 +233,7 @@ endif # someone updates the BZR working directory. inkscape-version.cpp: $(inkscape_version_deps) VER_PREFIX="$(VERSION)";\ - VER_BZRREV=" r`bzr log -r '-1..' | sed -n -e '/^revno:/s/revno: \(.*\)/\1/p'`"; \ + VER_BZRREV=" r`bzr revno`"; \ if test ! -z "`bzr status -S -V $(srcdir)`"; then \ VER_CUSTOM=" custom"; \ fi; \