Skip to content

Commit

Permalink
get rid of the last svn mentions
Browse files Browse the repository at this point in the history
  • Loading branch information
Janne Grunau committed Mar 18, 2011
1 parent fda299f commit faa6f1c
Show file tree
Hide file tree
Showing 8 changed files with 9 additions and 17 deletions.
2 changes: 1 addition & 1 deletion Doxyfile
Original file line number Diff line number Diff line change
Expand Up @@ -577,7 +577,7 @@ EXCLUDE_SYMLINKS = NO
# against the file with absolute path, so to exclude all test directories
# for example use the pattern */test/*

EXCLUDE_PATTERNS = *.svn *.git *.d
EXCLUDE_PATTERNS = *.git *.d

# The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names
# (namespaces, classes, functions, etc.) that should be excluded from the
Expand Down
3 changes: 1 addition & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -98,9 +98,8 @@ ffplay.o: CFLAGS += $(SDL_CFLAGS)

VERSION_SH = $(SRC_PATH_BARE)/version.sh
GIT_LOG = $(SRC_PATH_BARE)/.git/logs/HEAD
SVN_ENTRIES = $(SRC_PATH_BARE)/.svn/entries

.version: $(wildcard $(GIT_LOG) $(SVN_ENTRIES)) $(VERSION_SH) config.mak
.version: $(wildcard $(GIT_LOG)) $(VERSION_SH) config.mak
.version: M=@

version.h .version:
Expand Down
2 changes: 1 addition & 1 deletion doc/developer.texi
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ Indent size is 4.
The presentation is one inspired by 'indent -i4 -kr -nut'.
The TAB character is forbidden outside of Makefiles as is any
form of trailing whitespace. Commits containing either will be
rejected by the Subversion repository.
rejected by the git repository.

The main priority in Libav is simplicity and small code size in order to
minimize the bug count.
Expand Down
4 changes: 2 additions & 2 deletions doc/faq.texi
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ help out creating them.
@section I have a problem with an old version of Libav; where should I report it?
Nowhere. We do not support old Libav versions in any way, we simply lack
the time, motivation and manpower to do so. If you have a problem with an
old version of Libav, upgrade to the latest Subversion snapshot. If you
old version of Libav, upgrade to the latest git snapshot. If you
still experience the problem, then you can report it according to the
guidelines in @url{http://libav.org/bugreports.html}.

Expand All @@ -47,7 +47,7 @@ Likely reasons
@item We are busy and haven't had time yet to read your report or
investigate the issue.
@item You didn't follow @url{http://libav.org/bugreports.html}.
@item You didn't use Subversion HEAD.
@item You didn't use git master.
@item You reported a segmentation fault without gdb output.
@item You describe a problem but not how to reproduce it.
@item It's unclear if you use ffmpeg as command line tool or use
Expand Down
2 changes: 1 addition & 1 deletion doc/general.texi
Original file line number Diff line number Diff line change
Expand Up @@ -1032,7 +1032,7 @@ llrint() in its C library.
Install your Cygwin with all the "Base" packages, plus the
following "Devel" ones:
@example
binutils, gcc4-core, make, subversion, mingw-runtime, texi2html
binutils, gcc4-core, make, git, mingw-runtime, texi2html
@end example

And the following "Utils" one:
Expand Down
2 changes: 1 addition & 1 deletion libpostproc/postprocess.c
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ try to unroll inner for(x=0 ... loop to avoid these damn if(x ... checks
...
*/

//Changelog: use the Subversion log
//Changelog: use git log

#include "config.h"
#include "libavutil/avutil.h"
Expand Down
2 changes: 0 additions & 2 deletions tests/fate.sh
Original file line number Diff line number Diff line change
Expand Up @@ -29,15 +29,13 @@ checkout(){
case "$repo" in
file:*|/*) src="${repo#file:}" ;;
git:*) git clone "$repo" "$src" ;;
svn:*) svn co "$repo" "$src" ;;
esac
}

update()(
cd ${src} || return
case "$repo" in
git:*) git pull ;;
svn:*) svn up ;;
esac
)

Expand Down
9 changes: 2 additions & 7 deletions version.sh
Original file line number Diff line number Diff line change
@@ -1,13 +1,8 @@
#!/bin/sh

revision=$(cd "$1" && cat snapshot_version 2> /dev/null)
test "$revision" && revision=SVN-r$revision

# check for git short hash
if ! test "$revision"; then
revision=$(cd "$1" && git describe --always 2> /dev/null)
test "$revision" && revision=git-$revision
fi
revision=$(cd "$1" && git describe --always 2> /dev/null)
test "$revision" && revision=git-$revision

# no revision number found
test "$revision" || revision=UNKNOWN
Expand Down

0 comments on commit faa6f1c

Please sign in to comment.