Ticket #366: win32.patch

config.mak

@@ -195 +215 @@
 -DWIN32 -D__WIN32__ -D_WIN32 -D_WINDOWS \
 -D "HAVE_VSNPRINTF" -D "HAVE_STRDUP" -D "_USE_32BIT_TIME_T" \
 -D_CRT_SECURE_NO_DEPRECATE \
--I "$(ZLIB_INCLUDE_DIR)"
+-I"$(ZLIB_INCLUDE_DIR)"
 
 # The various parts of Xapian (but *not* the test suite or treecheck libs)
 XAPIAN_LIBS = \

win32_bindings_python.mak

@@ -81 +87 @@
 CHECK: ALL DOTEST       
 
 DIST: "$(OUTDIR)\$(PYTHON_PACKAGE)" CHECK
-    cd $(MAKEDIR)
+    cd "$(MAKEDIR)"
     copy setup.py "$(OUTDIR)"
     if not exist "$(OUTDIR)\$(PYTHON_PACKAGE)\docs" mkdir "$(OUTDIR)\$(PYTHON_PACKAGE)\docs"
     if not exist "$(OUTDIR)\$(PYTHON_PACKAGE)\docs\examples" mkdir "$(OUTDIR)\$(PYTHON_PACKAGE)\docs\examples"
@@ -101 +107 @@
     if not exist "$(OUTDIR)/$(PYTHON_PACKAGE)/$(NULL)" mkdir "$(OUTDIR)\$(PYTHON_PACKAGE)"
 
 CPP_PROJ=$(CPPFLAGS_EXTRA)  /GR \
- /I "$(XAPIAN_CORE_REL_PYTHON)" /I "$(XAPIAN_CORE_REL_PYTHON)\include" \
- /I "$(PYTHON_INCLUDE)" /I "$(PYTHON_INCLUDE_2)" /I"." \
+ /I"$(XAPIAN_CORE_REL_PYTHON)" /I"$(XAPIAN_CORE_REL_PYTHON)\include" \
+ /I"$(PYTHON_INCLUDE)" /I"$(PYTHON_INCLUDE_2)" /I"." \
  /Fo"$(INTDIR)\\" /Tp$(INPUTNAME)
 CPP_OBJS=$(XAPIAN_CORE_REL_PYTHON)\win32\$(XAPIAN_DEBUG_OR_RELEASE)\
 CPP_SBRS=.
@@ -155 +161 @@
         f.close();"
     $(RSC) /v \
       /fo version.res \
-      /I "$(XAPIAN_CORE_REL_PYTHON)\include" \
+      /I"$(XAPIAN_CORE_REL_PYTHON)\include" \
       version.rc 
 
 

win32_tests.mak

@@ -53 +53 @@
     "$(OUTDIR)\apitest.obj" \
     "$(OUTDIR)\api_anydb.obj" \
     "$(OUTDIR)\api_backend.obj" \
+    "$(INTDIR)\api_closedb.obj" \
+    "$(INTDIR)\api_collapse.obj" \
     "$(OUTDIR)\api_db.obj" \
     "$(OUTDIR)\api_generated.obj" \
     "$(OUTDIR)\api_nodb.obj" \
     "$(OUTDIR)\api_percentages.obj" \
     "$(OUTDIR)\api_posdb.obj" \
     "$(OUTDIR)\api_query.obj" \
+    "$(INTDIR)\api_replicate.obj" \
+    "$(INTDIR)\api_serialise.obj" \
     "$(OUTDIR)\api_sorting.obj" \
     "$(OUTDIR)\api_spelling.obj" \
     "$(OUTDIR)\api_transdb.obj" \
     "$(OUTDIR)\api_unicode.obj" \
+    "$(INTDIR)\api_valuestats.obj" \
+    "$(INTDIR)\api_valuestream.obj" \
     "$(OUTDIR)\api_wrdb.obj" 
     
 INTERNALTEST_OBJS= "$(OUTDIR)\internaltest.obj"
@@ -79 +85 @@
     "$(INTDIR)\apitest.cc" \
     "$(INTDIR)\api_anydb.cc" \
     "$(INTDIR)\api_backend.cc" \
+    "$(INTDIR)\api_closedb.cc" \
+    "$(INTDIR)\api_collapse.cc" \
     "$(INTDIR)\api_db.cc" \
     "$(INTDIR)\api_generated.cc" \
     "$(INTDIR)\api_nodb.cc" \
@@ -91 +99 @@
     "$(INTDIR)\api_spelling.cc" \
     "$(INTDIR)\api_transdb.cc" \
     "$(INTDIR)\api_unicode.cc" \
+    "$(INTDIR)\api_valuestats.cc" \
+    "$(INTDIR)\api_valuestream.cc" \
     "$(INTDIR)\api_wrdb.cc" \
     "$(INTDIR)\btreetest.cc" \
     "$(INTDIR)\internaltest.cc" \

win32_testsuite.mak

@@ -27 +27 @@
         $(INTDIR)\backendmanager_remote.obj \
         $(INTDIR)\backendmanager_remoteprog.obj \
         $(INTDIR)\backendmanager_remotetcp.obj \
+        $(INTDIR)\cputimer.obj \
         $(INTDIR)\index_utils.obj \
         $(INTDIR)\unixcmds.obj
 
@@ -42 +43 @@
         $(INTDIR)\backendmanager_remote.cc \
         $(INTDIR)\backendmanager_remoteprog.cc \
         $(INTDIR)\backendmanager_remotetcp.cc \
+        $(INTDIR)\cputimer.cc \
         $(INTDIR)\index_utils.cc \
         $(INTDIR)\unixcmds.cc