You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apr.apache.org by wr...@apache.org on 2008/05/30 22:54:04 UTC
svn commit: r661848 - /apr/apr-util/trunk/Makefile.win
Author: wrowe
Date: Fri May 30 13:54:04 2008
New Revision: 661848
URL: http://svn.apache.org/viewvc?rev=661848&view=rev
Log:
Round out the DBD_LIST build schema
Modified:
apr/apr-util/trunk/Makefile.win
Modified: apr/apr-util/trunk/Makefile.win
URL: http://svn.apache.org/viewvc/apr/apr-util/trunk/Makefile.win?rev=661848&r1=661847&r2=661848&view=diff
==============================================================================
--- apr/apr-util/trunk/Makefile.win (original)
+++ apr/apr-util/trunk/Makefile.win Fri May 30 13:54:04 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 "libaprapp - $(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