Ticket #495: patch43_msvc_makefiles.patch

File patch43_msvc_makefiles.patch, 64.4 KB (added by Charlie Hull, 14 years ago)

Patch for MSVC makefiles - 1.2.2

  • ChangeLog

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

  • config.h.omega.win32

     
    8383#define PACKAGE_NAME "xapian-omega"
    8484
    8585/* Define to the full name and version of this package. */
    86 #define PACKAGE_STRING "xapian-omega 1.0.11"
     86#define PACKAGE_STRING "xapian-omega 1.2.2"
    8787
    8888/* Define to the one symbol short name of this package. */
    8989#define PACKAGE_TARNAME "xapian-omega"
    9090
    9191/* Define to the version of this package. */
    92 #define PACKAGE_VERSION "1.0.11"
     92#define PACKAGE_VERSION "1.2.2"
    9393
    9494/* Define to the name of a function implementing snprintf but not caring about
    9595   ISO C90 return value semantics (if one exists) */
    … …  
    106106/* USE_ICONV */
    107107
    108108/* Version number of package */
    109 #define VERSION "1.0.11"
     109#define VERSION "1.2.2"
    110110
    111111/* Define to 1 if your processor stores words with the most significant byte
    112112   first (like Motorola and SPARC, unlike Intel and VAX). */

  • config.h.win32

     
    9999#define PACKAGE_NAME "xapian-core"
    100100
    101101/* Define to the full name and version of this package. */
    102 #define PACKAGE_STRING "xapian-core 1.1.0"
     102#define PACKAGE_STRING "xapian-core 1.2.2"
    103103
    104104/* Define to the one symbol short name of this package. */
    105105#define PACKAGE_TARNAME "xapian-core"
    106106
    107107/* Define to the version of this package. */
    108 #define PACKAGE_VERSION "1.1.0"
     108#define PACKAGE_VERSION "1.2.2"
    109109
    110110/* explicit prototype needed for pread (if any) */
    111111/* #undef PREAD_PROTOTYPE */
    … …  
    128128#define STDC_HEADERS 1
    129129
    130130/* Version number of package */
    131 #define VERSION "1.1.0"
     131#define VERSION "1.2.2"
    132132
    133133/* Define if you want debugging to be enabled (will cause some slow down) */
    134134/* #undef XAPIAN_DEBUG */

  • config.mak

     
    2424# win32_applications_omega.mak
    2525# win32_bindings_python.mak
    2626# and any other bindings mak files
    27 XAPIAN_APPLICATIONS=..\..\xapian-applications\omega
    28 XAPIAN_BINDINGS=..\..\xapian-bindings
     27XAPIAN_APPLICATIONS=..\..\xapian-omega-1.2.2
     28XAPIAN_BINDINGS=..\..\xapian-bindings-1.2.2
    2929
    3030#  ------------- Perl settings-------------
    3131# Perl folder
    … …  
    118118-I "$(PHP_SRC_DIR)" -I "$(PHP_SRC_DIR)\tsrm" -I "$(PHP_SRC_DIR)\Zend" -I "$(PHP_SRC_DIR)\main" -I "$(PHP_SRC_DIR)\regex"  \
    119119-D ZTS=1 -D ZEND_WIN32=1 -D PHP_WIN32=1 -D ZEND_WIN32_FORCE_INLINE -D HAVE_WIN32STD=1 \
    120120
    121 # version 4 or 5: Define exactly the one you want and leave the other one
    122 # commented out. Note you will have to modify the paths below as well.
    123 #PHP_MAJOR_VERSION = 4
    124 PHP_MAJOR_VERSION = 5
    125 
    126121# PHP_EXE_DIR: Set this to the folder where the PHP executable is
    127122# PHP_LIB : Set this to the path to the PHP library
    128123!if "$(DEBUG)"=="1"
    … …  
    137132
    138133#    PHP executable
    139134PHP_EXE=$(PHP_EXE_DIR)\PHP.exe
     135
     136# PHP 5.3.0 only -----------------
     137# We need to build separate bindings for PHP 5.3.0 as the module API has changed
     138
     139# PHP source folder
     140PHP_53x_SRC_DIR=C:\work\php-5.3.2
     141
     142PHP_53x_INCLUDE_CPPFLAGS= \
     143-I "$(PHP_53x_SRC_DIR)" -I "$(PHP_53x_SRC_DIR)\tsrm" -I "$(PHP_53x_SRC_DIR)\Zend" -I "$(PHP_53x_SRC_DIR)\main" -I "$(PHP_53x_SRC_DIR)\regex"  \
     144-D ZTS=1 -D ZEND_WIN32=1 -D PHP_WIN32=1 -D ZEND_WIN32_FORCE_INLINE -D HAVE_WIN32STD=1 \
     145
     146# PHP_EXE_DIR: Set this to the folder where the PHP executable is
     147# PHP_LIB : Set this to the path to the PHP library
     148!if "$(DEBUG)"=="1"
     149PHP_53x_EXE_DIR=C:\php-5.3.2\Debug_TS
     150PHP_53x_LIB=$(PHP_53x_EXE_DIR)\php5ts_debug.lib
     151PHP_53x_DEBUG_OR_RELEASE= /D "ZEND_DEBUG=1"
     152!else
     153PHP_53x_EXE_DIR=C:\php-5.3.2
     154PHP_53x_LIB=$(PHP_53x_EXE_DIR)\dev\php5ts.lib
     155PHP_53x_DEBUG_OR_RELEASE= /D "ZEND_DEBUG=0"
     156!endif
     157
     158#    PHP executable
     159PHP_53x_EXE=$(PHP_53x_EXE_DIR)\PHP.exe
     160# end PHP 5.3.0 only -----------------
     161
    140162# ------------- end PHP settings-------------
    141163
    142164# -------------Ruby settings-------------
    … …  
    190212ZLIB_LIB_DIR=$(ZLIB_DIR)\lib
    191213ZLIB_BIN_DIR=$(ZLIB_DIR)
    192214
     215PCRE_DIR=C:\Program Files\GnuWin32
     216PCRE_INCLUDE_DIR=$(PCRE_DIR)\include
     217PCRE_LIB_DIR=$(PCRE_DIR)\lib
     218
     219
     220
    193221#--------------------------------------
    194222# Visual C++ Compiler and linker programs, and flags for these
    195223#--------------------------------------

  • makebinaries.py

     
    123123filename = 'xapian-python-bindings for Python 2.5.1 -%s.win32.exe' % rev
    124124os.system ('copy "..\\Release\\Python25\\dist\\%s" ' % filename)
    125125md5it(filename)
    126 filename = 'xapian-python-bindings for Python 2.6.2 -%s.win32.exe' % rev
     126filename = 'xapian-python-bindings for Python 2.6.4 -%s.win32.exe' % rev
    127127os.system ('copy "..\\Release\\Python26\\dist\\%s" ' % filename)
    128128md5it(filename)
    129129
    130130zipandmd5it("xapian-%s-bindings-ruby.zip" % rev,"..\\Release\\Ruby\\dist\\*.*")
    131131zipandmd5it("xapian-%s-bindings-csharp.zip" % rev,"..\\Release\\CSharp\\dist\\*.*")
    132 zipandmd5it("xapian-%s-bindings-java-swig.zip" % rev,"..\\Release\\Java-swig\\dist\\*.*")
    133132
     133# Java-Swig bindings do not work in this release, see http://trac.xapian.org/ticket/474
     134# zipandmd5it("xapian-%s-bindings-java-swig.zip" % rev,"..\\Release\\Java-swig\\dist\\*.*")
     135
    134136# Make a HTML list
    135137ifi = open(tmpfile, "r")
    136138ofi = open(newhtml, "w")
    137139print >> ofi, r"<html><head></head><body><table>"
    138140print >> ofi, r"<!-- cut and paste from after here -->"
    139 print >> ofi, r'<tr><td><b>' + rev + '</b><br><br>'
    140 print >> ofi, r'<a href=xapian/' + revnodots + '/xapian-core-' + rev + '.tar.gz>xapian-core-' + rev + '.tar.gz</a><br>'
    141 print >> ofi, r'<a href=xapian/' + revnodots + '/xapian-bindings-' + rev + '.tar.gz>xapian-bindings-' + rev + '.tar.gz</a><br>'
    142 print >> ofi, r'<a href=xapian/' + revnodots + '/xapian-omega-' + rev + '.tar.gz>xapian-omega-' + rev + '.tar.gz</a></td>'
    143 print >> ofi, '<td><a href=\"xapian/' + revnodots + '/win32.zip\">win32.zip</a></td>'
    144 print >> ofi, r'<td><a href="xapian/' + revnodots + '/readme.txt\">readme.txt</a></td><td>'
     141print >> ofi, r"       <tr>"
     142print >> ofi, r"        <td class version>"
     143print >> ofi, r"         <h3>" + rev + " <?php binaries_link('xapian/" + revnodots + "/readme.txt'); ?></h3>"
     144print >> ofi, r"         <h4>Source</h4>"
     145print >> ofi, r"         <?php binaries_link('xapian/" + revnodots + "/xapian-core-" + rev + ".tar.gz'); ?>"
     146print >> ofi, r"         <?php binaries_link('xapian/" + revnodots + "/xapian-bindings-" + rev + ".tar.gz'); ?>"
     147print >> ofi, r"         <?php binaries_link('xapian/" + revnodots + "/xapian-omega-" + rev + ".tar.gz'); ?>"
     148print >> ofi, r"         <h4>Build Files</h4>"
     149print >> ofi, r"         <?php binaries_link('xapian/" + revnodots + "/win32.zip'); ?>"
     150print >> ofi, r"        </td>"
     151print >> ofi, r'        <td class="binaries">'
     152print >> ofi, r"          <?php binaries_list(array("
    145153for line in ifi:
    146154    parts = line.split('*')
    147155    print parts
    148156    parts1mod = parts[1].replace("\n","")
    149     print >> ofi, r'<a href="' + newdir + r'/' + parts[1] + r'">' + parts[1] + r'</a> MD5 sum: ' + parts[0] + r'<br>'
     157    print >> ofi, r"            'xapian/" + revnodots + "/" + parts1mod + r"'  => '" + parts[0] + r"',"
    150158   
     159print >> ofi, r"           )); ?>"
     160print >> ofi, r"        </td>"
     161print >> ofi, r"       </tr>"
     162   
    151163print >> ofi, r"<!-- cut and paste to before here -->"
    152164print >> ofi, r"</table></body></html>"
    153165

  • README

     
    11README for Xapian/Visual C++ Tools
    22==================================
    3 2010-03-02 for Xapian SVN HEAD
     32010-07-15 for Xapian 1.2.2, trunk
    44
    55Make files, some extra headers and associated tools for compiling Xapian on
    66Win32 using the Microsoft Visual C++ compilers. This is particularly useful
    … …  
    2929What works?
    3030===========
    3131
    32 - The Python, PHP, Ruby, C# bindings
     32- The Python, PHP, C#, Ruby bindings (but see below for the latter)
    3333- The xapian-compact, xapian-check, xapian-inspect binaries
    3434- The xapian-progsrv and xapian-tcpsrv binaries
    3535- The delve, quest and copydatabase binaries
    3636- The Xapian example binaries
    37 - The testsuite, which is run as part of the makefile in tests/
     37- The testsuite, which is run as part of the makefile in tests/ , *but* see below for a necessary minor patch
    3838- omega, omindex and scriptindex (although these may have difficulty parsing
    39   Windows directory paths).
     39  Windows directory paths), *but* see below for a necessary minor patch
    4040
    4141What doesn't work?
    4242==================
    4343
    44 - Any other bindings. Java-Swig bindings do not work for SVN HEAD (note that the Java-Swig bindings
    45   are still rather alpha, and may be subject to significant API change).
     44- Any other bindings. Java-Swig bindings do not work for SVN HEAD and the
     45  1.2.0 series (note that the Java-Swig bindings are still rather alpha,
     46  and may be subject to significant API change). See http://trac.xapian.org/ticket/474
    4647
    4748- Warning: unlike Unix, windows does not usually allow open files to be
    4849  deleted.  This caused a serious problem with releases of Xapian on
    … …  
    5455  not expect it to cause serious problems.
    5556
    5657- To get round the fact that MSVC doesn't do dependency checking correctly,
    57 we use an external program 'xapdep'. Each Makefile use the -showIncludes switch of the MSVC
    58 compiler to generate a list of includes, which xapdep then processes and inserts
    59 into the Makefile in the various subdirectories.
     58  we use an external program 'xapdep'. Each Makefile use the -showIncludes switch of the MSVC
     59  compiler to generate a list of includes as deps.d, which xapdep then processes and inserts
     60  into the Makefile in the various subdirectories. An unfortunate side effect is that
     61  details of any compilation errors may be hidden: if you see:
    6062
     63  NMAKE : fatal error U1077: 'cl.exe' : return code '0x2'
     64
     65  this signifies a compilation error while dependencies were being checked. Look at the file
     66  deps.d in the appropriate folder to see what actually caused the failure.
     67 
     68- The 'replicate3' test currently fails on Windows for the Flint database.
     69This may be due to the test itself or the replication subsystem, so at
     70present we do not advise the use of the replication system on Windows when using a
     71Flint database.
     72
     73- The ruby bindings fail one of the tests, see http://trac.xapian.org/ticket/478 for
     74more details. We have opted to package them anyway (see win32_bindings_ruby.mak for how)
     75
    6176TODOS
    6277=====
    6378
    … …  
    157172http://www.zlib.net/zlib123-dll.zip
    158173and make sure the path to where you downloaded it matches the path in config.mak (ZLIB_DIR).
    159174
     175- For Omega you will need the PCRE library. Download from
     176http://gnuwin32.sourceforge.net/downlinks/pcre.php
     177(we have used pcre-7.0.exe)
     178and make sure the path to where you downloaded it matches the path in config.mak (PCRE_DIR).
     179
    160180- To compile the Python bindings you need Python from www.python.org. Make sure the paths to this are set correctly in config.mak (PYTHON_DIR).
    161181Note that the build system supports Python 2.4, 2.5, 2.6, and 3.0 currently, you must specify which you require.
    162182
    … …  
    216236   - to build and run the test suite
    2172375b) nmake
    218238   - to just build.
     239   
     240**NOTE: if you get the following error:
    219241
     242    NMAKE : fatal error U1077: 'cl.exe' : return code '0x2'
     243
     244    this signifies a compilation error while dependencies were being checked. Look at the file
     245    deps.d in the appropriate folder to see what actually caused the failure.
     246
    220247To build the bindings (do steps 1-5 above first to make sure you have Xapian built):
    221248
    2222496) cd to xapian-core-0.x.y\win32 or the appropriate path on your system.

  • win32_applications_omega.mak

     
    1010
    1111# Where the core is, relative to the Omega application
    1212# Change this to match your environment
    13 XAPIAN_CORE_REL_OMEGA=..\..\xapian-core
     13XAPIAN_CORE_REL_OMEGA=..\xapian-core-1.2.2
    1414
    1515!IF "$(OS)" == "Windows_NT"
    1616NULL=
    … …  
    3131OUTEXEDIR=$(XAPIAN_CORE_REL_OMEGA)\win32\$(XAPIAN_DEBUG_OR_RELEASE)
    3232
    3333PROGRAMS =   "$(OUTEXEDIR)\scriptindex.exe" "$(OUTEXEDIR)\omindex.exe" "$(OUTEXEDIR)\omega.exe" \
    34 "$(OUTEXEDIR)\md5test.exe" "$(OUTEXEDIR)\htmlparsetest.exe" "$(OUTEXEDIR)\utf8converttest.exe" 
     34"$(OUTEXEDIR)\md5test.exe" "$(OUTEXEDIR)\htmlparsetest.exe" "$(OUTEXEDIR)\utf8converttest.exe"
    3535
    36 ALL : $(PROGRAMS)
     36ALL : HEADERS $(PROGRAMS)
    3737
    3838OMEGA_OBJS= \
    39  omindex.obj myhtmlparse.obj htmlparse.obj\
    40  getopt.obj commonhelp.obj utils.obj hashterm.obj loadfile.obj md5.obj\
    41  md5wrap.obj xmlparse.obj metaxmlparse.obj utf8convert.obj sample.obj diritor.obj\
    42  runfilter.obj freemem.obj msvc_dirent.obj xpsxmlparse.obj mkdtemp.obj
    43        
     39        "$(OUTDIR)\omega.obj" \
     40        "$(OUTDIR)\query.obj" \
     41        "$(OUTDIR)\cgiparam.obj" \
     42        "$(OUTDIR)\utils.obj" \
     43        "$(OUTDIR)\configfile.obj" \
     44        "$(OUTDIR)\date.obj" \
     45        "$(OUTDIR)\cdb_init.obj" \
     46        "$(OUTDIR)\cdb_find.obj" \
     47        "$(OUTDIR)\cdb_hash.obj" \
     48        "$(OUTDIR)\cdb_unpack.obj" \
     49        "$(OUTDIR)\loadfile.obj" \
     50        "$(OUTDIR)\utf8convert.obj" \
     51        "$(OUTDIR)\datematchdecider.obj" \
     52        "$(OUTDIR)\weight.obj" \
     53        "$(OUTDIR)\str.obj" \
     54        "$(OUTDIR)\transform.obj"
     55   
    4456OMINDEX_OBJS= \
    45  omindex.obj myhtmlparse.obj htmlparse.obj\
    46  getopt.obj commonhelp.obj utils.obj hashterm.obj loadfile.obj md5.obj\
    47  md5wrap.obj xmlparse.obj metaxmlparse.obj utf8convert.obj sample.obj diritor.obj\
    48  runfilter.obj freemem.obj msvc_dirent.obj xpsxmlparse.obj mkdtemp.obj
     57        "$(OUTDIR)\omindex.obj" \
     58        "$(OUTDIR)\myhtmlparse.obj" \
     59        "$(OUTDIR)\htmlparse.obj" \
     60        "$(OUTDIR)\getopt.obj" \
     61        "$(OUTDIR)\commonhelp.obj" \
     62        "$(OUTDIR)\utils.obj" \
     63        "$(OUTDIR)\hashterm.obj" \
     64        "$(OUTDIR)\loadfile.obj" \
     65        "$(OUTDIR)\md5.obj" \
     66        "$(OUTDIR)\md5wrap.obj" \
     67        "$(OUTDIR)\xmlparse.obj" \
     68        "$(OUTDIR)\metaxmlparse.obj" \
     69        "$(OUTDIR)\utf8convert.obj" \
     70        "$(OUTDIR)\sample.obj" \
     71        "$(OUTDIR)\diritor.obj" \
     72        "$(OUTDIR)\mkdtemp.obj" \
     73        "$(OUTDIR)\runfilter.obj" \
     74        "$(OUTDIR)\freemem.obj" \
     75        "$(OUTDIR)\msvc_dirent.obj" \
     76        "$(OUTDIR)\xpsxmlparse.obj" \
     77        "$(OUTDIR)\str.obj"
    4978       
    5079       
    5180SCRIPTINDEX_OBJS= \
    52  scriptindex.obj myhtmlparse.obj htmlparse.obj\
    53  getopt.obj commonhelp.obj utils.obj hashterm.obj loadfile.obj\
    54  safe.obj stringutils.obj utf8convert.obj utf8truncate.obj
     81        "$(OUTDIR)\scriptindex.obj" \
     82        "$(OUTDIR)\myhtmlparse.obj" \
     83        "$(OUTDIR)\htmlparse.obj" \
     84        "$(OUTDIR)\getopt.obj" \
     85        "$(OUTDIR)\commonhelp.obj" \
     86        "$(OUTDIR)\utils.obj" \
     87        "$(OUTDIR)\hashterm.obj" \
     88        "$(OUTDIR)\loadfile.obj" \
     89        "$(OUTDIR)\safe.obj" \
     90        "$(OUTDIR)\stringutils.obj" \
     91        "$(OUTDIR)\utf8convert.obj" \
     92        "$(OUTDIR)\utf8truncate.obj"
    5593       
    5694       
    5795HTMLPARSETEST_OBJS= \
    58 htmlparsetest.obj myhtmlparse.obj htmlparse.obj utf8convert.obj
     96        "$(OUTDIR)\htmlparsetest.obj" \
     97        "$(OUTDIR)\myhtmlparse.obj" \
     98        "$(OUTDIR)\htmlparse.obj" \
     99        "$(OUTDIR)\utf8convert.obj"
    59100
    60101MD5TEST_OBJS= \
    61 md5test.obj md5wrap.obj md5.obj
     102        "$(OUTDIR)\md5.obj" \
     103        "$(OUTDIR)\md5wrap.obj" \
     104        "$(OUTDIR)\md5test.obj"
    62105
    63106UTF8CONVERTTEST_OBJS= \
    64 utf8converttest.obj utf8convert.obj
     107        "$(OUTDIR)\utf8convert.obj" \
     108        "$(OUTDIR)\utf8converttest.obj"
    65109
    66110SRCS= \
    67111        "$(INTDIR)\omega.cc" \
    … …  
    75119        "$(INTDIR)\cdb_hash.cc" \
    76120        "$(INTDIR)\cdb_unpack.cc" \
    77121        "$(INTDIR)\loadfile.cc" \
    78         "$(INTDIR)\utf8convert.cc" \
    79122        "$(INTDIR)\datematchdecider.cc" \
    80123        "$(INTDIR)\omindex.cc" \
    81124        "$(INTDIR)\myhtmlparse.cc" \
    … …  
    95138        "$(INTDIR)\scriptindex.cc" \
    96139        "$(INTDIR)\myhtmlparse.cc" \
    97140        "$(INTDIR)\htmlparse.cc" \
    98         "$(INTDIR)\common\getopt.cc" \
    99141        "$(INTDIR)\commonhelp.cc" \
    100142        "$(INTDIR)\utils.cc" \
    101143        "$(INTDIR)\hashterm.cc" \
    102144        "$(INTDIR)\loadfile.cc" \
    103145        "$(INTDIR)\common\safe.cc" \
    104         "$(INTDIR)\utf8converttest.cc" \
     146        "$(INTDIR)\utf8convert.cc" \
    105147        "$(INTDIR)\utf8truncate.cc" \
    106148        "$(INTDIR)\htmlparsetest.cc" \
    107149        "$(INTDIR)\myhtmlparse.cc" \
    … …  
    112154        "$(INTDIR)\md5test.cc" \
    113155        "$(INTDIR)\diritor.cc" \
    114156        "$(INTDIR)\runfilter.cc" \
    115     "$(OUTDIR)\xpsxmlparse.cc" \
    116     "$(OUTDIR)\weight.cc" \
    117     "$(OUTDIR)\freemem.cc"
     157        "$(OUTDIR)\xpsxmlparse.cc" \
     158        "$(OUTDIR)\common\stringutils.cc" \
     159        "$(OUTDIR)\common\str.cc" \
     160        "$(OUTDIR)\common\safe.cc" \
     161        "$(OUTDIR)\transform.cc"
    118162   
    119163       
    120164CLEAN :
    … …  
    123167        -@erase $(OMINDEX_OBJS)
    124168        -@erase $(SCRIPTINDEX_OBJS)
    125169        -@erase $(HTMLPARSETEST_OBJS)
    126     -@erase $(UTF8CONVERTTEST_OBJS)
    127170        -@erase $(MD5TEST_OBJS)
     171        -@erase $(UTF8CONVERTTEST_OBJS)
    128172        -@erase "$(INTDIR)\*.pdb"
    129173
     174#"$(OUTDIR)" :
     175#    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
    130176
    131177CPP_PROJ=$(CPPFLAGS_EXTRA) \
    132 -I.. -I. -I "common" -I "$(XAPIAN_CORE_REL_OMEGA)\include" -I "$(XAPIAN_CORE_REL_OMEGA)\win32" \
     178 -I "." -I "common" -I "$(XAPIAN_CORE_REL_OMEGA)\include" -I "$(XAPIAN_CORE_REL_OMEGA)\win32" \
     179 -I "$(PCRE_INCLUDE_DIR)" \
    133180 -Fo"$(INTDIR)\\" -Fd"$(INTDIR)\\" -Tp$(INPUTNAME)
    134181
    135182CPP_OBJS=..\win32\$(XAPIAN_DEBUG_OR_RELEASE)
    136183CPP_SBRS=.
    137184
    138 ALL_LINK32_FLAGS=$(LINK32_FLAGS) $(XAPIAN_LIBS)
     185ALL_LINK32_FLAGS=$(LINK32_FLAGS) $(XAPIAN_LIBS) "$(PCRE_LIB_DIR)/pcre.lib"
    139186
    140187PROGRAM_DEPENDENCIES =
    141188
    … …  
    173220  $(ALL_LINK32_FLAGS) /out:"$(OUTEXEDIR)\md5test.exe" $(DEF_FLAGS) $(MD5TEST_OBJS)
    174221<<
    175222
    176 "$(OUTEXEDIR)\UTF8CONVERTTEST.exe" : "$(OUTEXEDIR)" $(DEF_FILE) $(UTF8CONVERTTEST_OBJS)
     223"$(OUTEXEDIR)\utf8converttest.exe" : "$(OUTEXEDIR)" $(DEF_FILE) $(UTF8CONVERTTEST_OBJS)
    177224                      $(PROGRAM_DEPENDENCIES)
    178225    $(LINK32) @<<
    179   $(ALL_LINK32_FLAGS) /out:"$(OUTEXEDIR)\UTF8CONVERTTEST.exe" $(DEF_FLAGS) $(UTF8CONVERTTEST_OBJS)
     226  $(ALL_LINK32_FLAGS) /out:"$(OUTEXEDIR)\utf8converttest.exe" $(DEF_FLAGS) $(UTF8CONVERTTEST_OBJS)
    180227<<
    181228
    182 # rules for various files in subfolders
    183 
    184 "dirent.obj" : "$(XAPIAN_CORE_REL_OMEGA)\win32\dirent.c"
     229"$(INTDIR)\msvc_dirent.obj" : ".\common\msvc_dirent.cc"
    185230        $(CPP) @<<
    186231   $(CPP_PROJ) $**
    187232<<
    188233
    189 "getopt.obj" : ".\common\getopt.cc"
     234
     235"$(INTDIR)\getopt.obj" : ".\common\getopt.cc"
    190236        $(CPP) @<<
    191237   $(CPP_PROJ) $**
    192238<<
    193239
    194 "stringutils.obj" : ".\common\stringutils.cc"
     240"$(INTDIR)\mkdtemp.obj" : ".\portability\mkdtemp.cc"
    195241        $(CPP) @<<
    196242   $(CPP_PROJ) $**
    197243<<
    198244
    199 "mkdtemp.obj" : ".\portability\mkdtemp.cc"
     245"$(INTDIR)\safe.obj" : ".\common\safe.cc"
    200246        $(CPP) @<<
    201247   $(CPP_PROJ) $**
    202248<<
    203249
    204 "safe.obj" : ".\common\safe.cc"
     250"$(INTDIR)\stringutils.obj" : ".\common\stringutils.cc"
    205251        $(CPP) @<<
    206252   $(CPP_PROJ) $**
    207253<<
    208254
    209 "msvc_dirent.obj" : "$(XAPIAN_CORE_REL_OMEGA)\common\msvc_dirent.cc"
     255"$(INTDIR)\str.obj" : ".\common\str.cc"
    210256        $(CPP) @<<
    211257   $(CPP_PROJ) $**
    212258<<
    … …  
    228274    -@erase deps.d
    229275    $(CPP) -showIncludes $(CPP_PROJ) $(SRCS) >>deps.d
    230276    if exist "$(XAPIAN_CORE_REL_OMEGA)\win32\$(DEPEND)" $(XAPIAN_CORE_REL_OMEGA)\win32\$(DEPEND)
    231 # DO NOT DELETE THIS LINE -- xapdep depends on it.
    232  No newline at end of file
     277# DO NOT DELETE THIS LINE -- xapdep depends on it.

  • win32_backends_brass.mak

     
    2424                $(INTDIR)\brass_dbstats.obj\
    2525                $(INTDIR)\brass_document.obj\
    2626                $(INTDIR)\brass_inverter.obj\
    27                 $(INTDIR)\brass_io.obj\
    2827                $(INTDIR)\brass_metadata.obj\
    2928                $(INTDIR)\brass_positionlist.obj\
    3029                $(INTDIR)\brass_postlist.obj\
    … …  
    4948                $(INTDIR)\brass_dbstats.cc\
    5049                $(INTDIR)\brass_document.cc\
    5150                $(INTDIR)\brass_inverter.cc\
    52                 $(INTDIR)\brass_io.cc\
    5351                $(INTDIR)\brass_metadata.cc\
    5452                $(INTDIR)\brass_positionlist.cc\
    5553                $(INTDIR)\brass_postlist.cc\

  • win32_bindings_csharp.mak

     
    77# Where the core is, relative to the Csharp bindings
    88# Change this to match your environment
    99
    10 XAPIAN_CORE_REL_CSHARP=..\..\xapian-core
     10XAPIAN_CORE_REL_CSHARP=..\..\xapian-core-1.2.2
    1111OUTLIBDIR=$(XAPIAN_CORE_REL_CSHARP)\win32\$(XAPIAN_DEBUG_OR_RELEASE)\libs
    1212
    1313!INCLUDE $(XAPIAN_CORE_REL_CSHARP)\win32\config.mak
    … …  
    2020BINDING=_XapianSharp
    2121
    2222XAPIAN_SWIG_CSHARP_SRCS=\
    23     AssemblyInfo.cs \
    2423    Auto.cs \
    2524    BM25Weight.cs \
    2625    BoolWeight.cs \
     26    Brass.cs \
    2727    Chert.cs \
    2828    Database.cs \
    2929    DateValueRangeProcessor.cs \
    … …  
    3434    ExpandDecider.cs \
    3535    Flint.cs \
    3636    InMemory.cs \
     37    KeyMaker.cs \
     38    MatchSpy.cs \
    3739    MatchDecider.cs \
    3840    MSet.cs \
    3941    MSetIterator.cs \
    … …  
    4446    PostingSource.cs \
    4547    Query.cs \
    4648    QueryParser.cs \
     49    Registry.cs \
    4750    Remote.cs \
    4851    RSet.cs \
    49     SerialisationContext.cs \
    5052    SimpleStopper.cs \
    5153    SmokeTest.cs \
    5254    Sorter.cs \
    5355    Stem.cs \
     56    StemImplementation.cs \
    5457    Stopper.cs \
    5558    StringValueRangeProcessor.cs \
    5659    SWIGTYPE_p_std__string.cs \

  • win32_bindings_java-swig.mak

     
    77# Where the core is, relative to the Java Swig bindings
    88# Change this to match your environment
    99
    10 XAPIAN_CORE_REL_JAVA=..\..\xapian-core
     10XAPIAN_CORE_REL_JAVA=..\..\xapian-core-1.2.2
    1111OUTLIBDIR=$(XAPIAN_CORE_REL_JAVA)\win32\$(XAPIAN_DEBUG_OR_RELEASE)\libs
    1212
    1313!INCLUDE $(XAPIAN_CORE_REL_JAVA)\win32\config.mak
    … …  
    1919        Auto.java\
    2020        BM25Weight.java\
    2121        BoolWeight.java\
     22    Brass.java\
    2223    Chert.java\
    2324        Database.java\
    2425        DateValueRangeProcessor.java\
    … …  
    3738        PositionIterator.java\
    3839        PostingIterator.java\
    3940    PostingSource.java\
    40         Quartz.java\
    4141        Query.java\
    4242        QueryParser.java\
    4343        Remote.java\

  • win32_bindings_php.mak

     
    77
    88# Where the core is, relative to the PHP bindings
    99# Change this to match your environment
    10 XAPIAN_CORE_REL_PHP=..\..\xapian-core
     10XAPIAN_CORE_REL_PHP=..\..\xapian-core-1.2.2
    1111
    1212OUTLIBDIR=$(XAPIAN_CORE_REL_PHP)\win32\$(XAPIAN_DEBUG_OR_RELEASE)\libs
    1313
    … …  
    1919RSC=rc.exe
    2020
    2121OUTROOT=$(XAPIAN_CORE_REL_PHP)\win32\$(XAPIAN_DEBUG_OR_RELEASE)\PHP
    22 OUTDIR=$(OUTROOT)\php$(PHP_MAJOR_VERSION)
     22OUTDIR=$(OUTROOT)\php5
    2323INTDIR=.\
    2424
    2525       
    2626ALL : "$(OUTDIR)\php_xapian.dll" "$(OUTDIR)\xapian.php" \
    27         "$(OUTROOT)\smoketest.php" "$(OUTDIR)\smoketest$(PHP_MAJOR_VERSION).php"
     27        "$(OUTROOT)\smoketest.php"
    2828
    2929CLEAN :
    3030        -@erase "$(OUTDIR)\php_xapian.dll"
    … …  
    3232        -@erase "$(OUTDIR)\php_xapian.lib"
    3333        -@erase $(LIB_XAPIAN_OBJS)
    3434        -@erase "$(OUTDIR)\xapian.php"
    35         -@erase "$(OUTDIR)\smoketest4.php"
    36         -@erase "$(OUTDIR)\smoketest5.php"
    3735        -@erase "$(OUTROOT)\smoketest.php"
    3836
    3937       
    4038CLEANSWIG :     
    41         -@erase /Q /s php4
    4239        -@erase /Q /s php5
    43         if exist "php4" rmdir "php4" /s /q
    4440        if exist "php5" rmdir "php5" /s /q
    4541
    4642DOTEST :
    4743        cd "$(OUTROOT)"
    48         $(PHP_EXE) -q -n -d safe_mode=off -d enable_dl=on -d extension_dir="php$(PHP_MAJOR_VERSION)" -d include_path="php$(PHP_MAJOR_VERSION)" smoketest.php
     44        $(PHP_EXE) -q -n -d safe_mode=off -d enable_dl=on -d extension_dir="php5" -d include_path="php5" smoketest.php
    4945
    5046CHECK: ALL DOTEST
    5147
    … …  
    7369CPP_SBRS=.
    7470
    7571!IF "$(SWIGBUILD)" == "1"
    76 php4/xapian_wrap.cc php4/php_xapian.h php4/xapian.php: ../xapian.i util.i
    77         -erase /Q /s php4
    78         -md php4
    79         $(SWIG) -I"$(XAPIAN_CORE_REL_PHP)\include" $(SWIG_FLAGS) -c++ -php4 \
    80             -outdir php4 -o php4/xapian_wrap.cc $(srcdir)/../xapian.i
    8172
    8273php5/xapian_wrap.cc php5/php_xapian.h php5/xapian.php: ../xapian.i util.i
    8374        -erase /Q /s php5
    … …  
    9586  $(ALL_LINK32_FLAGS) /DLL /out:"$(OUTDIR)\php_xapian.dll" $(DEF_FLAGS) $(LIB_XAPIAN_OBJS)
    9687<<
    9788
    98 "$(OUTDIR)\xapian.php" : php$(PHP_MAJOR_VERSION)\xapian.php
     89"$(OUTDIR)\xapian.php" : php5\xapian.php
    9990        -copy $** "$(OUTDIR)\xapian.php"
    10091# REMOVE THIS NEXT LINE if using Visual C++ .net 2003 - you won't need to worry about manifests
    10192        $(MANIFEST) "$(OUTDIR)\php_xapian.dll.manifest" -outputresource:"$(OUTDIR)\php_xapian.dll;2"
    10293        -@erase "$(OUTDIR)\php_xapian.dll.manifest"
    103 "$(OUTDIR)\smoketest5.php" : ".\smoketest5.php"
    104         -copy $** "$(OUTDIR)\smoketest5.php"
    105 "$(OUTDIR)\smoketest4.php" : ".\smoketest4.php"
    106         -copy $** "$(OUTDIR)\smoketest4.php"
    10794"$(OUTROOT)\smoketest.php" : ".\smoketest.php"
    10895        -copy $** "$(OUTROOT)\smoketest.php"
    10996#
    … …  
    115102      /fo version.res \
    116103      /I "$(XAPIAN_CORE_REL_PHP)\include" \
    117104      /I "$(PHP_SRC_DIR)\main" \
    118       /d PHP_MAJOR_VERSION="\"$(PHP_MAJOR_VERSION)\"" \
     105      /d PHP_MAJOR_VERSION="\"5\"" \
    119106      version.rc
    120107
    121 ".\xapian_wrap.obj" : "php$(PHP_MAJOR_VERSION)\xapian_wrap.cc"
     108".\xapian_wrap.obj" : "php5\xapian_wrap.cc"
    122109     $(CPP) @<<
    123110  $(CPP_PROJ) $**
    124111<<

  • win32_bindings_python.mak

     
    99# Where the core is, relative to the Python bindings
    1010# Change this to match your environment
    1111
    12 XAPIAN_CORE_REL_PYTHON=..\..\xapian-core
     12XAPIAN_CORE_REL_PYTHON=..\..\xapian-core-1.2.2
    1313
    1414OUTLIBDIR=$(XAPIAN_CORE_REL_PYTHON)\win32\$(XAPIAN_DEBUG_OR_RELEASE)\libs
    1515
    … …  
    8383    copy testsuite*.py "$(OUTDIR)"
    8484    copy smoketest*.py "$(OUTDIR)"
    8585    copy replication*.py "$(OUTDIR)"
     86    copy test_xapian_star.py "$(OUTDIR)"
    8687        cd "$(OUTDIR)"
    8788        copy "$(ZLIB_BIN_DIR)\zlib1.dll"
    8889        "$(PYTHON_EXE)" smoketest.py

  • win32_bindings_ruby.mak

     
    77
    88# Where the core is, relative to the Ruby bindings
    99# Change this to match your environment
    10 XAPIAN_CORE_REL_RUBY=..\..\xapian-core
     10XAPIAN_CORE_REL_RUBY=..\..\xapian-core-1.2.2
    1111
    1212OUTLIBDIR=$(XAPIAN_CORE_REL_RUBY)\win32\$(XAPIAN_DEBUG_OR_RELEASE)\libs
    1313
    … …  
    3838       
    3939CHECK: ALL DOTEST       
    4040
    41 DIST: CHECK
     41# currently the bindings fail a test so we need a target that builds DIST without CHECKing
     42# not great and should be fixed in the next release
     43DISTNOCHECK: ALL DISTROOT
     44    @echo *** Built Ruby without running tests!!!! ***
     45
     46DIST: CHECK DISTROOT
     47
     48DISTROOT:
    4249    cd $(MAKEDIR)
    4350    if not exist "$(OUTDIR)\dist\$(NULL)" mkdir "$(OUTDIR)\dist"   
    4451    if not exist "$(OUTDIR)\dist\docs\$(NULL)" mkdir "$(OUTDIR)\dist\docs"   

  • win32_common.mak

     
    2121    $(INTDIR)\io_utils.obj \
    2222    $(INTDIR)\msvc_dirent.obj \
    2323    $(INTDIR)\msvc_posix_wrapper.obj \
    24     $(INTDIR)\omdebug.obj \
    2524    $(INTDIR)\replicate_utils.obj \
    2625    $(INTDIR)\safe.obj \
    2726    $(INTDIR)\serialise-double.obj \
    … …  
    4039    $(INTDIR)\io_utils.cc \
    4140    $(INTDIR)\msvc_dirent.cc \
    4241    $(INTDIR)\msvc_posix_wrapper.cc \
    43     $(INTDIR)\omdebug.cc \
    4442    $(INTDIR)\replicate_utils.cc \
    4543    $(INTDIR)\safe.cc \
    4644    $(INTDIR)\serialise-double.cc \

  • win32_expand.mak

     
    6161    -@erase deps.d
    6262    $(CPP) -showIncludes $(CPP_PROJ) $(SRCS) >>deps.d
    6363    if exist "..\win32\$(DEPEND)" ..\win32\$(DEPEND)
    64 # DO NOT DELETE THIS LINE -- xapdep depends on it.
     64# DO NOT DELETE THIS LINE -- xapdep depends on it.
     65 No newline at end of file

  • win32_languages.mak

     
    112112# Generate .h and .cc files from Snowball algorithms using Snowball compiler
    113113       
    114114".\danish.h" ".\danish.cc" : ".\danish.sbl"
    115         $(SBL) danish.sbl $(SBL_OPTIONS) -o danish -n InternalStemDanish -p Stem::Internal
     115        $(SBL) danish.sbl $(SBL_OPTIONS) -o danish -n InternalStemDanish -p SnowballStemImplementation
    116116
    117117".\dutch.h" ".\dutch.cc" : ".\dutch.sbl"
    118         $(SBL) dutch.sbl $(SBL_OPTIONS) -o dutch -n InternalStemDutch -p Stem::Internal
     118        $(SBL) dutch.sbl $(SBL_OPTIONS) -o dutch -n InternalStemDutch -p SnowballStemImplementation
    119119
    120120".\english.h" ".\english.cc" : ".\english.sbl"
    121         $(SBL) english.sbl $(SBL_OPTIONS) -o english -n InternalStemEnglish -p Stem::Internal
     121        $(SBL) english.sbl $(SBL_OPTIONS) -o english -n InternalStemEnglish -p SnowballStemImplementation
    122122
    123123".\french.h" ".\french.cc" : ".\french.sbl"
    124         $(SBL) french.sbl $(SBL_OPTIONS) -o french -n InternalStemFrench -p Stem::Internal
     124        $(SBL) french.sbl $(SBL_OPTIONS) -o french -n InternalStemFrench -p SnowballStemImplementation
    125125
    126126".\german.h" ".\german.cc" : ".\german.sbl"
    127         $(SBL) german.sbl $(SBL_OPTIONS) -o german -n InternalStemGerman -p Stem::Internal
     127        $(SBL) german.sbl $(SBL_OPTIONS) -o german -n InternalStemGerman -p SnowballStemImplementation
    128128
    129129".\german2.h" ".\german2.cc" : ".\german2.sbl"
    130         $(SBL) german2.sbl $(SBL_OPTIONS) -o german2 -n InternalStemGerman2 -p Stem::Internal
     130        $(SBL) german2.sbl $(SBL_OPTIONS) -o german2 -n InternalStemGerman2 -p SnowballStemImplementation
    131131
    132132".\hungarian.h" ".\hungarian.cc" : ".\hungarian.sbl"
    133         $(SBL) hungarian.sbl $(SBL_OPTIONS) -o hungarian -n InternalStemHungarian -p Stem::Internal
     133        $(SBL) hungarian.sbl $(SBL_OPTIONS) -o hungarian -n InternalStemHungarian -p SnowballStemImplementation
    134134
    135135".\italian.h" ".\italian.cc" : ".\italian.sbl"
    136         $(SBL) italian.sbl $(SBL_OPTIONS) -o italian -n InternalStemItalian -p Stem::Internal
     136        $(SBL) italian.sbl $(SBL_OPTIONS) -o italian -n InternalStemItalian -p SnowballStemImplementation
    137137
    138138".\norwegian.h" ".\norwegian.cc" : ".\norwegian.sbl"
    139         $(SBL) norwegian.sbl $(SBL_OPTIONS) -o norwegian -n InternalStemNorwegian -p Stem::Internal
     139        $(SBL) norwegian.sbl $(SBL_OPTIONS) -o norwegian -n InternalStemNorwegian -p SnowballStemImplementation
    140140
    141141".\porter.h" ".\porter.cc" : ".\porter.sbl"
    142         $(SBL) porter.sbl $(SBL_OPTIONS) -o porter -n InternalStemPorter -p Stem::Internal
     142        $(SBL) porter.sbl $(SBL_OPTIONS) -o porter -n InternalStemPorter -p SnowballStemImplementation
    143143
    144144".\portuguese.h" ".\portuguese.cc" : ".\portuguese.sbl"
    145         $(SBL) portuguese.sbl $(SBL_OPTIONS) -o portuguese -n InternalStemPortuguese -p Stem::Internal
     145        $(SBL) portuguese.sbl $(SBL_OPTIONS) -o portuguese -n InternalStemPortuguese -p SnowballStemImplementation
    146146
    147147".\russian.h" ".\russian.cc" : ".\russian.sbl"
    148         $(SBL) russian.sbl $(SBL_OPTIONS) -o russian -n InternalStemRussian -p Stem::Internal
     148        $(SBL) russian.sbl $(SBL_OPTIONS) -o russian -n InternalStemRussian -p SnowballStemImplementation
    149149
    150150".\spanish.h" ".\spanish.cc" : ".\spanish.sbl"
    151         $(SBL) spanish.sbl $(SBL_OPTIONS) -o spanish -n InternalStemSpanish -p Stem::Internal
     151        $(SBL) spanish.sbl $(SBL_OPTIONS) -o spanish -n InternalStemSpanish -p SnowballStemImplementation
    152152
    153153".\swedish.h" ".\swedish.cc" : ".\swedish.sbl"
    154         $(SBL) swedish.sbl $(SBL_OPTIONS) -o swedish -n InternalStemSwedish -p Stem::Internal
     154        $(SBL) swedish.sbl $(SBL_OPTIONS) -o swedish -n InternalStemSwedish -p SnowballStemImplementation
    155155
    156156".\kraaij_pohlmann.h" ".\kraaij_pohlmann.cc" : ".\kraaij_pohlmann.sbl"
    157         $(SBL) kraaij_pohlmann.sbl $(SBL_OPTIONS) -o kraaij_pohlmann -n InternalStemKraaij_pohlmann -p Stem::Internal
     157        $(SBL) kraaij_pohlmann.sbl $(SBL_OPTIONS) -o kraaij_pohlmann -n InternalStemKraaij_pohlmann -p SnowballStemImplementation
    158158               
    159159".\romanian.h" ".\romanian.cc" : ".\romanian.sbl"
    160         $(SBL) romanian.sbl $(SBL_OPTIONS) -o romanian -n InternalStemRomanian -p Stem::Internal       
     160        $(SBL) romanian.sbl $(SBL_OPTIONS) -o romanian -n InternalStemRomanian -p SnowballStemImplementation   
    161161
    162162".\turkish.h" ".\turkish.cc" : ".\turkish.sbl"
    163         $(SBL) turkish.sbl $(SBL_OPTIONS) -o turkish -n InternalStemTurkish -p Stem::Internal   
     163        $(SBL) turkish.sbl $(SBL_OPTIONS) -o turkish -n InternalStemTurkish -p SnowballStemImplementation       
    164164
    165165".\finnish.h" ".\finnish.cc" : ".\finnish.sbl"
    166         $(SBL) finnish.sbl $(SBL_OPTIONS) -o finnish -n InternalStemFinnish -p Stem::Internal
     166        $(SBL) finnish.sbl $(SBL_OPTIONS) -o finnish -n InternalStemFinnish -p SnowballStemImplementation
    167167
    168168".\lovins.h" ".\lovins.cc" : ".\lovins.sbl"
    169         $(SBL) lovins.sbl $(SBL_OPTIONS) -o lovins -n InternalStemLovins -p Stem::Internal
     169        $(SBL) lovins.sbl $(SBL_OPTIONS) -o lovins -n InternalStemLovins -p SnowballStemImplementation
    170170
    171171
    172172"$(INTDIR)\stem.obj" : ".\stem.cc"

  • win32_matcher.mak

     
    2121    $(INTDIR)\collapser.obj\
    2222    $(INTDIR)\exactphrasepostlist.obj\
    2323    $(INTDIR)\externalpostlist.obj\
    24     $(INTDIR)\localmatch.obj\
     24    $(INTDIR)\localsubmatch.obj\
    2525    $(INTDIR)\mergepostlist.obj\
    2626    $(INTDIR)\msetcmp.obj\
    2727    $(INTDIR)\msetpostlist.obj\
    2828    $(INTDIR)\multiandpostlist.obj\
    2929    $(INTDIR)\multimatch.obj\
     30    $(INTDIR)\multixorpostlist.obj\
    3031    $(INTDIR)\orpostlist.obj\
    3132    $(INTDIR)\phrasepostlist.obj\
    3233    $(INTDIR)\queryoptimiser.obj\
    33     $(INTDIR)\rset.obj\
    3434    $(INTDIR)\selectpostlist.obj\
    3535    $(INTDIR)\synonympostlist.obj\
    3636    $(INTDIR)\valuerangepostlist.obj\
    3737    $(INTDIR)\valuegepostlist.obj\
    3838    $(INTDIR)\valuestreamdocument.obj\
    39     $(INTDIR)\xorpostlist.obj\
    4039    $(INTDIR)\remotesubmatch.obj
    4140
    4241
    … …  
    4746    $(INTDIR)\collapser.cc\
    4847    $(INTDIR)\exactphrasepostlist.cc\
    4948    $(INTDIR)\externalpostlist.cc\
    50     $(INTDIR)\localmatch.cc\
     49    $(INTDIR)\localsubmatch.cc\
    5150    $(INTDIR)\mergepostlist.cc\
    5251    $(INTDIR)\msetcmp.cc\
    5352    $(INTDIR)\msetpostlist.cc\
    5453    $(INTDIR)\multiandpostlist.cc\
    5554    $(INTDIR)\multimatch.cc\
     55    $(INTDIR)\multixorpostlist.cc\
    5656    $(INTDIR)\orpostlist.cc\
    5757    $(INTDIR)\phrasepostlist.cc\
    5858    $(INTDIR)\queryoptimiser.cc\
    59     $(INTDIR)\rset.cc\
    6059    $(INTDIR)\selectpostlist.cc\
    6160    $(INTDIR)\synonympostlist.cc\
    6261    $(INTDIR)\valuerangepostlist.cc\
    6362    $(INTDIR)\valuegepostlist.cc\
    6463    $(INTDIR)\valuestreamdocument.cc\
    65     $(INTDIR)\xorpostlist.cc\
    6664    $(INTDIR)\remotesubmatch.cc
    6765
    6866CLEAN :

  • win32_tests.mak

     
    1818PROGRAM_QUERYPARSERTEST= "$(OUTDIR)\queryparsertest.exe"
    1919PROGRAM_STEMTEST= "$(OUTDIR)\stemtest.exe"
    2020PROGRAM_TERMGENTEST= "$(OUTDIR)\termgentest.exe"
     21PROGRAM_UNITTEST= "$(OUTDIR)\unittest.exe"
    2122
    2223ALL : $(CLEAN_COLLATED_HEADERS) $(PROGRAM_APITEST) $(PROGRAM_INTERNALTEST) \
    23  $(PROGRAM_QUERYPARSERTEST) $(PROGRAM_STEMTEST) $(PROGRAM_TERMGENTEST)
     24 $(PROGRAM_QUERYPARSERTEST) $(PROGRAM_STEMTEST) $(PROGRAM_TERMGENTEST) $(PROGRAM_UNITTEST)
    2425 
    2526 
    2627APITEST : $(PROGRAM_APITEST)
    … …  
    2829INTERNALTEST : $(PROGRAM_INTERNALTEST) 
    2930QUERYPARSERTEST : $(PROGRAM_QUERYPARSERTEST) 
    3031TERMGENTEST : $(PROGRAM_TERMGENTEST) 
     32UNITTEST : $(PROGRAM_UNITTEST) 
    3133
    3234
    3335DOTEST :
    … …  
    3840    queryparsertest
    3941    stemtest
    4042    termgentest
     43    unittest
    4144
    4245   
    4346#    remotetest
    … …  
    5861    "$(OUTDIR)\api_compact.obj" \
    5962    "$(OUTDIR)\api_db.obj" \
    6063    "$(OUTDIR)\api_generated.obj" \
     64    "$(OUTDIR)\api_matchspy.obj" \
     65    "$(OUTDIR)\api_metadata.obj" \
    6166    "$(OUTDIR)\api_nodb.obj" \
     67    "$(OUTDIR)\api_none.obj" \
     68    "$(OUTDIR)\api_opsynonym.obj" \
     69    "$(OUTDIR)\api_opvalue.obj" \
    6270    "$(OUTDIR)\api_percentages.obj" \
    6371    "$(OUTDIR)\api_posdb.obj" \
     72    "$(OUTDIR)\api_postingsource.obj" \
     73    "$(OUTDIR)\api_qpbackend.obj" \
    6474    "$(OUTDIR)\api_query.obj" \
     75    "$(OUTDIR)\api_replacedoc.obj" \
    6576    "$(OUTDIR)\api_replicate.obj" \
     77    "$(OUTDIR)\api_scalability.obj" \
    6678    "$(OUTDIR)\api_serialise.obj" \
    6779    "$(OUTDIR)\api_sorting.obj" \
    6880    "$(OUTDIR)\api_sortingold.obj" \
    6981    "$(OUTDIR)\api_spelling.obj" \
     82    "$(OUTDIR)\api_stem.obj" \
    7083    "$(OUTDIR)\api_transdb.obj" \
    7184    "$(OUTDIR)\api_unicode.obj" \
    7285    "$(OUTDIR)\api_valuestats.obj" \
    … …  
    8497
    8598TERMGENTEST_OBJS= "$(OUTDIR)\termgentest.obj"   
    8699
     100UNITTEST_OBJS= "$(OUTDIR)\unittest.obj"   
     101
    87102SRC = \
    88103    "$(INTDIR)\apitest.cc" \
    89104    "$(INTDIR)\dbcheck.cc" \
    90105    "$(INTDIR)\internaltest.cc" \
    91106    "$(INTDIR)\queryparsertest.cc" \
    92107    "$(INTDIR)\stemtest.cc" \
    93     "$(INTDIR)\termgentest.cc"
     108    "$(INTDIR)\termgentest.cc"  \
     109    "$(INTDIR)\unittest.cc"
    94110
    95111COLLATED_APITEST_SOURCES= \
    96112    "$(INTDIR)\api_anydb.cc" \
    … …  
    100116    "$(INTDIR)\api_compact.cc" \
    101117    "$(INTDIR)\api_db.cc" \
    102118    "$(INTDIR)\api_generated.cc" \
     119    "$(INTDIR)\api_matchspy.cc" \
     120    "$(INTDIR)\api_metadata.cc" \
    103121    "$(INTDIR)\api_nodb.cc" \
     122    "$(INTDIR)\api_none.cc" \
     123    "$(INTDIR)\api_opsynonym.cc" \
     124    "$(INTDIR)\api_opvalue.cc" \
    104125    "$(INTDIR)\api_percentages.cc" \
    105126    "$(INTDIR)\api_posdb.cc" \
     127    "$(INTDIR)\api_postingsource.cc" \
     128    "$(INTDIR)\api_qpbackend.cc" \
    106129    "$(INTDIR)\api_query.cc" \
     130    "$(INTDIR)\api_replacedoc.cc" \
    107131    "$(INTDIR)\api_replicate.cc" \
     132    "$(INTDIR)\api_scalability.cc" \
    108133    "$(INTDIR)\api_serialise.cc" \
    109134    "$(INTDIR)\api_sorting.cc" \
    110135    "$(INTDIR)\api_sortingold.cc" \
    111136    "$(INTDIR)\api_spelling.cc" \
     137    "$(INTDIR)\api_stem.cc" \
    112138    "$(INTDIR)\api_transdb.cc" \
    113139    "$(INTDIR)\api_unicode.cc" \
    114140    "$(INTDIR)\api_valuestats.cc" \
    … …  
    123149    "$(INTDIR)\api_compact.h" \
    124150    "$(INTDIR)\api_db.h" \
    125151    "$(INTDIR)\api_generated.h" \
     152    "$(INTDIR)\api_matchspy.h" \
     153    "$(INTDIR)\api_metadata.h" \
    126154    "$(INTDIR)\api_nodb.h" \
     155    "$(INTDIR)\api_none.h" \
     156    "$(INTDIR)\api_opsynonym.h" \
    127157    "$(INTDIR)\api_percentages.h" \
    128158    "$(INTDIR)\api_posdb.h" \
     159    "$(INTDIR)\api_postingsource.h" \
     160    "$(INTDIR)\api_qpbackend.h" \
    129161    "$(INTDIR)\api_query.h" \
     162    "$(INTDIR)\api_replacedoc.h" \
    130163    "$(INTDIR)\api_replicate.h" \
     164    "$(INTDIR)\api_scalability.h" \
    131165    "$(INTDIR)\api_serialise.h" \
    132166    "$(INTDIR)\api_sorting.h" \
    133167    "$(INTDIR)\api_sortingold.h" \
     168    "$(INTDIR)\api_opsynonym.h" \
    134169    "$(INTDIR)\api_spelling.h" \
    135170    "$(INTDIR)\api_transdb.h" \
    136171    "$(INTDIR)\api_unicode.h" \
    … …  
    233268  $(ALL_LINK32_FLAGS) /out:"$(OUTDIR)\remotetest.exe" $(DEF_FLAGS) $(REMOTETEST_OBJS)
    234269<<
    235270
     271"$(OUTDIR)\unittest.exe" : "$(OUTDIR)" $(DEF_FILE) $(UNITTEST_OBJS) \
     272                      $(PROGRAM_DEPENDENCIES)
     273    $(LINK32) @<<
     274  $(ALL_LINK32_FLAGS) /out:"$(OUTDIR)\unittest.exe" $(DEF_FLAGS) $(UNITTEST_OBJS)
     275<<
     276
    236277# inference rules, showing how to create one type of file from another with the same root name
    237278{.}.cc{$(INTDIR)}.obj::
    238279    $(CPP) @<<

  • win32_unicode.mak

     
    6060    -@erase deps.d
    6161    $(CPP) -showIncludes $(CPP_PROJ) $(SRCS) >>deps.d
    6262    if exist "..\win32\$(DEPEND)" ..\win32\$(DEPEND)
    63 # DO NOT DELETE THIS LINE -- xapdep depends on it.
     63# DO NOT DELETE THIS LINE -- xapdep depends on it.
     64 No newline at end of file