[Xapian-devel] Latest patches for win32 build files

[Charlie Hull]

Hi all,

Some small patches are attached for the Win32 build files. Also, 
currently it's failing a test on some of the new stuff:
...
Running test: spell1... ok
Running test: spell2... ok
Running test: spell3....flint\dbw\flintlock - The process cannot access 
the file because it is being used by another process.
.flint\dbw\postlist.DB - The process cannot access the file because it 
is being used by another process.
.flint\dbw\record.DB - The process cannot access the file because it is 
being used by another process.
.flint\dbw\termlist.DB - The process cannot access the file because it 
is being used by another process.
  DatabaseLockErrorDatabaseLockError: Unable to acquire database write 
lock on .flint/dbw
Running test: spell4... ok
...

Cheers

Charlie
-------------- next part --------------
Index: win32_api.mak
===================================================================
--- win32_api.mak	(revision 9118)
+++ win32_api.mak	(working copy)
@@ -31,7 +31,9 @@
              $(INTDIR)\termlist.obj \
              $(INTDIR)\valuerangeproc.obj \
 	     $(INTDIR)\version.obj \
-	     $(INTDIR)\editdistance.obj
+	     $(INTDIR)\editdistance.obj \
+	     $(INTDIR)\valuerangeproccompat.obj \
+	     $(INTDIR)\matchspy.obj 
 SRCS= \
              $(INTDIR)\error.cc \
              $(INTDIR)\errorhandler.cc \
@@ -48,7 +50,9 @@
              $(INTDIR)\termlist.cc \
              $(INTDIR)\valuerangeproc.cc \
 	     $(INTDIR)\version.cc \
-	     $(INTDIR)\editdistance.cc
+	     $(INTDIR)\editdistance.cc  \
+	     $(INTDIR)\valuerangeproccompat.cc \
+	     $(INTDIR)\matchspy.cc 
 
 	     
 CLEAN :
Index: win32_applications_omega.mak
===================================================================
--- win32_applications_omega.mak	(revision 9118)
+++ win32_applications_omega.mak	(working copy)
@@ -66,7 +66,8 @@
  	"$(OUTDIR)\utf8convert.obj" \
 	"$(OUTDIR)\sample.obj" \
 	"$(OUTDIR)\mkdtemp.obj" \
-	"$(OUTDIR)\dirent.obj" 
+	"$(OUTDIR)\dirent.obj" \
+	"$(OUTDIR)\diritor.obj"
 	
 	
 SCRIPTINDEX_OBJS= \
@@ -96,53 +97,54 @@
 
 
 SRCS= \
