You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by wr...@apache.org on 2008/06/07 05:13:55 UTC
svn commit: r664254 - in /httpd/httpd/branches/2.2.x: Apache.dsw
BuildBin.dsp Makefile.win
Author: wrowe
Date: Fri Jun 6 20:13:55 2008
New Revision: 664254
URL: http://svn.apache.org/viewvc?rev=664254&view=rev
Log:
Catch up to apr-util-1.3.0, build apr_ldap always, and
conditionally build DBD_LIST members.
Backport: 664253
Modified:
httpd/httpd/branches/2.2.x/Apache.dsw
httpd/httpd/branches/2.2.x/BuildBin.dsp
httpd/httpd/branches/2.2.x/Makefile.win
Modified: httpd/httpd/branches/2.2.x/Apache.dsw
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/Apache.dsw?rev=664254&r1=664253&r2=664254&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/Apache.dsw (original)
+++ httpd/httpd/branches/2.2.x/Apache.dsw Fri Jun 6 20:13:55 2008
@@ -87,12 +87,18 @@
Project_Dep_Name ApacheMonitor
End Project Dependency
Begin Project Dependency
+ Project_Dep_Name apr_ldap
+ End Project Dependency
+ Begin Project Dependency
Project_Dep_Name libapriconv_ces_modules
End Project Dependency
Begin Project Dependency
Project_Dep_Name libapriconv_ccs_modules
End Project Dependency
Begin Project Dependency
+ Project_Dep_Name apr_ldap
+ End Project Dependency
+ Begin Project Dependency
Project_Dep_Name mod_actions
End Project Dependency
Begin Project Dependency
@@ -396,6 +402,132 @@
###############################################################################
+Project: "apr_dbd_freetds"=".\srclib\apr-util\dbd\apr_dbd_freetds.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+ Begin Project Dependency
+ Project_Dep_Name libapr
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name libaprutil
+ End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "apr_dbd_mysql"=".\srclib\apr-util\dbd\apr_dbd_mysql.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+ Begin Project Dependency
+ Project_Dep_Name libapr
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name libaprutil
+ End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "apr_dbd_oracle"=".\srclib\apr-util\dbd\apr_dbd_oracle.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+ Begin Project Dependency
+ Project_Dep_Name libapr
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name libaprutil
+ End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "apr_dbd_pgsql"=".\srclib\apr-util\dbd\apr_dbd_pgsql.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+ Begin Project Dependency
+ Project_Dep_Name libapr
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name libaprutil
+ End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "apr_dbd_sqlite2"=".\srclib\apr-util\dbd\apr_dbd_sqlite2.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+ Begin Project Dependency
+ Project_Dep_Name libapr
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name libaprutil
+ End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "apr_dbd_sqlite3"=".\srclib\apr-util\dbd\apr_dbd_sqlite3.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+ Begin Project Dependency
+ Project_Dep_Name libapr
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name libaprutil
+ End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "apr_ldap"=".\srclib\apr-util\ldap\apr_ldap.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+ Begin Project Dependency
+ Project_Dep_Name libapr
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name libaprutil
+ End Project Dependency
+}}}
+
+###############################################################################
+
Project: "dftables"=.\srclib\pcre\dftables.dsp - Package Owner=<4>
Package=<5>
Modified: httpd/httpd/branches/2.2.x/BuildBin.dsp
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/BuildBin.dsp?rev=664254&r1=664253&r2=664254&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/BuildBin.dsp (original)
+++ httpd/httpd/branches/2.2.x/BuildBin.dsp Fri Jun 6 20:13:55 2008
@@ -39,7 +39,7 @@
# PROP Use_Debug_Libraries 0
# PROP Output_Dir ""
# PROP Intermediate_Dir ""
-# PROP Cmd_Line "NMAKE /f makefile.win INSTDIR="\Apache2" LONG=Release _tryssl _tryzlib _dummy"
+# PROP Cmd_Line "NMAKE /f makefile.win INSTDIR="\Apache2" LONG=Release _trydbd _tryssl _tryzlib _dummy"
# PROP Rebuild_Opt ""
# PROP Target_File "\Apache2\bin\httpd.exe"
# PROP Bsc_Name ".\Browse\httpd.bsc"
@@ -58,7 +58,7 @@
# PROP Use_Debug_Libraries 1
# PROP Output_Dir ""
# PROP Intermediate_Dir ""
-# PROP Cmd_Line "NMAKE /f makefile.win INSTDIR="\Apache2" LONG=Debug _tryssl _tryzlib _dummy"
+# PROP Cmd_Line "NMAKE /f makefile.win INSTDIR="\Apache2" LONG=Debug _trydbd _tryssl _tryzlib _dummy"
# PROP Rebuild_Opt ""
# PROP Target_File "\Apache2\bin\httpd.exe"
# PROP Bsc_Name ".\Browse\httpd.bsc"
Modified: httpd/httpd/branches/2.2.x/Makefile.win
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/Makefile.win?rev=664254&r1=664253&r2=664254&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/Makefile.win (original)
+++ httpd/httpd/branches/2.2.x/Makefile.win Fri Jun 6 20:13:55 2008
@@ -22,6 +22,12 @@
#
# ALL (unset) Includes additional modules for build testing
#
+# Provide a DBD_LIST argument after configuring LIB and INCLUDE with
+# the SDK paths of the corresponding client support libraries.
+# Note that at this time, none of these are supported on win32, per say.
+#
+# DBD_LIST="sqlite3 pgsql oracle mysql freetds"
+#
# For example;
#
# nmake -f Makefile.win PORT=80 INSTDIR="d:\Program Files\Apache" installr
@@ -123,6 +129,36 @@
!ENDIF
+
+!IFDEF DBD_LIST
+
+_trydbd:
+!IF $(USEMAK) == 1
+ cd srclib\apr-util\dbd & \
+ for %d in ($(DBD_LIST)) do \
+ $(MAKE) $(MAKEOPT) -f apr_dbd_%d.mak CFG="apr_dbd_%d - $(LONG)" RECURSE=0 $(CTARGET)
+ cd ..
+
+!ELSEIF $(USESLN) == 1
+ for %d in ($(DBD_LIST)) do \
+ devenv Apache.sln /useenv $(CTARGET) $(LONG) /project apr_dbd_%d
+!ELSE
+ @for %d in ($(DBD_LIST)) do \
+ msdev Apache.dsw /USEENV /MAKE \
+ "apr_dbd_%d - Win32 $(LONG)" /NORECURSE $(CTARGET)
+!ENDIF
+
+!ELSE
+# no DBD_LIST
+
+_trydbd:
+ @echo -----
+ @echo apr_dbd drivers will not build unless DBD_LIST is set to the list
+ @echo of all the client modules available in the LIB and INCLUDE path.
+
+!ENDIF
+
+
!IF "$(INSTDIR)" == ""
INSTDIR=\Apache22
!ENDIF
@@ -229,7 +265,9 @@
cd ..\..\..
$(MAKE) $(MAKEOPT) -f aprutil.mak CFG="aprutil - Win32 $(LONG)" RECURSE=0 $(CTARGET)
$(MAKE) $(MAKEOPT) -f libaprutil.mak CFG="libaprutil - Win32 $(LONG)" RECURSE=0 $(CTARGET)
- cd ..\..
+ cd ldap
+ $(MAKE) $(MAKEOPT) -f apr_ldap.mak CFG="apr_ldap - $(ARCH)" RECURSE=0 $(CTARGET)
+ cd ..\..\..
cd srclib\pcre
$(MAKE) $(MAKEOPT) -f dftables.mak CFG="dftables - Win32 $(LONG)" RECURSE=0 $(CTARGET)
$(MAKE) $(MAKEOPT) -f pcre.mak CFG="pcre - Win32 $(LONG)" RECURSE=0 $(CTARGET)
@@ -443,6 +481,12 @@
copy srclib\apr\$(LONG)\libapr-1.$(src_dll) "$(inst_dll)" <.y
copy srclib\apr-iconv\$(LONG)\libapriconv-1.$(src_dll) "$(inst_dll)" <.y
copy srclib\apr-util\$(LONG)\libaprutil-1.$(src_dll) "$(inst_dll)" <.y
+ copy srclib\apr-util\ldap\$(LONG)\apr_ldap-1.$(src_dll) "$(inst_dll)" <.y
+!IFDEF DBD_LIST
+ for %d in ($(DBD_LIST)) do ( \
+ copy srclib\apr-util\dbd\$(LONG)\apr_dbd_%d-1.$(src_dll) "$(inst_dll)" <.y && \
+ )
+!ENDIF
!IF EXIST("srclib\zlib\zlib1.$(src_dll)")
copy srclib\zlib\zlib1.$(src_dll) "$(inst_dll)" <.y
!ENDIF