[Gnash-commit] [SCM] Gnash branch, master, updated. 2041ab2c22c73dc053b35e6a12b58b2e6c1e8c5b

[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  2041ab2c22c73dc053b35e6a12b58b2e6c1e8c5b (commit)
       via  c103bbe686e0d2335e4de1aa40a7f19317438960 (commit)
       via  42fbac5bf3c89a9a9bcd47d04b4dfbfd0b602b62 (commit)
       via  30fa498f74796fa604c5118bc4f190ca1fe64a7d (commit)
       via  7b4a6083adafbe3e10eaa600a2bff9e4ffe4db99 (commit)
       via  a7d816d056694495ab8b2c66ff041e3a14013190 (commit)
      from  8c3075908ed1b2cf7d02025350f463641ba76915 (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=2041ab2c22c73dc053b35e6a12b58b2e6c1e8c5b


commit 2041ab2c22c73dc053b35e6a12b58b2e6c1e8c5b
Merge: c103bbe 8c30759
Author: Sandro Santilli <address@hidden>
Date:   Thu Dec 9 09:25:22 2010 +0100

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


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


commit c103bbe686e0d2335e4de1aa40a7f19317438960
Author: Sandro Santilli <address@hidden>
Date:   Thu Dec 9 09:19:05 2010 +0100

    Rationalize version printing (do not duplicate version print, include all 
informations we have about sources)

diff --git a/gui/gnash.cpp b/gui/gnash.cpp
index 9f9a02b..2f760b9 100644
--- a/gui/gnash.cpp
+++ b/gui/gnash.cpp
@@ -532,7 +532,10 @@ usage(std::ostream& os, const po::options_description& 
opts)
 void
 version_and_copyright(std::ostream& os)
 {
-    os << "Gnash " << VERSION << "\n\n"
+    os << "Gnash "
+       << VERSION " ("
+       << BRANCH_NICK << "-" << BRANCH_REVNO << "-" << COMMIT_ID
+       << ")" << endl << endl
        << _("Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010 "
             "Free Software Foundation, Inc.\n"
             "Gnash comes with NO WARRANTY, to the extent permitted "
@@ -544,15 +547,14 @@ version_and_copyright(std::ostream& os)
 void
 build_options(std::ostream& os)
 {
-    os << _("Build options ") << VERSION << "\n"
-          << _("   Renderers: ") << RENDERER_CONFIG << "\n"
-          << _("   Hardware Acceleration: ") << HWACCEL_CONFIG << "\n"
-          << _("   GUI: ") << GUI_CONFIG << "\n"
-          << _("   Media handlers: ") << MEDIA_CONFIG << "\n"
+    os << _("Build options ") << endl
+          << _("   Renderers: ") << RENDERER_CONFIG << endl
+          << _("   Hardware Acceleration: ") << HWACCEL_CONFIG << endl
+          << _("   GUI: ") << GUI_CONFIG << endl
+          << _("   Media handlers: ") << MEDIA_CONFIG << endl
         
-          << _("   Configured with: ") << CONFIG_CONFIG << "\n"
-          << _("   CXXFLAGS: ") << CXXFLAGS << "\n"
-          << _("   Version: ")  << BRANCH_NICK << ":" << BRANCH_REVNO << "\n";
+          << _("   Configured with: ") << CONFIG_CONFIG << endl
+          << _("   CXXFLAGS: ") << CXXFLAGS << endl;
 }
 
 

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


commit 42fbac5bf3c89a9a9bcd47d04b4dfbfd0b602b62
Author: Sandro Santilli <address@hidden>
Date:   Thu Dec 9 08:15:57 2010 +0100

    Take REVNO variable from revno.h as well, so use of GIT is centralized in a 
single rule

diff --git a/packaging/snapshot.am b/packaging/snapshot.am
index 161571a..8efdc34 100644
--- a/packaging/snapshot.am
+++ b/packaging/snapshot.am
@@ -20,8 +20,8 @@ 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)
+BRANCH_REVNO  := $(shell grep "REVNO" $(top_srcdir)/revno.h | cut -d '"' -f 2)
+BRANCH_NICK   := $(shell grep "NICK" $(top_srcdir)/revno.h | cut -d '"' -f 2)
 
 # this is used for Debian style naming conventions
 NEXT_RELEASE = 0.8.9

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


commit 30fa498f74796fa604c5118bc4f190ca1fe64a7d
Author: Sandro Santilli <address@hidden>
Date:   Thu Dec 9 08:15:14 2010 +0100

    Add COMMIT_ID macro in revno.h and revert BRANCH_REVNO to a sequential 
number

diff --git a/Makefile.am b/Makefile.am
index d24b5d5..99c99ca 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -130,20 +130,22 @@ revno.h:
 if HAVE_GIT
        @cd $(top_srcdir); \
     if test -d .git; then \
-        revno=`$(GIT) rev-parse --short HEAD`; \
+        revno=`$(GIT) log | grep '^commit' | wc -l`; \
+        comm_id=`$(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; \
+        echo "static const char* COMMIT_ID = \"$${comm_id}\";" >> 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})"; \
+                echo "Current revno.h is up to date ($${nick} $${revno} 
$${comm_id})"; \
                 rm -f revno.h.n; \
             else \
-                echo "Updating revno.h ($${nick} $${revno})"; \
+                echo "Updating revno.h ($${nick} $${revno} $${comm_id})"; \
                 mv revno.h.n revno.h; \
             fi; \
         else \
-            echo "Generating revno.h ($${nick} $${revno})"; \
+            echo "Generating revno.h ($${nick} $${revno} $${comm_id})"; \
             mv revno.h.n revno.h; \
         fi; \
     else \

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


commit 7b4a6083adafbe3e10eaa600a2bff9e4ffe4db99
Author: Sandro Santilli <address@hidden>
Date:   Wed Dec 8 23:40:15 2010 +0100

    Revert "don't look for git here, we do it at runtime"
    
    This reverts commit 045c4630ae4327b307880034e48de77377445885.

diff --git a/configure.ac b/configure.ac
index d45f5fd..10dd37d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1216,6 +1216,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 -------------------------------------

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


commit a7d816d056694495ab8b2c66ff041e3a14013190
Author: Sandro Santilli <address@hidden>
Date:   Wed Dec 8 23:40:10 2010 +0100

    Revert "Look for git at runtime. Default to the date if no git. Create 
revno.h in the build tree"
    
    This reverts commit bfa00dee0eb79cb74e197e78c73a062bdd7eb1ce.

diff --git a/Makefile.am b/Makefile.am
index 6b8fe7f..d24b5d5 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -108,11 +108,12 @@ 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 .revno.h.n
+CLEANFILES = .configline
 BUILT_SOURCES = revno.h .configline
 
 #
@@ -125,31 +126,33 @@ BUILT_SOURCES = revno.h .configline
 # It will NOT be removed by any 'clean' rule (eventually, it should be
 # removed by maintainer-clean...)
 #
-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; \
+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; \
             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 \
-            echo "Generating revno.h ($${nick} $${revno})"; \
-            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
+            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
+
 
 .configline: config.log
        address@hidden -f .configline
@@ -469,6 +472,7 @@ anal testreport checksum:
 endif
 
 .PHONY : dumpconfig \
+       revno.h \
        anal \
        testreport \
        checksum \

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

Summary of changes:
 Makefile.am           |   52 +++++++++++++++++++++++++++---------------------
 configure.ac          |    3 ++
 gui/gnash.cpp         |   20 ++++++++++--------
 packaging/snapshot.am |    4 +-
 4 files changed, 45 insertions(+), 34 deletions(-)


hooks/post-receive
-- 
Gnash