some more NetWare build tweaks.

[apache] / build / nw_ver.awk

diff --git a/build/nw_ver.awk b/build/nw_ver.awk
index 7207f7b1e9e7e6128fe2f9e13ae2ae631b7385df..385cd658cd64526cc51d45bdb9680e893524d95c 100644 (file)
--- a/build/nw_ver.awk
+++ b/build/nw_ver.awk
@@ -1,8 +1,9 @@
-# Copyright 2002-2004 Apache Software Foundation
-#
-# Licensed 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
+# 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
 #
@@ -13,11 +14,15 @@
 # limitations under the License.
 
 BEGIN {
-
-  # fetch Apache version numbers from input file and writes them to STDOUT
+  # fetch Apache version numbers from input file and write them to STDOUT
 
   while ((getline < ARGV[1]) > 0) {
-    if (match ($0, /^#define AP_SERVER_MAJORVERSION_NUMBER /)) {
+    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_MAJORVERSION_NUMBER /)) {
       ver_major = $3;
     }
     else if (match ($0, /^#define AP_SERVER_MINORVERSION_NUMBER /)) {
@@ -26,14 +31,18 @@ BEGIN {
     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);
+    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_patch ver_str_release;
+  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 "";
 
 }
+
+