Ticket #466: patch4.patch

ChangeLog

@@ +1 @@
+Fri Apr 16 09:30:20 GMT 2010  Charlie Hull <charlie@flax.co.uk>
+
+    * win32_tests.mak: add api_none.cc and api_replacedoc.cc to list 
+    of sources
+    * win32_applications_omega.cc: remove extra getopt.cc from sources,
+    change dirent.cc to msvc_dirent.cc
+    * makebinaries.py: use Python 2.6.4 
+    * xapdep/xapdep.c: improve checking for redundant strings in dep file
+
 Wed Mar 17 01:20:08 GMT 2010  Olly Betts <olly@survex.com>
 
         * win32_tests.mak: Remove long-defunct remotetest.cc from list of

makebinaries.py

@@ -123 +123 @@
 filename = 'xapian-python-bindings for Python 2.5.1 -%s.win32.exe' % rev
 os.system ('copy "..\\Release\\Python25\\dist\\%s" ' % filename)
 md5it(filename)
-filename = 'xapian-python-bindings for Python 2.6.2 -%s.win32.exe' % rev
+filename = 'xapian-python-bindings for Python 2.6.4 -%s.win32.exe' % rev
 os.system ('copy "..\\Release\\Python26\\dist\\%s" ' % filename)
 md5it(filename)
 

README

@@ -1 +1 @@
 README for Xapian/Visual C++ Tools
 ==================================
-2010-03-02 for Xapian 1.0.18
+2010-04-16 for Xapian 1.0.19
 
 Make files, some extra headers and associated tools for compiling Xapian on
 Win32 using the Microsoft Visual C++ compilers. This is particularly useful

win32_applications_omega.mak

@@ -10 +10 @@
 
 # Where the core is, relative to the Omega application
 # Change this to match your environment
-XAPIAN_CORE_REL_OMEGA=..\..\xapian-core
+XAPIAN_CORE_REL_OMEGA=..\xapian-core-1.0.19
 
 !IF "$(OS)" == "Windows_NT"
 NULL=
@@ -66 +66 @@
         "$(OUTDIR)\utf8convert.obj" \
         "$(OUTDIR)\sample.obj" \
         "$(OUTDIR)\mkdtemp.obj" \
-        "$(OUTDIR)\dirent.obj" \
+        "$(OUTDIR)\msvc_dirent.obj" \
         "$(OUTDIR)\diritor.obj" \
         "$(OUTDIR)\runfilter.obj" \
         "$(OUTDIR)\xpsxmlparse.obj"
@@ -127 +127 @@
         "$(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" \
@@ -208 +206 @@
   $(ALL_LINK32_FLAGS) /out:"$(OUTEXEDIR)\md5test.exe" $(DEF_FLAGS) $(MD5TEST_OBJS)
 <<
 
-"$(INTDIR)\dirent.obj" : "$(XAPIAN_CORE_REL_OMEGA)\win32\dirent.c"
+"$(INTDIR)\msvc_dirent.obj" : ".\common\msvc_dirent.cc"
         $(CPP) @<<
    $(CPP_PROJ) $**
 <<
@@ -242 +240 @@
 
 
 # Calculate any header dependencies and automatically insert them into this file
+HEADERS :
     -@erase deps.d
     $(CPP) -showIncludes $(CPP_PROJ) $(SRCS) >>deps.d
     if exist "$(XAPIAN_CORE_REL_OMEGA)\win32\$(DEPEND)" $(XAPIAN_CORE_REL_OMEGA)\win32\$(DEPEND) 

win32_tests.mak

@@ -64 +64 @@
     "$(OUTDIR)\api_generated.obj" \
     "$(OUTDIR)\api_metadata.obj" \
     "$(OUTDIR)\api_nodb.obj" \
+    "$(OUTDIR)\api_none.obj" \
     "$(OUTDIR)\api_percentages.obj" \
     "$(OUTDIR)\api_posdb.obj" \
     "$(OUTDIR)\api_qpbackend.obj" \
     "$(OUTDIR)\api_query.obj" \
+    "$(OUTDIR)\api_replacedoc.obj" \
     "$(OUTDIR)\api_scalability.obj" \
     "$(OUTDIR)\api_sorting.obj" \
     "$(OUTDIR)\api_spelling.obj" \
@@ -107 +109 @@
     "$(INTDIR)\api_generated.cc" \
     "$(INTDIR)\api_metadata.cc" \
     "$(INTDIR)\api_nodb.cc" \
+    "$(INTDIR)\api_none.cc" \
     "$(INTDIR)\api_percentages.cc" \
     "$(INTDIR)\api_posdb.cc" \
     "$(INTDIR)\api_qpbackend.cc" \
     "$(INTDIR)\api_query.cc" \
+    "$(INTDIR)\api_replacedoc.cc" \
     "$(INTDIR)\api_scalability.cc" \
     "$(INTDIR)\api_sorting.cc" \
     "$(INTDIR)\api_spelling.cc" \

xapdep/xapdep.c

@@ -78 +78 @@
                         while(!feof(indep))
                         {
                 /* check for other random strings the compiler emits sometimes */
-                while ( (strcmp(buf, DISCARDSTRING)==0) || (strcmp(buf, DISCARDSTRING2)==0) )    
+                while ( (strncmp(buf, DISCARDSTRING, strlen(DISCARDSTRING))==0) || 
+                    (strncmp(buf, DISCARDSTRING2, strlen(DISCARDSTRING2))==0) )    
                 {
+                      sprintf(buf,""); /* don't use the discard string later */
                       if(feof(indep)) break;
                       else /* skip line */
                         fgets(buf, sizeof(buf), indep);
                 }
+                if(feof(indep)) break;
 
                                 /* first line should be a .cc file, use this to generate the .obj file */
                                 for (ch=0; (buf[ch]!='.') && (buf[ch]!='\0'); ++ch)
@@ -99 +102 @@
                                                 break;
                         
                     /* check for other random strings the compiler emits sometimes */
-                    if ( (strcmp(buf, DISCARDSTRING)==0) || (strcmp(buf, DISCARDSTRING2)==0) )  
+                    if ( (strncmp(buf, DISCARDSTRING, strlen(DISCARDSTRING))==0) || 
+                    (strncmp(buf, DISCARDSTRING2, strlen(DISCARDSTRING2))==0) )    
                         break;
-                        
+
                     /* clean up the dependencies and write them to the makefile */
                                         ch=INSET;
                                         endch=strlen(buf);