Commit dd396683 authored by Simon Morlat's avatar Simon Morlat

mediastreamer2 now displays its git version at startup

parent 39d0f9ee
EXTRA_DIST=mediastreamer-config.h.in pkg.list autogen.sh mediastreamer.pc.in mediastreamer2.spec.in mediastreamer2.spec
EXTRA_DIST=mediastreamer-config.h.in pkg.list autogen.sh mediastreamer.pc.in mediastreamer2.spec.in mediastreamer2.spec gitversion.h
SUBDIRS=po src build include tests help
......
......@@ -58,7 +58,7 @@ autoheader
$AUTOMAKE --force-missing --add-missing --copy ${AUTOMAKE_FLAGS}
autoconf
if !test -e ".git/hooks/pre-commit" ; then
if ! test -e ".git/hooks/pre-commit" ; then
echo "Installing pre-commit hook in git tree."
cp build/git-pre-commit-hook .git/hooks/pre-commit
chmod +x .git/hooks/pre-commit
......
GITVERSION_FILE=gitversion.h
echo "#define GIT_VERSION" > $GITVERSION_FILE
git describe >> $GITVERSION_FILE
echo "\n" >>$GITVERSION_FILE
echo -n "#define GIT_VERSION " > $GITVERSION_FILE
echo \"`git describe`\" >> $GITVERSION_FILE
......@@ -15,7 +15,7 @@ BUILT_SOURCES=alldescs.h
CLEANFILES=alldescs.h filterdescs.txt
INCLUDES=-I$(top_srcdir)/include/
INCLUDES=-I$(top_srcdir) -I$(top_srcdir)/include/
lib_LTLIBRARIES=libmediastreamer.la
......
......@@ -28,6 +28,8 @@ extern void libmsandroiddisplay_init(void);
#include "mediastreamer2/mscommon.h"
#include "mediastreamer2/msfilter.h"
#include "gitversion.h"
#include "alldescs.h"
#include "mediastreamer2/mssndcard.h"
#include "mediastreamer2/mswebcam.h"
......@@ -595,7 +597,7 @@ void ms_init(){
ortp_set_log_level_mask(ORTP_MESSAGE|ORTP_WARNING|ORTP_ERROR|ORTP_FATAL);
ortp_set_log_handler(ms_android_log_handler);
#endif
ms_message("Registering all filters...");
ms_message("Mediastreamer2 " GIT_VERSION " starting.");
/* register builtin MSFilter's */
for (i=0;ms_filter_descs[i]!=NULL;i++){
ms_filter_register(ms_filter_descs[i]);
......
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