# HG changeset patch
# User "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
# Date 1203289137 0
# Node ID ff598e5b4bb532e5f0c5dd94aaa55f6288f1bd09
# Parent  3dc88c41b7a64bc70eb87e3e3c2ac3b4a497e9be
When installing SVN snapshots, include the branch and revision in the version number.
In case some random snapshot is installed and used for production, then this
will ease rewinding.

diff -r 3dc88c41b7a6 -r ff598e5b4bb5 Makefile.in
--- a/Makefile.in	Sun Feb 17 22:19:26 2008 +0000
+++ b/Makefile.in	Sun Feb 17 22:58:57 2008 +0000
@@ -101,10 +101,10 @@
 	     tar cf - --exclude=.svn $${src_dir} |(cd $(LIBDIR); tar xf -); \
 	 done
 	@rm -f $(LIBDIR)/tools/addToolVersion.sh
-	@for src_file in steps.mk .version; do                 \
-	     echo "  INST   $${src_file}";                          \
-	     install -m 644 $${src_file} $(LIBDIR)/$${src_file};    \
-	 done
+	@echo "  INST   steps.mk"
+	@install -m 644 steps.mk $(LIBDIR)/steps.mk
+	@echo "  INST   .version"
+	@echo "$(VERSION)" >$(LIBDIR)/.version
 
 # Samples need a little love:
 #  - change every occurrence of CT_TOP_DIR to CT_LIB_DIR
diff -r 3dc88c41b7a6 -r ff598e5b4bb5 configure
--- a/configure	Sun Feb 17 22:19:26 2008 +0000
+++ b/configure	Sun Feb 17 22:58:57 2008 +0000
@@ -121,6 +121,21 @@
 #---------------------------------------------------------------------
 # Some sanity checks, now
 
+# If this version is a svn snapshot, try to get the revision number
+# If we can't get the revision number, use date
+case "${VERSION}" in
+  *+svn)
+    REVISION=$(LANG=C svn info 2>/dev/null |egrep 'Revision: ' |cut -d ' ' -f 2-)
+    if [ -n "${REVISION}" ]; then
+      URL=$(LANG=C svn info 2>/dev/null |egrep 'URL: ' |cut -d ' ' -f 2-)
+      ROOT=$(LANG=C svn info 2>/dev/null |egrep 'Repository Root: ' |cut -d ' ' -f 3-)
+      VERSION="${VERSION}:${URL#${ROOT}}@${REVISION}"
+    else
+      VERSION="${VERSION}:unknown@$(date +%Y%m%d.%H%M%S)"
+    fi
+    ;;
+esac
+
 # Check bash is present, and at least version 3.0
 [ -x /bin/bash ] || do_error "bash 3.0 or above was not found in /bin/bash"
 bash_version=$(/bin/bash -c 'echo ${BASH_VERSION}')