From apache-cvs-return-6414-apmail-apache-cvs-archive=apache.org@apache.org Sat Jun 09 06:33:54 2001
Return-Path: <apache-cvs-return-6414-apmail-apache-cvs-archive=apache.org@apache.org>
Delivered-To: apmail-apache-cvs-archive@apache.org
Received: (qmail 7520 invoked by uid 500); 9 Jun 2001 06:33:52 -0000
Mailing-List: contact apache-cvs-help@apache.org; run by ezmlm
Precedence: bulk
Reply-To: new-httpd@apache.org
list-help: <mailto:apache-cvs-help@apache.org>
list-unsubscribe: <mailto:apache-cvs-unsubscribe@apache.org>
list-post: <mailto:apache-cvs@apache.org>
Delivered-To: mailing list apache-cvs@apache.org
Received: (qmail 7392 invoked by uid 500); 9 Jun 2001 06:33:51 -0000
Delivered-To: apmail-httpd-2.0-cvs@apache.org
Date: 9 Jun 2001 06:33:51 -0000
Message-ID: <20010609063351.7342.qmail@apache.org>
From: orlikowski@apache.org
To: httpd-2.0-cvs@apache.org
Subject: cvs commit: httpd-2.0/server Makefile.in

orlikowski    01/06/08 23:33:51

  Modified:    server   Makefile.in
  Added:       build    make_var_export.awk
  Log:
  Add the missing AP[RU]_DECLARE_DATA symbols to httpd.exp.
  httpd.exp should now be generated automatically.
  Any missing symbols are now the fault of awk scripts.
  Or rather, their authors. :)
  
  Revision  Changes    Path
  1.1                  httpd-2.0/build/make_var_export.awk
  
  Index: make_var_export.awk
  ===================================================================
  # Based on apr's make_export.awk, which is
  # based on Ryan Bloom's make_export.pl
  
  /^#[ \t]*if(def)? (AP[RU]?_|!?defined).*/ {
  	if (old_filename != FILENAME) {
  		if (old_filename != "") printf("%s", line)
  		macro_no = 0
  		found = 0
  		count = 0
  		old_filename = FILENAME
  		line = ""
  	}
  	macro_stack[macro_no++] = macro
  	macro = substr($0, length($1)+2)
  	count++
  	line = line "#ifdef " macro "\n"
  	next
  }
  
  /^#[ \t]*endif/ {
  	if (count > 0) {
  		count--
  		line = line "#endif " macro "\n"
  		macro = macro_stack[--macro_no]
  	}
  	if (count == 0) {
  		if (found != 0) {
  			printf("%s", line)
  		}
  		line = ""
  	}
  	next
  }
  
  function add_symbol (sym_name) {
  	if (count) {
  		found++
  	}
  	for (i = 0; i < count; i++) {
  		line = line "\t"
  	}
  	line = line sym_name "\n"
  
  	if (count == 0) {
  		printf("%s", line)
  		line = ""
  	}
  }
  
  /^[ \t]*AP[RU]?_DECLARE_DATA .*;$/ {
         varname = $NF;
         gsub( /[*;]/, "", varname);
         gsub( /\[.*\]/, "", varname);
         add_symbol(varname);
  }
  
  END {
  	printf("%s", line)
  }
  
  
  
  1.52      +1 -0      httpd-2.0/server/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/Makefile.in,v
  retrieving revision 1.51
  retrieving revision 1.52
  diff -u -r1.51 -r1.52
  --- Makefile.in	2001/06/08 20:36:09	1.51
  +++ Makefile.in	2001/06/09 06:33:50	1.52
  @@ -66,3 +66,4 @@
   httpd.exp: exports.c
   	echo "#! ." > $@
   	$(CPP) $(ALL_CPPFLAGS) $(ALL_INCLUDES) exports.c | grep "ap_hack_" | sed -e 's/^.*[)]\(.*\);$$/\1/' >> $@
  +	$(AWK) -f $(top_srcdir)/build/make_var_export.awk $(top_srcdir)/include/*.h $(top_srcdir)/os/$(OS_DIR)/*.h $(top_srcdir)/srclib/apr/include/*.h $(top_srcdir)/srclib/apr-util/include/*.h | $(CPP) $(ALL_CPPFLAGS) $(ALL_INCLUDES) - | sed -e 's/^\# .*//' | sed -e '/^$$/d' >> $@