Don't put the Vex SVN revision number in the preamble -- it achieves little

and is an enormous pain.

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@10447

diff --git a/Makefile.vex.am b/Makefile.vex.am
index 7da89472225a19d2670f245ac46e30bbb3d9d843..339a7e8d841f50acf9f777040d43f3ddc4e60179 100644 (file)
--- a/Makefile.vex.am
+++ b/Makefile.vex.am
@@ -61,51 +61,18 @@ pub/libvex_guest_offsets.h:
        rm -f auxprogs/genoffsets.s
 
 #----------------------------------------------------------------------------
-# vex_svnversion.h
+# main_vex_svnversion.h
 #----------------------------------------------------------------------------
 
-# The contents of vex_svnversion.h depends on the Vex revision number.  The
-# ideal way to deal with it would be if SVN had post-update hooks: we'd
-# generate/regenerate it every time we did "svn co"/"svn up", and otherwise
-# never delete it or regenerate it.
-#
-# But SVN lacks post-update hooks.  So instead we generate it when building
-# (it's in BUILT_SOURCES) if it's not present (we test for that in the
-# generation rule), or if 'make version' is run.  (Thus it can get
-# out-of-date when developing;  the 'make version' target lets that be
-# remedied manually.)  Otherwise, we never delete it or regenerate it (in
-# particular, it is not present in CLEANFILES).  Furthermore, at 'make dist'
-# time, we regenerate it, and copy it into the dist tarball, thus ensuring
-# the distributed version is up-to-date.  Note that if a user manually
-# deletes it and rebuilds, or does 'make dist' from a distributed version,
-# it will be regenerated incorrectly, containing the string "exported"
-# instead of the SVN revision number.
-
 BUILT_SOURCES += priv/main_vex_svnversion.h
 
-# Generate it at build time if not present.  Nb: generating a file and
-# putting it in $(srcdir) rather than $(builddir) seems like bad form.  But
-# because this file won't be regenerated post-distribution, then it's more
-# like a non-generated file and so is reasonable to put in $(srcdir).
-priv/main_vex_svnversion.h: version
-       if [ ! -f priv/main_vex_svnversion.h ] ; then \
-           mv $(top_srcdir)/vex_svnversion.h \
-              $(srcdir)/priv/main_vex_svnversion.h; \
-       else \
-           rm -f $(top_srcdir)/vex_svnversion.h; \
-       fi
-
-# Regenerate it and copy it into the dist tarball at 'make dist' time.
-dist-hook: version
-       mv $(top_srcdir)/vex_svnversion.h \
-          $(distdir)/priv/main_vex_svnversion.h
-
-# Generate it.
-version:
-       cat quote.txt    > $(top_srcdir)/vex_svnversion.h
-       svnversion -n . >> $(top_srcdir)/vex_svnversion.h
-       cat quote.txt   >> $(top_srcdir)/vex_svnversion.h
-       cat newline.txt >> $(top_srcdir)/vex_svnversion.h
+# The contents of this file don't matter, as we don't call LibVEX_version()
+# from Valgrind.
+# Nb: generating a file and putting it in $(srcdir) rather than $(builddir)
+# seems like bad form... this should be fixed if VPATH builds are made to
+# work.
+priv/main_vex_svnversion.h:
+       echo "\"version\"" > $(srcdir)/priv/main_vex_svnversion.h
 
 #----------------------------------------------------------------------------
 # libvex-<platform>.a

diff --git a/coregrind/m_main.c b/coregrind/m_main.c
index e0544d36097f68a25a0493d722ccb8f3f116b4f9..19273e76ef441aef5b2c095ad71e810819d38b4f 100644 (file)
--- a/coregrind/m_main.c
+++ b/coregrind/m_main.c
@@ -803,8 +803,8 @@ static void print_preamble(Bool logging_to_fd, const char* toolname)
 
       /* Core details */
       VG_(message)(Vg_UserMsg,
-         "%sUsing LibVEX rev %s, a library for dynamic binary translation.%s",
-         xpre, LibVEX_Version(), xpost );
+         "%sUsing LibVEX, a library for dynamic binary translation.%s",
+         xpre, xpost );
       VG_(message)(Vg_UserMsg, 
          "%sCopyright (C) 2004-2009, and GNU GPL'd, by OpenWorks LLP.%s",
          xpre, xpost );