cvs commit: httpd-2.0/build/win32 win32ver.awk

[wr...@apache.org]

wrowe       2004/07/14 17:29:44

  Modified:    build/win32 win32ver.awk
  Log:
    Moderize our .rc generation, using the license-2.0 text,
    extracting copyright dates from the version header, and
    dropping a redundant s/./,/.
  
  Revision  Changes    Path
  1.9       +15 -8     httpd-2.0/build/win32/win32ver.awk
  
  Index: win32ver.awk
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/build/win32/win32ver.awk,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- win32ver.awk	22 Feb 2004 03:27:49 -0000	1.8
  +++ win32ver.awk	15 Jul 2004 00:29:43 -0000	1.9
  @@ -49,6 +49,9 @@
     }
   
     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 @@
   
     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 @@
     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\"";
     }