apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wr...@apache.org
Subject svn commit: r661846 - in /apr/apr-util/branches/1.3.x: Makefile.win aprutil.dsw dbd/apr_dbd_freetds.dsp dbd/apr_dbd_mysql.dsp dbd/apr_dbd_oracle.dsp dbd/apr_dbd_pgsql.dsp dbd/apr_dbd_sqlite2.dsp dbd/apr_dbd_sqlite3.dsp include/apu.hw libaprutil.dsp
Date Fri, 30 May 2008 20:51:20 GMT
Author: wrowe
Date: Fri May 30 13:51:19 2008
New Revision: 661846

URL: http://svn.apache.org/viewvc?rev=661846&view=rev
Log:
Deploy a win32 build schema to provide Makefile.win
with a DBD_LIST of dso providers.

Added:
    apr/apr-util/branches/1.3.x/dbd/apr_dbd_freetds.dsp
      - copied unchanged from r661845, apr/apr-util/trunk/dbd/apr_dbd_freetds.dsp
    apr/apr-util/branches/1.3.x/dbd/apr_dbd_mysql.dsp
      - copied unchanged from r661845, apr/apr-util/trunk/dbd/apr_dbd_mysql.dsp
    apr/apr-util/branches/1.3.x/dbd/apr_dbd_oracle.dsp
      - copied unchanged from r661845, apr/apr-util/trunk/dbd/apr_dbd_oracle.dsp
    apr/apr-util/branches/1.3.x/dbd/apr_dbd_pgsql.dsp
      - copied unchanged from r661845, apr/apr-util/trunk/dbd/apr_dbd_pgsql.dsp
    apr/apr-util/branches/1.3.x/dbd/apr_dbd_sqlite2.dsp
      - copied unchanged from r661845, apr/apr-util/trunk/dbd/apr_dbd_sqlite2.dsp
    apr/apr-util/branches/1.3.x/dbd/apr_dbd_sqlite3.dsp
      - copied unchanged from r661845, apr/apr-util/trunk/dbd/apr_dbd_sqlite3.dsp
Modified:
    apr/apr-util/branches/1.3.x/Makefile.win
    apr/apr-util/branches/1.3.x/aprutil.dsw
    apr/apr-util/branches/1.3.x/include/apu.hw
    apr/apr-util/branches/1.3.x/libaprutil.dsp

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=661846&r1=661845&r2=661846&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:51:19 2008
@@ -32,6 +32,12 @@
 #     API_PATH=..\apr-iconv-1.3.0
 #     APU_PATH=..\apr-util-1.3.0
 #
+# 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 PREFIX=C:\APR buildall checkall installall clean
@@ -70,7 +76,7 @@
 !MESSAGE API_PATH    = $(API_PATH)  (apr-iconv)
 !MESSAGE APU_PATH    = $(APU_PATH)  (apr-util)
 !MESSAGE PREFIX      = $(PREFIX)  (install path)
-
+!MESSAGE DBD_LIST    = $(DBD_LIST)
 
 # Utility and Translation things, nothing here for the user
 #
@@ -213,6 +219,8 @@
 #	$(USEDSP) == 1
 
 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
@@ -233,6 +241,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)"
 
 !ENDIF
 

Modified: apr/apr-util/branches/1.3.x/aprutil.dsw
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.3.x/aprutil.dsw?rev=661846&r1=661845&r2=661846&view=diff
==============================================================================
--- apr/apr-util/branches/1.3.x/aprutil.dsw (original)
+++ apr/apr-util/branches/1.3.x/aprutil.dsw Fri May 30 13:51:19 2008
@@ -30,6 +30,114 @@
 
 ###############################################################################
 
+Project: "apr_dbd_freetds"=".\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"=".\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"=".\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"=".\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"=".\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"=".\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"=".\ldap\apr_ldap.dsp" - Package Owner=<4>
 
 Package=<5>

Modified: apr/apr-util/branches/1.3.x/include/apu.hw
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.3.x/include/apu.hw?rev=661846&r1=661845&r2=661846&view=diff
==============================================================================
--- apr/apr-util/branches/1.3.x/include/apu.hw (original)
+++ apr/apr-util/branches/1.3.x/include/apu.hw Fri May 30 13:51:19 2008
@@ -108,11 +108,14 @@
 #define APU_HAVE_DB_VERSION     0
 #endif
 
+#ifndef APU_DBD_DSO_BUILD
 #define APU_HAVE_PGSQL          0
 #define APU_HAVE_MYSQL          0
 #define APU_HAVE_SQLITE3        0
 #define APU_HAVE_SQLITE2        0
 #define APU_HAVE_ORACLE         0
+#define APU_HAVE_FREETDS        0
+#endif
 
 #define APU_HAVE_APR_ICONV      1
 #define APU_HAVE_ICONV          0

Modified: apr/apr-util/branches/1.3.x/libaprutil.dsp
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.3.x/libaprutil.dsp?rev=661846&r1=661845&r2=661846&view=diff
==============================================================================
--- apr/apr-util/branches/1.3.x/libaprutil.dsp (original)
+++ apr/apr-util/branches/1.3.x/libaprutil.dsp Fri May 30 13:51:19 2008
@@ -259,26 +259,32 @@
 # Begin Source File
 
 SOURCE=.\dbd\apr_dbd_freetds.c
+# PROP Exclude_From_Build 1
 # End Source File
 # Begin Source File
 
 SOURCE=.\dbd\apr_dbd_mysql.c
+# PROP Exclude_From_Build 1
 # End Source File
 # Begin Source File
 
 SOURCE=.\dbd\apr_dbd_oracle.c
+# PROP Exclude_From_Build 1
 # End Source File
 # Begin Source File
 
 SOURCE=.\dbd\apr_dbd_pgsql.c
+# PROP Exclude_From_Build 1
 # End Source File
 # Begin Source File
 
 SOURCE=.\dbd\apr_dbd_sqlite2.c
+# PROP Exclude_From_Build 1
 # End Source File
 # Begin Source File
 
 SOURCE=.\dbd\apr_dbd_sqlite3.c
+# PROP Exclude_From_Build 1
 # End Source File
 # End Group
 # Begin Group "dbm"



Mime
View raw message