Commit 0a520894 authored by Konstantin Pavlov's avatar Konstantin Pavlov

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

parent c40d2481
......@@ -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:
......
......@@ -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@videolan.org, http://www.videolan.org" );
......
......@@ -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@videolan.org>\n"
"http://www.videolan.org/");
......
......@@ -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
......
......@@ -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 $@
......
......@@ -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 );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment