svn commit: r328652 - /httpd/httpd/branches/2.0.x/build/nw_ver.awk

[bn...@apache.org]

Author: bnicholes
Date: Wed Oct 26 07:51:06 2005
New Revision: 328652

URL: http://svn.apache.org/viewcvs?rev=328652&view=rev
Log:
Fix up the NetWare AWK script that extracts the version number so that it matches the new #defines in ap_release.h

Modified:
    httpd/httpd/branches/2.0.x/build/nw_ver.awk

Modified: httpd/httpd/branches/2.0.x/build/nw_ver.awk
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.0.x/build/nw_ver.awk?rev=328652&r1=328651&r2=328652&view=diff
==============================================================================
--- httpd/httpd/branches/2.0.x/build/nw_ver.awk (original)
+++ httpd/httpd/branches/2.0.x/build/nw_ver.awk Wed Oct 26 07:51:06 2005
@@ -18,21 +18,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 "";