Skip to content
This repository
Browse code

The number of the beta versions cannot rely on Subversion's revision

number. The date and latest git short hash is now used instead.
  • Loading branch information...
commit 3bd2f1e65fc489e5e08ba4c3c70ae5c0a6764331 1 parent 2e20c3e
Alvaro Lopez Ortega authored

Showing 1 changed file with 4 additions and 9 deletions. Show diff stats Hide diff stats

  1. 13  configure.in
13  configure.in
@@ -62,15 +62,10 @@ AC_ARG_ENABLE(beta, AC_HELP_STRING([--enable-beta], [Enable beta development]),
62 62
 
63 63
 if test x"$is_beta" = "xyes"; then
64 64
   dnl Figure revision
65  
-  if test -d ".svn"; then
66  
-     svn_rev="`svn info -R | grep Revision | sort | tail -1 | sed 's/Revision: //'`";
67  
-  elif test -d ".git"; then
68  
-	svn_rev="`git svn info | grep 'Last Changed Rev' | sed 's/Last Changed Rev: //'`";
69  
-  elif test -f "ChangeLog"; then
70  
-     svn_rev=$(head -10 ChangeLog | grep 'svn=' | sed -n 's|.*svn=\(.*\) .*|\1|p' | head -1)
71  
-  fi
  65
+  today=`date +'%y%m%d'`
  66
+  git_hash=`git log -1 --pretty=tformat:%h`
72 67
 
73  
-  PACKAGE_PATCH_VERSION="b$svn_rev"
  68
+  PACKAGE_PATCH_VERSION="b${today}_${git_hash}"
74 69
 
75 70
   dnl Redefine versions
76 71
   PACKAGE_VERSION="$PACKAGE_MAJOR_VERSION.$PACKAGE_MINOR_VERSION.$PACKAGE_MICRO_VERSION$PACKAGE_PATCH_VERSION"
@@ -1653,7 +1648,7 @@ echo "GeoIP                 $have_geoip"
1653 1648
 echo "FFMpeg                $have_ffmpeg"
1654 1649
 echo "crypt support         $crypt_type"
1655 1650
 if test "x$is_beta" = "xyes"; then
1656  
-echo "Beta release          $svn_rev"
  1651
+echo "Beta release          $PACKAGE_PATCH_VERSION"
1657 1652
 fi
1658 1653
 echo
1659 1654
 eval eval echo "Installation dir      $bindir"

0 notes on commit 3bd2f1e

Please sign in to comment.
Something went wrong with that request. Please try again.