[Reconnoiter-devel] [reconnoiter commit] Reconnoiter branch, master, updated. f0114718cabb08f0487ff82261a4a07b409e899f

git at labs.omniti.com git at labs.omniti.com
Fri Apr 22 01:24:16 EDT 2011


This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Reconnoiter".

The branch, master has been updated
       via  f0114718cabb08f0487ff82261a4a07b409e899f (commit)
      from  cc25c432f34afbca6ba39d5eb9c7164bb3b2aa18 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit f0114718cabb08f0487ff82261a4a07b409e899f
Author: Theo Schlossnagle <jesus at omniti.com>
Date:   Fri Apr 22 01:24:09 2011 -0400

    add %at in there so that people that need numbers can have numbers

diff --git a/buildtools/mkversion.sh b/buildtools/mkversion.sh
index dbd82f6..049eb64 100755
--- a/buildtools/mkversion.sh
+++ b/buildtools/mkversion.sh
@@ -4,6 +4,7 @@ STATUS=`git status 2>&1`
 if [ $? == 0 ]; then
   echo "Building version info from git"
   HASH=`git show --format=%H | head -1`
+  TSTAMP=`git show --format=%at | head -1`
   echo "    * version -> $HASH"
   SYM=`git name-rev $HASH | awk '{print $2;}' | sed -e 's/\^.*//'`
   if [ -z "`echo $SYM | grep '^tags/'`" ]; then
@@ -11,8 +12,9 @@ if [ $? == 0 ]; then
   fi
   echo "    * symbolic -> $SYM"
   BRANCH=$SYM
+  VERSION="$HASH.$TSTAMP"
   if [ -n "`echo $STATUS | grep 'Changed but not updated'`" ]; then
-    HASH="$HASH.modified"
+    VERSION="$HASH.modified.$TSTAMP"
   fi
 else
   BRANCH=exported
@@ -21,7 +23,7 @@ fi
 
 if [ -r "$1" ]; then
   eval `cat noit_version.h | awk '/^#define/ { print $2"="$3;}'`
-  if [ "$NOIT_BRANCH" == "$BRANCH" -a "$NOIT_VERSION" == "$HASH" ]; then
+  if [ "$NOIT_BRANCH" == "$BRANCH" -a "$NOIT_VERSION" == "$VERSION" ]; then
     echo "    * version unchanged"
     exit
   fi
@@ -33,7 +35,7 @@ cat > $1 <<EOF
 #define NOIT_BRANCH "$BRANCH"
 #endif
 #ifndef NOIT_VERSION
-#define NOIT_VERSION "$HASH"
+#define NOIT_VERSION "$VERSION"
 #endif
 
 #include <stdio.h>

-----------------------------------------------------------------------

Summary of changes:
 buildtools/mkversion.sh |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
Reconnoiter


More information about the Reconnoiter-devel mailing list