diff options
| author | Gerald Combs <gerald@wireshark.org> | 2014-02-07 11:14:52 -0800 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2014-02-07 23:03:03 +0000 |
| commit | f966980937abd4899a9c43329041bb00798ab18e (patch) | |
| tree | e31210350fa778765b6d2d4711fc5cc6c27f2aae /docbook/check_git_version.sh | |
| parent | 217f9fd0d9f2d6a9084da3fc945cce001414eea3 (diff) | |
Replace "svn" with "git" all over the place.
Rename "SVNPATH" to "GITBRANCH" since that seems more appropriate.
Rename "svnversion.h" to "version.h" as Evan suggested. Update some
URLs. In make-version.pl, make sure we don't set an improper upstream
branch name. Use the number of commits + short hash from `git describe`
for package names by default.
Change-Id: I922bba8d83eabdf49284a119f55b4076bc469b96
Reviewed-on: https://code.wireshark.org/review/139
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Diffstat (limited to 'docbook/check_git_version.sh')
| -rwxr-xr-x | docbook/check_git_version.sh | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/docbook/check_git_version.sh b/docbook/check_git_version.sh index c26c1e7812..f7322559ca 100755 --- a/docbook/check_git_version.sh +++ b/docbook/check_git_version.sh @@ -1,6 +1,6 @@ #!/bin/bash # -# Check for SVN version +# Check for Git version # # $Id$ # @@ -23,14 +23,14 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # -#if [ -d ../.git ] ; then -# GIT_VERSION=`git describe --tags --dirty` -#fi -#echo '<!ENTITY GitVersion "'${GIT_VERSION}'">' > git_version_tmp.xml +if [ -d ../.git ] ; then + GIT_VERSION=`git describe --tags --dirty` +fi +echo '<!ENTITY GitVersion "'${GIT_VERSION}'">' > git_version_tmp.xml -echo -n '<!ENTITY GitVersion "' > git_version_tmp.xml -[ -x svnversion ] && svnversion -n . >> git_version_tmp.xml -echo '">' >> git_version_tmp.xml +#echo -n '<!ENTITY GitVersion "' > git_version_tmp.xml +#[ -x svnversion ] && svnversion -n . >> git_version_tmp.xml +#echo '">' >> git_version_tmp.xml # /dev/null buries the output of the "cmp" command. diff git_version.xml git_version_tmp.xml &> /dev/null |