jerenkrantz 2003/09/26 00:25:59
Modified: . Tag: APR_0_9_BRANCH CHANGES
build Tag: APR_0_9_BRANCH make_exports.awk
make_nw_export.awk make_var_export.awk
Log:
Fix up make_exports.awk and friends to support apr-iconv.
(The apr-iconv 0.9.4 release tarball will include *these* awk files, so that
it isn't a dud release.)
Revision Changes Path
No revision
No revision
1.426.2.4 +2 -0 apr/CHANGES
Index: CHANGES
===================================================================
RCS file: /home/cvs/apr/CHANGES,v
retrieving revision 1.426.2.3
retrieving revision 1.426.2.4
diff -u -u -r1.426.2.3 -r1.426.2.4
--- CHANGES 26 Sep 2003 05:44:26 -0000 1.426.2.3
+++ CHANGES 26 Sep 2003 07:25:59 -0000 1.426.2.4
@@ -1,5 +1,7 @@
Changes with APR 0.9.5
+ *) Fix make_exports.awk to work with apr-iconv. [Justin Erenkrantz]
+
Changes with APR 0.9.4
*) win32: fix apr_file_dup() and apr_file_dup2() to dup the
No revision
No revision
1.5.2.1 +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.5.2.1
diff -u -u -r1.5 -r1.5.2.1
--- make_exports.awk 16 Jul 2002 10:08:36 -0000 1.5
+++ make_exports.awk 26 Sep 2003 07:25:59 -0000 1.5.2.1
@@ -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.9.2.1 +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.9.2.1
diff -u -u -r1.9 -r1.9.2.1
--- make_nw_export.awk 19 Jul 2002 19:46:33 -0000 1.9
+++ make_nw_export.awk 26 Sep 2003 07:25:59 -0000 1.9.2.1
@@ -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.2.2.1 +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.2.2.1
diff -u -u -r1.2 -r1.2.2.1
--- make_var_export.awk 8 Apr 2002 22:43:33 -0000 1.2
+++ make_var_export.awk 26 Sep 2003 07:25:59 -0000 1.2.2.1
@@ -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);
