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

[Sandro Santilli]

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  eb1b0afc79fae3651b46e91cd1e74ba5a6d5de58 (commit)
       via  59991fcc5e60a652cf1ce5c5c6834657adfaa5b8 (commit)
       via  34939f5b37a608ba293fad3af8a2868070d9f7eb (commit)
       via  d01accca280c33783987f5e53f87416328195cf6 (commit)
       via  8e3bbd3ca765ffbdf7d7955b0d88b3ffa433f4bc (commit)
      from  f0d8fb800b6b4aa4de0efaa7f14ac8ad1757cd84 (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=eb1b0afc79fae3651b46e91cd1e74ba5a6d5de58


commit eb1b0afc79fae3651b46e91cd1e74ba5a6d5de58
Merge: 59991fc f0d8fb8
Author: Sandro Santilli <address@hidden>
Date:   Wed Dec 8 13:50:25 2010 +0100

    Merge branch 'master' of ssh://git.sv.gnu.org/srv/git/gnash


http://git.savannah.gnu.org/cgit//commit/?id=59991fcc5e60a652cf1ce5c5c6834657adfaa5b8


commit 59991fcc5e60a652cf1ce5c5c6834657adfaa5b8
Author: Sandro Santilli <address@hidden>
Date:   Wed Dec 8 13:48:16 2010 +0100

    Do not override existing revno.h if it didn't change (to avoid unecessary 
rebuilds)

diff --git a/Makefile.am b/Makefile.am
index d0c2df3..a7baf6c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -132,9 +132,15 @@ if HAVE_GIT
     if test -d .git; then \
         revno=`$(GIT) rev-parse --short HEAD`; \
         nick=`$(GIT) branch | grep '^\*' | cut -d ' ' -f 2`; \
-        echo "Updating revno.h ($${nick} $${revno})"; \
-        echo "static const char* BRANCH_REVNO  = \"$${revno}\";" > revno.h; \
-        echo "static const char* BRANCH_NICK = \"$${nick}\";" >> revno.h; \
+        echo "static const char* BRANCH_REVNO  = \"$${revno}\";" > revno.h.n; \
+        echo "static const char* BRANCH_NICK = \"$${nick}\";" >> revno.h.n; \
+        if diff -q revno.h.n revno.h; 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; \
+        fi; \
     else \
         echo "Source is not in a git repository, revno.h won't be updated"; \
     fi;

http://git.savannah.gnu.org/cgit//commit/?id=34939f5b37a608ba293fad3af8a2868070d9f7eb


commit 34939f5b37a608ba293fad3af8a2868070d9f7eb
Author: Sandro Santilli <address@hidden>
Date:   Wed Dec 8 12:55:34 2010 +0100

    Simplify commit extraction, and use abbreviated commit id

diff --git a/Makefile.am b/Makefile.am
index 9cfc1f8..d0c2df3 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -130,7 +130,7 @@ revno.h:
 if HAVE_GIT
        @cd $(top_srcdir); \
     if test -d .git; then \
-        revno=`$(GIT) log -1 | grep '^commit' | cut -d ' ' -f 2`; \
+        revno=`$(GIT) rev-parse --short HEAD`; \
         nick=`$(GIT) branch | grep '^\*' | cut -d ' ' -f 2`; \
         echo "Updating revno.h ($${nick} $${revno})"; \
         echo "static const char* BRANCH_REVNO  = \"$${revno}\";" > revno.h; \

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


commit d01accca280c33783987f5e53f87416328195cf6
Author: Sandro Santilli <address@hidden>
Date:   Wed Dec 8 12:50:48 2010 +0100

    Find revno.h in source dir, not build dir

diff --git a/packaging/debian/rules b/packaging/debian/rules
index aac4a15..68da710 100755
--- a/packaging/debian/rules
+++ b/packaging/debian/rules
@@ -316,8 +316,8 @@ binary-arch: install
        dh_builddeb
 
 VERSION_DATE = $(shell /bin/date --utc +%0Y%0m%0d.%0k%0M)
-BRANCH_NICK   = `grep "NICK" $(BUILD_DIRECTORY)/revno.h | cut -d '"' -f 2`
-BRANCH_REVNO  = `grep "REVNO" $(BUILD_DIRECTORY)/revno.h | cut -d '"' -f 2`
+BRANCH_NICK   = `grep "NICK" $(CURDIR)/revno.h | cut -d '"' -f 2`
+BRANCH_REVNO  = `grep "REVNO" $(CURDIR)/revno.h | cut -d '"' -f 2`
 #VERSION_ID = 0.8.8+bzr.trunk$(VERSION_DATE)
 VERSION_ID = 0.8.8+git.$(BRANCH_NICK)$(BRANCH_REVNO)
 get-git-source:

