Ticket #457: geospatial3.patch

File geospatial3.patch, 31.0 KB (added by Charlie Hull, 15 years ago)

Improved patch to current sources, adds in Brass backend etc.

  • 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 Fri Nov 20 11:49:07 GMT 2009  Richard Boulton <richard@tartarus.org>
    22 
    23         * win32_backends_multi.mak,win32_matcher.mak: Patch from Charlie to
    24           add valuestreamdocument.cc and multi_valuelist.cc to build.
    25 
    26 Tue Oct 27 16:17:09 GMT 2009  Richard Boulton <richard@lemurconsulting.com>
    27 
    28         * win32_applications_omega.mak: Remove dirent.cc, update path to
    29           getopt.cc, add freemem.cc, add mkdtemp.obj to OMINDEX objects,
    30           and rename UTF8TEST_OBJS to UTF8CONVERTTEST_OBJS.
    31 
    32 Fri Oct 16 09:04:00 GMT 2009  Charlie Hull <charlie@flax.co.uk>
    33 
    34         * config.h.win32,config.h.omega.win32: disable warning about macros
    35           with missing parameters.
    36         * win32_tests.mak: add api_sortingold.cc
    37         * win32_api.mak: remove sorter.cc, add keymaker.cc
    38 
    39 Mon Aug 24 10:40:00 GMT 2009  Charlie Hull <charlie@flax.co.uk>
    40 
    41         * Makefile: Remove rules to make generate-exceptions.
    42         * win32_api.mak: Remove serialisationcontext.cc, add registry.cc
    43 
    44 Tue Aug 04 15:30:00 GMT 2009  Charlie Hull <charlie@flax.co.uk>
    45 
    46         * Makefile, win32_bindings_python.mak, config.mak, makebinaries.py:
    47           Add Python 2.6 option.
    48 
    49 Sun Aug 02 12:22:52 GMT 2009  Richard Boulton <richard@lemurconsulting.com>
    50 
    51         * win32_api.mak: Add matchspy files.
    52 
    53 Mon Jul 20 13:52:53 GMT 2009  Olly Betts <olly@survex.com>
    54 
    55         * config.mak,win32_bindings_python.mak: Update to include Python 3.0
    56           support, ready for when then bindings support this.  From patch in
    57           ticket #346.
    58 
    59 Mon Jul 20 13:43:48 GMT 2009  Olly Betts <olly@survex.com>
    60 
    61         * win32_api.mak: Update for added sources, from patch by Peter Kelm in
    62           ticket#346.
    63 
    64 Mon Jul 20 13:38:37 GMT 2009  Olly Betts <olly@survex.com>
    65 
    66         * win32_matcher.mak: Update for removed sources, from patch by Peter
    67           Kelm in ticket#346.
    68 
    69 Fri May 08 12:55:32 GMT 2009  Olly Betts <olly@survex.com>
    70 
    71         * config.mak,win32_bindings_python.mak,win32_tests.mak,
    72           win32_testsuite.mak: Update from Peter Kelm to work with SVN trunk
    73           (ticket#366).
    74 
    75 Tue May 05 12:42:26 GMT 2009  Richard Boulton <richard@lemurconsulting.com>
    76 
    77         * win32_matcher.mak: Add synoympostlist.cc to build.
    78 
    79 Fri May 01 15:40:48 GMT 2009  Richard Boulton <richard@lemurconsulting.com>
    80 
    81         * win32_tests.mak: Add api_replicate.cc and api_serialise.cc, and
    82           cleanup .obj files.
    83 
    84 Wed Apr 22 16:21:53 GMT 2009  Richard Boulton <richard@lemurconsulting.com>
    85 
    86         * makebinaries.py,win32_tests.mak: Add a script and some changes to
    87           the test makefile which got missed out of the previous commit.
    88 
    89 Tue Apr 21 10:34:00 GMT 2009  Charlie Hull <charlie@lemurconsulting.com>
    90 
    91         * config.h.omega.win32: Update version numbers
    92         * win32_tests.mak: add some new tests and reformat for clarity
    93         * Makefile: MAKEALLBINDINGS now depends on COPYMAKFILES
    94         * config.h.omega.win32: define 'rare' and 'usual'
    95         * makebinaries.py: fix quotes
    96         * makedepend.mak, Makefile: CLEAN now also cleans makedepend
    97 
    98 Wed Mar 25 12:49:00 GMT 2009  Charlie Hull <charlie@lemurconsulting.com>
    99 
    100         * win32_weight.mak,config.mak,Makefile: add new makefile for
    101           /weight folder
    102         * win32_api.mak,win32_matcher.mak,win32_backend_chert.mak,
    103           win32_common.mak: correct file lists
    104         * win32_bin.mak,config.mak: remove Quartz bits, add
    105           xapian-replicate and xapian-replicate-server
    106 
    107 Thu Mar 19 11:55:00 GMT 2009  Charlie Hull <charlie@lemurconsulting.com>
    108 
    109         * config.mak, win32_bindings_python.mak: add ability to build two
    110           different Python versions, and add example files, and change
    111           BUILDDIST to DIST for consistency with other bindings
    112         * setup.py: add example & documentation files for Python
    113         * win32_bindings_php.mak,win32_bindings_csharp.mak,
    114           win32_bindings_java-swig.mak,win32_bindings_ruby.mak: add example
    115           & doc files where they exist and DIST build target
    116         * win32_bindings_php.mak,win32_bindings_csharp.mak,win32_examples.mak,
    117           win32_bin.mak: add Manifests into .exe or .dll and remove
    118           separate manifest files
    119         * Makefile: add MAKEALLBINDINGS target for building all bindings
    120         * README: update for the above changes
    121         * win32_applications_omega.mak: add new file for omindex
    122         * config.h.omega.win32: Update version numbers, undefine rare()
    123 
    124 Mon Feb 16 12:02:48 GMT 2009  Richard Boulton <richard@lemurconsulting.com>
    125 
    126         * win32_bindings_csharp.mak: Remove doubled file contents.
    127 
    128 Mon Dec 22 16:50:55 GMT 2008  Richard Boulton <richard@lemurconsulting.com>
    129 
    130         * version.rc.csharp,win32_bindings_csharp.mak: Add files missed
    131           from last commit.
    132 
    133 Mon Dec 22 16:49:46 GMT 2008  Richard Boulton <richard@lemurconsulting.com>
    134 
    135         * Makefile,README,config.h.omega.win32,config.mak,genversion.pl,
    136           win32_api.mak,win32_backends.mak,win32_backends_chert.mak,
    137           win32_backends_flint.mak,win32_perftest.mak: Add C# bindings to
    138           build system, and update with new files for replication in
    139           xapian-core.
    140 
    141 Thu Dec 11 12:04:11 GMT 2008  Richard Boulton <richard@lemurconsulting.com>
    142 
    143         * win32_tests.mak: Add support for new test file, api_backend.cc
    144 
    145 Thu Nov 06 12:50:34 GMT 2008  Richard Boulton <richard@lemurconsulting.com>
    146 
    147         * win32_perftest.mak: Call collate-apitest in the new way.  Add
    148           libtest.lib.
    149         * win32_tests.mak: Call collate-apitest in the
    150           new way.  Add api_spelling.cc.  Improve "nmake CLEAN" target.
    151         * win32_api.mak: omvalueiterator.cc renamed to valueiterator.cc,
    152           add documentvaluelist.cc.
    153         * win32_backends.mak: add dbfactory_remote.cc, valuelist.cc and
    154           slowvaluelist.cc.
    155         * win32_backends_remote.mak: rename net_document.cc to
    156           remote-document.cc.
    157         * config.mak: Change paths to XAPIAN_APPLICATIONS and
    158           XAPIAN_BINDINGS to be appropriate for a SVN checkout, rather than
    159           for unpacked tarballs.  Add rpcrt4.lib for UUID functions. Remove
    160           libquartz.lib, and add libchert.lib.
    161         * win32_common.mak: Add win32_uuid.cc. (Not yet in trunk, but
    162           needed for windows compile - currently requires patch attached to
    163           bug #303.)
    164         * config.h.win32: Update version numbers (to 1.1.0, to match
    165           configure.ac). Define 'usual' keyword to identity, since we don't
    166           have this in MSVC.
    167 
    168 Mon Sep 08 09:59:17 GMT 2008  Richard Boulton <richard@lemurconsulting.com>
    169 
    170         * genversion.pl: Update to match new configure.ac (cope with the []'s
    171           which have been added).
    172 
    173 Wed Aug 20 09:31:47 GMT 2008  Richard Boulton <richard@lemurconsulting.com>
    174 
    175         * README: Remove trailing whitespace.
    176 
    177 Thu Aug 14 15:42:00 GMT 2008  Charlie Hull <charlie@lemurconsulting.com>
    178 
    179         * win32_bindings_ruby.mak,config.mak,README,Makefile: Added new
    180           Ruby bindings makefile written by Zsolt Sz. Sztupák.  Update list
    181           of "what works" in README.
    182 
    183 Sun Jun 29 06:53:28 GMT 2008  Richard Boulton <richard@lemurconsulting.com>
    184 
    185         * version.rc.java-swig,version.rc.php,version.rc.python: Change
    186           "Copyright ... Xapian" messages to a note to consult the source
    187           code - Xapian isn't a legal entity, so nothing can be "(C)
    188           Xapian".
    189 
    190 Wed Jun 25 13:18:50 GMT 2008  Richard Boulton <richard@lemurconsulting.com>
    191 
    192         * Makefile: Patch from Charlie to fix some paths for "cd".
    193 
    194 Tue Jun 24 16:06:57 GMT 2008  Richard Boulton <richard@lemurconsulting.com>
    195 
    196         * NEWS: Add note about Java-SWIG makefiles.
    197 
    198 Tue Jun 24 16:06:21 GMT 2008  Richard Boulton <richard@lemurconsulting.com>
    199 
    200         * win32_backends_chert.mak: Add chert_alldocsmodifiedpostlist
    201           source files.
    202         * win32_testsuite.mak: Add backendmanager_remote source file.
    203 
    204 Thu Jun 05 17:29:16 GMT 2008  Richard Boulton <richard@lemurconsulting.com>
    205 
    206         * win32_expand.mak: Replace reference to expand.cc and expand.obj
    207           with esetinternal.cc and esetinternal.obj - expand.cc has now
    208           been removed, and esetinternal.cc added.
    209 
    210 Thu Jun 05 17:11:14 GMT 2008  Richard Boulton <richard@lemurconsulting.com>
    211 
    212         * win32_bin.mak: Remove comments about the now removed quartz
    213           utilities, and a reference to them in the CLEAN rule.
    214         * README: Remove trailing whitespace.  Clean up list of "what
    215           works".
    216 
    217 Thu Jun 05 17:04:26 GMT 2008  Richard Boulton <richard@lemurconsulting.com>
    218 
    219         * Start of ChangeLog.
     1Fri  16 10:51:42 GMT 2010  Charlie Hull <charlie@flax.co.uk>
     2
     3        * Makefile,config.mak,version.h.in,win32_backends.mak,
     4          win32_backends_brass.mak,win32_backends_chert.mak,
     5          win32_backends_flint.mak,win32_bin.mak,win32_testsuite.mak:
     6        add in Brass backend, move flint_lock.cc to backends root
     7    * win32_geospatial.mak: replace latlong_distance_sorter.cc
     8    with latlong_distance_keymaker.cc
     9
     10Fri Apr 16 09:53:05 GMT 2010  Richard Boulton <richard@tartarus.org>
     11
     12        * win32_api.mak,win32_backends_multi.mak,win32_matcher.mak,
     13          win32_tests.mak: Revert previous patch - was broken in several
     14          ways.
     15
     16Fri Apr 16 09:07:44 GMT 2010  Richard Boulton <richard@tartarus.org>
     17
     18        * win32_api.mak,win32_backends_multi.mak,win32_matcher.mak,
     19          win32_tests.mak: Updates to the windows build system from Charlie
     20          Hull - ticket #457.
     21
     22Tue Aug 25 16:32:54 GMT 2009  Richard Boulton <richard@lemurconsulting.com>
     23
     24        * Makefile,config.mak,win32_geospatial.mak: Add geospatial lib.
     25
     26Tue Aug 25 16:41:00 GMT 2009  Charlie Hull <charlie@flax.co.uk>
     27
     28    * Makefile, win32_geospatial.mak, config.mak - add geospatial lib
     29
     30Fri Nov 20 11:49:07 GMT 2009  Richard Boulton <richard@tartarus.org>
     31
     32        * win32_backends_multi.mak,win32_matcher.mak: Patch from Charlie to
     33          add valuestreamdocument.cc and multi_valuelist.cc to build.
     34
     35Tue Oct 27 16:17:09 GMT 2009  Richard Boulton <richard@lemurconsulting.com>
     36
     37        * win32_applications_omega.mak: Remove dirent.cc, update path to
     38          getopt.cc, add freemem.cc, add mkdtemp.obj to OMINDEX objects,
     39          and rename UTF8TEST_OBJS to UTF8CONVERTTEST_OBJS.
     40
     41Fri Oct 16 09:04:00 GMT 2009  Charlie Hull <charlie@flax.co.uk>
     42
     43        * config.h.win32,config.h.omega.win32: disable warning about macros
     44          with missing parameters.
     45        * win32_tests.mak: add api_sortingold.cc
     46        * win32_api.mak: remove sorter.cc, add keymaker.cc
     47
     48Mon Aug 24 10:40:00 GMT 2009  Charlie Hull <charlie@flax.co.uk>
     49
     50        * Makefile: Remove rules to make generate-exceptions.
     51        * win32_api.mak: Remove serialisationcontext.cc, add registry.cc
     52
     53Tue Aug 04 15:30:00 GMT 2009  Charlie Hull <charlie@flax.co.uk>
     54
     55        * Makefile, win32_bindings_python.mak, config.mak, makebinaries.py:
     56          Add Python 2.6 option.
     57
     58Sun Aug 02 12:22:52 GMT 2009  Richard Boulton <richard@lemurconsulting.com>
     59
     60        * win32_api.mak: Add matchspy files.
     61
     62Mon Jul 20 13:52:53 GMT 2009  Olly Betts <olly@survex.com>
     63
     64        * config.mak,win32_bindings_python.mak: Update to include Python 3.0
     65          support, ready for when then bindings support this.  From patch in
     66          ticket #346.
     67
     68Mon Jul 20 13:43:48 GMT 2009  Olly Betts <olly@survex.com>
     69
     70        * win32_api.mak: Update for added sources, from patch by Peter Kelm in
     71          ticket#346.
     72
     73Mon Jul 20 13:38:37 GMT 2009  Olly Betts <olly@survex.com>
     74
     75        * win32_matcher.mak: Update for removed sources, from patch by Peter
     76          Kelm in ticket#346.
     77
     78Fri May 08 12:55:32 GMT 2009  Olly Betts <olly@survex.com>
     79
     80        * config.mak,win32_bindings_python.mak,win32_tests.mak,
     81          win32_testsuite.mak: Update from Peter Kelm to work with SVN trunk
     82          (ticket#366).
     83
     84Tue May 05 12:42:26 GMT 2009  Richard Boulton <richard@lemurconsulting.com>
     85
     86        * win32_matcher.mak: Add synoympostlist.cc to build.
     87
     88Fri May 01 15:40:48 GMT 2009  Richard Boulton <richard@lemurconsulting.com>
     89
     90        * win32_tests.mak: Add api_replicate.cc and api_serialise.cc, and
     91          cleanup .obj files.
     92
     93Wed Apr 22 16:21:53 GMT 2009  Richard Boulton <richard@lemurconsulting.com>
     94
     95        * makebinaries.py,win32_tests.mak: Add a script and some changes to
     96          the test makefile which got missed out of the previous commit.
     97
     98Tue Apr 21 10:34:00 GMT 2009  Charlie Hull <charlie@lemurconsulting.com>
     99
     100        * config.h.omega.win32: Update version numbers
     101        * win32_tests.mak: add some new tests and reformat for clarity
     102        * Makefile: MAKEALLBINDINGS now depends on COPYMAKFILES
     103        * config.h.omega.win32: define 'rare' and 'usual'
     104        * makebinaries.py: fix quotes
     105        * makedepend.mak, Makefile: CLEAN now also cleans makedepend
     106
     107Wed Mar 25 12:49:00 GMT 2009  Charlie Hull <charlie@lemurconsulting.com>
     108
     109        * win32_weight.mak,config.mak,Makefile: add new makefile for
     110          /weight folder
     111        * win32_api.mak,win32_matcher.mak,win32_backend_chert.mak,
     112          win32_common.mak: correct file lists
     113        * win32_bin.mak,config.mak: remove Quartz bits, add
     114          xapian-replicate and xapian-replicate-server
     115
     116Thu Mar 19 11:55:00 GMT 2009  Charlie Hull <charlie@lemurconsulting.com>
     117
     118        * config.mak, win32_bindings_python.mak: add ability to build two
     119          different Python versions, and add example files, and change
     120          BUILDDIST to DIST for consistency with other bindings
     121        * setup.py: add example & documentation files for Python
     122        * win32_bindings_php.mak,win32_bindings_csharp.mak,
     123          win32_bindings_java-swig.mak,win32_bindings_ruby.mak: add example
     124          & doc files where they exist and DIST build target
     125        * win32_bindings_php.mak,win32_bindings_csharp.mak,win32_examples.mak,
     126          win32_bin.mak: add Manifests into .exe or .dll and remove
     127          separate manifest files
     128        * Makefile: add MAKEALLBINDINGS target for building all bindings
     129        * README: update for the above changes
     130        * win32_applications_omega.mak: add new file for omindex
     131        * config.h.omega.win32: Update version numbers, undefine rare()
     132
     133Mon Feb 16 12:02:48 GMT 2009  Richard Boulton <richard@lemurconsulting.com>
     134
     135        * win32_bindings_csharp.mak: Remove doubled file contents.
     136
     137Mon Dec 22 16:50:55 GMT 2008  Richard Boulton <richard@lemurconsulting.com>
     138
     139        * version.rc.csharp,win32_bindings_csharp.mak: Add files missed
     140          from last commit.
     141
     142Mon Dec 22 16:49:46 GMT 2008  Richard Boulton <richard@lemurconsulting.com>
     143
     144        * Makefile,README,config.h.omega.win32,config.mak,genversion.pl,
     145          win32_api.mak,win32_backends.mak,win32_backends_chert.mak,
     146          win32_backends_flint.mak,win32_perftest.mak: Add C# bindings to
     147          build system, and update with new files for replication in
     148          xapian-core.
     149
     150Thu Dec 11 12:04:11 GMT 2008  Richard Boulton <richard@lemurconsulting.com>
     151
     152        * win32_tests.mak: Add support for new test file, api_backend.cc
     153
     154Thu Nov 06 12:50:34 GMT 2008  Richard Boulton <richard@lemurconsulting.com>
     155
     156        * win32_perftest.mak: Call collate-apitest in the new way.  Add
     157          libtest.lib.
     158        * win32_tests.mak: Call collate-apitest in the
     159          new way.  Add api_spelling.cc.  Improve "nmake CLEAN" target.
     160        * win32_api.mak: omvalueiterator.cc renamed to valueiterator.cc,
     161          add documentvaluelist.cc.
     162        * win32_backends.mak: add dbfactory_remote.cc, valuelist.cc and
     163          slowvaluelist.cc.
     164        * win32_backends_remote.mak: rename net_document.cc to
     165          remote-document.cc.
     166        * config.mak: Change paths to XAPIAN_APPLICATIONS and
     167          XAPIAN_BINDINGS to be appropriate for a SVN checkout, rather than
     168          for unpacked tarballs.  Add rpcrt4.lib for UUID functions. Remove
     169          libquartz.lib, and add libchert.lib.
     170        * win32_common.mak: Add win32_uuid.cc. (Not yet in trunk, but
     171          needed for windows compile - currently requires patch attached to
     172          bug #303.)
     173        * config.h.win32: Update version numbers (to 1.1.0, to match
     174          configure.ac). Define 'usual' keyword to identity, since we don't
     175          have this in MSVC.
     176
     177Mon Sep 08 09:59:17 GMT 2008  Richard Boulton <richard@lemurconsulting.com>
     178
     179        * genversion.pl: Update to match new configure.ac (cope with the []'s
     180          which have been added).
     181
     182Wed Aug 20 09:31:47 GMT 2008  Richard Boulton <richard@lemurconsulting.com>
     183
     184        * README: Remove trailing whitespace.
     185
     186Thu Aug 14 15:42:00 GMT 2008  Charlie Hull <charlie@lemurconsulting.com>
     187
     188        * win32_bindings_ruby.mak,config.mak,README,Makefile: Added new
     189          Ruby bindings makefile written by Zsolt Sz. Sztupák.  Update list
     190          of "what works" in README.
     191
     192Sun Jun 29 06:53:28 GMT 2008  Richard Boulton <richard@lemurconsulting.com>
     193
     194        * version.rc.java-swig,version.rc.php,version.rc.python: Change
     195          "Copyright ... Xapian" messages to a note to consult the source
     196          code - Xapian isn't a legal entity, so nothing can be "(C)
     197          Xapian".
     198
     199Wed Jun 25 13:18:50 GMT 2008  Richard Boulton <richard@lemurconsulting.com>
     200
     201        * Makefile: Patch from Charlie to fix some paths for "cd".
     202
     203Tue Jun 24 16:06:57 GMT 2008  Richard Boulton <richard@lemurconsulting.com>
     204
     205        * NEWS: Add note about Java-SWIG makefiles.
     206
     207Tue Jun 24 16:06:21 GMT 2008  Richard Boulton <richard@lemurconsulting.com>
     208
     209        * win32_backends_chert.mak: Add chert_alldocsmodifiedpostlist
     210          source files.
     211        * win32_testsuite.mak: Add backendmanager_remote source file.
     212
     213Thu Jun 05 17:29:16 GMT 2008  Richard Boulton <richard@lemurconsulting.com>
     214
     215        * win32_expand.mak: Replace reference to expand.cc and expand.obj
     216          with esetinternal.cc and esetinternal.obj - expand.cc has now
     217          been removed, and esetinternal.cc added.
     218
     219Thu Jun 05 17:11:14 GMT 2008  Richard Boulton <richard@lemurconsulting.com>
     220
     221        * win32_bin.mak: Remove comments about the now removed quartz
     222          utilities, and a reference to them in the CLEAN rule.
     223        * README: Remove trailing whitespace.  Clean up list of "what
     224          works".
     225
     226Thu Jun 05 17:04:26 GMT 2008  Richard Boulton <richard@lemurconsulting.com>
     227
     228        * Start of ChangeLog.

  • config.mak

     
    240240 "$(OUTLIBDIR)\libexpand.lib"  \
    241241 "$(OUTLIBDIR)\libchert.lib" \
    242242 "$(OUTLIBDIR)\libflint.lib" \
     243 "$(OUTLIBDIR)\libbrass.lib" \
    243244 "$(OUTLIBDIR)\libinmemory.lib" \
    244245 "$(OUTLIBDIR)\libmulti.lib" \
    245246 "$(OUTLIBDIR)\libmatcher.lib"  \

  • Makefile

     
    106106   copy  win32_backends.mak ..\backends\Makefile
    107107   copy  win32_backends_flint.mak ..\backends\flint\Makefile
    108108   copy  win32_backends_chert.mak ..\backends\chert\Makefile
     109   copy  win32_backends_brass.mak ..\backends\brass\Makefile
    109110   copy  win32_backends_inmemory.mak ..\backends\inmemory\Makefile
    110111   copy  win32_backends_multi.mak ..\backends\multi\Makefile
    111112   copy  win32_backends_remote.mak ..\backends\remote\Makefile

  • version.h.in

     
    2828#define XAPIAN_MINOR_VERSION @MINOR_VERSION@
    2929#define XAPIAN_REVISION @REVISION@
    3030
     31#define XAPIAN_HAS_BRASS_BACKEND 1
    3132#define XAPIAN_HAS_CHERT_BACKEND 1
    3233#define XAPIAN_HAS_FLINT_BACKEND 1
    3334#define XAPIAN_HAS_QUARTZ_BACKEND 1

  • win32_backends.mak

     
    1515    "$(OUTDIR)\libinmemory.lib" \
    1616    "$(OUTDIR)\libremote.lib" \
    1717    "$(OUTDIR)\libflint.lib" \
     18    "$(OUTDIR)\libbrass.lib" \
    1819    "$(OUTDIR)\libchert.lib" \
    1920    $(NULL)
    2021
    … …  
    2526        $(INTDIR)\alltermslist.obj \
    2627        $(INTDIR)\valuelist.obj \
    2728        $(INTDIR)\slowvaluelist.obj \
    28         $(INTDIR)\contiguousalldocspostlist.obj
     29        $(INTDIR)\contiguousalldocspostlist.obj \
     30        $(INTDIR)\flint_lock.obj
    2931
    3032SRCS=   $(INTDIR)\database.cc \
    3133        $(INTDIR)\databasereplicator.cc\
    … …  
    3436        $(INTDIR)\alltermslist.cc \
    3537        $(INTDIR)\valuelist.cc \
    3638        $(INTDIR)\slowvaluelist.cc \
    37         $(INTDIR)\contiguousalldocspostlist.cc
     39        $(INTDIR)\contiguousalldocspostlist.cc \
     40        $(INTDIR)\flint_lock.cc
    3841
    3942
    4043         
    … …  
    4952        nmake /$(MAKEFLAGS) CLEAN DEBUG=$(DEBUG)
    5053        cd ..\flint
    5154        nmake /$(MAKEFLAGS) CLEAN DEBUG=$(DEBUG)
     55        cd ..\brass
     56        nmake /$(MAKEFLAGS) CLEAN DEBUG=$(DEBUG)
    5257        cd ..\inmemory
    5358        nmake /$(MAKEFLAGS) CLEAN DEBUG=$(DEBUG)
    5459        cd ..\multi
    … …  
    8388       nmake $(MAKEMACRO) /$(MAKEFLAGS) CFG="$(CFG)" DEBUG="$(DEBUG)"
    8489       cd ..
    8590
     91"$(OUTDIR)\libbrass.lib":
     92       cd brass
     93       nmake $(MAKEMACRO) /$(MAKEFLAGS) CFG="$(CFG)" DEBUG="$(DEBUG)"
     94       cd ..
     95       
    8696"$(OUTDIR)\libinmemory.lib":
    8797       cd inmemory
    8898       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

     
    2525                $(INTDIR)\chert_dbstats.obj\
    2626                $(INTDIR)\chert_document.obj\
    2727                $(INTDIR)\chert_io.obj\
    28                 $(INTDIR)\chert_lock.obj\
    2928                $(INTDIR)\chert_metadata.obj\
    3029                $(INTDIR)\chert_modifiedpostlist.obj\
    3130                $(INTDIR)\chert_positionlist.obj\
    … …  
    5251                $(INTDIR)\chert_dbstats.cc\
    5352                $(INTDIR)\chert_document.cc\
    5453                $(INTDIR)\chert_io.cc\
    55                 $(INTDIR)\chert_lock.cc\
    5654                $(INTDIR)\chert_metadata.cc\
    5755                $(INTDIR)\chert_modifiedpostlist.cc\
    5856                $(INTDIR)\chert_positionlist.cc\

  • win32_backends_flint.mak

     
    2525                $(INTDIR)\flint_databasereplicator.obj\
    2626                $(INTDIR)\flint_document.obj\
    2727                $(INTDIR)\flint_io.obj\
    28                 $(INTDIR)\flint_lock.obj\
    2928                $(INTDIR)\flint_metadata.obj\
    3029                $(INTDIR)\flint_modifiedpostlist.obj\
    3130                $(INTDIR)\flint_positionlist.obj\
    … …  
    4948                $(INTDIR)\flint_databasereplicator.cc\
    5049                $(INTDIR)\flint_document.cc\
    5150                $(INTDIR)\flint_io.cc\
    52                 $(INTDIR)\flint_lock.cc\
    5351                $(INTDIR)\flint_metadata.cc\
    5452                $(INTDIR)\flint_modifiedpostlist.cc\
    5553                $(INTDIR)\flint_positionlist.cc\

  • win32_bin.mak

     
    2424           
    2525SRCS = \
    2626        "$(INTDIR)\xapian-compact.cc" \
     27    "$(INTDIR)\xapian-compact-flint.cc" \
     28    "$(INTDIR)\xapian-compact-brass.cc" \
     29    "$(INTDIR)\xapian-compact-chert.cc" \
    2730        "$(INTDIR)\xapian-progsrv.cc" \
    2831        "$(INTDIR)\xapian-tcpsrv.cc" \
    2932        "$(INTDIR)\xapian-inspect.cc" \
    … …  
    3538           
    3639ALL : $(PROGRAMS)
    3740
    38 XAPIAN_COMPACT_OBJS= "$(INTDIR)\xapian-compact.obj"
     41XAPIAN_COMPACT_OBJS= "$(INTDIR)\xapian-compact.obj" "$(INTDIR)\xapian-compact-brass.obj" "$(INTDIR)\xapian-compact-flint.obj" "$(INTDIR)\xapian-compact-chert.obj" 
    3942
    4043XAPIAN_PROGSRV_OBJS= "$(INTDIR)\xapian-progsrv.obj"
    4144
    … …  
    4346
    4447XAPIAN_INSPECT_OBJS= "$(INTDIR)\xapian-inspect.obj"
    4548
    46 XAPIAN_CHECK_OBJS= "$(INTDIR)\xapian-check.obj"  "$(INTDIR)\xapian-check-flint.obj"
     49XAPIAN_CHECK_OBJS= "$(INTDIR)\xapian-check.obj" "$(INTDIR)\xapian-check-flint.obj" "$(INTDIR)\xapian-check-chert.obj" "$(INTDIR)\xapian-check-brass.obj"
    4750
    4851XAPIAN_REPLICATE_OBJS= "$(INTDIR)\xapian-replicate.obj"
    4952
    … …  
    6669    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
    6770
    6871CPP_PROJ=$(CPPFLAGS_EXTRA)  \
    69  /I ".." /I "..\testsuite"  /I"..\backends\flint" /I"..\backends\chert" \
     72 /I ".." /I "..\testsuite"  /I"..\backends\flint" /I"..\backends\chert" /I"..\backends\brass" \
    7073 /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /Tp$(INPUTNAME)
    7174
    7275CPP_OBJS=..\win32\$(XAPIAN_DEBUG_OR_RELEASE)
    … …  
    114117"$(OUTDIR)\xapian-check.exe" : "$(OUTDIR)" $(DEF_FILE) $(XAPIAN_CHECK_OBJS) \
    115118                             $(PROGRAM_DEPENDENCIES)
    116119    $(LINK32) @<<
    117   $(ALL_LINK32_FLAGS) /out:"$(OUTDIR)\xapian-check.exe" $(DEF_FLAGS) $(XAPIAN_CHECK_OBJS) "$(OUTLIBDIR)\libflintbtreecheck.lib" "$(OUTLIBDIR)\libchertbtreecheck.lib"
     120  $(ALL_LINK32_FLAGS) /out:"$(OUTDIR)\xapian-check.exe" $(DEF_FLAGS) $(XAPIAN_CHECK_OBJS) "$(OUTLIBDIR)\libflintbtreecheck.lib" "$(OUTLIBDIR)\libchertbtreecheck.lib" "$(OUTLIBDIR)\libbrassbtreecheck.lib"
    118121<<
    119122    $(MANIFEST) "$(OUTDIR)\xapian-check.exe.manifest" -outputresource:"$(OUTDIR)\xapian-check.exe;1"
    120123    -@erase "$(OUTDIR)\xapian-check.exe.manifest"

  • 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 \

  • 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

     
    2222        $(INTDIR)\backendmanager.obj \
    2323        $(INTDIR)\backendmanager_flint.obj \
    2424        $(INTDIR)\backendmanager_chert.obj \
     25        $(INTDIR)\backendmanager_brass.obj \
    2526        $(INTDIR)\backendmanager_inmemory.obj \
    2627        $(INTDIR)\backendmanager_multi.obj \
    2728        $(INTDIR)\backendmanager_remote.obj \
    … …  
    3839        $(INTDIR)\backendmanager.cc \
    3940        $(INTDIR)\backendmanager_flint.cc \
    4041        $(INTDIR)\backendmanager_chert.cc \
     42        $(INTDIR)\backendmanager_brass.cc \
    4143        $(INTDIR)\backendmanager_inmemory.cc \
    4244        $(INTDIR)\backendmanager_multi.cc \
    4345        $(INTDIR)\backendmanager_remote.cc \