apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wr...@apache.org
Subject svn commit: r720092 - in /apr/apr-util/branches/1.3.x: Makefile.win aprutil.dsw dbm/apr_dbm_db.dsp dbm/apr_dbm_gdbm.dsp libaprutil.dsp test/testall.dsw
Date Mon, 24 Nov 2008 01:33:40 GMT
Author: wrowe
Date: Sun Nov 23 17:33:39 2008
New Revision: 720092

URL: http://svn.apache.org/viewvc?rev=720092&view=rev
Log:
Win32 build schema for DBM_LIST, at the moment including only
berkeley (db) and gdbm.  Unsure of the lib binding for gdbm,
so substituted libgdbm.lib for that library name.

Overlaps the load baseaddr's of dbd_freetds (duplicates dbd_odbc)
and dbd_sqlite2 (dbd_sqlite3 is the expected implementation).

Backports: 720090

Added:
    apr/apr-util/branches/1.3.x/dbm/apr_dbm_db.dsp
      - copied unchanged from r720090, apr/apr-util/trunk/dbm/apr_dbm_db.dsp
    apr/apr-util/branches/1.3.x/dbm/apr_dbm_gdbm.dsp
      - copied unchanged from r720090, apr/apr-util/trunk/dbm/apr_dbm_gdbm.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/libaprutil.dsp
    apr/apr-util/branches/1.3.x/test/testall.dsw

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=720092&r1=720091&r2=720092&view=diff
==============================================================================
--- apr/apr-util/branches/1.3.x/Makefile.win (original)
+++ apr/apr-util/branches/1.3.x/Makefile.win Sun Nov 23 17:33:39 2008
@@ -39,6 +39,13 @@
 #
 #     DBD_LIST="sqlite3 pgsql oracle mysql freetds"
 #
+# Provide a DBM_LIST argument after configuring LIB and INCLUDE with
+# the SDK paths of the corresponding database support libraries.  Right
+# now only db has been configured, gdbm and ndbm require additional study.
+# Note that at this time, none of these are supported on win32, per say.
+#
+#     DBM_LIST="db gdbm"
+#
 # For example;
 #
 #   nmake -f Makefile.win PREFIX=C:\APR buildall checkall installall clean
@@ -78,6 +85,7 @@
 !MESSAGE APU_PATH    = $(APU_PATH)  (apr-util)
 !MESSAGE PREFIX      = $(PREFIX)  (install path)
 !MESSAGE DBD_LIST    = $(DBD_LIST)
+!MESSAGE DBM_LIST    = $(DBM_LIST)
 
 # Utility and Translation things, nothing here for the user
 #
@@ -195,12 +203,18 @@
 	  for %d in (odbc $(DBD_LIST)) do \
 	    $(MAKE) $(MAKEOPT) -f apr_dbd_%d.mak CFG="apr_dbd_%d - $(ARCH)" RECURSE=0 $(CTARGET)
 	cd ..
+	cd dbm
+	  for %d in ($(DBM_LIST)) do \
+	    $(MAKE) $(MAKEOPT) -f apr_dbm_%d.mak CFG="apr_dbm_%d - $(ARCH)" RECURSE=0 $(CTARGET)
+	cd ..
 
 !ELSEIF $(USESLN) == 1
 
 clean:
 	-for %d in (odbc $(DBD_LIST)) do \
 	  devenv aprutil.sln /useenv /clean "$(SLNARCH)" /project apr_dbd_%d
+	-for %d in ($(DBM_LIST)) do \
+	  devenv aprutil.sln /useenv /clean "$(SLNARCH)" /project apr_dbm_%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
@@ -223,6 +237,8 @@
 	devenv aprutil.sln /useenv /build "$(SLNARCH)" /project apr_ldap
 	for %d in (odbc $(DBD_LIST)) do \
 	  devenv aprutil.sln /useenv /build "$(SLNARCH)" /project apr_dbd_%d
+	for %d in ($(DBM_LIST)) do \
+	  devenv aprutil.sln /useenv /build "$(SLNARCH)" /project apr_dbm_%d
 
 !ELSE
 #	$(USEDSP) == 1
@@ -230,6 +246,8 @@
 clean:
 	-for %d in (odbc $(DBD_LIST)) do \
 	  msdev aprutil.dsw /USEENV /MAKE "apr_dbd_%d - $(ARCH)" /CLEAN
+	-for %d in ($(DBM_LIST)) do \
+	  msdev aprutil.dsw /USEENV /MAKE "apr_dbm_%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
@@ -252,6 +270,8 @@
 	@msdev aprutil.dsw /USEENV /MAKE "apr_ldap - $(ARCH)"
 	@for %d in (odbc $(DBD_LIST)) do \
 	  msdev aprutil.dsw /USEENV /MAKE "apr_dbd_%d - $(ARCH)"
+	@for %d in ($(DBM_LIST)) do \
+	  msdev aprutil.dsw /USEENV /MAKE "apr_dbm_%d - $(ARCH)"
 
 !ENDIF
 
@@ -312,6 +332,10 @@
 	  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 \
 	)
+	for %d in ($(DBM_LIST)) do ( \
+	  copy $(APU_PATH)\dbm\$(ARCHPATH)\apr_dbm_%d-1.dll "$(PREFIX)\bin\" <.y && \
+	  copy $(APU_PATH)\dbm\$(ARCHPATH)\apr_dbm_%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

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=720092&r1=720091&r2=720092&view=diff
==============================================================================
--- apr/apr-util/branches/1.3.x/aprutil.dsw (original)
+++ apr/apr-util/branches/1.3.x/aprutil.dsw Sun Nov 23 17:33:39 2008
@@ -156,6 +156,42 @@
 
 ###############################################################################
 
+Project: "apr_dbm_db"=".\dbm\apr_dbm_db.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_dbm_gdbm"=".\dbm\apr_dbm_gdbm.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/libaprutil.dsp
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.3.x/libaprutil.dsp?rev=720092&r1=720091&r2=720092&view=diff
==============================================================================
--- apr/apr-util/branches/1.3.x/libaprutil.dsp (original)
+++ apr/apr-util/branches/1.3.x/libaprutil.dsp Sun Nov 23 17:33:39 2008
@@ -302,10 +302,12 @@
 # Begin Source File
 
 SOURCE=.\dbm\apr_dbm_berkeleydb.c
+# PROP Exclude_From_Build 1
 # End Source File
 # Begin Source File
 
 SOURCE=.\dbm\apr_dbm_gdbm.c
+# PROP Exclude_From_Build 1
 # End Source File
 # Begin Source File
 

Modified: apr/apr-util/branches/1.3.x/test/testall.dsw
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.3.x/test/testall.dsw?rev=720092&r1=720091&r2=720092&view=diff
==============================================================================
--- apr/apr-util/branches/1.3.x/test/testall.dsw (original)
+++ apr/apr-util/branches/1.3.x/test/testall.dsw Sun Nov 23 17:33:39 2008
@@ -156,6 +156,42 @@
 
 ###############################################################################
 
+Project: "apr_dbm_db"="..\dbm\apr_dbm_db.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+    Begin Project Dependency
+    Project_Dep_Name libaprutil
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name libapr
+    End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "apr_dbm_gdbm"="..\dbm\apr_dbm_gdbm.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+    Begin Project Dependency
+    Project_Dep_Name libaprutil
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name libapr
+    End Project Dependency
+}}}
+
+###############################################################################
+
 Project: "apr_ldap"="..\ldap\apr_ldap.dsp" - Package Owner=<4>
 
 Package=<5>



Mime
View raw message