some more NetWare build tweaks.

[apache] / build / nw_ver.awk

diff --git a/build/nw_ver.awk b/build/nw_ver.awk
index 868dd1520b08ffdba4a56deb574b49ae9e5780dd..385cd658cd64526cc51d45bdb9680e893524d95c 100644 (file)
--- a/build/nw_ver.awk
+++ b/build/nw_ver.awk
@@ -1,25 +1,48 @@
-BEGIN {
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
 
-  # fetch Apache version numbers from input file and writes them to STDOUT
+BEGIN {
+  # fetch Apache version numbers from input file and write 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_COPYRIGHT \\/)) {
+      if (((getline < ARGV[1]) > 0) && (split($0, c, "\"") == 3)) {
+        copyright_str = c[2];
+      }
     }
-    else if (match ($0, /^#define AP_SERVER_MINORVERSION "[^"]+"/)) {
-      ver_minor = substr($3, 2, length($3) - 2);
+    else if (match ($0, /^#define AP_SERVER_MAJORVERSION_NUMBER /)) {
+      ver_major = $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_MINORVERSION_NUMBER /)) {
+      ver_minor = $3;
+    }
+    else if (match ($0, /^#define AP_SERVER_PATCHLEVEL_NUMBER/)) {
+      ver_patch = $3;
+    }
+    else if (match ($0, /^#define AP_SERVER_DEVBUILD_BOOLEAN/)) {
+      ver_devbuild = $3;
     }
   }
-  ver = ver_major "," ver_minor "," ver_patch;
-  ver_str = ver_major "." ver_minor "." ver_str_patch;
+  ver_nlm = ver_major "," ver_minor "," ver_patch;
+  ver_str = ver_major "." ver_minor "." ver_patch (ver_devbuild ? "-dev" : "");
 
-  print "VERSION = " ver "";
+  print "VERSION = " ver_nlm "";
   print "VERSION_STR = " ver_str "";
+  print "VERSION_MAJMIN = " ver_major ver_minor "";
+  print "COPYRIGHT_STR = " copyright_str "";
 
 }
+
+