Return-Path: Delivered-To: apmail-apr-commits-archive@www.apache.org Received: (qmail 1258 invoked from network); 21 Jun 2006 23:09:43 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 21 Jun 2006 23:09:43 -0000 Received: (qmail 34936 invoked by uid 500); 21 Jun 2006 23:09:42 -0000 Delivered-To: apmail-apr-commits-archive@apr.apache.org Received: (qmail 34902 invoked by uid 500); 21 Jun 2006 23:09:42 -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 34891 invoked by uid 99); 21 Jun 2006 23:09:42 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 21 Jun 2006 16:09:42 -0700 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received-SPF: pass (asf.osuosl.org: local policy) Received: from [140.211.166.113] (HELO eris.apache.org) (140.211.166.113) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 21 Jun 2006 16:09:41 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id DF9B91A9842; Wed, 21 Jun 2006 16:09:21 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r416161 - in /apr/apr-iconv/branches/0.9.x: build/modules.mk.win libapriconv.dsp Date: Wed, 21 Jun 2006 23:09:21 -0000 To: commits@apr.apache.org From: wrowe@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20060621230921.DF9B91A9842@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: wrowe Date: Wed Jun 21 16:09:21 2006 New Revision: 416161 URL: http://svn.apache.org/viewvc?rev=416161&view=rev Log: Merge VS2005 .manifest files to their .dll/.so objects. Backports: 416160 Modified: apr/apr-iconv/branches/0.9.x/build/modules.mk.win apr/apr-iconv/branches/0.9.x/libapriconv.dsp Modified: apr/apr-iconv/branches/0.9.x/build/modules.mk.win URL: http://svn.apache.org/viewvc/apr/apr-iconv/branches/0.9.x/build/modules.mk.win?rev=416161&r1=416160&r2=416161&view=diff ============================================================================== --- apr/apr-iconv/branches/0.9.x/build/modules.mk.win (original) +++ apr/apr-iconv/branches/0.9.x/build/modules.mk.win Wed Jun 21 16:09:21 2006 @@ -98,6 +98,7 @@ /base:@"..\build\BaseAddr.ref",$(@F) \ "$(API_LIB_PFX)apriconv.lib" "$(APR_LIB_PFX)apr.lib" \ kernel32.lib advapi32.lib ws2_32.lib mswsock.lib + if exist $@.manifest mt.exe -manifest $@.manifest -outputresource:$@;2 $(SILENT)echo. $(SILENT)del "$*.exp" $(SILENT)del "$*.lib" Modified: apr/apr-iconv/branches/0.9.x/libapriconv.dsp URL: http://svn.apache.org/viewvc/apr/apr-iconv/branches/0.9.x/libapriconv.dsp?rev=416161&r1=416160&r2=416161&view=diff ============================================================================== --- apr/apr-iconv/branches/0.9.x/libapriconv.dsp (original) +++ apr/apr-iconv/branches/0.9.x/libapriconv.dsp Wed Jun 21 16:09:21 2006 @@ -54,6 +54,12 @@ LINK32=link.exe # ADD BASE LINK32 kernel32.lib advapi32.lib /nologo /base:"0x6EE50000" /subsystem:windows /dll /incremental:no /debug /machine:I386 /opt:ref # ADD LINK32 kernel32.lib advapi32.lib /nologo /base:"0x6EE50000" /subsystem:windows /dll /incremental:no /debug /machine:I386 /opt:ref +# Begin Special Build Tool +OutDir=.\Release +SOURCE="$(InputPath)" +PostBuild_Desc=Embed .manifest +PostBuild_Cmds=if exist $(OUTDIR)\libapriconv.dll.manifest mt.exe -manifest $(OUTDIR)\libapriconv.dll.manifest -outputresource:$(OUTDIR)\libapriconv.dll;2 +# End Special Build Tool !ELSEIF "$(CFG)" == "libapriconv - Win32 Debug" @@ -80,6 +86,12 @@ LINK32=link.exe # ADD BASE LINK32 kernel32.lib advapi32.lib /nologo /base:"0x6EE50000" /subsystem:windows /dll /incremental:no /debug /machine:I386 # ADD LINK32 kernel32.lib advapi32.lib /nologo /base:"0x6EE50000" /subsystem:windows /dll /incremental:no /debug /machine:I386 +# Begin Special Build Tool +OutDir=.\Release +SOURCE="$(InputPath)" +PostBuild_Desc=Embed .manifest +PostBuild_Cmds=if exist $(OUTDIR)\libapriconv.dll.manifest mt.exe -manifest $(OUTDIR)\libapriconv.dll.manifest -outputresource:$(OUTDIR)\libapriconv.dll;2 +# End Special Build Tool !ENDIF