httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bnicho...@apache.org
Subject cvs commit: httpd-2.0/build nw_ver.awk
Date Thu, 29 Jan 2004 23:40:02 GMT
bnicholes    2004/01/29 15:40:02

  Modified:    build    nw_ver.awk
  Log:
  Rework the version extraction AWK script for NetWare to match the changes made in ap_release.h
  
  Revision  Changes    Path
  1.2       +10 -10    httpd-2.0/build/nw_ver.awk
  
  Index: nw_ver.awk
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/build/nw_ver.awk,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- nw_ver.awk	16 Oct 2002 23:48:00 -0000	1.1
  +++ nw_ver.awk	29 Jan 2004 23:40:02 -0000	1.2
  @@ -3,21 +3,21 @@
     # fetch Apache version numbers from input file and writes them to STDOUT
   
     while ((getline < ARGV[1]) > 0) {
  -    if (match ($0, /^#define AP_SERVER_MAJORVERSION "[^"]+"/)) {
  -      ver_major = substr($3, 2, length($3) - 2);
  +    if (match ($0, /^#define AP_SERVER_MAJORVERSION_NUMBER /)) {
  +      ver_major = $3;
       }
  -    else if (match ($0, /^#define AP_SERVER_MINORVERSION "[^"]+"/)) {
  -      ver_minor = substr($3, 2, length($3) - 2);
  +    else if (match ($0, /^#define AP_SERVER_MINORVERSION_NUMBER /)) {
  +      ver_minor = $3;
       }
  -    else if (match ($0, /^#define AP_SERVER_PATCHLEVEL/)) {
  -      ver_str_patch = substr($3, 2, length($3) - 2);
  -      if (match (ver_str_patch, /[0-9][0-9]*/)) {
  -         ver_patch = substr(ver_str_patch, RSTART, RLENGTH); 
  -      }
  +    else if (match ($0, /^#define AP_SERVER_PATCHLEVEL_NUMBER/)) {
  +      ver_patch = $3;
  +    }
  +    else if (match ($0, /^#define AP_SERVER_ADD_STRING /)) {
  +        ver_str_release = substr($3, 2, length($3) - 2);
       }
     }
     ver = ver_major "," ver_minor "," ver_patch;
  -  ver_str = ver_major "." ver_minor "." ver_str_patch;
  +  ver_str = ver_major "." ver_minor "." ver_patch ver_str_release;
   
     print "VERSION = " ver "";
     print "VERSION_STR = " ver_str "";
  
  
  

Mime
View raw message