http://git.savannah.gnu.org/cgit//commit/?id=8e3bbd3ca765ffbdf7d7955b0d88b3ffa433f4bc


commit 8e3bbd3ca765ffbdf7d7955b0d88b3ffa433f4bc
Author: Sandro Santilli <address@hidden>
Date:   Wed Dec 8 12:43:52 2010 +0100

    Update revno.h at every make invocation. Make sure to generate in source 
dir (not build dir) for proper distribution. Report failure reasons. Never use 
a stub.

diff --git a/Makefile.am b/Makefile.am
index f959b6e..9cfc1f8 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -113,57 +113,35 @@ EXTRA_DIST =  \
 #      @test -d "$(distdir)/packaging" || $(mkinstalldirs) 
"$(distdir)/packaging"
 #      cp -p $(srcdir)/*.am $(top_distdir)/packaging/
 
-CLEANFILES = revno.h .configline
+CLEANFILES = .configline
 BUILT_SOURCES = revno.h .configline
 
 #
-# Extract info from the repository to include in the build. If
-# bazar (bzr) isn't installed, just print stubs, as this is only
-# used for display purposes. It's primarily used by the testsuites
-# and when building binary packages from multiple branches.
-# Note that this is only rebuilt after "make clean", if the Makefile
-# has changed, or the source tree gets reconfigured. So unless you do
-# a make clean, or nuke the revno.h file, this can get slightly
-# behind the current version. Currently Gnash doesn't have this info
-# so it'll be an improvement anyway. Bzr is amazing slow producing
-# the info, which is why we don't want to do it all the time.
+# Extract info from the repository to include in the build.
+# If top source dir is not a git repository or git is not installed,
+# keep the current revno.h file (which should be part of any distribution).
+# It's primarily used by the testsuites and when building binary packages
+# from multiple branches.
 #
-revno.h: Makefile.in
-       address@hidden test -d $(srcdir)/.bzr; then \
-         status=`which bzr 2>&1 | grep -c " no bzr"`; \
-         if test x"$${status}" = x"0"; then \
-           echo "Generating revno.h"; \
-           $(RM) -f revno.h; \
-           revno=`(cd $(srcdir) && bzr revno)`; \
-           nick=`basename $(top_srcdir)`; \
-         else \
-           revno="$(NOW)"; \
-         fi; \
-       else \
-         if test -d $(top_srcdir)/.git; then \
-            status=`which git 2>&1 | grep -c " no git"`; \
-            if test x"$${status}" = x"0"; then \
-              echo "Generating revno.h"; \
-              $(RM) -f revno.h; \
-              revno="`(cd $(top_srcdir) && git describe --tags | cut -d '-' -f 
2-3 | tr a- a.)`"; \
-              nick="`(cd $(top_srcdir) && git branch | grep "\*" | cut -d ' ' 
-f 2)`"; \
-           fi; \
-          else \
-            revno="$(NOW)"; \
-            nick="none"; \
-         fi; \
-         if test x$$revno = x; then \
-           revno="$(NOW)"; \
-         fi; \
-       fi; \
-       echo "static const char* BRANCH_REVNO  = \"$${revno}\";" > revno.h; \
-       echo "static const char* BRANCH_NICK = \"$${nick}\";" >> revno.h;
-
-# 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 grep "REVNO" revno.h | cut -d '"' -f 2 | cut -d '.' 
-f 1)
-BRANCH_NICK   := $(shell grep "NICK" revno.h | cut -d '"' -f 2)
+# 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) log -1 | grep '^commit' | cut -d ' ' -f 2`; \
+        nick=`$(GIT) branch | grep '^\*' | cut -d ' ' -f 2`; \
+        echo "Updating revno.h ($${nick} $${revno})"; \
+        echo "static const char* BRANCH_REVNO  = \"$${revno}\";" > revno.h; \
+        echo "static const char* BRANCH_NICK = \"$${nick}\";" >> revno.h; \
+    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
+
 
 .configline: config.log
        address@hidden -f .configline
@@ -483,6 +461,7 @@ anal testreport checksum:
 endif
 
 .PHONY : dumpconfig \
+       revno.h \
        anal \
        testreport \
        checksum \
diff --git a/configure.ac b/configure.ac
index 9802deb..417fae3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1215,6 +1215,9 @@ 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 -------------------------------------

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

Summary of changes:
 Makefile.am            |   79 +++++++++++++++++++----------------------------
 configure.ac           |    3 ++
 packaging/debian/rules |    4 +-
 3 files changed, 37 insertions(+), 49 deletions(-)


hooks/post-receive
-- 
Gnash