Moderize our .rc generation, using the license-2.0 text,

  extracting copyright dates from the version header, and
  dropping a redundant s/./,/.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@104295 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/build/win32/win32ver.awk b/build/win32/win32ver.awk
index 0930c4936eaae2e31cf0f0b1477eff8f3df8c214..5b1bc1e3affba76218d5ab5db81e1688c62a152b 100644 (file)
--- a/build/win32/win32ver.awk
+++ b/build/win32/win32ver.awk
@@ -49,6 +49,9 @@ BEGIN {
   }
 
   while ((getline < rel_h) > 0) {
+    if (match ($0, /^.*Copyright /)) {
+      copyright = substr($0, RLENGTH + 1);
+    }
     if (match ($0, /^#define AP_SERVER_MAJORVERSION_NUMBER [^*]/)) {
       ver_major = $3;
     }
@@ -65,7 +68,6 @@ BEGIN {
 
   ver = ver_major "." ver_minor "." ver_patch ver_patch_modifier;
   verc = ver_major "," ver_minor "," ver_patch;   
-  gsub(/\./, ",", verc);
   if (build) {
     sub(/-.*/, "", verc)
     verc = verc "," build;
@@ -102,17 +104,22 @@ BEGIN {
   print "  BEGIN";
   print "    BLOCK \"040904b0\"";
   print "    BEGIN";
-  print "      VALUE \"Comments\", \"All rights reserved.  The license "\
-        "is available at <http://www.apache.org/licenses/LICENSE-2.0.txt>. "\
-        "The Apache HTTP Server project pages are at "\
-        "<http://httpd.apache.org/>.\\0\"";
+  print "      VALUE \"Comments\", "\
+     "\"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\\r\\n\\r\\n"\
+     "http://www.apache.org/licenses/LICENSE-2.0\\r\\n\\r\\n"\
+     "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.\\0\"";
   print "      VALUE \"CompanyName\", \"Apache Software Foundation\\0\"";
   print "      VALUE \"FileDescription\", \"" desc "\\0\"";
   print "      VALUE \"FileVersion\", \"" ver "\\0\"";
   print "      VALUE \"InternalName\", \"" file "\\0\"";
-  print "      VALUE \"LegalCopyright\", \"Copyright © 2000-2004 "\
-        "The Apache Software Foundation.\\0\"";
-  print "      VALUE \"OriginalFilename\", \"" file ".exe\\0\"";
+  print "      VALUE \"LegalCopyright\", \"Copyright " copyright "\\0\"";
+  print "      VALUE \"OriginalFilename\", \"" file "\\0\"";
   if (vendor) {
     print "      VALUE \"PrivateBuild\", \"" vendor "\\0\"";
   }