Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
BC
public
liblinphone
Commits
31c895b5
Commit
31c895b5
authored
Aug 06, 2014
by
Simon Morlat
Browse files
really check that we are in a linphone git repo before taking the "git describe".
parent
574ed8e5
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
6 deletions
+5
-6
console/linphonec.c
console/linphonec.c
+1
-1
coreapi/Makefile.am
coreapi/Makefile.am
+3
-4
mediastreamer2
mediastreamer2
+1
-1
No files found.
console/linphonec.c
View file @
31c895b5
...
...
@@ -747,7 +747,7 @@ linphonec_init(int argc, char **argv)
linphone_core_enable_video_display
(
linphonec
,
display_enabled
);
if
(
display_enabled
&&
window_id
!=
0
)
{
printf
(
"Setting window_id: 0x%x
\n
"
,
window_id
);
printf
(
"Setting window_id: 0x%x
\n
"
,
window_id
);
linphone_core_set_native_video_window_id
(
linphonec
,
window_id
);
}
...
...
coreapi/Makefile.am
View file @
31c895b5
...
...
@@ -8,9 +8,8 @@ GITREVISION=`cd $(top_srcdir) && git rev-parse HEAD`
## This command is used to check if the sources are cloned in a git repo.
## We can't only depend on the presence of the .git/ directory anymore,
## because of gits submodule handling.
## We now simply issue a git status and if there's an error, the $(GITSTATUS)
## variable won't contain "GITOK"
GITSTATUS
=
`
cd
$(top_srcdir)
&&
git status
>
/dev/null
&&
echo
GITOK
`
## We now simply issue a git log on configure.ac and if the output is empty (error or file not tracked), then we are not in git.
GITLOG
=
$(
shell
git log
-1
$(top_srcdir)
/configure.ac
)
ECHO
=
/bin/echo
...
...
@@ -168,7 +167,7 @@ AM_CXXFLAGS=$(AM_CFLAGS)
#the PACKAGE_VERSION given in configure.ac
make_gitversion_h
:
if
test
"
$(GIT
STATUS)
"
==
"GITOK
"
;
then
\
if
test
-n
"
$(GIT
LOG)
"
;
then
\
if
test
"
$(GITDESCRIBE)
"
!=
""
;
then
\
if
test
"
$(GIT_TAG)
"
!=
"
$(PACKAGE_VERSION)
"
;
then
\
echo
"*** PACKAGE_VERSION and git tag differ. Please put them identical."
;
\
...
...
mediastreamer2
@
932964c5
Subproject commit
70a029a00f2b7272d8c790557e71ff8b73004b85
Subproject commit
932964c57f0fc8d7690334dae59ab70b455bf466
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment