Return-Path: Delivered-To: apmail-apr-commits-archive@www.apache.org Received: (qmail 33345 invoked from network); 30 May 2008 20:54:52 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 30 May 2008 20:54:52 -0000 Received: (qmail 80723 invoked by uid 500); 30 May 2008 20:54:54 -0000 Delivered-To: apmail-apr-commits-archive@apr.apache.org Received: (qmail 80684 invoked by uid 500); 30 May 2008 20:54:54 -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 80672 invoked by uid 99); 30 May 2008 20:54:54 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 30 May 2008 13:54:54 -0700 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, 30 May 2008 20:54:14 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 2EC972388A22; Fri, 30 May 2008 13:54:31 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r661849 - /apr/apr-util/branches/1.3.x/Makefile.win Date: Fri, 30 May 2008 20:54:31 -0000 To: commits@apr.apache.org From: wrowe@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080530205431.2EC972388A22@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: wrowe Date: Fri May 30 13:54:30 2008 New Revision: 661849 URL: http://svn.apache.org/viewvc?rev=661849&view=rev Log: Round out the DBD_LIST build schema. Backports: r661848 Modified: apr/apr-util/branches/1.3.x/Makefile.win Modified: apr/apr-util/branches/1.3.x/Makefile.win URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.3.x/Makefile.win?rev=661849&r1=661848&r2=661849&view=diff ============================================================================== --- apr/apr-util/branches/1.3.x/Makefile.win (original) +++ apr/apr-util/branches/1.3.x/Makefile.win Fri May 30 13:54:30 2008 @@ -190,15 +190,21 @@ cd ldap $(MAKE) $(MAKEOPT) -f apr_ldap.mak CFG="apr_ldap - $(ARCH)" RECURSE=0 $(CTARGET) cd .. + cd dbd + for %d in ($(DBD_LIST)) do \ + $(MAKE) $(MAKEOPT) -f apr_dbd_%d.mak CFG="apr_dbd_%d - $(ARCH)" RECURSE=0 $(CTARGET) + cd .. !ELSEIF $(USESLN) == 1 clean: + -for %d in ($(DBD_LIST)) do \ + devenv aprutil.sln /useenv /clean "$(SLNARCH)" /project apr_dbd_%d -devenv aprutil.sln /useenv /clean "$(SLNARCH)" /project apr_ldap -devenv aprutil.sln /useenv /clean "$(SLNARCH)" /project libaprutil -devenv aprutil.sln /useenv /clean "$(SLNARCH)" /project aprutil cd $(API_PATH) - $(MAKE) $(MAKEOPT) -f build\modules.mk.win clean \ + -$(MAKE) $(MAKEOPT) -f build\modules.mk.win clean \ BUILD_MODE="$(ARCH)" BIND_MODE=shared API_SOURCE=. cd $(APU_PATH) -devenv aprutil.sln /useenv /clean "$(SLNARCH)" /project libapriconv @@ -214,13 +220,15 @@ devenv aprutil.sln /useenv /build "$(SLNARCH)" /project aprutil devenv aprutil.sln /useenv /build "$(SLNARCH)" /project libaprutil devenv aprutil.sln /useenv /build "$(SLNARCH)" /project apr_ldap + for %d in ($(DBD_LIST)) do \ + devenv aprutil.sln /useenv /build "$(SLNARCH)" /project apr_dbd_%d !ELSE # $(USEDSP) == 1 clean: - for %d in ($(DBD_LIST)) do \ - -msdev aprutil.dsw /USEENV /MAKE "apr_dbd_%d - $(ARCH)" /CLEAN + -for %d in ($(DBD_LIST)) do \ + msdev aprutil.dsw /USEENV /MAKE "apr_dbd_%d - $(ARCH)" /CLEAN -msdev aprutil.dsw /USEENV /MAKE "apr_ldap - $(ARCH)" /CLEAN -msdev aprutil.dsw /USEENV /MAKE "libaprutil - $(ARCH)" /CLEAN -msdev aprutil.dsw /USEENV /MAKE "aprutil - $(ARCH)" /CLEAN @@ -241,8 +249,8 @@ @msdev aprutil.dsw /USEENV /MAKE "libapr_app - $(ARCH)" @msdev aprutil.dsw /USEENV /MAKE "libaprutil - $(ARCH)" @msdev aprutil.dsw /USEENV /MAKE "apr_ldap - $(ARCH)" - for %d in ($(DBD_LIST)) do \ - @msdev aprutil.dsw /USEENV /MAKE "apr_dbd_%d - $(ARCH)" + @for %d in ($(DBD_LIST)) do \ + msdev aprutil.dsw /USEENV /MAKE "apr_dbd_%d - $(ARCH)" !ENDIF @@ -299,6 +307,10 @@ copy $(APU_PATH)\$(ARCHPATH)\libaprutil-1.pdb "$(PREFIX)\bin\" <.y copy $(APU_PATH)\ldap\$(ARCHPATH)\apr_ldap-1.dll "$(PREFIX)\bin\" <.y copy $(APU_PATH)\ldap\$(ARCHPATH)\apr_ldap-1.pdb "$(PREFIX)\bin\" <.y + for %d in ($(DBD_LIST)) do ( \ + copy $(APU_PATH)\dbd\$(ARCHPATH)\apr_dbd_%d-1.dll "$(PREFIX)\bin\" <.y && \ + copy $(APU_PATH)\dbd\$(ARCHPATH)\apr_dbd_%d-1.pdb "$(PREFIX)\bin\" <.y \ + ) xcopy $(API_PATH)\$(ARCHPATH)\iconv\*.so "$(PREFIX)\bin\iconv\" /d < .a xcopy $(API_PATH)\$(ARCHPATH)\iconv\*.pdb "$(PREFIX)\bin\iconv\" /d < .a del .y