apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wr...@apache.org
Subject cvs commit: apr/build win32ver.awk
Date Thu, 15 Jul 2004 01:12:16 GMT
wrowe       2004/07/14 18:12:16

  Modified:    .        libapr.dsp
               build    win32ver.awk
  Log:
    Update the license language to asl 2.0, and correctly grab
    apr[u|i] revisions from the usual version files.
  
  Revision  Changes    Path
  1.96      +4 -2      apr/libapr.dsp
  
  Index: libapr.dsp
  ===================================================================
  RCS file: /home/cvs/apr/libapr.dsp,v
  retrieving revision 1.95
  retrieving revision 1.96
  diff -u -r1.95 -r1.96
  --- libapr.dsp	9 Dec 2003 10:06:55 -0000	1.95
  +++ libapr.dsp	15 Jul 2004 01:12:15 -0000	1.96
  @@ -644,22 +644,24 @@
   !IF  "$(CFG)" == "libapr - Win32 Release"
   
   # PROP Ignore_Default_Tool 1
  +USERDEP__WIN32="./include/apr_version.h"	
   # Begin Custom Build - Creating Version Resource
   InputPath=.\build\win32ver.awk
   
   ".\libapr.rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
  -	awk -f ./build/win32ver.awk libapr.dll "Apache Portability Runtime Library"  ../../include/ap_release.h
> .\libapr.rc
  +	awk -f ./build/win32ver.awk libapr.dll "Apache Portability Runtime Library" ./include/apr_version.h
> .\libapr.rc
   
   # End Custom Build
   
   !ELSEIF  "$(CFG)" == "libapr - Win32 Debug"
   
   # PROP Ignore_Default_Tool 1
  +USERDEP__WIN32="./include/apr_version.h"	
   # Begin Custom Build - Creating Version Resource
   InputPath=.\build\win32ver.awk
   
   ".\libapr.rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
  -	awk -f ./build/win32ver.awk libapr.dll "Apache Portability Runtime Library"  ../../include/ap_release.h
> .\libapr.rc
  +	awk -f ./build/win32ver.awk libapr.dll "Apache Portability Runtime Library" ./include/apr_version.h
> .\libapr.rc
   
   # End Custom Build
   
  
  
  
  1.6       +31 -27    apr/build/win32ver.awk
  
  Index: win32ver.awk
  ===================================================================
  RCS file: /home/cvs/apr/build/win32ver.awk,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- win32ver.awk	20 Jan 2003 18:36:09 -0000	1.5
  +++ win32ver.awk	15 Jul 2004 01:12:16 -0000	1.6
  @@ -40,30 +40,28 @@
     }
   
     while ((getline < rel_h) > 0) {
  -    if (match ($0, /^#define AP_SERVER_BASEREVISION "[^"]+"/)) {
  -      ver = substr($0, RSTART + 32, RLENGTH - 33);
  +    if (match ($0, /^#define AP._MAJOR_VERSION/)) {
  +      ver_major = $3;
  +    }
  +    if (match ($0, /^#define AP._MINOR_VERSION/)) {
  +      ver_minor = $3;
  +    }
  +    if (match ($0, /^#define AP._PATCH_VERSION/)) {
  +      ver_patch = $3;
  +    }
  +    if (match ($0, /^#define AP._IS_DEV_VERSION/)) {
  +      ver_suffix = "-dev";
  +      ver_build = "0";
  +    }
  +    if (match ($0, /^#undef AP._IS_DEV_VERSION/)) {
  +      ver_build = "100";
  +    }
  +    if (match ($0, /^.*Copyright /)) {
  +      copyright = substr($0, RLENGTH + 1);
       }
     }
  -  if (ver) {
  -    verc = ver;
  -    gsub(/\./, ",", verc);
  -    if (build) {
  -      sub(/-.*/, "", verc)
  -      verc = verc "," build;
  -    } else if (sub(/-dev/, ",0", verc)) {
  -        ff = ff + 2;
  -    } else if (!sub(/-alpha/, ",10", verc)  \
  -            && !sub(/-beta/, ",100", verc)  \
  -            && !sub(/-gold/, ",200", verc)) {
  -      sub(/-.*/, "", verc);
  -      verc = verc "," 0;
  -    }
  -  } else {
  -# XXX Gotta fix this for non-httpd installs :(
  -    ver = "0.0.0.0"
  -    verc = "0,0,0,0"
  -    ff = ff + 2;
  -  }
  +  ver = ver_major "." ver_minor "." ver_patch ver_suffix;
  +  verc = ver_major "," ver_minor "," ver_patch "," ver_build;   
   
     if (length(vendor)) {
       ff = ff + 8;
  @@ -89,15 +87,21 @@
     print "  BEGIN";
     print "    BLOCK \"040904b0\"";
     print "    BEGIN";
  -  print "      VALUE \"Comments\", \"All rights reserved.  The "\
  -        "license is available at <http://www.apache.org/LICENSE.txt>.  "\
  -        "The APR project pages are at <http://apr.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-2003 "\
  -        "The Apache Software Foundation.\\0\"";
  +  print "      VALUE \"LegalCopyright\", \"Copyright " copyright "\\0\"";
     print "      VALUE \"OriginalFilename\", \"" filename "\\0\"";
     if (vendor) {
       print "      VALUE \"PrivateBuild\", \"" vendor "\\0\"";
  
  
  

Mime
View raw message