Ticket #457: geospatial4.patch

File geospatial4.patch, 36.5 KB (added by Charlie Hull, 15 years ago)

Improved patch to current sources.

  • ChangeLog

     
    1 Fri Apr 16 09:53:05 GMT 2010  Richard Boulton <richard@tartarus.org>
    2 
    3         * win32_api.mak,win32_backends_multi.mak,win32_matcher.mak,
    4           win32_tests.mak: Revert previous patch - was broken in several
    5           ways.
    6 
    7 Fri Apr 16 09:07:44 GMT 2010  Richard Boulton <richard@tartarus.org>
    8 
    9         * win32_api.mak,win32_backends_multi.mak,win32_matcher.mak,
    10           win32_tests.mak: Updates to the windows build system from Charlie
    11           Hull - ticket #457.
    12 
    13 Tue Aug 25 16:32:54 GMT 2009  Richard Boulton <richard@lemurconsulting.com>
    14 
    15         * Makefile,config.mak,win32_geospatial.mak: Add geospatial lib.
    16 
    17 Tue Aug 25 16:41:00 GMT 2009  Charlie Hull <charlie@flax.co.uk>
    18 
    19     * Makefile, win32_geospatial.mak, config.mak - add geospatial lib
    20 
    21 Thu Apr 15 14:31:56 GMT 2010  Richard Boulton <richard@tartarus.org>
    22 
    23         * win32_testsuite.mak: Patch from Charlie Hull: Tidy up order of
    24           files, and add fdtracker.obj and scalability.obj.
    25 
    26 Thu Mar 11 16:11:45 GMT 2010  Richard Boulton <richard@tartarus.org>
    27 
    28         * xapdep/xapdep.mak: Remove duplicate version of contents.
    29 
    30 Tue Mar 09 10:58:52 GMT 2010  Charlie Hull <charlie@flax.co.uk>
    31 
    32         * xapdep/xapdep.c: Print object file on every line like Makedepend
    33           did, add quotes round dependencies to cope with Windows paths,
    34           remove old rename-in-place function.
    35 
    36 Mon Mar 08 06:26:13 GMT 2010  Olly Betts <olly@survex.com>
    37 
    38         * xapdep/README: Undouble contents (this file was in the patch twice).
    39 
    40 Mon Mar 08 06:11:10 GMT 2010  Olly Betts <olly@survex.com>
    41 
    42         * xapdep/xapdep.c: Fix O(n*n) behaviour we only needs to be O(n).
    43 
    44 Mon Mar 08 05:58:30 GMT 2010  Olly Betts <olly@survex.com>
    45 
    46         * xapdep/xapdep.c: Eliminate depbuf - a fixed sized buffer we probably
    47           can't overflow, but don't need to use.
    48 
    49 Mon Mar 08 05:54:36 GMT 2010  Olly Betts <olly@survex.com>
    50 
    51         * xapdep/xapdep.c: Eliminate objbuf - a fixed sized buffer we could
    52           overflow.
    53 
    54 Mon Mar 08 05:37:14 GMT 2010  Olly Betts <olly@survex.com>
    55 
    56         * xapdep/xapdep.c: Remove a potential buffer overflow.
    57 
    58 Mon Mar 08 05:31:50 GMT 2010  Olly Betts <olly@survex.com>
    59 
    60         * Makefile,README,config.mak,makedepend/,win32_api.mak,
    61           win32_applications_omega.mak,win32_backends.mak,
    62           win32_backends_chert.mak,win32_backends_flint.mak,
    63           win32_backends_inmemory.mak,win32_backends_multi.mak,
    64           win32_backends_quartz.mak,win32_backends_remote.mak,win32_bin.mak,
    65           win32_common.mak,win32_examples.mak,win32_expand.mak,
    66           win32_getopt.mak,win32_languages_compiler.mak,win32_matcher.mak,
    67           win32_net.mak,win32_perftest.mak,win32_queryparser.mak,
    68           win32_tests.mak,win32_testsuite.mak,win32_unicode.mak,
    69           win32_weight.mak,xapdep/README,xapdep/xapdep.c,xapdep/xapdep.mak:
    70           Apply Charlie's "xapdep" patch (ticket#239).
    71 
    72 Wed Mar 03 06:10:51 GMT 2010  Olly Betts <olly@survex.com>
    73 
    74         * README: Sync documentation of makebinaries.py from branches/1.0..
    75           Note that Python 3.0 is supported.
    76 
    77 Wed Mar 03 05:17:14 GMT 2010  Olly Betts <olly@survex.com>
    78 
    79         * README: List run-time requirements (ticket#391).
    80 
    81 Wed Mar 03 05:11:58 GMT 2010  Olly Betts <olly@survex.com>
    82 
    83         * README: Don't mention libs internal to building the testsuite.  Links
    84           to xapian.org shouldn't have a ".php" extension now.
    85 
    86 Wed Mar 03 04:59:07 GMT 2010  Olly Betts <olly@survex.com>
    87 
    88         * README: Remove mention of PHP4.
    89 
    90 Fri Feb 12 04:42:19 GMT 2010  Olly Betts <olly@survex.com>
    91 
    92         * win32_bindings_python.mak: Update for generate-python-exception.in
    93           to generate-python-exceptions renaming (untested).  (ticket#367)
    94 
    95 Fri Feb 05 23:21:41 GMT 2010  Charlie Hull <charlie@lemurconsulting.com>
    96 
    97         * win32_tests.mak: Correct $(INTDIR) to $(OUTDIR).  Add new apitest
    98           sources.  (ticket#441)
    99 
    100 Wed Feb 03 15:24:40 GMT 2010  Charlie Hull <charlie@flax.co.uk>
    101 
    102         * Makefile,version.h.in,win32_testsuite.mak,config.mak: Add support
    103           for brass backend.
    104         * win32_backends.mak: Add support for brass, and also add flint_lock.
    105         * win32_backends_chert.mak: Remove references to chert_lock.
    106         * win32_backends_flint.mak: Remove references to flint_lock.
    107         * win32_tests.mak: Clean up existing test databases.
    108         * win32_bin.mak: Update list of source files for xapian-compact and
    109           xapian-check, and add include path and libbrassbtreecheck
    110           library.
    111 
    112 Fri Nov 20 11:49:07 GMT 2009  Richard Boulton <richard@tartarus.org>
    113 
    114         * win32_backends_multi.mak,win32_matcher.mak: Patch from Charlie to
    115           add valuestreamdocument.cc and multi_valuelist.cc to build.
    116 
    117 Tue Oct 27 16:17:09 GMT 2009  Richard Boulton <richard@lemurconsulting.com>
    118 
    119         * win32_applications_omega.mak: Remove dirent.cc, update path to
    120           getopt.cc, add freemem.cc, add mkdtemp.obj to OMINDEX objects,
    121           and rename UTF8TEST_OBJS to UTF8CONVERTTEST_OBJS.
    122 
    123 Fri Oct 16 09:04:00 GMT 2009  Charlie Hull <charlie@flax.co.uk>
    124 
    125         * config.h.win32,config.h.omega.win32: disable warning about macros
    126           with missing parameters.
    127         * win32_tests.mak: add api_sortingold.cc
    128         * win32_api.mak: remove sorter.cc, add keymaker.cc
    129 
    130 Mon Aug 24 10:40:00 GMT 2009  Charlie Hull <charlie@flax.co.uk>
    131 
    132         * Makefile: Remove rules to make generate-exceptions.
    133         * win32_api.mak: Remove serialisationcontext.cc, add registry.cc
    134 
    135 Tue Aug 04 15:30:00 GMT 2009  Charlie Hull <charlie@flax.co.uk>
    136 
    137         * Makefile, win32_bindings_python.mak, config.mak, makebinaries.py:
    138           Add Python 2.6 option.
    139 
    140 Sun Aug 02 12:22:52 GMT 2009  Richard Boulton <richard@lemurconsulting.com>
    141 
    142         * win32_api.mak: Add matchspy files.
    143 
    144 Mon Jul 20 13:52:53 GMT 2009  Olly Betts <olly@survex.com>
    145 
    146         * config.mak,win32_bindings_python.mak: Update to include Python 3.0
    147           support, ready for when then bindings support this.  From patch in
    148           ticket #346.
    149 
    150 Mon Jul 20 13:43:48 GMT 2009  Olly Betts <olly@survex.com>
    151 
    152         * win32_api.mak: Update for added sources, from patch by Peter Kelm in
    153           ticket#346.
    154 
    155 Mon Jul 20 13:38:37 GMT 2009  Olly Betts <olly@survex.com>
    156 
    157         * win32_matcher.mak: Update for removed sources, from patch by Peter
    158           Kelm in ticket#346.
    159 
    160 Fri May 08 12:55:32 GMT 2009  Olly Betts <olly@survex.com>
    161 
    162         * config.mak,win32_bindings_python.mak,win32_tests.mak,
    163           win32_testsuite.mak: Update from Peter Kelm to work with SVN trunk
    164           (ticket#366).
    165 
    166 Tue May 05 12:42:26 GMT 2009  Richard Boulton <richard@lemurconsulting.com>
    167 
    168         * win32_matcher.mak: Add synoympostlist.cc to build.
    169 
    170 Fri May 01 15:40:48 GMT 2009  Richard Boulton <richard@lemurconsulting.com>
    171 
    172         * win32_tests.mak: Add api_replicate.cc and api_serialise.cc, and
    173           cleanup .obj files.
    174 
    175 Wed Apr 22 16:21:53 GMT 2009  Richard Boulton <richard@lemurconsulting.com>
    176 
    177         * makebinaries.py,win32_tests.mak: Add a script and some changes to
    178           the test makefile which got missed out of the previous commit.
    179 
    180 Tue Apr 21 10:34:00 GMT 2009  Charlie Hull <charlie@lemurconsulting.com>
    181 
    182         * config.h.omega.win32: Update version numbers
    183         * win32_tests.mak: add some new tests and reformat for clarity
    184         * Makefile: MAKEALLBINDINGS now depends on COPYMAKFILES
    185         * config.h.omega.win32: define 'rare' and 'usual'
    186         * makebinaries.py: fix quotes
    187         * makedepend.mak, Makefile: CLEAN now also cleans makedepend
    188 
    189 Wed Mar 25 12:49:00 GMT 2009  Charlie Hull <charlie@lemurconsulting.com>
    190 
    191         * win32_weight.mak,config.mak,Makefile: add new makefile for
    192           /weight folder
    193         * win32_api.mak,win32_matcher.mak,win32_backend_chert.mak,
    194           win32_common.mak: correct file lists
    195         * win32_bin.mak,config.mak: remove Quartz bits, add
    196           xapian-replicate and xapian-replicate-server
    197 
    198 Thu Mar 19 11:55:00 GMT 2009  Charlie Hull <charlie@lemurconsulting.com>
    199 
    200         * config.mak, win32_bindings_python.mak: add ability to build two
    201           different Python versions, and add example files, and change
    202           BUILDDIST to DIST for consistency with other bindings
    203         * setup.py: add example & documentation files for Python
    204         * win32_bindings_php.mak,win32_bindings_csharp.mak,
    205           win32_bindings_java-swig.mak,win32_bindings_ruby.mak: add example
    206           & doc files where they exist and DIST build target
    207         * win32_bindings_php.mak,win32_bindings_csharp.mak,win32_examples.mak,
    208           win32_bin.mak: add Manifests into .exe or .dll and remove
    209           separate manifest files
    210         * Makefile: add MAKEALLBINDINGS target for building all bindings
    211         * README: update for the above changes
    212         * win32_applications_omega.mak: add new file for omindex
    213         * config.h.omega.win32: Update version numbers, undefine rare()
    214 
    215 Mon Feb 16 12:02:48 GMT 2009  Richard Boulton <richard@lemurconsulting.com>
    216 
    217         * win32_bindings_csharp.mak: Remove doubled file contents.
    218 
    219 Mon Dec 22 16:50:55 GMT 2008  Richard Boulton <richard@lemurconsulting.com>
    220 
    221         * version.rc.csharp,win32_bindings_csharp.mak: Add files missed
    222           from last commit.
    223 
    224 Mon Dec 22 16:49:46 GMT 2008  Richard Boulton <richard@lemurconsulting.com>
    225 
    226         * Makefile,README,config.h.omega.win32,config.mak,genversion.pl,
    227           win32_api.mak,win32_backends.mak,win32_backends_chert.mak,
    228           win32_backends_flint.mak,win32_perftest.mak: Add C# bindings to
    229           build system, and update with new files for replication in
    230           xapian-core.
    231 
    232 Thu Dec 11 12:04:11 GMT 2008  Richard Boulton <richard@lemurconsulting.com>
    233 
    234         * win32_tests.mak: Add support for new test file, api_backend.cc
    235 
    236 Thu Nov 06 12:50:34 GMT 2008  Richard Boulton <richard@lemurconsulting.com>
    237 
    238         * win32_perftest.mak: Call collate-apitest in the new way.  Add
    239           libtest.lib.
    240         * win32_tests.mak: Call collate-apitest in the
    241           new way.  Add api_spelling.cc.  Improve "nmake CLEAN" target.
    242         * win32_api.mak: omvalueiterator.cc renamed to valueiterator.cc,
    243           add documentvaluelist.cc.
    244         * win32_backends.mak: add dbfactory_remote.cc, valuelist.cc and
    245           slowvaluelist.cc.
    246         * win32_backends_remote.mak: rename net_document.cc to
    247           remote-document.cc.
    248         * config.mak: Change paths to XAPIAN_APPLICATIONS and
    249           XAPIAN_BINDINGS to be appropriate for a SVN checkout, rather than
    250           for unpacked tarballs.  Add rpcrt4.lib for UUID functions. Remove
    251           libquartz.lib, and add libchert.lib.
    252         * win32_common.mak: Add win32_uuid.cc. (Not yet in trunk, but
    253           needed for windows compile - currently requires patch attached to
    254           bug #303.)
    255         * config.h.win32: Update version numbers (to 1.1.0, to match
    256           configure.ac). Define 'usual' keyword to identity, since we don't
    257           have this in MSVC.
    258 
    259 Mon Sep 08 09:59:17 GMT 2008  Richard Boulton <richard@lemurconsulting.com>
    260 
    261         * genversion.pl: Update to match new configure.ac (cope with the []'s
    262           which have been added).
    263 
    264 Wed Aug 20 09:31:47 GMT 2008  Richard Boulton <richard@lemurconsulting.com>
    265 
    266         * README: Remove trailing whitespace.
    267 
    268 Thu Aug 14 15:42:00 GMT 2008  Charlie Hull <charlie@lemurconsulting.com>
    269 
    270         * win32_bindings_ruby.mak,config.mak,README,Makefile: Added new
    271           Ruby bindings makefile written by Zsolt Sz. Sztupák.  Update list
    272           of "what works" in README.
    273 
    274 Sun Jun 29 06:53:28 GMT 2008  Richard Boulton <richard@lemurconsulting.com>
    275 
    276         * version.rc.java-swig,version.rc.php,version.rc.python: Change
    277           "Copyright ... Xapian" messages to a note to consult the source
    278           code - Xapian isn't a legal entity, so nothing can be "(C)
    279           Xapian".
    280 
    281 Wed Jun 25 13:18:50 GMT 2008  Richard Boulton <richard@lemurconsulting.com>
    282 
    283         * Makefile: Patch from Charlie to fix some paths for "cd".
    284 
    285 Tue Jun 24 16:06:57 GMT 2008  Richard Boulton <richard@lemurconsulting.com>
    286 
    287         * NEWS: Add note about Java-SWIG makefiles.
    288 
    289 Tue Jun 24 16:06:21 GMT 2008  Richard Boulton <richard@lemurconsulting.com>
    290 
    291         * win32_backends_chert.mak: Add chert_alldocsmodifiedpostlist
    292           source files.
    293         * win32_testsuite.mak: Add backendmanager_remote source file.
    294 
    295 Thu Jun 05 17:29:16 GMT 2008  Richard Boulton <richard@lemurconsulting.com>
    296 
    297         * win32_expand.mak: Replace reference to expand.cc and expand.obj
    298           with esetinternal.cc and esetinternal.obj - expand.cc has now
    299           been removed, and esetinternal.cc added.
    300 
    301 Thu Jun 05 17:11:14 GMT 2008  Richard Boulton <richard@lemurconsulting.com>
    302 
    303         * win32_bin.mak: Remove comments about the now removed quartz
    304           utilities, and a reference to them in the CLEAN rule.
    305         * README: Remove trailing whitespace.  Clean up list of "what
    306           works".
    307 
    308 Thu Jun 05 17:04:26 GMT 2008  Richard Boulton <richard@lemurconsulting.com>
    309 
    310         * Start of ChangeLog.
     1Thu  06 11:40:27 GMT 2010  Charlie Hull <charlie@flax.co.uk>
     2
     3        * Makefile,config.mak,win32_backends.mak,win32_backends_brass.mak,
     4          win32_backends_chert.mak,win32_backends_flint.mak,win32_common.mak,
     5          win32_geospatial.mak,win32_matcher.mak,win32_testsuite.mak:
     6      updated patch to add various missing or relocated files, fixes #457.
     7
     8Fri Apr 16 09:53:05 GMT 2010  Richard Boulton <richard@tartarus.org>
     9
     10        * win32_api.mak,win32_backends_multi.mak,win32_matcher.mak,
     11          win32_tests.mak: Revert previous patch - was broken in several
     12          ways.
     13
     14Fri Apr 16 09:07:44 GMT 2010  Richard Boulton <richard@tartarus.org>
     15
     16        * win32_api.mak,win32_backends_multi.mak,win32_matcher.mak,
     17          win32_tests.mak: Updates to the windows build system from Charlie
     18          Hull - ticket #457.
     19
     20Tue Aug 25 16:32:54 GMT 2009  Richard Boulton <richard@lemurconsulting.com>
     21
     22        * Makefile,config.mak,win32_geospatial.mak: Add geospatial lib.
     23
     24Tue Aug 25 16:41:00 GMT 2009  Charlie Hull <charlie@flax.co.uk>
     25
     26    * Makefile, win32_geospatial.mak, config.mak - add geospatial lib
     27
     28Thu Apr 15 14:31:56 GMT 2010  Richard Boulton <richard@tartarus.org>
     29
     30        * win32_testsuite.mak: Patch from Charlie Hull: Tidy up order of
     31          files, and add fdtracker.obj and scalability.obj.
     32
     33Thu Mar 11 16:11:45 GMT 2010  Richard Boulton <richard@tartarus.org>
     34
     35        * xapdep/xapdep.mak: Remove duplicate version of contents.
     36
     37Tue Mar 09 10:58:52 GMT 2010  Charlie Hull <charlie@flax.co.uk>
     38
     39        * xapdep/xapdep.c: Print object file on every line like Makedepend
     40          did, add quotes round dependencies to cope with Windows paths,
     41          remove old rename-in-place function.
     42
     43Mon Mar 08 06:26:13 GMT 2010  Olly Betts <olly@survex.com>
     44
     45        * xapdep/README: Undouble contents (this file was in the patch twice).
     46
     47Mon Mar 08 06:11:10 GMT 2010  Olly Betts <olly@survex.com>
     48
     49        * xapdep/xapdep.c: Fix O(n*n) behaviour we only needs to be O(n).
     50
     51Mon Mar 08 05:58:30 GMT 2010  Olly Betts <olly@survex.com>
     52
     53        * xapdep/xapdep.c: Eliminate depbuf - a fixed sized buffer we probably
     54          can't overflow, but don't need to use.
     55
     56Mon Mar 08 05:54:36 GMT 2010  Olly Betts <olly@survex.com>
     57
     58        * xapdep/xapdep.c: Eliminate objbuf - a fixed sized buffer we could
     59          overflow.
     60
     61Mon Mar 08 05:37:14 GMT 2010  Olly Betts <olly@survex.com>
     62
     63        * xapdep/xapdep.c: Remove a potential buffer overflow.
     64
     65Mon Mar 08 05:31:50 GMT 2010  Olly Betts <olly@survex.com>
     66
     67        * Makefile,README,config.mak,makedepend/,win32_api.mak,
     68          win32_applications_omega.mak,win32_backends.mak,
     69          win32_backends_chert.mak,win32_backends_flint.mak,
     70          win32_backends_inmemory.mak,win32_backends_multi.mak,
     71          win32_backends_quartz.mak,win32_backends_remote.mak,win32_bin.mak,
     72          win32_common.mak,win32_examples.mak,win32_expand.mak,
     73          win32_getopt.mak,win32_languages_compiler.mak,win32_matcher.mak,
     74          win32_net.mak,win32_perftest.mak,win32_queryparser.mak,
     75          win32_tests.mak,win32_testsuite.mak,win32_unicode.mak,
     76          win32_weight.mak,xapdep/README,xapdep/xapdep.c,xapdep/xapdep.mak:
     77          Apply Charlie's "xapdep" patch (ticket#239).
     78
     79Wed Mar 03 06:10:51 GMT 2010  Olly Betts <olly@survex.com>
     80
     81        * README: Sync documentation of makebinaries.py from branches/1.0..
     82          Note that Python 3.0 is supported.
     83
     84Wed Mar 03 05:17:14 GMT 2010  Olly Betts <olly@survex.com>
     85
     86        * README: List run-time requirements (ticket#391).
     87
     88Wed Mar 03 05:11:58 GMT 2010  Olly Betts <olly@survex.com>
     89
     90        * README: Don't mention libs internal to building the testsuite.  Links
     91          to xapian.org shouldn't have a ".php" extension now.
     92
     93Wed Mar 03 04:59:07 GMT 2010  Olly Betts <olly@survex.com>
     94
     95        * README: Remove mention of PHP4.
     96
     97Fri Feb 12 04:42:19 GMT 2010  Olly Betts <olly@survex.com>
     98
     99        * win32_bindings_python.mak: Update for generate-python-exception.in
     100          to generate-python-exceptions renaming (untested).  (ticket#367)
     101
     102Fri Feb 05 23:21:41 GMT 2010  Charlie Hull <charlie@lemurconsulting.com>
     103
     104        * win32_tests.mak: Correct $(INTDIR) to $(OUTDIR).  Add new apitest
     105          sources.  (ticket#441)
     106
     107Wed Feb 03 15:24:40 GMT 2010  Charlie Hull <charlie@flax.co.uk>
     108
     109        * Makefile,version.h.in,win32_testsuite.mak,config.mak: Add support
     110          for brass backend.
     111        * win32_backends.mak: Add support for brass, and also add flint_lock.
     112        * win32_backends_chert.mak: Remove references to chert_lock.
     113        * win32_backends_flint.mak: Remove references to flint_lock.
     114        * win32_tests.mak: Clean up existing test databases.
     115        * win32_bin.mak: Update list of source files for xapian-compact and
     116          xapian-check, and add include path and libbrassbtreecheck
     117          library.
     118
     119Fri Nov 20 11:49:07 GMT 2009  Richard Boulton <richard@tartarus.org>
     120
     121        * win32_backends_multi.mak,win32_matcher.mak: Patch from Charlie to
     122          add valuestreamdocument.cc and multi_valuelist.cc to build.
     123
     124Tue Oct 27 16:17:09 GMT 2009  Richard Boulton <richard@lemurconsulting.com>
     125
     126        * win32_applications_omega.mak: Remove dirent.cc, update path to
     127          getopt.cc, add freemem.cc, add mkdtemp.obj to OMINDEX objects,
     128          and rename UTF8TEST_OBJS to UTF8CONVERTTEST_OBJS.
     129
     130Fri Oct 16 09:04:00 GMT 2009  Charlie Hull <charlie@flax.co.uk>
     131
     132        * config.h.win32,config.h.omega.win32: disable warning about macros
     133          with missing parameters.
     134        * win32_tests.mak: add api_sortingold.cc
     135        * win32_api.mak: remove sorter.cc, add keymaker.cc
     136
     137Mon Aug 24 10:40:00 GMT 2009  Charlie Hull <charlie@flax.co.uk>
     138
     139        * Makefile: Remove rules to make generate-exceptions.
     140        * win32_api.mak: Remove serialisationcontext.cc, add registry.cc
     141
     142Tue Aug 04 15:30:00 GMT 2009  Charlie Hull <charlie@flax.co.uk>
     143
     144        * Makefile, win32_bindings_python.mak, config.mak, makebinaries.py:
     145          Add Python 2.6 option.
     146
     147Sun Aug 02 12:22:52 GMT 2009  Richard Boulton <richard@lemurconsulting.com>
     148
     149        * win32_api.mak: Add matchspy files.
     150
     151Mon Jul 20 13:52:53 GMT 2009  Olly Betts <olly@survex.com>
     152
     153        * config.mak,win32_bindings_python.mak: Update to include Python 3.0
     154          support, ready for when then bindings support this.  From patch in
     155          ticket #346.
     156
     157Mon Jul 20 13:43:48 GMT 2009  Olly Betts <olly@survex.com>
     158
     159        * win32_api.mak: Update for added sources, from patch by Peter Kelm in
     160          ticket#346.
     161
     162Mon Jul 20 13:38:37 GMT 2009  Olly Betts <olly@survex.com>
     163
     164        * win32_matcher.mak: Update for removed sources, from patch by Peter
     165          Kelm in ticket#346.
     166
     167Fri May 08 12:55:32 GMT 2009  Olly Betts <olly@survex.com>
     168
     169        * config.mak,win32_bindings_python.mak,win32_tests.mak,
     170          win32_testsuite.mak: Update from Peter Kelm to work with SVN trunk
     171          (ticket#366).
     172
     173Tue May 05 12:42:26 GMT 2009  Richard Boulton <richard@lemurconsulting.com>
     174
     175        * win32_matcher.mak: Add synoympostlist.cc to build.
     176
     177Fri May 01 15:40:48 GMT 2009  Richard Boulton <richard@lemurconsulting.com>
     178
     179        * win32_tests.mak: Add api_replicate.cc and api_serialise.cc, and
     180          cleanup .obj files.
     181
     182Wed Apr 22 16:21:53 GMT 2009  Richard Boulton <richard@lemurconsulting.com>
     183
     184        * makebinaries.py,win32_tests.mak: Add a script and some changes to
     185          the test makefile which got missed out of the previous commit.
     186
     187Tue Apr 21 10:34:00 GMT 2009  Charlie Hull <charlie@lemurconsulting.com>
     188
     189        * config.h.omega.win32: Update version numbers
     190        * win32_tests.mak: add some new tests and reformat for clarity
     191        * Makefile: MAKEALLBINDINGS now depends on COPYMAKFILES
     192        * config.h.omega.win32: define 'rare' and 'usual'
     193        * makebinaries.py: fix quotes
     194        * makedepend.mak, Makefile: CLEAN now also cleans makedepend
     195
     196Wed Mar 25 12:49:00 GMT 2009  Charlie Hull <charlie@lemurconsulting.com>
     197
     198        * win32_weight.mak,config.mak,Makefile: add new makefile for
     199          /weight folder
     200        * win32_api.mak,win32_matcher.mak,win32_backend_chert.mak,
     201          win32_common.mak: correct file lists
     202        * win32_bin.mak,config.mak: remove Quartz bits, add
     203          xapian-replicate and xapian-replicate-server
     204
     205Thu Mar 19 11:55:00 GMT 2009  Charlie Hull <charlie@lemurconsulting.com>
     206
     207        * config.mak, win32_bindings_python.mak: add ability to build two
     208          different Python versions, and add example files, and change
     209          BUILDDIST to DIST for consistency with other bindings
     210        * setup.py: add example & documentation files for Python
     211        * win32_bindings_php.mak,win32_bindings_csharp.mak,
     212          win32_bindings_java-swig.mak,win32_bindings_ruby.mak: add example
     213          & doc files where they exist and DIST build target
     214        * win32_bindings_php.mak,win32_bindings_csharp.mak,win32_examples.mak,
     215          win32_bin.mak: add Manifests into .exe or .dll and remove
     216          separate manifest files
     217        * Makefile: add MAKEALLBINDINGS target for building all bindings
     218        * README: update for the above changes
     219        * win32_applications_omega.mak: add new file for omindex
     220        * config.h.omega.win32: Update version numbers, undefine rare()
     221
     222Mon Feb 16 12:02:48 GMT 2009  Richard Boulton <richard@lemurconsulting.com>
     223
     224        * win32_bindings_csharp.mak: Remove doubled file contents.
     225
     226Mon Dec 22 16:50:55 GMT 2008  Richard Boulton <richard@lemurconsulting.com>
     227
     228        * version.rc.csharp,win32_bindings_csharp.mak: Add files missed
     229          from last commit.
     230
     231Mon Dec 22 16:49:46 GMT 2008  Richard Boulton <richard@lemurconsulting.com>
     232
     233        * Makefile,README,config.h.omega.win32,config.mak,genversion.pl,
     234          win32_api.mak,win32_backends.mak,win32_backends_chert.mak,
     235          win32_backends_flint.mak,win32_perftest.mak: Add C# bindings to
     236          build system, and update with new files for replication in
     237          xapian-core.
     238
     239Thu Dec 11 12:04:11 GMT 2008  Richard Boulton <richard@lemurconsulting.com>
     240
     241        * win32_tests.mak: Add support for new test file, api_backend.cc
     242
     243Thu Nov 06 12:50:34 GMT 2008  Richard Boulton <richard@lemurconsulting.com>
     244
     245        * win32_perftest.mak: Call collate-apitest in the new way.  Add
     246          libtest.lib.
     247        * win32_tests.mak: Call collate-apitest in the
     248          new way.  Add api_spelling.cc.  Improve "nmake CLEAN" target.
     249        * win32_api.mak: omvalueiterator.cc renamed to valueiterator.cc,
     250          add documentvaluelist.cc.
     251        * win32_backends.mak: add dbfactory_remote.cc, valuelist.cc and
     252          slowvaluelist.cc.
     253        * win32_backends_remote.mak: rename net_document.cc to
     254          remote-document.cc.
     255        * config.mak: Change paths to XAPIAN_APPLICATIONS and
     256          XAPIAN_BINDINGS to be appropriate for a SVN checkout, rather than
     257          for unpacked tarballs.  Add rpcrt4.lib for UUID functions. Remove
     258          libquartz.lib, and add libchert.lib.
     259        * win32_common.mak: Add win32_uuid.cc. (Not yet in trunk, but
     260          needed for windows compile - currently requires patch attached to
     261          bug #303.)
     262        * config.h.win32: Update version numbers (to 1.1.0, to match
     263          configure.ac). Define 'usual' keyword to identity, since we don't
     264          have this in MSVC.
     265
     266Mon Sep 08 09:59:17 GMT 2008  Richard Boulton <richard@lemurconsulting.com>
     267
     268        * genversion.pl: Update to match new configure.ac (cope with the []'s
     269          which have been added).
     270
     271Wed Aug 20 09:31:47 GMT 2008  Richard Boulton <richard@lemurconsulting.com>
     272
     273        * README: Remove trailing whitespace.
     274
     275Thu Aug 14 15:42:00 GMT 2008  Charlie Hull <charlie@lemurconsulting.com>
     276
     277        * win32_bindings_ruby.mak,config.mak,README,Makefile: Added new
     278          Ruby bindings makefile written by Zsolt Sz. Sztupák.  Update list
     279          of "what works" in README.
     280
     281Sun Jun 29 06:53:28 GMT 2008  Richard Boulton <richard@lemurconsulting.com>
     282
     283        * version.rc.java-swig,version.rc.php,version.rc.python: Change
     284          "Copyright ... Xapian" messages to a note to consult the source
     285          code - Xapian isn't a legal entity, so nothing can be "(C)
     286          Xapian".
     287
     288Wed Jun 25 13:18:50 GMT 2008  Richard Boulton <richard@lemurconsulting.com>
     289
     290        * Makefile: Patch from Charlie to fix some paths for "cd".
     291
     292Tue Jun 24 16:06:57 GMT 2008  Richard Boulton <richard@lemurconsulting.com>
     293
     294        * NEWS: Add note about Java-SWIG makefiles.
     295
     296Tue Jun 24 16:06:21 GMT 2008  Richard Boulton <richard@lemurconsulting.com>
     297
     298        * win32_backends_chert.mak: Add chert_alldocsmodifiedpostlist
     299          source files.
     300        * win32_testsuite.mak: Add backendmanager_remote source file.
     301
     302Thu Jun 05 17:29:16 GMT 2008  Richard Boulton <richard@lemurconsulting.com>
     303
     304        * win32_expand.mak: Replace reference to expand.cc and expand.obj
     305          with esetinternal.cc and esetinternal.obj - expand.cc has now
     306          been removed, and esetinternal.cc added.
     307
     308Thu Jun 05 17:11:14 GMT 2008  Richard Boulton <richard@lemurconsulting.com>
     309
     310        * win32_bin.mak: Remove comments about the now removed quartz
     311          utilities, and a reference to them in the CLEAN rule.
     312        * README: Remove trailing whitespace.  Clean up list of "what
     313          works".
     314
     315Thu Jun 05 17:04:26 GMT 2008  Richard Boulton <richard@lemurconsulting.com>
     316
     317        * Start of ChangeLog.

  • config.mak

     
    239239 "$(OUTLIBDIR)\libbrass.lib" \
    240240 "$(OUTLIBDIR)\libchert.lib" \
    241241 "$(OUTLIBDIR)\libflint.lib" \
     242 "$(OUTLIBDIR)\libbrass.lib" \
    242243 "$(OUTLIBDIR)\libinmemory.lib" \
    243244 "$(OUTLIBDIR)\libmulti.lib" \
    244245 "$(OUTLIBDIR)\libmatcher.lib"  \

  • Makefile

     
    107107   copy  win32_backends_flint.mak ..\backends\flint\Makefile
    108108   copy  win32_backends_brass.mak ..\backends\brass\Makefile
    109109   copy  win32_backends_chert.mak ..\backends\chert\Makefile
     110   copy  win32_backends_brass.mak ..\backends\brass\Makefile
    110111   copy  win32_backends_inmemory.mak ..\backends\inmemory\Makefile
    111112   copy  win32_backends_multi.mak ..\backends\multi\Makefile
    112113   copy  win32_backends_remote.mak ..\backends\remote\Makefile

  • win32_backends.mak

     
    1515    "$(OUTDIR)\libinmemory.lib" \
    1616    "$(OUTDIR)\libremote.lib" \
    1717    "$(OUTDIR)\libflint.lib" \
     18    "$(OUTDIR)\libbrass.lib" \
    1819    "$(OUTDIR)\libchert.lib" \
    1920    "$(OUTDIR)\libbrass.lib" \
    2021    $(NULL)
    … …  
    3738        $(INTDIR)\valuelist.cc \
    3839        $(INTDIR)\slowvaluelist.cc \
    3940        $(INTDIR)\contiguousalldocspostlist.cc \
    40         $(INTDIR)\flint_lock.cc 
     41        $(INTDIR)\flint_lock.cc
    4142
    42 
    43          
     43 
    4444ALL : $(DEPLIBS) "$(OUTDIR)\libbackend.lib"
    4545
    4646CLEAN :
    … …  
    5454        nmake /$(MAKEFLAGS) CLEAN DEBUG=$(DEBUG)
    5555        cd ..\flint
    5656        nmake /$(MAKEFLAGS) CLEAN DEBUG=$(DEBUG)
     57        cd ..\brass
     58        nmake /$(MAKEFLAGS) CLEAN DEBUG=$(DEBUG)
    5759        cd ..\inmemory
    5860        nmake /$(MAKEFLAGS) CLEAN DEBUG=$(DEBUG)
    5961        cd ..\multi
    … …  
    9395       nmake $(MAKEMACRO) /$(MAKEFLAGS) CFG="$(CFG)" DEBUG="$(DEBUG)"
    9496       cd ..
    9597
     98"$(OUTDIR)\libbrass.lib":
     99       cd brass
     100       nmake $(MAKEMACRO) /$(MAKEFLAGS) CFG="$(CFG)" DEBUG="$(DEBUG)"
     101       cd ..
     102       
    96103"$(OUTDIR)\libinmemory.lib":
    97104       cd inmemory
    98105       nmake $(MAKEMACRO) /$(MAKEFLAGS) CFG="$(CFG)" DEBUG="$(DEBUG)"

  • win32_backends_brass.mak

     
     1# Makefile for Microsoft Visual C++ 7.0 (or compatible)
     2#  by Charlie Hull, Lemur Consulting Ltd.
     3# www.lemurconsulting.com
     4
     5# Will build a Win32 static library (non-debug) libbrass.lib
     6
     7!INCLUDE ..\..\win32\config.mak
     8
     9OUTDIR=..\..\win32\$(XAPIAN_DEBUG_OR_RELEASE)\libs
     10INTDIR=.\
     11
     12ALL : "$(OUTDIR)\libbrass.lib"  "$(OUTDIR)\libbrassbtreecheck.lib"
     13
     14LIBBRASSBTREECHECK_OBJS= \
     15                $(INTDIR)\brass_check.obj
     16
     17OBJS= \
     18                $(INTDIR)\brass_alldocspostlist.obj\
     19                $(INTDIR)\brass_alltermslist.obj\
     20                $(INTDIR)\brass_btreebase.obj\
     21                $(INTDIR)\brass_cursor.obj\
     22                $(INTDIR)\brass_database.obj\
     23                $(INTDIR)\brass_databasereplicator.obj\
     24                $(INTDIR)\brass_dbstats.obj\
     25                $(INTDIR)\brass_document.obj\
     26                $(INTDIR)\brass_inverter.obj\
     27                $(INTDIR)\brass_io.obj\
     28                $(INTDIR)\brass_metadata.obj\
     29                $(INTDIR)\brass_positionlist.obj\
     30                $(INTDIR)\brass_postlist.obj\
     31                $(INTDIR)\brass_record.obj\
     32                $(INTDIR)\brass_spelling.obj\
     33                $(INTDIR)\brass_spellingwordslist.obj\
     34                $(INTDIR)\brass_synonym.obj\
     35                $(INTDIR)\brass_table.obj\
     36                $(INTDIR)\brass_termlist.obj\
     37                $(INTDIR)\brass_termlisttable.obj\
     38                $(INTDIR)\brass_values.obj\
     39                $(INTDIR)\brass_valuelist.obj\
     40                $(INTDIR)\brass_version.obj
     41
     42SRCS= \
     43                $(INTDIR)\brass_alldocspostlist.cc\
     44                $(INTDIR)\brass_alltermslist.cc\
     45                $(INTDIR)\brass_btreebase.cc\
     46                $(INTDIR)\brass_cursor.cc\
     47                $(INTDIR)\brass_database.cc\
     48                $(INTDIR)\brass_databasereplicator.cc\
     49                $(INTDIR)\brass_dbstats.cc\
     50                $(INTDIR)\brass_document.cc\
     51                $(INTDIR)\brass_inverter.cc\
     52                $(INTDIR)\brass_io.cc\
     53                $(INTDIR)\brass_metadata.cc\
     54                $(INTDIR)\brass_positionlist.cc\
     55                $(INTDIR)\brass_postlist.cc\
     56                $(INTDIR)\brass_record.cc\
     57                $(INTDIR)\brass_spelling.cc\
     58                $(INTDIR)\brass_spellingwordslist.cc\
     59                $(INTDIR)\brass_synonym.cc\
     60                $(INTDIR)\brass_table.cc\
     61                $(INTDIR)\brass_termlist.cc\
     62                $(INTDIR)\brass_termlisttable.cc\
     63                $(INTDIR)\brass_values.cc\
     64                $(INTDIR)\brass_valuelist.cc\
     65                $(INTDIR)\brass_version.cc\
     66                $(INTDIR)\brass_check.cc
     67
     68CLEAN :
     69    -@erase "$(OUTDIR)\libbrass.lib"
     70    -@erase "$(OUTDIR)\libbrassbtreecheck.lib"
     71    -@erase "*.pch"
     72    -@erase "$(INTDIR)\*.pdb"
     73    -@erase "$(INTDIR)\getopt.obj"
     74    -@erase "$(INTDIR)\brass_check.obj"
     75    -@erase $(OBJS)
     76
     77
     78"$(OUTDIR)" :
     79    if not exist "$(OUTDIR)-$(NULL)" mkdir "$(OUTDIR)"
     80
     81CPP_PROJ=$(CPPFLAGS_EXTRA) \
     82 -I "..\.." -I "..\..\include" -I"..\..\common" -I"..\..\languages" \
     83 -Fo"$(INTDIR)\\"
     84 
     85CPP_OBJS=..\..\win32\$(XAPIAN_DEBUG_OR_RELEASE)
     86CPP_SBRS=.
     87
     88"$(OUTDIR)\libbrass.lib" : "$(OUTDIR)" $(DEF_FILE) $(OBJS)
     89    $(LIB32) @<<
     90  $(LIB32_FLAGS) -out:"$(OUTDIR)\libbrass.lib" $(DEF_FLAGS) $(OBJS)
     91<<
     92
     93"$(OUTDIR)\libbrassbtreecheck.lib" : "$(OUTDIR)" $(DEF_FILE) $(LIBBRASSBTREECHECK_OBJS)
     94    $(LIB32) @<<
     95  $(LIB32_FLAGS) -out:"$(OUTDIR)\libbrassbtreecheck.lib" $(DEF_FLAGS) $(LIBBRASSBTREECHECK_OBJS)
     96<<
     97
     98# inference rules, showing how to create one type of file from another with the same root name
     99{.}.cc{$(INTDIR)}.obj::
     100        $(CPP) @<<
     101        $(CPP_PROJ) $<
     102<<
     103
     104{.}.cc{$(CPP_SBRS)}.sbr::
     105   $(CPP) @<<
     106   $(CPP_PROJ) $<
     107<<
     108
     109# Calculate any header dependencies and automatically insert them into this file
     110HEADERS :
     111            if exist "..\win32\$(DEPEND)" ..\win32\$(DEPEND) $(DEPEND_FLAGS) -- $(CPP_PROJ) -- $(SRCS) -I"$(INCLUDE)"
     112# DO NOT DELETE THIS LINE -- make depend depends on it.
     113

  • win32_backends_chert.mak

     
    2424                $(INTDIR)\chert_databasereplicator.obj\
    2525                $(INTDIR)\chert_dbstats.obj\
    2626                $(INTDIR)\chert_document.obj\
    27                 $(INTDIR)\chert_io.obj\
    2827                $(INTDIR)\chert_metadata.obj\
    2928                $(INTDIR)\chert_modifiedpostlist.obj\
    3029                $(INTDIR)\chert_positionlist.obj\
    … …  
    5049                $(INTDIR)\chert_databasereplicator.cc\
    5150                $(INTDIR)\chert_dbstats.cc\
    5251                $(INTDIR)\chert_document.cc\
    53                 $(INTDIR)\chert_io.cc\
    5452                $(INTDIR)\chert_metadata.cc\
    5553                $(INTDIR)\chert_modifiedpostlist.cc\
    5654                $(INTDIR)\chert_positionlist.cc\

  • win32_backends_flint.mak

     
    2424                $(INTDIR)\flint_database.obj\
    2525                $(INTDIR)\flint_databasereplicator.obj\
    2626                $(INTDIR)\flint_document.obj\
    27                 $(INTDIR)\flint_io.obj\
    2827                $(INTDIR)\flint_metadata.obj\
    2928                $(INTDIR)\flint_modifiedpostlist.obj\
    3029                $(INTDIR)\flint_positionlist.obj\
    … …  
    4746                $(INTDIR)\flint_database.cc\
    4847                $(INTDIR)\flint_databasereplicator.cc\
    4948                $(INTDIR)\flint_document.cc\
    50                 $(INTDIR)\flint_io.cc\
    5149                $(INTDIR)\flint_metadata.cc\
    5250                $(INTDIR)\flint_modifiedpostlist.cc\
    5351                $(INTDIR)\flint_positionlist.cc\

  • win32_common.mak

     
    1818    $(INTDIR)\debuglog.obj\
    1919    $(INTDIR)\fileutils.obj \
    2020    $(INTDIR)\getopt.obj \
     21    $(INTDIR)\io_utils.obj \
    2122    $(INTDIR)\msvc_dirent.obj \
    2223    $(INTDIR)\msvc_posix_wrapper.obj \
    2324    $(INTDIR)\omdebug.obj \
     25    $(INTDIR)\replicate_utils.obj \
    2426    $(INTDIR)\safe.obj \
    2527    $(INTDIR)\serialise-double.obj \
    2628    $(INTDIR)\socket_utils.obj \
    … …  
    3537    $(INTDIR)\debuglog.cc\
    3638    $(INTDIR)\fileutils.cc \
    3739    $(INTDIR)\getopt.cc \
     40    $(INTDIR)\io_utils.cc \
    3841    $(INTDIR)\msvc_dirent.cc \
    3942    $(INTDIR)\msvc_posix_wrapper.cc \
    4043    $(INTDIR)\omdebug.cc \
     44    $(INTDIR)\replicate_utils.cc \
    4145    $(INTDIR)\safe.cc \
    4246    $(INTDIR)\serialise-double.cc \
    4347    $(INTDIR)\socket_utils.cc \

  • win32_geospatial.mak

     
    1313
    1414OBJS= \
    1515        $(INTDIR)\htmcalc.obj \
    16         $(INTDIR)\latlong_distance_sorter.obj \
     16        $(INTDIR)\latlong_distance_keymaker.obj \
    1717        $(INTDIR)\latlong_match_decider.obj \
    1818        $(INTDIR)\latlong_posting_source.obj \
    1919        $(INTDIR)\latlongcoord.obj \
    … …  
    2222
    2323SRCS= \
    2424        $(INTDIR)\htmcalc.cc \
    25         $(INTDIR)\latlong_distance_sorter.cc \
     25        $(INTDIR)\latlong_distance_keymaker.cc \
    2626        $(INTDIR)\latlong_match_decider.cc \
    2727        $(INTDIR)\latlong_posting_source.cc \
    2828        $(INTDIR)\latlongcoord.cc \
    … …  
    6767<<
    6868
    6969# Calculate any header dependencies and automatically insert them into this file
    70 HEADERS :
    71             if exist "..\win32\$(DEPEND)" ..\win32\$(DEPEND) $(DEPEND_FLAGS) -- $(CPP_PROJ) -- $(SRCS) -I"$(INCLUDE)"
    72 # DO NOT DELETE THIS LINE -- make depend depends on it.
     70HEADERS : $(INTDIR)\latlongparse_token.h
     71    -@erase deps.d
     72    $(CPP) -showIncludes $(CPP_PROJ) $(SRCS) >>deps.d
     73    if exist "..\win32\$(DEPEND)" ..\win32\$(DEPEND)
     74# DO NOT DELETE THIS LINE -- xapdep depends on it.
     75 No newline at end of file

  • win32_matcher.mak

     
    6161    $(INTDIR)\synonympostlist.cc\
    6262    $(INTDIR)\valuerangepostlist.cc\
    6363    $(INTDIR)\valuegepostlist.cc\
    64     $(INTDIR)\valuestreamdocument.cc\
     64    $(INTDIR)\valuestreamdocument.cc \
    6565    $(INTDIR)\xorpostlist.cc\
    6666    $(INTDIR)\remotesubmatch.cc
    6767

  • win32_testsuite.mak

     
    2020        $(INTDIR)\backendmanager_flint.obj \
    2121        $(INTDIR)\backendmanager_brass.obj \
    2222        $(INTDIR)\backendmanager_chert.obj \
     23        $(INTDIR)\backendmanager_brass.obj \
    2324        $(INTDIR)\backendmanager_inmemory.obj \
    2425        $(INTDIR)\backendmanager_multi.obj \
    2526        $(INTDIR)\backendmanager_remote.obj \
    … …  
    3940        $(INTDIR)\backendmanager_flint.cc \
    4041        $(INTDIR)\backendmanager_brass.cc \
    4142        $(INTDIR)\backendmanager_chert.cc \
     43        $(INTDIR)\backendmanager_brass.cc \
    4244        $(INTDIR)\backendmanager_inmemory.cc \
    4345        $(INTDIR)\backendmanager_multi.cc \
    4446        $(INTDIR)\backendmanager_remote.cc \