- try to fix version generation for SVN vs. non-SVN once more
git-svn-id: svn://svn.berlios.de/mutt-ng/trunk@436
e385b8ad-14ed-0310-8656-
cc95a2468c6d
bin_SCRIPTS = muttngbug fleang
bin_SCRIPTS = muttngbug fleang
-BUILT_SOURCES = keymap_defs.h patchlist.c svnrev.h
+BUILT_SOURCES = keymap_defs.h patchlist.c version.h
bin_PROGRAMS = muttng @DOTLOCK_TARGET@ @PGPAUX_TARGET@ @SMIMEAUX_TARGET@
muttng_SOURCES = $(BUILT_SOURCES) \
bin_PROGRAMS = muttng @DOTLOCK_TARGET@ @PGPAUX_TARGET@ @SMIMEAUX_TARGET@
muttng_SOURCES = $(BUILT_SOURCES) \
cp $(srcdir)/dotlock.c mutt_dotlock.c
CLEANFILES = mutt_dotlock.c stamp-doc-rc makedoc \
cp $(srcdir)/dotlock.c mutt_dotlock.c
CLEANFILES = mutt_dotlock.c stamp-doc-rc makedoc \
- keymap_alldefs.h keymap_defs.h patchlist.c svnrev.h
+ keymap_alldefs.h keymap_defs.h patchlist.c version.h
$(srcdir)/OPS.MIX $(srcdir)/OPS.CRYPT $(srcdir)/OPS.SMIME \
> keymap_alldefs.h
$(srcdir)/OPS.MIX $(srcdir)/OPS.CRYPT $(srcdir)/OPS.SMIME \
> keymap_alldefs.h
+version.h:
+ echo "#undef MUTT_VERSION" > version.h
if test -f "$(srcdir)/.svn/entries" ; then \
if test -f "$(srcdir)/.svn/entries" ; then \
- echo "#define MUTTNG_SVNREV \"r`grep revision $(srcdir)/.svn/entries | sort -r | uniq | head -n 1 | cut -d '"' -f 2`\"" > svnrev.h ; \
+ echo "#define MUTT_VERSION \"`cat $(srcdir)/VERSION.in`-r`grep revision $(srcdir)/.svn/entries | sort -r | uniq | head -n 1 | cut -d '"' -f 2`\"" >> version.h ; \
- echo "#define MUTTNG_SVNREV \"`date "+%Y%m%d"`\"" > svnrev.h ; \
+ echo "#define MUTT_VERSION \"`cat $(srcdir)/VERSION.in`-`cat $(srcdir)/VERSION.date`\"" >> version.h ; \
--- /dev/null
+#!/bin/sh
+date "+%Y%m%d" > ./VERSION.date
+svn commit "$@"
#include "attach.h"
#include "reldate.h"
#include "attach.h"
#include "reldate.h"
#ifdef USE_IMAP
#include "imap.h"
#ifdef USE_IMAP
#include "imap.h"
static char vstring[STRING];
if (full)
static char vstring[STRING];
if (full)
- snprintf (vstring, sizeof (vstring), "Mutt-ng %s-%s (based "
- "on Mutt 1.5.10/%s)", MUTT_VERSION, MUTTNG_SVNREV,
- ReleaseDate);
+ snprintf (vstring, sizeof (vstring), "Mutt-ng %s (based "
+ "on Mutt 1.5.10/%s)", MUTT_VERSION, ReleaseDate);
- snprintf (vstring, sizeof (vstring), "mutt-ng/%s-%s",
- MUTT_VERSION, MUTTNG_SVNREV);
+ snprintf (vstring, sizeof (vstring), "mutt-ng/%s", MUTT_VERSION);
#include "charset.h"
#include "mutt_crypt.h"
#include "mutt_idna.h"
#include "charset.h"
#include "mutt_crypt.h"
#include "mutt_idna.h"
#include "lib/mem.h"
#include "lib/str.h"
#include "lib/mem.h"
#include "lib/str.h"