[vlc-devel] commit: We're on git now, so show Git commit instead of svn revision. ( Pavlov Konstantin )

[git version control]

vlc | branch: master | Pavlov Konstantin <thresh at videolan.org> | Tue Mar  4 03:37:44 2008 +0300| [0a520894c4451459a1e93426a1042e88be5db0cc]

We're on git now, so show Git commit instead of svn revision.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=0a520894c4451459a1e93426a1042e88be5db0cc
---

 modules/gui/macosx/about.m          |    2 +-
 modules/gui/qt4/dialogs/help.cpp    |    2 +-
 modules/gui/wince/interface.cpp     |    2 +-
 modules/gui/wxwidgets/interface.cpp |    2 +-
 src/Makefile.am                     |    2 +-
 src/libvlc-common.c                 |    2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/modules/gui/macosx/about.m b/modules/gui/macosx/about.m
index cbf16b1..92cc6d8 100644
--- a/modules/gui/macosx/about.m
+++ b/modules/gui/macosx/about.m
@@ -88,7 +88,7 @@ static VLAboutBox *_o_sharedInstance = nil;
         /* setup the creator / revision field */
         if( VLC_Changeset() != "exported" )
             [o_revision_field setStringValue:
-                [NSString stringWithFormat: _NS("Compiled by %s, based on SVN revision %s"), 
+                [NSString stringWithFormat: _NS("Compiled by %s, based on Git commit %s"),
                     VLC_CompileBy(), VLC_Changeset()]];
         else
             [o_revision_field setStringValue: 
diff --git a/modules/gui/qt4/dialogs/help.cpp b/modules/gui/qt4/dialogs/help.cpp
index 5f33c31..e443e30 100644
--- a/modules/gui/qt4/dialogs/help.cpp
+++ b/modules/gui/qt4/dialogs/help.cpp
@@ -122,7 +122,7 @@ AboutDialog::AboutDialog( QWidget *parent, intf_thread_t *_p_intf)
             + qfu( VLC_CompileBy() )+ "@" + qfu( VLC_CompileHost() ) + "."
             + qfu( VLC_CompileDomain() ) + ".\n"
             + "Compiler: " + qfu( VLC_Compiler() ) + ".\n"
-            + qtr( "Based on SVN revision: " ) + qfu( VLC_Changeset() ) + ".\n"
+            + qtr( "Based on Git commit: " ) + qfu( VLC_Changeset() ) + ".\n"
             + qtr( "You are using the Qt4 Interface.\n\n" )
             + qtr( "Copyright (c) " COPYRIGHT_YEARS " by the VideoLAN Team.\n" )
             + "vlc at videolan.org, http://www.videolan.org" );
diff --git a/modules/gui/wince/interface.cpp b/modules/gui/wince/interface.cpp
index 6634eae..49cd08d 100644
--- a/modules/gui/wince/interface.cpp
+++ b/modules/gui/wince/interface.cpp
@@ -502,7 +502,7 @@ LRESULT Interface::WndProc( HWND hwnd, UINT msg, WPARAM wp, LPARAM lp )
                 _("Compiled by ") + VLC_CompileBy() + "@" +
                 VLC_CompileHost() + "." + VLC_CompileDomain() + ".\n" +
                 _("Compiler: ") + VLC_Compiler() + ".\n" +
-                _("Based on SVN revision: ") + VLC_Changeset() + ".\n\n" +
+                _("Based on Git commit: ") + VLC_Changeset() + ".\n\n" +
                 _("The VideoLAN team <videolan at videolan.org>\n"
                   "http://www.videolan.org/");
 
diff --git a/modules/gui/wxwidgets/interface.cpp b/modules/gui/wxwidgets/interface.cpp
index 716607b..6485c9a 100644
--- a/modules/gui/wxwidgets/interface.cpp
+++ b/modules/gui/wxwidgets/interface.cpp
@@ -958,7 +958,7 @@ void Interface::OnAbout( wxCommandEvent& WXUNUSED(event) )
        wxU(_("Compiled by "))+ wxU(VLC_CompileBy())+ wxU("@") +
        wxU(VLC_CompileHost())+ wxT(".")+ wxU(VLC_CompileDomain())+ wxT(".\n") +
        wxU(_("Compiler: "))+ wxU(VLC_Compiler())+wxT( ".\n") +
-       wxU(_("Based on SVN revision: "))+wxU(VLC_Changeset())+wxT(".\n\n") +
+       wxU(_("Based on Git commit: "))+wxU(VLC_Changeset())+wxT(".\n\n") +
 #ifdef __WXMSW__
         wxU( vlc_wraptext(LICENSE_MSG,WRAPCOUNT) ) + wxT("\n\n") +
 #else
diff --git a/src/Makefile.am b/src/Makefile.am
index ff4b1ac..35029d2 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -380,7 +380,7 @@ SOURCES_libvlc_control = \
 misc/revision.c:
 	rm -f $@ $@.tmp
 	echo "/* AUTOGENERATED FILE - DO NOT EDIT */" > $@.tmp
-	REVISION="$$(LANG=C svnversion "$(top_srcdir)" 2>/dev/null || echo exported)" ; \
+	REVISION="$$(LANG=C git-show-ref -s HEAD 2>/dev/null | cut -b -10 || echo exported)"; \
 	echo "const char psz_vlc_changeset[] = \"$$REVISION\";" >> $@.tmp
 	mv -f $@.tmp $@
 
diff --git a/src/libvlc-common.c b/src/libvlc-common.c
index e667d24..1142944 100644
--- a/src/libvlc-common.c
+++ b/src/libvlc-common.c
@@ -1810,7 +1810,7 @@ static void Version( void )
              VLC_CompileBy(), VLC_CompileHost(), VLC_CompileDomain() );
     utf8_fprintf( stdout, _("Compiler: %s\n"), VLC_Compiler() );
     if( strcmp( VLC_Changeset(), "exported" ) )
-        utf8_fprintf( stdout, _("Based upon svn changeset [%s]\n"),
+        utf8_fprintf( stdout, _("Based upon Git commit [%s]\n"),
                  VLC_Changeset() );
     utf8_fprintf( stdout, LICENSE_MSG );