[Gnash-commit] [SCM] Gnash branch, master, updated. bfa00dee0eb79cb74e197e78c73a062bdd7eb1ce

[Rob Savoye]

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 "Gnash".

The branch, master has been updated
       via  bfa00dee0eb79cb74e197e78c73a062bdd7eb1ce (commit)
       via  045c4630ae4327b307880034e48de77377445885 (commit)
       via  67e40733eb5e3b69283049e12772fd3c19338623 (commit)
      from  50dd02faacaf322be2fbe5fdc9de9e84813c0aa1 (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 -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit//commit/?id=bfa00dee0eb79cb74e197e78c73a062bdd7eb1ce


commit bfa00dee0eb79cb74e197e78c73a062bdd7eb1ce
Author: Rob Savoye <address@hidden>
Date:   Wed Dec 8 15:11:26 2010 -0700

    Look for git at runtime. Default to the date if no git. Create revno.h in 
the build tree

diff --git a/Makefile.am b/Makefile.am
index d24b5d5..6b8fe7f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -108,12 +108,11 @@ EXTRA_DIST =  \
        packaging/klash.xpm \
        revno.h
 
-
 # dist-hook:
 #      @test -d "$(distdir)/packaging" || $(mkinstalldirs) 
"$(distdir)/packaging"
 #      cp -p $(srcdir)/*.am $(top_distdir)/packaging/
 
-CLEANFILES = .configline
+CLEANFILES = .configline .revno.h.n
 BUILT_SOURCES = revno.h .configline
 
 #
@@ -126,33 +125,31 @@ BUILT_SOURCES = revno.h .configline
 # It will NOT be removed by any 'clean' rule (eventually, it should be
 # removed by maintainer-clean...)
 #
-revno.h:
-if HAVE_GIT
-       @cd $(top_srcdir); \
-    if test -d .git; then \
-        revno=`$(GIT) rev-parse --short HEAD`; \
-        nick=`$(GIT) branch | grep '^\*' | cut -d ' ' -f 2`; \
-        echo "static const char* BRANCH_REVNO  = \"$${revno}\";" > revno.h.n; \
-        echo "static const char* BRANCH_NICK = \"$${nick}\";" >> revno.h.n; \
-        if test -e revno.h; then \
-            if diff -q revno.h.n revno.h > /dev/null; then \
-                echo "Current revno.h is up to date ($${nick} $${revno})"; \
-                rm -f revno.h.n; \
+revno.h: Makefile
+       git=`which git`; \
+       if test -d $(top_srcdir)/.git -a x$${git} != x; then \
+         revno="`(cd $(top_srcdir) ; $${git} rev-parse --short HEAD)`"; \
+          nick="`(cd $(top_srcdir) ; $${git} branch | grep '^\*' | cut -d ' ' 
-f 2)`"; \
+          echo "static const char* BRANCH_REVNO  = \"$${revno}\";" > 
.revno.h.n; \
+          echo "static const char* BRANCH_NICK = \"$${nick}\";" >> .revno.h.n; 
\
+          if test -e .revno.h; then \
+            if diff -q .revno.h.n revno.h > /dev/null; then \
+              echo "Current revno.h is up to date ($${nick} $${revno})"; \
+              rm -f .revno.h.n; \
             else \
-                echo "Updating revno.h ($${nick} $${revno})"; \
-                mv revno.h.n revno.h; \
+              echo "Updating revno.h ($${nick} $${revno})"; \
+              mv .revno.h.n revno.h; \
             fi; \
-        else \
+          else \
             echo "Generating revno.h ($${nick} $${revno})"; \
-            mv revno.h.n revno.h; \
-        fi; \
-    else \
-        echo "Source is not in a git repository, revno.h won't be updated"; \
-    fi;
-else
-       @echo "You don't have git installed, revno.h won't be updated";
-endif
-
+            mv .revno.h.n revno.h; \
+          fi; \
+        else \
+          revno="$(NOW)"; \
+          nick="none"; \
+          echo "static const char* BRANCH_REVNO  = \"$${revno}\";" > revno.h; \
+          echo "static const char* BRANCH_NICK = \"$${nick}\";" >> revno.h; \
+       fi
 
 .configline: config.log
        address@hidden -f .configline
@@ -472,7 +469,6 @@ anal testreport checksum:
 endif
 
 .PHONY : dumpconfig \
-       revno.h \
        anal \
        testreport \
        checksum \

http://git.savannah.gnu.org/cgit//commit/?id=045c4630ae4327b307880034e48de77377445885


commit 045c4630ae4327b307880034e48de77377445885
Author: Rob Savoye <address@hidden>
Date:   Wed Dec 8 15:10:17 2010 -0700

    don't look for git here, we do it at runtime

diff --git a/configure.ac b/configure.ac
index 417fae3..9802deb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1215,9 +1215,6 @@ AM_CONDITIONAL(HAVE_PERL, test x"$PERL" != x)
 AC_PATH_PROG(CSOUND, csound)
 AM_CONDITIONAL(HAVE_CSOUND, test x"$CSOUND" != x)
 
-AC_PATH_PROG(GIT, git)
-AM_CONDITIONAL(HAVE_GIT, test x"$GIT" != x)
-
 dnl -------------------------------------
 dnl LIRC
 dnl -------------------------------------

http://git.savannah.gnu.org/cgit//commit/?id=67e40733eb5e3b69283049e12772fd3c19338623


commit 67e40733eb5e3b69283049e12772fd3c19338623
Author: Rob Savoye <address@hidden>
Date:   Wed Dec 8 15:09:48 2010 -0700

    create a revno for the package that's different from the git revno.

diff --git a/packaging/snapshot.am b/packaging/snapshot.am
index fe7005c..161571a 100644
--- a/packaging/snapshot.am
+++ b/packaging/snapshot.am
@@ -17,6 +17,12 @@
 
 NOW := $(shell date "+%Y%m%d")
 
+# The branch nickname and revision number must be set before including
+# the other Makefile fragments used for package building, as they use
+# these values.
+BRANCH_REVNO  := $(shell (cd $(top_srcdir) ; git log | grep commit | wc -l))
+BRANCH_NICK   := $(shell grep "NICK" revno.h | cut -d '"' -f 2)
+
 # this is used for Debian style naming conventions
 NEXT_RELEASE = 0.8.9
 #SNAPSHOT_VERSION := 0.8.8

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

Summary of changes:
 Makefile.am           |   50 ++++++++++++++++++++++--------------------------
 configure.ac          |    3 --
 packaging/snapshot.am |    6 +++++
 3 files changed, 29 insertions(+), 30 deletions(-)


hooks/post-receive
-- 
Gnash