You are viewing a plain text version of this content. The canonical link for it is here.
Posted to apreq-cvs@httpd.apache.org by jo...@apache.org on 2004/06/21 20:01:13 UTC

cvs commit: httpd-apreq-2/build get-version.sh

joes        2004/06/21 11:01:13

  Modified:    build    get-version.sh
  Log:
  Greedy .* pattern matches first digit in all two-digit version numbers, which causes build system to ignore the first digit.
  
  Revision  Changes    Path
  1.2       +3 -3      httpd-apreq-2/build/get-version.sh
  
  Index: get-version.sh
  ===================================================================
  RCS file: /home/cvs/httpd-apreq-2/build/get-version.sh,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- get-version.sh	13 Oct 2003 18:24:46 -0000	1.1
  +++ get-version.sh	21 Jun 2004 18:01:13 -0000	1.2
  @@ -17,9 +17,9 @@
     exit 1
   fi
   
  -major_sed="/#define.*$3_MAJOR_VERSION/s/^.*\([0-9][0-9]*\).*$/\1/p"
  -minor_sed="/#define.*$3_MINOR_VERSION/s/^.*\([0-9][0-9]*\).*$/\1/p"
  -patch_sed="/#define.*$3_PATCH_VERSION/s/^.*\([0-9][0-9]*\).*$/\1/p"
  +major_sed="/#define.*$3_MAJOR_VERSION/s/^[^0-9]*\([0-9]*\).*$/\1/p"
  +minor_sed="/#define.*$3_MINOR_VERSION/s/^[^0-9]*\([0-9]*\).*$/\1/p"
  +patch_sed="/#define.*$3_PATCH_VERSION/s/^[^0-9]*\([0-9]*\).*$/\1/p"
   major="`sed -n $major_sed $2`"
   minor="`sed -n $minor_sed $2`"
   patch="`sed -n $patch_sed $2`"