Ticket #303: patch26.patch

xapian-core/backends/chert/chert_version.cc

@@ -38 +38 @@
 #include <cstring> // For memcmp() and memcpy().
 #include <string>
 
-#include <uuid/uuid.h>
+#include "common/safeuuid.h"
 
 using namespace std;
 

xapian-core/backends/chert/chert_version.h

@@ -24 +24 @@
 #include <cstring>
 #include <string>
 
-#include <uuid/uuid.h>
+#include "common/safeuuid.h"
 
 /** The ChertVersion class manages the "iamchert" file.
  *

xapian-core/backends/flint/flint_version.cc

@@ -37 +37 @@
 #include <cstring> // For memcmp() and memcpy().
 #include <string>
 
-#include <uuid/uuid.h>
+#include "common/safeuuid.h"
 
 using std::string;
 

xapian-core/backends/flint/flint_version.h

@@ -24 +24 @@
 #include <cstring>
 #include <string>
 
-#include <uuid/uuid.h>
+#include "common/safeuuid.h"
 
 /** The FlintVersion class manages the "iamflint" file.
  *

xapian-core/ChangeLog

@@ +1 @@
+<<<<<<< .mine
+<<<<<<< .mine
+Sun Jun 29 06:53:28 GMT 2008  Richard Boulton <richard@lemurconsulting.com>
+=======
+=======
 Sat Oct 11 12:19:38 GMT 2008  Olly Betts <olly@survex.com>
 
         * tests/api_wrdb.cc: If the timer for the first test for bigoaddvalue
@@ -15 +20 @@
           to match the different place that the compiled xapian-check is
           placed in.  Should fix bug #301.
 
+>>>>>>> .r11529
 Thu Oct 09 05:20:32 GMT 2008  Richard Boulton <richard@lemurconsulting.com>
 
         * configure.ac: Change -Wstrict-overflow level to 1 - even level 2
@@ -1058 +1064 @@
           rounding the result more than once.
 
 Fri Jul 11 12:21:11 GMT 2008  Olly Betts <olly@survex.com>
+>>>>>>> .r11521
 
-        * tests/api_anydb.cc: Add testcase for percent cutoff plus collapsing
-          which most likely would have failed before Richard's recent fix
-          for the lower bound with collapsing and a matchdecider.
+        * version.rc.java-swig,version.rc.php,version.rc.python: Change
+          "Copyright ... Xapian" messages to a note to consult the source
+          code - Xapian isn't a legal entity, so nothing can be "(C)
+          Xapian".
 
-Fri Jul 11 05:30:02 GMT 2008  Olly Betts <olly@survex.com>
+Wed Jun 25 13:18:50 GMT 2008  Richard Boulton <richard@lemurconsulting.com>
 
-        * backends/database.cc: Add support for XAPIAN_PREFER_CHERT
-          environmental variable.
+        * Makefile: Patch from Charlie to fix some paths for "cd".
 
-Thu Jul 10 22:21:46 GMT 2008  Richard Boulton <richard@lemurconsulting.com>
+Tue Jun 24 16:06:57 GMT 2008  Richard Boulton <richard@lemurconsulting.com>
 
-        * api/postingsource.cc: Fix skip_to() so that it doesn't advance if
-          it's already in a suitable position.
-        * include/xapian/postingsource.h: Specify that skip_to() should
-          stay in the same position if the current position is equal to
-          the docid argument of skip_to().
-        * tests/api_db.cc: Add valueweightsource3 to check that skip_to()
-          stays in the same position in this case.
+        * NEWS: Add note about Java-SWIG makefiles.
 
-Thu Jul 10 13:14:14 GMT 2008  Richard Boulton <richard@lemurconsulting.com>
+Tue Jun 24 16:06:21 GMT 2008  Richard Boulton <richard@lemurconsulting.com>
 
-        * api/postingsource.cc: Performance improvement - open documents
-          lazily (using the internal interface) so that we don't access
-          the record table for each one - we now just access the value
-          table.  Leads to considerable speed up for me (of the order of 5
-          times faster).
+        * win32_backends_chert.mak: Add chert_alldocsmodifiedpostlist
+          source files.
+        * win32_testsuite.mak: Add backendmanager_remote source file.
 
-Thu Jul 10 09:49:39 GMT 2008  Olly Betts <olly@survex.com>
+Thu Jun 05 17:29:16 GMT 2008  Richard Boulton <richard@lemurconsulting.com>
 
-        * HACKING: Overhaul the sections on building from SVN.  Remove ':'
-          from the end of headings.
+        * win32_expand.mak: Replace reference to expand.cc and expand.obj
+          with esetinternal.cc and esetinternal.obj - expand.cc has now
+          been removed, and esetinternal.cc added.
 
-Wed Jul 09 10:43:01 GMT 2008  Olly Betts <olly@survex.com>
+Thu Jun 05 17:11:14 GMT 2008  Richard Boulton <richard@lemurconsulting.com>
 
-        * configure.ac: The workaround to avoid probe code for F77, GCJ, and
-          RC being added to configure is no longer required now that we're
-          using libtool 2.2 so remove it.
+        * win32_bin.mak: Remove comments about the now removed quartz
+          utilities, and a reference to them in the CLEAN rule.
+        * README: Remove trailing whitespace.  Clean up list of "what
+          works".
 
-Wed Jul 09 09:40:43 GMT 2008  Olly Betts <olly@survex.com>
+Thu Jun 05 17:04:26 GMT 2008  Richard Boulton <richard@lemurconsulting.com>
 
+<<<<<<< .mine
+        * Start of ChangeLog.
+=======
         * Makefile.am,acinclude.m4,autoconf/dir_contents,
           autoconf/rjb_find_stlport.m4,autoconf/type_socklen_t.m4,
           m4/dir_contents,m4/rjb_find_stlport.m4,m4/type_socklen_t.m4: Move
@@ -25013 +25017 @@
 Fri Nov 24 15:34:17 GMT 2000  Richard Boulton <richard.boulton@open.muscat.com>
 
         * Declare this to be version 0.4.1
+>>>>>>> .r11521

xapian-core/common/safeuuid.h

@@ +1 @@
+/** @file safeuuid.h
+ *  @brief #include <uuid/uuid.h>, with alternative implementation for windows.
+ */
+/* Copyright (C) 2008 Lemur Consulting Ltd
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA
+ */
+
+#ifndef XAPIAN_INCLUDED_SAFEUUID_H
+#define XAPIAN_INCLUDED_SAFEUUID_H
+
+#ifdef __WIN32__
+# include "common/win32_uuid.h"
+#else
+# include <uuid/uuid.h>
+#endif
+
+#endif // XAPIAN_INCLUDED_SAFEUUID_H

