updated awk script to fetch copyright from header.

1 files changed, 20 insertions, 12 deletions

diff --git a/packages/NetWare/get_ver.awk b/packages/NetWare/get_ver.awk
index ff3b468a5..2eb347295 100644
--- a/packages/NetWare/get_ver.awk
+++ b/packages/NetWare/get_ver.awk
@@ -5,7 +5,7 @@
 # *                            | (__| |_| |  _ <| |___
 # *                             \___|\___/|_| \_\_____|
 # *
-# * Copyright (C) 1998 - 2004, Daniel Stenberg, <daniel@haxx.se>, et al.
+# * Copyright (C) 1998 - 2008, Daniel Stenberg, <daniel@haxx.se>, et al.
 # *
 # * This software is licensed as described in the file COPYING, which
 # * you should have received as part of this distribution. The terms
@@ -20,48 +20,56 @@
 # *
 # * $Id$
 # ***************************************************************************
-# awk script which fetches libcurl version number and string from input file
-# and writes them to STDOUT. Here you can get an awk version for Win32:
-# http://www.gknw.com/development/prgtools/awk.zip
+# awk script which fetches curl / ares version number and string from input
+# file and writes them to STDOUT. Here you can get an awk version for Win32:
+# http://www.gknw.net/development/prgtools/awk.zip
 #
 BEGIN {
   if (match (ARGV[1], /curlver.h/)) {
     while ((getline < ARGV[1]) > 0) {
-      if (match ($0, /^#define LIBCURL_VERSION "[^"]+"/)) {
+      if (match ($0, /^#define LIBCURL_COPYRIGHT "[^"]+"$/)) {
+        libcurl_copyright_str = substr($0, 28, length($0)-28);
+      }
+      else if (match ($0, /^#define LIBCURL_VERSION "[^"]+"$/)) {
         libcurl_ver_str = substr($3, 2, length($3)-2);
       }
-      else if (match ($0, /^#define LIBCURL_VERSION_MAJOR [^"]+/)) {
+      else if (match ($0, /^#define LIBCURL_VERSION_MAJOR [0-9]+$/)) {
         libcurl_ver_major = substr($3, 1, length($3));
       }
-      else if (match ($0, /^#define LIBCURL_VERSION_MINOR [^"]+/)) {
+      else if (match ($0, /^#define LIBCURL_VERSION_MINOR [0-9]+$/)) {
         libcurl_ver_minor = substr($3, 1, length($3));
       }
-      else if (match ($0, /^#define LIBCURL_VERSION_PATCH [^"]+/)) {
+      else if (match ($0, /^#define LIBCURL_VERSION_PATCH [0-9]+$/)) {
         libcurl_ver_patch = substr($3, 1, length($3));
       }
     }
     libcurl_ver = libcurl_ver_major "," libcurl_ver_minor "," libcurl_ver_patch;
     print "LIBCURL_VERSION = " libcurl_ver "";
     print "LIBCURL_VERSION_STR = " libcurl_ver_str "";
+    print "LIBCURL_COPYRIGHT_STR = " libcurl_copyright_str "";
   }
   if (match (ARGV[1], /ares_version.h/)) {
     while ((getline < ARGV[1]) > 0) {
-      if (match ($0, /^#define ARES_VERSION_STR "[^"]+"/)) {
+      if (match ($0, /^#define ARES_COPYRIGHT "[^"]+"$/)) {
+        libcares_copyright_str = substr($0, 25, length($0)-25);
+      }
+      else if (match ($0, /^#define ARES_VERSION_STR "[^"]+"$/)) {
         libcares_ver_str = substr($3, 2, length($3)-2);
       }
-      else if (match ($0, /^#define ARES_VERSION_MAJOR [^"]+/)) {
+      else if (match ($0, /^#define ARES_VERSION_MAJOR [0-9]+$/)) {
         libcares_ver_major = substr($3, 1, length($3));
       }
-      else if (match ($0, /^#define ARES_VERSION_MINOR [^"]+/)) {
+      else if (match ($0, /^#define ARES_VERSION_MINOR [0-9]+$/)) {
         libcares_ver_minor = substr($3, 1, length($3));
       }
-      else if (match ($0, /^#define ARES_VERSION_PATCH [^"]+/)) {
+      else if (match ($0, /^#define ARES_VERSION_PATCH [0-9]+$/)) {
         libcares_ver_patch = substr($3, 1, length($3));
       }
     }
     libcares_ver = libcares_ver_major "," libcares_ver_minor "," libcares_ver_patch;
     print "LIBCARES_VERSION = " libcares_ver "";
     print "LIBCARES_VERSION_STR = " libcares_ver_str "";
+    print "LIBCARES_COPYRIGHT_STR = " libcares_copyright_str "";
   }
 }