Return-Path: X-Original-To: apmail-httpd-cvs-archive@www.apache.org Delivered-To: apmail-httpd-cvs-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 3F08A9DD4 for ; Sat, 29 Oct 2011 14:31:23 +0000 (UTC) Received: (qmail 42044 invoked by uid 500); 29 Oct 2011 14:31:23 -0000 Delivered-To: apmail-httpd-cvs-archive@httpd.apache.org Received: (qmail 41995 invoked by uid 500); 29 Oct 2011 14:31:23 -0000 Mailing-List: contact cvs-help@httpd.apache.org; run by ezmlm Precedence: bulk Reply-To: dev@httpd.apache.org list-help: list-unsubscribe: List-Post: List-Id: Delivered-To: mailing list cvs@httpd.apache.org Received: (qmail 41984 invoked by uid 99); 29 Oct 2011 14:31:23 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 29 Oct 2011 14:31:23 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 29 Oct 2011 14:31:20 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 81AB223889FA; Sat, 29 Oct 2011 14:30:59 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1194896 - in /httpd/httpd/trunk/build: NWGNUmakefile make_nw_export.awk Date: Sat, 29 Oct 2011 14:30:59 -0000 To: cvs@httpd.apache.org From: fuankg@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20111029143059.81AB223889FA@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: fuankg Date: Sat Oct 29 14:30:59 2011 New Revision: 1194896 URL: http://svn.apache.org/viewvc?rev=1194896&view=rev Log: Some NetWare build tweaks: generate proxy import list. Modified: httpd/httpd/trunk/build/NWGNUmakefile httpd/httpd/trunk/build/make_nw_export.awk Modified: httpd/httpd/trunk/build/NWGNUmakefile URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/build/NWGNUmakefile?rev=1194896&r1=1194895&r2=1194896&view=diff ============================================================================== --- httpd/httpd/trunk/build/NWGNUmakefile (original) +++ httpd/httpd/trunk/build/NWGNUmakefile Sat Oct 29 14:30:59 2011 @@ -23,7 +23,7 @@ FILES_prebuild_headers = \ $(PCRE)/pcre.h \ $(EOLIST) -nlms :: libs $(NWOS)/httpd.imp $(DAV)/main/dav.imp +nlms :: libs $(NWOS)/httpd.imp $(DAV)/main/dav.imp $(PROXY)/proxy.imp libs :: chkapr $(NWOS)/chartables.c @@ -31,6 +31,10 @@ $(DAV)/main/dav.imp : make_nw_export.awk @echo $(DL)GEN $@$(DL) $(AWK) -v EXPPREFIX=AP$(VERSION_MAJMIN) -f $^ >$@ +$(PROXY)/proxy.imp : make_nw_export.awk $(PROXY)/mod_proxy.h + @echo $(DL)GEN $@$(DL) + $(AWK) -v EXPPREFIX=AP$(VERSION_MAJMIN) -f $^ >$@ + $(NWOS)/httpd.imp : make_nw_export.awk nw_export.i @echo $(DL)GEN $@$(DL) $(AWK) -v EXPPREFIX=AP$(VERSION_MAJMIN) -f $^ >$@ @@ -115,6 +119,7 @@ clean :: $(call DEL,$(PCRE)/config.h) $(call DEL,$(PCRE)/pcre.h) $(call DEL,$(DAV)/main/dav.imp) + $(call DEL,$(PROXY)/proxy.imp) $(call DEL,$(NWOS)/httpd.imp) $(call DEL,nw_export.i) $(call DEL,cc.opt) Modified: httpd/httpd/trunk/build/make_nw_export.awk URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/build/make_nw_export.awk?rev=1194896&r1=1194895&r2=1194896&view=diff ============================================================================== --- httpd/httpd/trunk/build/make_nw_export.awk (original) +++ httpd/httpd/trunk/build/make_nw_export.awk Sat Oct 29 14:30:59 2011 @@ -29,8 +29,8 @@ function add_symbol(sym_name) { #/ap_some_name/{next} /ap_mpm_pod_/{next} -/^[ \t]*(AP|DAV)([RU]|_CORE)?_DECLARE[^(]*[(][^)]*[)]([^ ]* )*[^(]+[(]/ { - sub("[ \t]*(AP|DAV)([RU]|_CORE)?_DECLARE[^(]*[(][^)]*[)][ \t]*", "") +/^[ \t]*(AP|DAV|PROXY)([RU]|_CORE)?_DECLARE[^(]*[(][^)]*[)]([^ ]* )*[^(]+[(]/ { + sub("[ \t]*(AP|DAV|PROXY)([RU]|_CORE)?_DECLARE[^(]*[(][^)]*[)][ \t]*", "") sub("[(].*", "") sub("([^ ]* (^([ \t]*[(])))+", "") add_symbol($0)