apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jerenkra...@apache.org
Subject cvs commit: apr/build make_exports.awk make_nw_export.awk make_var_export.awk
Date Fri, 26 Sep 2003 07:40:31 GMT
jerenkrantz    2003/09/26 00:40:31

  Modified:    .        CHANGES
               build    make_exports.awk make_nw_export.awk
                        make_var_export.awk
  Log:
  Fix up make_exports.awk and friends to support apr-iconv.
  
  (Forward port from APR_0_9_BRANCH which needed this in order to build
  apr-iconv.)
  
  Revision  Changes    Path
  1.436     +4 -0      apr/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/apr/CHANGES,v
  retrieving revision 1.435
  retrieving revision 1.436
  diff -u -u -r1.435 -r1.436
  --- CHANGES	25 Sep 2003 04:37:08 -0000	1.435
  +++ CHANGES	26 Sep 2003 07:40:31 -0000	1.436
  @@ -64,6 +64,10 @@
   
        apr_compat.h
   
  +Changes with APR 0.9.5
  +
  +  *) Fix make_exports.awk to work with apr-iconv.  [Justin Erenkrantz]
  +
   Changes with APR 0.9.4
   
     *) fix apr_file_dup() and apr_file_dup2() to dup the ungetchar
  
  
  
  1.6       +2 -2      apr/build/make_exports.awk
  
  Index: make_exports.awk
  ===================================================================
  RCS file: /home/cvs/apr/build/make_exports.awk,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -u -r1.5 -r1.6
  --- make_exports.awk	16 Jul 2002 10:08:36 -0000	1.5
  +++ make_exports.awk	26 Sep 2003 07:40:31 -0000	1.6
  @@ -76,8 +76,8 @@
       }
   }
   
  -/^[ \t]*AP[RU]?_(CORE_)?DECLARE[^(]*[(][^)]*[)]([^ ]* )*[^(]+[(]/ {
  -    sub("[ \t]*AP[RU]?_(CORE_)?DECLARE[^(]*[(][^)]*[)][ \t]*", "")
  +/^[ \t]*AP[RUI]?_(CORE_)?DECLARE[^(]*[(][^)]*[)]([^ ]* )*[^(]+[(]/ {
  +    sub("[ \t]*AP[RUI]?_(CORE_)?DECLARE[^(]*[(][^)]*[)][ \t]*", "")
       sub("[(].*", "")
       sub("([^ ]* (^([ \t]*[(])))+", "")
   
  
  
  
  1.10      +3 -3      apr/build/make_nw_export.awk
  
  Index: make_nw_export.awk
  ===================================================================
  RCS file: /home/cvs/apr/build/make_nw_export.awk,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -u -r1.9 -r1.10
  --- make_nw_export.awk	19 Jul 2002 19:46:33 -0000	1.9
  +++ make_nw_export.awk	26 Sep 2003 07:40:31 -0000	1.10
  @@ -23,8 +23,8 @@
   	}
   }
   
  -/^[ \t]*AP[RU]?_DECLARE[^(]*[(][^)]*[)]([^ ]* )*[^(]+[(]/ {
  -    sub("[ \t]*AP[RU]?_DECLARE[^(]*[(][^)]*[)][ \t]*", "")
  +/^[ \t]*AP[RUI]?_DECLARE[^(]*[(][^)]*[)]([^ ]* )*[^(]+[(]/ {
  +    sub("[ \t]*AP[RUI]?_DECLARE[^(]*[(][^)]*[)][ \t]*", "")
       sub("[(].*", "")
       sub("([^ ]* (^([ \t]*[(])))+", "")
   
  @@ -65,7 +65,7 @@
       next
   }
   
  -/^[ \t]*AP[RU]?_DECLARE_DATA .*;$/ {
  +/^[ \t]*AP[RUI]?_DECLARE_DATA .*;$/ {
          varname = $NF;
          gsub( /[*;]/, "", varname);
          gsub( /\[.*\]/, "", varname);
  
  
  
  1.3       +2 -2      apr/build/make_var_export.awk
  
  Index: make_var_export.awk
  ===================================================================
  RCS file: /home/cvs/apr/build/make_var_export.awk,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -u -r1.2 -r1.3
  --- make_var_export.awk	8 Apr 2002 22:43:33 -0000	1.2
  +++ make_var_export.awk	26 Sep 2003 07:40:31 -0000	1.3
  @@ -1,7 +1,7 @@
   # Based on apr's make_export.awk, which is
   # based on Ryan Bloom's make_export.pl
   
  -/^#[ \t]*if(def)? (AP[RU]?_|!?defined).*/ {
  +/^#[ \t]*if(def)? (AP[RUI]?_|!?defined).*/ {
   	if (old_filename != FILENAME) {
   		if (old_filename != "") printf("%s", line)
   		macro_no = 0
  @@ -47,7 +47,7 @@
   	}
   }
   
  -/^[ \t]*(extern[ \t]+)?AP[RU]?_DECLARE_DATA .*;$/ {
  +/^[ \t]*(extern[ \t]+)?AP[RUI]?_DECLARE_DATA .*;$/ {
          varname = $NF;
          gsub( /[*;]/, "", varname);
          gsub( /\[.*\]/, "", varname);
  
  
  

Mime
View raw message