Return-Path: Delivered-To: apmail-apr-commits-archive@www.apache.org Received: (qmail 1355 invoked from network); 17 Jul 2009 15:16:42 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 17 Jul 2009 15:16:42 -0000 Received: (qmail 82631 invoked by uid 500); 17 Jul 2009 15:17:47 -0000 Delivered-To: apmail-apr-commits-archive@apr.apache.org Received: (qmail 82559 invoked by uid 500); 17 Jul 2009 15:17:47 -0000 Mailing-List: contact commits-help@apr.apache.org; run by ezmlm Precedence: bulk List-Post: List-Help: List-Unsubscribe: Reply-To: dev@apr.apache.org List-Id: Delivered-To: mailing list commits@apr.apache.org Received: (qmail 82550 invoked by uid 99); 17 Jul 2009 15:17:47 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 17 Jul 2009 15:17:47 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.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; Fri, 17 Jul 2009 15:17:45 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 2F5A223888D9; Fri, 17 Jul 2009 15:17:25 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r795110 - in /apr/apr/branches/1.4.x/build: NWGNUmakefile NWGNUtail.inc make_nw_export.awk Date: Fri, 17 Jul 2009 15:17:24 -0000 To: commits@apr.apache.org From: fuankg@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090717151725.2F5A223888D9@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: fuankg Date: Fri Jul 17 15:17:22 2009 New Revision: 795110 URL: http://svn.apache.org/viewvc?rev=795110&view=rev Log: bachkport fix for Netware exports prefixing. Modified: apr/apr/branches/1.4.x/build/NWGNUmakefile apr/apr/branches/1.4.x/build/NWGNUtail.inc apr/apr/branches/1.4.x/build/make_nw_export.awk Modified: apr/apr/branches/1.4.x/build/NWGNUmakefile URL: http://svn.apache.org/viewvc/apr/apr/branches/1.4.x/build/NWGNUmakefile?rev=795110&r1=795109&r2=795110&view=diff ============================================================================== --- apr/apr/branches/1.4.x/build/NWGNUmakefile (original) +++ apr/apr/branches/1.4.x/build/NWGNUmakefile Fri Jul 17 15:17:22 2009 @@ -30,7 +30,7 @@ $(APR)/aprlib.imp : make_nw_export.awk nw_export.i @echo Generating $(subst /,\,$@) - awk -f make_nw_export.awk nw_export.i | sort >$(APR)/aprlib.imp + $(AWK) -v EXPPREFIX=APR$(VERSION_MAJMIN) -f $^ | sort >$@ nw_export.i : nw_export.inc $(APRUTIL)/build/nw_apu_export.inc $(FILES_prebuild_headers) $(NLM_NAME)_cc.opt @echo Generating $(subst /,\,$@) @@ -55,27 +55,27 @@ $(APR)/include/%.h: $(subst /,\,$(APR))\include\%.hnw @echo Creating $(subst /,\,$@) - copy $< $(subst /,\,$(APR))\include\$(@F) + $(CP) $< $(subst /,\,$(APR))\include\$(@F) $(APRUTIL)/include/private/%.h: $(subst /,\,$(APRUTIL))\include\private\%.hnw @echo Creating $(subst /,\,$@) - copy $< $(subst /,\,$(APRUTIL))\include\private\$(@F) + $(CP) $< $(subst /,\,$(APRUTIL))\include\private\$(@F) $(APRUTIL)/include/private/%.h: $(subst /,\,$(APRUTIL))\include\private\%.hw @echo Creating $(subst /,\,$@) - copy $< $(subst /,\,$(APRUTIL))\include\private\$(@F) + $(CP) $< $(subst /,\,$(APRUTIL))\include\private\$(@F) $(APRUTIL)/include/%.h: $(subst /,\,$(APRUTIL))\include\%.hnw @echo Creating $(subst /,\,$@) - copy $< $(subst /,\,$(APRUTIL))\include\$(@F) + $(CP) $< $(subst /,\,$(APRUTIL))\include\$(@F) $(APRUTIL)/xml/expat/lib/%.h: $(subst /,\,$(APRUTIL))\xml\expat\lib\%.hnw @echo Creating $(subst /,\,$@) - copy $< $(subst /,\,$(APRUTIL))\xml\expat\lib\$(@F) + $(CP) $< $(subst /,\,$(APRUTIL))\xml\expat\lib\$(@F) $(APRUTIL)/xml/expat/lib/%.h: $(subst /,\,$(APRUTIL))\xml\expat\lib\%.h.in @echo Creating $(subst /,\,$@) - copy $< $(subst /,\,$(APRUTIL))\xml\expat\lib\$(@F) + $(CP) $< $(subst /,\,$(APRUTIL))\xml\expat\lib\$(@F) # # You can use this target if all that is needed is to copy files to the Modified: apr/apr/branches/1.4.x/build/NWGNUtail.inc URL: http://svn.apache.org/viewvc/apr/apr/branches/1.4.x/build/NWGNUtail.inc?rev=795110&r1=795109&r2=795110&view=diff ============================================================================== --- apr/apr/branches/1.4.x/build/NWGNUtail.inc (original) +++ apr/apr/branches/1.4.x/build/NWGNUtail.inc Fri Jul 17 15:17:22 2009 @@ -93,8 +93,9 @@ ifneq "$(strip $(VERSION_STR))" "" VERSION_INC = $(APR_WORK)\build\NWGNUversion.inc else -VERSION = 1,0,0 -VERSION_STR = 1.0.0 +VERSION = 1,4,0 +VERSION_STR = 1.4.0 +VERSION_MAJMIN = 14 endif endif Modified: apr/apr/branches/1.4.x/build/make_nw_export.awk URL: http://svn.apache.org/viewvc/apr/apr/branches/1.4.x/build/make_nw_export.awk?rev=795110&r1=795109&r2=795110&view=diff ============================================================================== --- apr/apr/branches/1.4.x/build/make_nw_export.awk (original) +++ apr/apr/branches/1.4.x/build/make_nw_export.awk Fri Jul 17 15:17:22 2009 @@ -2,7 +2,7 @@ # based on Ryan Bloom's make_export.pl BEGIN { - printf(" (APRLIB)\n") + printf(" ("EXPPREFIX")\n") } # List of functions that we don't support, yet??