xapian-core/common/win32_uuid.cc

@@ +1 @@
+/* win32_uuid.cc: Provides UUID functions compatible with libuuid from e2fsprogs
+ *
+ * Copyright (C) 2008 Lemur Consulting Ltd
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ */
+
+#include <config.h>
+
+#include "win32_uuid.h"
+
+void uuid_generate(uuid_t uu)
+{
+    UUID uuid;
+    if(UuidCreate(&uuid) != RPC_S_OK) 
+        return;
+    memcpy(uu,&uuid,16);
+}
+    
+ int uuid_parse(const char * in, uuid_t uu)
+{
+    UUID uuid;
+    if(UuidFromString( (unsigned char*) in, &uuid) != RPC_S_OK) 
+        return -1;
+    memcpy(uu,&uuid,16);
+    return 0;
+}
+    
+void uuid_unparse_lower(const uuid_t uu, char *  out)
+{
+    UUID uuid;
+    char *uuidstr;
+    memcpy(&uuid,uu,16);
+    if(UuidToString(&uuid, (unsigned char**) &uuidstr) != RPC_S_OK) 
+        return;
+    int uuidlen = strlen(uuidstr);
+    strncpy( out, strlwr(uuidstr), uuidlen );
+    RpcStringFree( (unsigned char**) &uuidstr );
+}
+    
+void uuid_clear(uuid_t uu)
+{
+    memset(uu,0x00,16);
+}
+    
+int uuid_is_null(const uuid_t uu)
+{
+    int i=0;
+    while(i<16) if (uu[i++]) 
+        return 0;
+    return 1;
+}
+    

xapian-core/common/win32_uuid.h

@@ +1 @@
+/*win32_uuid.h: Provides UUID functions compatible with libuuid from e2fsprogs
+ *
+ * Copyright 2008 Lemur Consulting Ltd
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301
+ * USA
+ */
+
+#ifndef XAPIAN_INCLUDED_WIN32_UUID_H
+#define XAPIAN_INCLUDED_WIN32_UUID_H
+
+#if !defined __CYGWIN__ && !defined __WIN32__
+# error Including win32_uuid.h, but neither __CYGWIN__ nor __WIN32__ defined!
+#endif
+
+#include "safewindows.h"
+#include <rpc.h>
+
+// unfortunately Windows defines this as GUID, so let's redefine to match the Unix definition
+#undef uuid_t
+typedef unsigned char   uuid_t [16];
+
+void uuid_generate(uuid_t uu);
+    
+int uuid_parse(const char * in, uuid_t uu);
+    
+void uuid_unparse_lower(const uuid_t uu, char *  out);
+    
+void uuid_clear(uuid_t uu);
+    
+int uuid_is_null(const uuid_t uu);
+
+#endif /* XAPIAN_INCLUDED_WIN32_UUID_H */

xapian-maintainer-tools/win32msvc/ChangeLog

@@ +1 @@
+Thu Oct 23 15:42:00 GMT 2008  Charlie Hull <charlie@lemurconsulting.com>
+
+    * win32_uuid.h, win32_uuid.cc, safeuuid.h, flint_version.cc, flint_version.h, chert_version.cc,
+    chert_version.h: add new Windows version of UUID functions
+
+
 Mon Sep 08 09:59:17 GMT 2008  Richard Boulton <richard@lemurconsulting.com>
 
         * genversion.pl: Update to match new configure.ac (cope with the []'s

xapian-maintainer-tools/win32msvc/win32_common.mak

@@ -19 +19 @@
     $(INTDIR)\serialise-double.obj \
     $(INTDIR)\msvc_dirent.obj \
     $(INTDIR)\msvc_posix_wrapper.obj \
+    $(INTDIR)\win32_uuid.obj \
     $(INTDIR)\socket_utils.obj \
     $(INTDIR)\stringutils.obj \
     $(INTDIR)\safe.obj \
@@ -32 +33 @@
     $(INTDIR)\serialise-double.cc \
     $(INTDIR)\msvc_dirent.cc \
     $(INTDIR)\msvc_posix_wrapper.cc \
+    $(INTDIR)\win32_uuid.cc \
     $(INTDIR)\socket_utils.cc \
     $(INTDIR)\stringutils.cc \
     $(INTDIR)\safe.cc \