-	"$(OUTDIR)\omega.cc" \
-	"$(OUTDIR)\query.cc" \
-	"$(OUTDIR)\cgiparam.cc" \
-	"$(OUTDIR)\utils.cc" \
-	"$(OUTDIR)\configfile.cc" \
-	"$(OUTDIR)\date.cc" \
-	"$(OUTDIR)\cdb_init.cc" \
-	"$(OUTDIR)\cdb_find.cc" \
-	"$(OUTDIR)\cdb_hash.cc" \
-	"$(OUTDIR)\cdb_unpack.cc" \
- 	"$(OUTDIR)\loadfile.cc" \
- 	"$(OUTDIR)\utf8convert.cc" \
- 	"$(OUTDIR)\datematchdecider.cc" 
-	"$(OUTDIR)\omindex.cc" \
-	"$(OUTDIR)\myhtmlparse.cc" \
-	"$(OUTDIR)\htmlparse.cc" \
-	"$(OUTDIR)\getopt.cc" \
-	"$(OUTDIR)\commonhelp.cc" \
-	"$(OUTDIR)\utils.cc" \
-	"$(OUTDIR)\hashterm.cc" \
- 	"$(OUTDIR)\loadfile.cc" \
- 	"$(OUTDIR)\md5.cc" \
- 	"$(OUTDIR)\md5wrap.cc" \
- 	"$(OUTDIR)\xmlparse.cc" \
- 	"$(OUTDIR)\metaxmlparse.cc" \
- 	"$(OUTDIR)\utf8convert.cc" \
-	"$(OUTDIR)\sample.cc" \
-	"$(OUTDIR)\mkdtemp.cc" \
-	"$(OUTDIR)\dirent.cc" 
-	"$(OUTDIR)\scriptindex.cc" \
-	"$(OUTDIR)\myhtmlparse.cc" \
-	"$(OUTDIR)\htmlparse.cc" \
-	"$(OUTDIR)\getopt.cc" \
-	"$(OUTDIR)\commonhelp.cc" \
-	"$(OUTDIR)\utils.cc" \
-	"$(OUTDIR)\hashterm.cc" \
-	"$(OUTDIR)\loadfile.cc" \
-	"$(OUTDIR)\safe.cc" \
-	"$(OUTDIR)\utf8convert.cc" \
-	"$(OUTDIR)\utf8truncate.cc" 
- 	"$(OUTDIR)\htmlparsetest.cc" \
-	"$(OUTDIR)\myhtmlparse.cc" \
- 	"$(OUTDIR)\htmlparse.cc" \
-	"$(OUTDIR)\utf8convert.cc" 
- 	"$(OUTDIR)\md5.cc" \
- 	"$(OUTDIR)\md5wrap.cc" \
- 	"$(OUTDIR)\md5test.cc" 
+	"$(INTDIR)\omega.cc" \
+	"$(INTDIR)\query.cc" \
+	"$(INTDIR)\cgiparam.cc" \
+	"$(INTDIR)\utils.cc" \
+	"$(INTDIR)\configfile.cc" \
+	"$(INTDIR)\date.cc" \
+	"$(INTDIR)\cdb_init.cc" \
+	"$(INTDIR)\cdb_find.cc" \
+	"$(INTDIR)\cdb_hash.cc" \
+	"$(INTDIR)\cdb_unpack.cc" \
+ 	"$(INTDIR)\loadfile.cc" \
+ 	"$(INTDIR)\utf8convert.cc" \
+ 	"$(INTDIR)\datematchdecider.cc" \
+	"$(INTDIR)\omindex.cc" \
+	"$(INTDIR)\myhtmlparse.cc" \
+	"$(INTDIR)\htmlparse.cc" \
+	"$(INTDIR)\common\getopt.cc" \
+	"$(INTDIR)\commonhelp.cc" \
+	"$(INTDIR)\utils.cc" \
+	"$(INTDIR)\hashterm.cc" \
+ 	"$(INTDIR)\loadfile.cc" \
+ 	"$(INTDIR)\md5.cc" \
+ 	"$(INTDIR)\md5wrap.cc" \
+ 	"$(INTDIR)\xmlparse.cc" \
+ 	"$(INTDIR)\metaxmlparse.cc" \
+ 	"$(INTDIR)\utf8convert.cc" \
+	"$(INTDIR)\sample.cc" \
+	"$(INTDIR)\portability\mkdtemp.cc" \
+	"$(INTDIR)\dirent.cc" \
+	"$(INTDIR)\scriptindex.cc" \
+	"$(INTDIR)\myhtmlparse.cc" \
+	"$(INTDIR)\htmlparse.cc" \
+	"$(INTDIR)\getopt.cc" \
+	"$(INTDIR)\commonhelp.cc" \
+	"$(INTDIR)\utils.cc" \
+	"$(INTDIR)\hashterm.cc" \
+	"$(INTDIR)\loadfile.cc" \
+	"$(INTDIR)\common\safe.cc" \
+	"$(INTDIR)\utf8convert.cc" \
+	"$(INTDIR)\utf8truncate.cc" \
+ 	"$(INTDIR)\htmlparsetest.cc" \
+	"$(INTDIR)\myhtmlparse.cc" \
+ 	"$(INTDIR)\htmlparse.cc" \
+	"$(INTDIR)\utf8convert.cc" \
+ 	"$(INTDIR)\md5.cc" \
+ 	"$(INTDIR)\md5wrap.cc" \
+ 	"$(INTDIR)\md5test.cc" \
+	"$(INTDIR)\diritor.cc" 
 	
 CLEAN :
 	- at erase $(PROGRAMS)
@@ -223,37 +225,17 @@
 <<
 
 # inference rules, showing how to create one type of file from another with the same root name
-.c{$(CPP_OBJS)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $<
+{.}.cc{$(INTDIR)}.obj::
+	$(CPP) @<<
+	$(CPP_PROJ) $< 
 <<
 
-.cpp{$(CPP_OBJS)}.obj::
+{.}.cc{$(CPP_SBRS)}.sbr::
    $(CPP) @<<
    $(CPP_PROJ) $< 
 <<
 
-.cxx{$(CPP_OBJS)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
 
-.c{$(CPP_SBRS)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(CPP_SBRS)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(CPP_SBRS)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-
 # Calculate any header dependencies and automatically insert them into this file
 HEADERS :
             $(XAPIAN_CORE_REL_OMEGA)\win32\$(DEPEND) -- $(CPP_PROJ) -- $(SRCS) -I"$(INCLUDE)"
Index: win32_backends_flint.mak
===================================================================
--- win32_backends_flint.mak	(revision 9118)
+++ win32_backends_flint.mak	(working copy)
@@ -30,7 +30,11 @@
 	       $(INTDIR)\flint_io.obj \
                $(INTDIR)\flint_modifiedpostlist.obj \
                $(INTDIR)\flint_lock.obj \
-	       $(INTDIR)\flint_spelling.obj
+	       $(INTDIR)\flint_spelling.obj \
+	       $(INTDIR)\flint_synonym.obj \
+	       $(INTDIR)\flint_spellingwordslist.obj \
+       	       $(INTDIR)\contiguousalldocspostlist.obj
+
 SRCS= \
                $(INTDIR)\flint_database.cc \
                $(INTDIR)\flint_termlist.cc \
@@ -48,8 +52,10 @@
 	       $(INTDIR)\flint_io.cc \
                $(INTDIR)\flint_modifiedpostlist.cc \
                $(INTDIR)\flint_lock.cc \
-	       $(INTDIR)\flint_spelling.cc
-
+	       $(INTDIR)\flint_spelling.cc \
+	       $(INTDIR)\flint_synonym.cc \
+	       $(INTDIR)\flint_spellingwordslist.cc \
+       	       $(INTDIR)\contiguousalldocspostlist.cc
 CLEAN :
 	- at erase "$(OUTDIR)\libflint.lib"
 	- at erase "*.pch"