[FFmpeg-devel] [PATCH] Remove old VCSs from version.sh
Reinhard Tartler
siretart
Mon Feb 21 10:50:19 CET 2011
On Mon, Feb 21, 2011 at 09:07:10 (CET), Alex Converse wrote:
> $subj
>
> From 4d7ae86e662d127988582f00734d8b8bd4c1b7cc Mon Sep 17 00:00:00 2001
> From: Alex Converse <alex.converse at gmail.com>
> Date: Mon, 21 Feb 2011 00:01:09 -0800
> Subject: [PATCH] Remove old VCSs from version.sh
> MIME-Version: 1.0
> Content-Type: multipart/mixed; boundary="------------1"
>
> This is a multi-part message in MIME format.
> --------------1
> Content-Type: text/plain; charset=UTF-8; format=fixed
> Content-Transfer-Encoding: 8bit
>
> ---
> version.sh | 16 ----------------
> 1 files changed, 0 insertions(+), 16 deletions(-)
>
>
> --------------1
> Content-Type: text/x-patch; name="0001-Remove-old-VCSs-from-version.sh.patch"
> Content-Transfer-Encoding: 8bit
> Content-Disposition: attachment; filename="0001-Remove-old-VCSs-from-version.sh.patch"
>
> diff --git a/version.sh b/version.sh
> index 3269e03..dc610d3 100755
> --- a/version.sh
> +++ b/version.sh
> @@ -1,21 +1,5 @@
> #!/bin/sh
>
> -# check for SVN revision number
> -revision=$(cd "$1" && cat snapshot_version 2> /dev/null)
Please keep support for the 'snapshot_version' file. It is used to
specify the version number for out-of-vcs builds.
> -test "$revision" || revision=$(cd "$1" && LC_ALL=C svn info 2> /dev/null | grep "Last Changed Rev" | cut -d' ' -f4)
> -test "$revision" || revision=$(cd "$1" && grep committed-rev .svn/entries 2>/dev/null | head -n 1 | cut -d '"' -f2)
> -test "$revision" || revision=$(cd "$1" && sed -n -e '/^dir$/{n
> -p
> -q
> -}' .svn/entries 2>/dev/null)
> -test "$revision" && revision=SVN-r$revision
this might make sense
> -# check for git svn revision number
> -if ! test "$revision"; then
> - revision=$(cd "$1" && git svn find-rev HEAD 2> /dev/null)
> - test "$revision" && revision=git-svn-r$revision
> -fi
> -
> # check for git short hash
> if ! test "$revision"; then
> revision=$(cd "$1" && git describe --always 2> /dev/null)
--
Gruesse/greetings,
Reinhard Tartler, KeyID 945348A4
More information about the ffmpeg-devel
mailing list