Ticket #556: out.patch

File out.patch, 47.1 KB (added by greg, 13 years ago)

The aforementioned patch

  • Makefile 

    diff -ru win32msvc_svn15917/Makefile win32/Makefile
    old new  
    1717MAKEALL:
    1818# Note we must run each make process with the HEADERS target to calculate any missing dependencies and add them to the end of the makefile
    1919   cd ..\common
    20    nmake $(MAKEMACRO) /$(MAKEFLAGS) CFG="$(CFG)" DEBUG="$(DEBUG)" HEADERS
    21    nmake $(MAKEMACRO) /$(MAKEFLAGS) CFG="$(CFG)" DEBUG="$(DEBUG)" 
     20
     21   nmake $(MAKEMACRO) /$(MAKEFLAGS) CFG="$(CFG)" DEBUG="$(DEBUG)"
    2222   cd ..\api
    23    nmake $(MAKEMACRO) /$(MAKEFLAGS) CFG="$(CFG)" DEBUG="$(DEBUG)" HEADERS
     23
    2424   nmake $(MAKEMACRO) /$(MAKEFLAGS) CFG="$(CFG)" DEBUG="$(DEBUG)"
    2525   cd ..\backends
    26    nmake $(MAKEMACRO) /$(MAKEFLAGS) CFG="$(CFG)" DEBUG="$(DEBUG)" HEADERS
     26
    2727   nmake $(MAKEMACRO) /$(MAKEFLAGS) CFG="$(CFG)" DEBUG="$(DEBUG)"
    2828   cd ..\matcher
    29    nmake $(MAKEMACRO) /$(MAKEFLAGS) CFG="$(CFG)" DEBUG="$(DEBUG)" HEADERS
     29
    3030   nmake $(MAKEMACRO) /$(MAKEFLAGS) CFG="$(CFG)" DEBUG="$(DEBUG)"
    3131   cd ..\languages\compiler
    3232   nmake $(MAKEMACRO) /$(MAKEFLAGS) CFG="$(CFG)" DEBUG="$(DEBUG)"
    3333   cd ..
    3434   nmake $(MAKEMACRO) /$(MAKEFLAGS) CFG="$(CFG)" DEBUG="$(DEBUG)"
    3535   cd ..\queryparser
    36    nmake $(MAKEMACRO) /$(MAKEFLAGS) CFG="$(CFG)" DEBUG="$(DEBUG)" HEADERS
     36
    3737   nmake $(MAKEMACRO) /$(MAKEFLAGS) CFG="$(CFG)" DEBUG="$(DEBUG)"
    3838   cd ..\net
    39    nmake $(MAKEMACRO) /$(MAKEFLAGS) CFG="$(CFG)" DEBUG="$(DEBUG)" HEADERS
     39
    4040   nmake $(MAKEMACRO) /$(MAKEFLAGS) CFG="$(CFG)" DEBUG="$(DEBUG)"
    4141   cd ..\expand
    42    nmake $(MAKEMACRO) /$(MAKEFLAGS) CFG="$(CFG)" DEBUG="$(DEBUG)" HEADERS
     42
    4343   nmake $(MAKEMACRO) /$(MAKEFLAGS) CFG="$(CFG)" DEBUG="$(DEBUG)"
    4444   cd ..\unicode
    45    nmake $(MAKEMACRO) /$(MAKEFLAGS) CFG="$(CFG)" DEBUG="$(DEBUG)" HEADERS
     45
    4646   nmake $(MAKEMACRO) /$(MAKEFLAGS) CFG="$(CFG)" DEBUG="$(DEBUG)"
    4747   cd ..\weight
    48    nmake $(MAKEMACRO) /$(MAKEFLAGS) CFG="$(CFG)" DEBUG="$(DEBUG)" HEADERS
     48
    4949   nmake $(MAKEMACRO) /$(MAKEFLAGS) CFG="$(CFG)" DEBUG="$(DEBUG)"
    5050   cd ..\tests\harness
    51    nmake $(MAKEMACRO) /$(MAKEFLAGS) CFG="$(CFG)" DEBUG="$(DEBUG)" HEADERS
     51
    5252   nmake $(MAKEMACRO) /$(MAKEFLAGS) CFG="$(CFG)" DEBUG="$(DEBUG)"
    5353   cd ..\..\bin
    54    nmake $(MAKEMACRO) /$(MAKEFLAGS) CFG="$(CFG)" DEBUG="$(DEBUG)" HEADERS
     54
    5555   nmake $(MAKEMACRO) /$(MAKEFLAGS) CFG="$(CFG)" DEBUG="$(DEBUG)"
    5656   cd ..\examples
    57    nmake $(MAKEMACRO) /$(MAKEFLAGS) CFG="$(CFG)" DEBUG="$(DEBUG)" HEADERS
     57
    5858   nmake $(MAKEMACRO) /$(MAKEFLAGS) CFG="$(CFG)" DEBUG="$(DEBUG)"
    5959   cd ..\tests
    60    nmake $(MAKEMACRO) /$(MAKEFLAGS) CFG="$(CFG)" DEBUG="$(DEBUG)" HEADERS
     60
    6161   nmake $(MAKEMACRO) /$(MAKEFLAGS) CFG="$(CFG)" DEBUG="$(DEBUG)"
    6262
    6363DOTEST:
    … …  
    9999   cd ..\tests
    100100   nmake /$(MAKEFLAGS) DEBUG="$(DEBUG)" CLEAN
    101101   cd ..\win32
    102    -@erase ..\config.h 
     102   -@erase ..\config.h
    103103   -@erase ..\include\xapian\version.h
    104104   -@erase ..\include\xapian\error.h
    105105   -@erase ..\include\xapian\errordispatch.h
    … …  
    110110DISTCLEAN: CLEAN
    111111
    112112# Copy mak files to the right folders
    113 COPYMAKFILES: 
     113COPYMAKFILES:
    114114   copy config.h.win32 ..\config.h
    115115   copy  win32_api.mak ..\api\Makefile
    116116   copy  win32_backends.mak ..\backends\Makefile
    117    copy  win32_backends_flint.mak ..\backends\flint\Makefile
    118117   copy  win32_backends_brass.mak ..\backends\brass\Makefile
    119118   copy  win32_backends_chert.mak ..\backends\chert\Makefile
    120119   copy  win32_backends_inmemory.mak ..\backends\inmemory\Makefile
    … …  
    150149   if exist $(XAPIAN_APPLICATIONS) copy config.h.omega.win32 $(XAPIAN_APPLICATIONS)\config.h
    151150   if exist $(XAPIAN_APPLICATIONS) copy config.h.omega.win32 $(XAPIAN_APPLICATIONS)\common\config.h
    152151
    153 # Test for tools that we MUST have   
     152# Test for tools that we MUST have
    154153TESTFORTOOLS: xapdep.exe
    155154# Perl is needed for header generation
    156    if not exist $(PERL_EXE) exit(1) 
    157    
     155   if not exist $(PERL_EXE) exit(1)
     156
    158157MAKEALLBINDINGS: ALL COPYMAKFILES
    159158# Need bindings to exist
    160159   if not exist  $(XAPIAN_BINDINGS) exit(1)
    … …  
    165164
    166165   nmake PYTHON_VER=25 CLEAN
    167166   nmake PYTHON_VER=25 DIST
    168    
     167
    169168   nmake PYTHON_VER=26 CLEAN
    170169   nmake PYTHON_VER=26 DIST
    171  
     170
    172171   nmake PYTHON_VER=27 CLEAN
    173172   nmake PYTHON_VER=27 DIST
    174173
    … …  
    177176   nmake PHP_VER=52 DIST
    178177   nmake PHP_VER=53 CLEAN
    179178   nmake PHP_VER=53 DIST
    180    
     179
    181180# Java bindings didn't work, see http://trac.xapian.org/ticket/474
    182181# That issue is fixed, needs testing again
    183182#   cd $(XAPIAN_BINDINGS)\java
    … …  
    191190   cd $(XAPIAN_BINDINGS)\ruby
    192191   nmake CLEAN
    193192   nmake DISTNOCHECK
    194    
    195193
    196    
     194
     195
    197196# Header files generated automatically from various .in files
    198197MAKEHEADERS: ..\include\xapian\error.h ..\include\xapian\version.h
    199198
    … …  
    204203
    205204..\include\xapian\version.h: version.h.in ..\configure.ac
    206205    $(PERL_EXE) genversion.pl ..\configure.ac version.h.in ..\include\xapian\version.h
    207    
    208 xapdep.exe: 
     206
     207xapdep.exe:
    209208    cd xapdep
    210209    nmake -f xapdep.mak
    211210    copy xapdep.exe ..

  • config.mak 

    diff -ru win32msvc_svn15917/config.mak win32/config.mak
    old new  
    1212
    1313!IF "$(OS)" == "Windows_NT"
    1414NULL=
    15 !ELSE 
     15!ELSE
    1616NULL=nul
    17 !ENDIF 
     17!ENDIF
    1818# ----------------------------------------------
    1919# Xapian paths
    2020# ----------------------------------------------
    … …  
    2525# win32_bindings_python.mak
    2626# and any other bindings mak files
    2727XAPIAN_APPLICATIONS=..\..\xapian-applications\omega
    28 XAPIAN_BINDINGS=..\..\xapian-bindings
     28XAPIAN_BINDINGS=..\..\xapian-bindings-1.3.0
    2929
    3030#  ------------- Perl settings-------------
    3131# Perl folder
    … …  
    4242# Python folder for 2.4
    4343PYTHON_DIR_24=c:\Python24
    4444# Python executable
    45 PYTHON_EXE_24=$(PYTHON_DIR_24)\python.exe 
     45PYTHON_EXE_24=$(PYTHON_DIR_24)\python.exe
    4646 #PYTHON_INCLUDE : Set this to the directory that contains python.h
    4747PYTHON_INCLUDE_24=$(PYTHON_DIR_24)\include
    4848#A 'PC' directory is also included for people building from a source tree.
    … …  
    5858# Python folder for 2.5
    5959PYTHON_DIR_25=c:\Python25
    6060# Python executable
    61 PYTHON_EXE_25=$(PYTHON_DIR_25)\python.exe 
     61PYTHON_EXE_25=$(PYTHON_DIR_25)\python.exe
    6262 #PYTHON_INCLUDE : Set this to the directory that contains python.h
    6363PYTHON_INCLUDE_25=$(PYTHON_DIR_25)\include
    6464#A 'PC' directory is also included for people building from a source tree.
    … …  
    7474# Python folder for 2.6
    7575PYTHON_DIR_26=c:\Python26
    7676# Python executable
    77 PYTHON_EXE_26=$(PYTHON_DIR_26)\python.exe 
     77PYTHON_EXE_26=$(PYTHON_DIR_26)\python.exe
    7878 #PYTHON_INCLUDE : Set this to the directory that contains python.h
    7979PYTHON_INCLUDE_26=$(PYTHON_DIR_26)\include
    8080#A 'PC' directory is also included for people building from a source tree.
    … …  
    9090# Python folder for 2.7
    9191PYTHON_DIR_27=c:\Python27
    9292# Python executable
    93 PYTHON_EXE_27=$(PYTHON_DIR_27)\python.exe 
     93PYTHON_EXE_27=$(PYTHON_DIR_27)\python.exe
    9494 #PYTHON_INCLUDE : Set this to the directory that contains python.h
    9595PYTHON_INCLUDE_27=$(PYTHON_DIR_27)\include
    9696#A 'PC' directory is also included for people building from a source tree.
    … …  
    107107PYTHON_DIR_30=c:\Python30
    108108# Python executable
    109109!if "$(DEBUG)"=="1"
    110 PYTHON_EXE_30=$(PYTHON_DIR_30)\python_d.exe 
     110PYTHON_EXE_30=$(PYTHON_DIR_30)\python_d.exe
    111111!else
    112 PYTHON_EXE_30=$(PYTHON_DIR_30)\python.exe 
     112PYTHON_EXE_30=$(PYTHON_DIR_30)\python.exe
    113113!endif
    114114#PYTHON_INCLUDE : Set this to the directory that contains python.h
    115115PYTHON_INCLUDE_30=$(PYTHON_DIR_30)\include
    … …  
    132132
    133133PHP52_INCLUDE_CPPFLAGS= \
    134134-I "$(PHP52_SRC_DIR)" -I "$(PHP52_SRC_DIR)\tsrm" -I "$(PHP52_SRC_DIR)\Zend" -I "$(PHP52_SRC_DIR)\main" -I "$(PHP52_SRC_DIR)\regex"  \
    135 -D ZTS=1 -D ZEND_WIN32=1 -D PHP_WIN32=1 -D ZEND_WIN32_FORCE_INLINE -D HAVE_WIN32STD=1 
     135-D ZTS=1 -D ZEND_WIN32=1 -D PHP_WIN32=1 -D ZEND_WIN32_FORCE_INLINE -D HAVE_WIN32STD=1
    136136
    137137# PHP_EXE_DIR: Set this to the folder where the PHP executable is
    138 # PHP_LIB : Set this to the path to the PHP library 
     138# PHP_LIB : Set this to the path to the PHP library
    139139!if "$(DEBUG)"=="1"
    140140PHP52_EXE_DIR=C:\php-5.2.1\Debug_TS
    141141PHP52_LIB=$(PHP52_EXE_DIR)\php5ts_debug.lib
    … …  
    157157
    158158PHP53_INCLUDE_CPPFLAGS= \
    159159-I "$(PHP53_SRC_DIR)" -I "$(PHP53_SRC_DIR)\tsrm" -I "$(PHP53_SRC_DIR)\Zend" -I "$(PHP53_SRC_DIR)\main" \
    160 -D ZTS=1 -D ZEND_WIN32=1 -D PHP_WIN32=1 -D ZEND_WIN32_FORCE_INLINE -D HAVE_WIN32STD=1 
     160-D ZTS=1 -D ZEND_WIN32=1 -D PHP_WIN32=1 -D ZEND_WIN32_FORCE_INLINE -D HAVE_WIN32STD=1
    161161#-I "$(PHP53_SRC_DIR)\regex"  \
    162162
    163163# PHP_EXE_DIR: Set this to the folder where the PHP executable is
    164 # PHP_LIB : Set this to the path to the PHP library 
     164# PHP_LIB : Set this to the path to the PHP library
    165165!if "$(DEBUG)"=="1"
    166166PHP53_EXE_DIR=$(PHP53_SRC_DIR)\Debug_TS
    167167PHP53_LIB=$(PHP53_EXE_DIR)\php5ts_debug.lib
    … …  
    173173!endif
    174174
    175175#    PHP executable
    176 PHP53_EXE=$(PHP53_EXE_DIR)\PHP.exe 
     176PHP53_EXE=$(PHP53_EXE_DIR)\PHP.exe
    177177# end PHP 5.3.0 only -----------------
    178178
    179179# ------------- end PHP settings-------------
    … …  
    186186# Ruby folder
    187187RUBY_DIR=c:\Ruby
    188188# Ruby executable
    189 RUBY_EXE=$(RUBY_DIR)\bin\ruby.exe 
     189RUBY_EXE=$(RUBY_DIR)\bin\ruby.exe
    190190# RUBY_INCLUDE : Set this to the directory that contains ruby.h
    191191RUBY_INCLUDE=$(RUBY_DIR)\lib\ruby\1.8\i386-mswin32
    192192# RUBY_SO_DIR : Where to install the dll file
    … …  
    210210
    211211# ------------- C# settings ------------
    212212
    213 CSC="C:\WINDOWS\Microsoft.NET\Framework\v3.5\csc.exe"
    214 SN="C:\Program Files\Microsoft Visual Studio .NET 2003\SDK\v1.1\Bin\sn.exe"
     213CSC="c:\Windows\Microsoft.NET\Framework64\v4.0.30319\csc.exe"
     214SN="c:\Program Files\Microsoft SDKs\Windows\v7.1\Bin\sn.exe"
    215215
    216216# ------------- end C# settings ------------
    217217
    218218# ------------SWIG settings-------------
    219219# Swig executable
    220220SWIG=\work\xapian\xapian-svn\swig\swig.exe
    221 SWIG_FLAGS= -Werror 
     221SWIG_FLAGS= -Werror
    222222# ------------end SWIG settings-------------
    223223
    224224# ------------ Misc external libraries we depend on -------------
    225 ZLIB_DIR=C:\gnu\zlib123-dll
     225ZLIB_DIR=C:\zlib
    226226# If you installed a binary version, the following 3 lines are probably
    227227# correct.  If you build from sources, adjust accordingly.
    228228ZLIB_INCLUDE_DIR=$(ZLIB_DIR)\include
    … …  
    239239# Visual C++ Compiler and linker programs, and flags for these
    240240#--------------------------------------
    241241LIB32=link.exe -lib
    242 LIB32_FLAGS=-nologo  
     242LIB32_FLAGS=-nologo -machine:x64
    243243LINK32=link.exe
    244244LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib\
    245245 advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib rpcrt4.lib\
    246  wsock32.lib Ws2_32.lib  odbccp32.lib -subsystem:console -debug -nologo \
     246 wsock32.lib Ws2_32.lib  odbccp32.lib -subsystem:console -machine:x64 -debug -nologo \
    247247 "$(ZLIB_LIB_DIR)\zdll.lib"
    248  
     248
    249249CPP=cl.exe
    250250RSC=rc.exe
    251251MANIFEST=mt.exe /manifest
    … …  
    272272# assumed these files will *not* ship with a default binary build)
    273273CPPFLAGS_COMMON=-nologo -c -Zi -I.. -I..\include -I..\common -I..\win32 -W3 -EHsc \
    274274-DWIN32 -D__WIN32__ -D_WIN32 -D_WINDOWS \
    275 -D "HAVE_VSNPRINTF" -D "HAVE_STRDUP" -D "_USE_32BIT_TIME_T" \
     275-D "HAVE_VSNPRINTF" -D "HAVE_STRDUP" \
    276276-D_CRT_SECURE_NO_DEPRECATE \
    277277-I"$(ZLIB_INCLUDE_DIR)"
    278278
    … …  
    283283 "$(OUTLIBDIR)\libexpand.lib"  \
    284284 "$(OUTLIBDIR)\libbrass.lib" \
    285285 "$(OUTLIBDIR)\libchert.lib" \
    286  "$(OUTLIBDIR)\libflint.lib" \
    287286 "$(OUTLIBDIR)\libinmemory.lib" \
    288287 "$(OUTLIBDIR)\libmulti.lib" \
    289288 "$(OUTLIBDIR)\libmatcher.lib"  \
    … …  
    293292 "$(OUTLIBDIR)\libremote.lib"  \
    294293 "$(OUTLIBDIR)\libunicode.lib"  \
    295294 "$(OUTLIBDIR)\libweight.lib"  \
    296  "$(OUTLIBDIR)\libqueryparser.lib" 
     295 "$(OUTLIBDIR)\libqueryparser.lib"
    297296
    298297!IF "$(DEBUG)" == "1"
    299298# Debug build

  • win32_api.mak 

    diff -ru win32msvc_svn15917/win32_api.mak win32/win32_api.mak
    old new  
    1313OUTDIR=..\win32\$(XAPIAN_DEBUG_OR_RELEASE)\libs
    1414INTDIR=.\
    1515
    16 ALL : "$(OUTDIR)\libapi.lib" 
     16ALL : "$(OUTDIR)\libapi.lib"
    1717
    1818OBJS= \
    1919    $(INTDIR)/compactor.obj\
    … …  
    3030    $(INTDIR)/omdatabase.obj \
    3131    $(INTDIR)/omdocument.obj \
    3232    $(INTDIR)/omenquire.obj \
    33     $(INTDIR)/ompositionlistiterator.obj \
    3433    $(INTDIR)/ompostlistiterator.obj \
    3534    $(INTDIR)/omquery.obj \
    36     $(INTDIR)/omqueryinternal.obj \
    37     $(INTDIR)/omtermlistiterator.obj \
     35    $(INTDIR)/omqueryinternal.obj \
     36                $(INTDIR)/positioniterator.obj \
    3837    $(INTDIR)/postingsource.obj \
    3938    $(INTDIR)/postlist.obj \
    4039    $(INTDIR)/registry.obj \
    4140    $(INTDIR)/replication.obj \
    42     $(INTDIR)/sortable-serialise.obj \
     41    $(INTDIR)/sortable-serialise.obj \
     42                $(INTDIR)/termiterator.obj \
    4343    $(INTDIR)/termlist.obj \
    4444    $(INTDIR)/valueiterator.obj\
    4545    $(INTDIR)/valuerangeproc.obj \
    4646    $(INTDIR)/valuesetmatchdecider.obj \
    4747    $(INTDIR)/version.obj
    48    
     48
    4949SRCS= \
    5050    $(INTDIR)/compactor.cc\
    5151    $(INTDIR)/decvalwtsource.cc\
    … …  
    6161    $(INTDIR)/omdatabase.cc\
    6262    $(INTDIR)/omdocument.cc\
    6363    $(INTDIR)/omenquire.cc\
    64     $(INTDIR)/ompositionlistiterator.cc\
    6564    $(INTDIR)/ompostlistiterator.cc\
    6665    $(INTDIR)/omquery.cc\
    6766    $(INTDIR)/omqueryinternal.cc\
    68     $(INTDIR)/omtermlistiterator.cc\
     67    $(INTDIR)/omtermlistiterator.cc\
     68                $(INTDIR)/positioniterator.cc \
    6969    $(INTDIR)/postingsource.cc \
    7070    $(INTDIR)/postlist.cc\
    7171    $(INTDIR)/registry.cc \
    7272    $(INTDIR)/replication.cc \
    73     $(INTDIR)/sortable-serialise.cc\
     73    $(INTDIR)/sortable-serialise.cc\
     74                $(INTDIR)/termiterator.cc \
    7475    $(INTDIR)/termlist.cc\
    7576    $(INTDIR)/valueiterator.cc\
    7677    $(INTDIR)/valuerangeproc.cc\
    7778    $(INTDIR)/valuesetmatchdecider.cc \
    7879    $(INTDIR)/version.cc
    7980
    80              
     81
    8182CLEAN :
    8283    -@erase "$(OUTDIR)\libapi.lib"
    8384    -@erase "*.pch"
    … …  
    101102# inference rules, showing how to create one type of file from another with the same root name
    102103{.}.cc{$(INTDIR)}.obj::
    103104        $(CPP) @<<
    104         $(CPP_PROJ) $< 
     105        $(CPP_PROJ) $<
    105106<<
    106107
    107108{.}.cc{$(CPP_SBRS)}.sbr::
    108109   $(CPP) @<<
    109    $(CPP_PROJ) $< 
     110   $(CPP_PROJ) $<
    110111<<
    111112
    112113# Calculate any header dependencies and automatically insert them into this file
    113114HEADERS :
    114115    -@erase deps.d
    115116    $(CPP) -showIncludes $(CPP_PROJ) $(SRCS) >>deps.d
    116     if exist "..\win32\$(DEPEND)" ..\win32\$(DEPEND) 
     117    if exist "..\win32\$(DEPEND)" ..\win32\$(DEPEND)
    117118# DO NOT DELETE THIS LINE -- xapdep depends on it.

  • win32_backends.mak 

    diff -ru win32msvc_svn15917/win32_backends.mak win32/win32_backends.mak
    old new  
    1414DEPLIBS = "$(OUTDIR)\libmulti.lib"  \
    1515    "$(OUTDIR)\libinmemory.lib" \
    1616    "$(OUTDIR)\libremote.lib" \
    17     "$(OUTDIR)\libflint.lib" \
    1817    "$(OUTDIR)\libchert.lib" \
    1918    "$(OUTDIR)\libbrass.lib" \
    2019    $(NULL)
    … …  
    2726        $(INTDIR)\valuelist.obj \
    2827        $(INTDIR)\slowvaluelist.obj \
    2928        $(INTDIR)\contiguousalldocspostlist.obj \
    30         $(INTDIR)\flint_lock.obj 
     29        $(INTDIR)\flint_lock.obj
    3130
    3231SRCS=   $(INTDIR)\database.cc \
    3332        $(INTDIR)\databasereplicator.cc\
    … …  
    3736        $(INTDIR)\valuelist.cc \
    3837        $(INTDIR)\slowvaluelist.cc \
    3938        $(INTDIR)\contiguousalldocspostlist.cc \
    40         $(INTDIR)\flint_lock.cc 
     39        $(INTDIR)\flint_lock.cc
    4140
    4241
    43          
    44 ALL : $(DEPLIBS) "$(OUTDIR)\libbackend.lib" 
     42
     43ALL : $(DEPLIBS) "$(OUTDIR)\libbackend.lib"
    4544
    4645CLEAN :
    4746        -@erase /q "$(OUTDIR)\libbackend.lib"
    … …  
    4948        -@erase /q "$(INTDIR)\*.pdb"
    5049        -@erase /q $(OBJS)
    5150        cd brass
    52         nmake /$(MAKEFLAGS) CLEAN DEBUG=$(DEBUG) 
     51        nmake /$(MAKEFLAGS) CLEAN DEBUG=$(DEBUG)
    5352        cd ..\chert
    54         nmake /$(MAKEFLAGS) CLEAN DEBUG=$(DEBUG)
    55         cd ..\flint
    56         nmake /$(MAKEFLAGS) CLEAN DEBUG=$(DEBUG)
     53        nmake /$(MAKEFLAGS) CLEAN DEBUG=$(DEBUG)
    5754        cd ..\inmemory
    58         nmake /$(MAKEFLAGS) CLEAN DEBUG=$(DEBUG) 
     55        nmake /$(MAKEFLAGS) CLEAN DEBUG=$(DEBUG)
    5956        cd ..\multi
    60         nmake /$(MAKEFLAGS) CLEAN DEBUG=$(DEBUG) 
     57        nmake /$(MAKEFLAGS) CLEAN DEBUG=$(DEBUG)
    6158        cd ..\remote
    62         nmake /$(MAKEFLAGS) CLEAN DEBUG=$(DEBUG) 
     59        nmake /$(MAKEFLAGS) CLEAN DEBUG=$(DEBUG)
    6360        cd ..
    6461
    6562
    … …  
    6966CPP_PROJ=$(CPPFLAGS_EXTRA) \
    7067 -I"..\languages" \
    7168 -Fo"$(INTDIR)\\" -Tp$(INPUTNAME)
    72  
     69
    7370CPP_OBJS=..\win32\$(XAPIAN_DEBUG_OR_RELEASE)
    7471CPP_SBRS=.
    7572
    … …  
    8380       nmake $(MAKEMACRO) /$(MAKEFLAGS) CFG="$(CFG)" DEBUG="$(DEBUG)"
    8481       cd ..
    8582
    86 "$(OUTDIR)\libflint.lib":
    87        cd flint
    88        nmake $(MAKEMACRO) /$(MAKEFLAGS) CFG="$(CFG)" DEBUG="$(DEBUG)"
    89        cd ..
    90 
    9183"$(OUTDIR)\libchert.lib":
    9284       cd chert
    9385       nmake $(MAKEMACRO) /$(MAKEFLAGS) CFG="$(CFG)" DEBUG="$(DEBUG)"
    … …  
    111103# inference rules, showing how to create one type of file from another with the same root name
    112104{.}.cc{$(INTDIR)}.obj::
    113105        $(CPP) @<<
    114         $(CPP_PROJ) $< 
     106        $(CPP_PROJ) $<
    115107<<
    116108
    117109{.}.cc{$(CPP_SBRS)}.sbr::
    118110   $(CPP) @<<
    119    $(CPP_PROJ) $< 
     111   $(CPP_PROJ) $<
    120112<<
    121113
    122114# Calculate any header dependencies and automatically insert them into this file
    123115HEADERS :
    124116    -@erase deps.d
    125117    $(CPP) -showIncludes $(CPP_PROJ) $(SRCS) >>deps.d
    126     if exist "..\win32\$(DEPEND)" ..\win32\$(DEPEND) 
     118    if exist "..\win32\$(DEPEND)" ..\win32\$(DEPEND)
    127119# DO NOT DELETE THIS LINE -- xapdep depends on it.
    128120

  • win32_bin.mak 

    diff -ru win32msvc_svn15917/win32_bin.mak win32/win32_bin.mak
    old new  
    1616PROGRAMS = \
    1717           "$(OUTDIR)\xapian-compact.exe" \
    1818           "$(OUTDIR)\xapian-progsrv.exe" \
    19            "$(OUTDIR)\xapian-chert-update.exe" \
    2019           "$(OUTDIR)\xapian-tcpsrv.exe" \
    2120           "$(OUTDIR)\xapian-inspect.exe" \
    2221           "$(OUTDIR)\xapian-check.exe" \
    2322           "$(OUTDIR)\xapian-replicate.exe" \
    2423           "$(OUTDIR)\xapian-replicate-server.exe"\
    25            
     24
    2625SRCS = \
    2726        "$(INTDIR)\xapian-compact.cc" \
    28         "$(INTDIR)\xapian-chert-update.cc" \
    2927        "$(INTDIR)\xapian-progsrv.cc" \
    3028        "$(INTDIR)\xapian-tcpsrv.cc" \
    3129        "$(INTDIR)\xapian-inspect.cc" \
    3230        "$(INTDIR)\xapian-check-chert.cc" \
    3331        "$(INTDIR)\xapian-check-brass.cc" \
    34         "$(INTDIR)\xapian-check-flint.cc" \
    3532        "$(INTDIR)\xapian-check.cc" \
    3633    "$(INTDIR)\xapian-replicate.cc" \
    3734    "$(INTDIR)\xapian-replicate-server.cc"
    3835
    39            
    40 ALL : $(PROGRAMS)
    4136
    42 XAPIAN_COMPACT_OBJS= "$(INTDIR)\xapian-compact.obj"
     37ALL : $(PROGRAMS)
    4338
    44 XAPIAN_CHERT_UPDATE_OBJS= "$(INTDIR)\xapian-chert-update.obj"
     39XAPIAN_COMPACT_OBJS= "$(INTDIR)\xapian-compact.obj"
    4540
    46 XAPIAN_PROGSRV_OBJS= "$(INTDIR)\xapian-progsrv.obj" 
     41XAPIAN_PROGSRV_OBJS= "$(INTDIR)\xapian-progsrv.obj"
    4742
    48 XAPIAN_TCPSRV_OBJS= "$(INTDIR)\xapian-tcpsrv.obj" 
     43XAPIAN_TCPSRV_OBJS= "$(INTDIR)\xapian-tcpsrv.obj"
    4944
    50 XAPIAN_INSPECT_OBJS= "$(INTDIR)\xapian-inspect.obj" 
     45XAPIAN_INSPECT_OBJS= "$(INTDIR)\xapian-inspect.obj"
    5146
    5247XAPIAN_CHECK_OBJS= \
    5348        "$(INTDIR)\xapian-check.obj" \
    54         "$(INTDIR)\xapian-check-flint.obj" \
    5549        "$(INTDIR)\xapian-check-chert.obj" \
    56         "$(INTDIR)\xapian-check-brass.obj"
     50        "$(INTDIR)\xapian-check-brass.obj"
     51
     52XAPIAN_REPLICATE_OBJS= "$(INTDIR)\xapian-replicate.obj"
    5753
    58 XAPIAN_REPLICATE_OBJS= "$(INTDIR)\xapian-replicate.obj"
     54XAPIAN_REPLICATE_SERVER_OBJS= "$(INTDIR)\xapian-replicate-server.obj"
    5955
    60 XAPIAN_REPLICATE_SERVER_OBJS= "$(INTDIR)\xapian-replicate-server.obj"
    6156
    62        
    6357CLEAN :
    6458        -@erase $(PROGRAMS)
    6559        -@erase $(XAPIAN_COMPACT_OBJS)
    66     -@erase $(XAPIAN_CHERT_UPDATE_OBJS)
    6760        -@erase $(XAPIAN_PROGSRV_OBJS)
    6861        -@erase $(XAPIAN_TCPSRV_OBJS)
    6962        -@erase $(XAPIAN_INSPECT_OBJS)
    70         -@erase $(XAPIAN_CHECK_OBJS)   
     63        -@erase $(XAPIAN_CHECK_OBJS)
    7164        -@erase $(XAPIAN_REPLICATE_OBJS)
    7265        -@erase $(XAPIAN_REPLICATE_SERVER_OBJS)
    7366        -@erase "$(INTDIR)\*.pdb"
    … …  
    8477CPP_SBRS=.
    8578
    8679ALL_LINK32_FLAGS=$(LINK32_FLAGS) $(XAPIAN_LIBS)
    87  
     80
    8881PROGRAM_DEPENDENCIES = $(XAPIAN_LIBS)
    8982
    9083
    … …  
    9487  $(ALL_LINK32_FLAGS) /out:"$(OUTDIR)\xapian-compact.exe" $(DEF_FLAGS) $(XAPIAN_COMPACT_OBJS)
    9588<<
    9689# REMOVE THIS NEXT LINE if using Visual C++ .net 2003 - you won't need to worry about manifests. For later compilers this prevents error R6034
    97     $(MANIFEST) "$(OUTDIR)\xapian-compact.exe.manifest" -outputresource:"$(OUTDIR)\xapian-compact.exe;1"
     90#$(MANIFEST) "$(OUTDIR)\xapian-compact.exe.manifest" -outputresource:"$(OUTDIR)\xapian-compact.exe;1"
    9891    -@erase "$(OUTDIR)\xapian-compact.exe.manifest"
    9992
    10093"$(OUTDIR)\xapian-progsrv.exe" : "$(OUTDIR)" $(DEF_FILE) $(XAPIAN_PROGSRV_OBJS) \
    … …  
    10295    $(LINK32) @<<
    10396  $(ALL_LINK32_FLAGS) /out:"$(OUTDIR)\xapian-progsrv.exe" $(DEF_FLAGS) $(XAPIAN_PROGSRV_OBJS)
    10497<<
    105     $(MANIFEST) "$(OUTDIR)\xapian-progsrv.exe.manifest" -outputresource:"$(OUTDIR)\xapian-progsrv.exe;1"
     98#$(MANIFEST) "$(OUTDIR)\xapian-progsrv.exe.manifest" -outputresource:"$(OUTDIR)\xapian-progsrv.exe;1"
    10699    -@erase "$(OUTDIR)\xapian-progsrv.exe.manifest"
    107100
    108 "$(OUTDIR)\xapian-chert-update.exe" : "$(OUTDIR)" $(DEF_FILE) $(XAPIAN_CHERT_UPDATE_OBJS) \
    109                              $(PROGRAM_DEPENDENCIES)
    110     $(LINK32) @<<
    111   $(ALL_LINK32_FLAGS) /out:"$(OUTDIR)\xapian-chert-update.exe" $(DEF_FLAGS) $(XAPIAN_CHERT_UPDATE_OBJS)
    112 <<
    113     $(MANIFEST) "$(OUTDIR)\xapian-chert-update.exe.manifest" -outputresource:"$(OUTDIR)\xapian-chert-update.exe;1"
    114     -@erase "$(OUTDIR)\xapian-chert-update.exe.manifest"
    115    
    116101"$(OUTDIR)\xapian-tcpsrv.exe" : "$(OUTDIR)" $(DEF_FILE) $(XAPIAN_TCPSRV_OBJS) \
    117102                             $(PROGRAM_DEPENDENCIES)
    118103    $(LINK32) @<<
    119104  $(ALL_LINK32_FLAGS) /out:"$(OUTDIR)\xapian-tcpsrv.exe" $(DEF_FLAGS) $(XAPIAN_TCPSRV_OBJS)
    120105<<
    121     $(MANIFEST) "$(OUTDIR)\xapian-tcpsrv.exe.manifest" -outputresource:"$(OUTDIR)\xapian-tcpsrv.exe;1"
     106#$(MANIFEST) "$(OUTDIR)\xapian-tcpsrv.exe.manifest" -outputresource:"$(OUTDIR)\xapian-tcpsrv.exe;1"
    122107    -@erase "$(OUTDIR)\xapian-tcpsrv.exe.manifest"
    123108
    124109"$(OUTDIR)\xapian-inspect.exe" : "$(OUTDIR)" $(DEF_FILE) $(XAPIAN_INSPECT_OBJS) \
    … …  
    126111    $(LINK32) @<<
    127112  $(ALL_LINK32_FLAGS) /out:"$(OUTDIR)\xapian-inspect.exe" $(DEF_FLAGS) $(XAPIAN_INSPECT_OBJS)
    128113<<
    129     $(MANIFEST) "$(OUTDIR)\xapian-inspect.exe.manifest" -outputresource:"$(OUTDIR)\xapian-inspect.exe;1"
     114#$(MANIFEST) "$(OUTDIR)\xapian-inspect.exe.manifest" -outputresource:"$(OUTDIR)\xapian-inspect.exe;1"
    130115    -@erase "$(OUTDIR)\xapian-inspect.exe.manifest"
    131116
    132117
    133118"$(OUTDIR)\xapian-check.exe" : "$(OUTDIR)" $(DEF_FILE) $(XAPIAN_CHECK_OBJS) \
    134119                             $(PROGRAM_DEPENDENCIES)
    135120    $(LINK32) @<<
    136   $(ALL_LINK32_FLAGS) /out:"$(OUTDIR)\xapian-check.exe" $(DEF_FLAGS) $(XAPIAN_CHECK_OBJS) "$(OUTLIBDIR)\libflintbtreecheck.lib" "$(OUTLIBDIR)\libchertbtreecheck.lib" "$(OUTLIBDIR)\libbrassbtreecheck.lib"
     121  $(ALL_LINK32_FLAGS) /out:"$(OUTDIR)\xapian-check.exe" $(DEF_FLAGS) $(XAPIAN_CHECK_OBJS) "$(OUTLIBDIR)\libchertbtreecheck.lib" "$(OUTLIBDIR)\libbrassbtreecheck.lib"
    137122<<
    138     $(MANIFEST) "$(OUTDIR)\xapian-check.exe.manifest" -outputresource:"$(OUTDIR)\xapian-check.exe;1"
     123#$(MANIFEST) "$(OUTDIR)\xapian-check.exe.manifest" -outputresource:"$(OUTDIR)\xapian-check.exe;1"
    139124    -@erase "$(OUTDIR)\xapian-check.exe.manifest"
    140125
    141126
    … …  
    144129    $(LINK32) @<<
    145130  $(ALL_LINK32_FLAGS) /out:"$(OUTDIR)\xapian-replicate.exe" $(DEF_FLAGS) $(XAPIAN_REPLICATE_OBJS)
    146131<<
    147     $(MANIFEST) "$(OUTDIR)\xapian-replicate.exe.manifest" -outputresource:"$(OUTDIR)\xapian-replicate.exe;1"
     132#$(MANIFEST) "$(OUTDIR)\xapian-replicate.exe.manifest" -outputresource:"$(OUTDIR)\xapian-replicate.exe;1"
    148133    -@erase "$(OUTDIR)\xapian-replicate.exe.manifest"
    149134
    150135"$(OUTDIR)\xapian-replicate-server.exe" : "$(OUTDIR)" $(DEF_FILE) $(XAPIAN_REPLICATE_SERVER_OBJS) \
    … …  
    152137    $(LINK32) @<<
    153138  $(ALL_LINK32_FLAGS) /out:"$(OUTDIR)\xapian-replicate-server.exe" $(DEF_FLAGS) $(XAPIAN_REPLICATE_SERVER_OBJS)
    154139<<
    155     $(MANIFEST) "$(OUTDIR)\xapian-replicate-server.exe.manifest" -outputresource:"$(OUTDIR)\xapian-replicate-server.exe;1"
     140#$(MANIFEST) "$(OUTDIR)\xapian-replicate-server.exe.manifest" -outputresource:"$(OUTDIR)\xapian-replicate-server.exe;1"
    156141    -@erase "$(OUTDIR)\xapian-replicate.exe.manifest"
    157142
    158143# inference rules, showing how to create one type of file from another with the same root name
    159144{.}.cc{$(INTDIR)}.obj::
    160145        $(CPP) @<<
    161         $(CPP_PROJ) $< 
     146        $(CPP_PROJ) $<
    162147<<
    163148
    164149{.}.cc{$(CPP_SBRS)}.sbr::
    165150   $(CPP) @<<
    166    $(CPP_PROJ) $< 
     151   $(CPP_PROJ) $<
    167152<<
    168153
    169154# Calculate any header dependencies and automatically insert them into this file
    170155HEADERS :
    171156    -@erase deps.d
    172157    $(CPP) -showIncludes $(CPP_PROJ) $(SRCS) >>deps.d
    173     if exist "..\win32\$(DEPEND)" ..\win32\$(DEPEND) 
     158    if exist "..\win32\$(DEPEND)" ..\win32\$(DEPEND)
    174159# DO NOT DELETE THIS LINE -- xapdep depends on it.
    175160

  • win32_bindings_csharp.mak 

    diff -ru win32msvc_svn15917/win32_bindings_csharp.mak win32/win32_bindings_csharp.mak
    old new  
    22# Charlie Hull
    33# 12th December 2008
    44
    5 # Will build the Csharp  bindings 
     5# Will build the Csharp  bindings
    66
    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.3.0
    1111OUTLIBDIR=$(XAPIAN_CORE_REL_CSHARP)\win32\$(XAPIAN_DEBUG_OR_RELEASE)\libs
    1212
    1313!INCLUDE $(XAPIAN_CORE_REL_CSHARP)\win32\config.mak
    … …  
    3333    ESet.cs \
    3434    ESetIterator.cs \
    3535    ExpandDecider.cs \
    36     Flint.cs \
    3736    InMemory.cs \
    3837    KeyMaker.cs \
    3938    MatchSpy.cs \
    4039    MatchDecider.cs \
    4140    MSet.cs \
    4241    MSetIterator.cs \
    43     MultiValueSorter.cs \
    4442    NumberValueRangeProcessor.cs \
    4543    PositionIterator.cs \
    4644    PostingIterator.cs \
    … …  
    5250    RSet.cs \
    5351    SimpleStopper.cs \
    5452    SmokeTest.cs \
    55     Sorter.cs \
    5653    Stem.cs \
    5754    StemImplementation.cs \
    5855    Stopper.cs \
    … …  
    7067    WritableDatabase.cs \
    7168    Xapian.cs \
    7269    XapianPINVOKE.cs
    73    
     70
    7471ALL : "$(ASSEMBLY).dll" SmokeTest.exe "$(BINDING).dll"
    7572# REMOVE THIS NEXT LINE if using Visual C++ .net 2003 - you won't need to worry about manifests. For later compilers this prevents error R6034
    76     $(MANIFEST) "$(BINDING).dll.manifest" -outputresource:"$(BINDING).dll;2"
     73#$(MANIFEST) "$(BINDING).dll.manifest" -outputresource:"$(BINDING).dll;2"
    7774    copy  "$(ASSEMBLY).dll" $(OUTDIR)
    7875    copy  "$(BINDING).dll" $(OUTDIR)
    79     copy "$(ZLIB_LIB_DIR)\zdll.lib" 
     76    copy "$(ZLIB_LIB_DIR)\zdll.lib"
    8077    copy "$(ZLIB_BIN_DIR)\zlib1.dll" $(OUTDIR)
    8178
    8279CLEAN :
    83     -@erase XapianSharp.snk 
     80    -@erase XapianSharp.snk
    8481    -@erase AssemblyInfo.cs
    8582    -@erase "$(BINDING).dll"
    8683    -@erase "$(OUTDIR)\$(BINDING).dll"
    8784    -@erase "$(BINDING).dll.manifest"
    88     -@erase "$(ASSEMBLY).dll" 
     85    -@erase "$(ASSEMBLY).dll"
    8986    -@erase "$(OUTDIR)\$(ASSEMBLY).dll"
    90     -@erase "$(ASSEMBLY).dll.manifest" 
     87    -@erase "$(ASSEMBLY).dll.manifest"
    9188    -@erase "SmokeTest.exe"
    9289    -@erase "$(OUTDIR)\SmokeTest.exe"
    9390    -@erase xapian_wrap.obj
    … …  
    9693    -@erase *.lib
    9794    -@erase *.exp
    9895    -@erase version.res
    99    
     96
    10097CLEANSWIG: CLEAN
    10198    -@erase xapian_wrap.cc
    10299    -@erase xapian_wrap.h
    103100    -@erase $(XAPIAN_SWIG_CSHARP_SRCS)
    104101
    105 DOTEST: 
     102DOTEST:
    106103    copy SmokeTest.exe "$(OUTDIR)\SmokeTest.exe"
    107104    cd $(OUTDIR)
    108105    SmokeTest
    109    
     106
    110107CHECK: ALL DOTEST
    111108
    112 DIST: CHECK 
     109DIST: CHECK
    113110    cd $(MAKEDIR)
    114111    if not exist "$(OUTDIR)\dist\$(NULL)" mkdir "$(OUTDIR)\dist"
    115112    if not exist "$(OUTDIR)\dist\docs/$(NULL)" mkdir "$(OUTDIR)\dist\docs"
    116     if not exist "$(OUTDIR)\dist\docs\examples/$(NULL)" mkdir "$(OUTDIR)\dist\docs\examples"           
     113    if not exist "$(OUTDIR)\dist\docs\examples/$(NULL)" mkdir "$(OUTDIR)\dist\docs\examples"
    117114    copy "$(OUTDIR)\_XapianSharp.dll" "$(OUTDIR)\dist"
    118115    copy "$(OUTDIR)\XapianCSharp.dll" "$(OUTDIR)\dist"
    119116    if exist docs copy docs\*.htm* "$(OUTDIR)\dist\docs"
    … …  
    124121
    125122XapianSharp.snk:
    126123    $(SN) -k $@
    127    
    128 "$(ASSEMBLY).dll": $(XAPIAN_SWIG_CSHARP_SRCS) AssemblyInfo.cs XapianSharp.snk "$(OUTDIR)" $(BINDING).dll 
     124
     125"$(ASSEMBLY).dll": $(XAPIAN_SWIG_CSHARP_SRCS) AssemblyInfo.cs XapianSharp.snk "$(OUTDIR)" $(BINDING).dll
    129126    $(CSC) -unsafe -target:library -out:"$(ASSEMBLY).dll" \
    130         $(XAPIAN_SWIG_CSHARP_SRCS) AssemblyInfo.cs 
     127        $(XAPIAN_SWIG_CSHARP_SRCS) AssemblyInfo.cs
    131128
    132129AssemblyInfo.cs: AssemblyInfo.cs.in "$(XAPIAN_CORE_REL_CSHARP)\configure.ac"
    133130    $(PERL_EXE) "$(XAPIAN_CORE_REL_CSHARP)\win32\genversion.pl"  "$(XAPIAN_CORE_REL_CSHARP)\configure.ac" AssemblyInfo.cs.in AssemblyInfo.cs
    134        
     131
    135132CPP_PROJ=$(CPPFLAGS_EXTRA)  /GR \
    136133 /I "$(XAPIAN_CORE_REL_CSHARP)" /I "$(XAPIAN_CORE_REL_CSHARP)\include" \
    137  /I"." /Fo"$(INTDIR)\\" /Tp$(INPUTNAME) 
    138  
    139 ALL_LINK32_FLAGS=$(LINK32_FLAGS) $(XAPIAN_LIBS) 
     134 /I"." /Fo"$(INTDIR)\\" /Tp$(INPUTNAME)
     135
     136ALL_LINK32_FLAGS=$(LINK32_FLAGS) $(XAPIAN_LIBS)
    140137
    141 "$(BINDING).dll" : "$(OUTDIR)" xapian_wrap.obj ".\version.res" 
     138"$(BINDING).dll" : "$(OUTDIR)" xapian_wrap.obj ".\version.res"
    142139    $(LINK32) @<<
    143   $(ALL_LINK32_FLAGS) /DLL /out:"$(BINDING).dll" xapian_wrap.obj ".\version.res" 
     140  $(ALL_LINK32_FLAGS) /DLL /out:"$(BINDING).dll" xapian_wrap.obj ".\version.res"
    144141
    145142<<
    146  
     143
    147144!IF "$(SWIGBUILD)" == "1"
    148145xapian_wrap.cc xapian_wrap.h $(XAPIAN_SWIG_CSHARP_SRCS): util.i ..\xapian.i
    149146# Make sure that we don't package stale generated sources in the
    … …  
    151148    -@erase $(XAPIAN_SWIG_CSHARP_SRCS)
    152149    $(SWIG) $(SWIG_FLAGS) -I$(XAPIAN_CORE_REL_CSHARP)\include -I..\generic \
    153150        -csharp -namespace Xapian -module Xapian -dllimport $(BINDING) \
    154         -c++ -o xapian_wrap.cc ..\xapian.i   
     151        -c++ -o xapian_wrap.cc ..\xapian.i
    155152!ENDIF
    156153
    157154#
    … …  
    162159    $(RSC) /v \
    163160      /I "$(XAPIAN_CORE_REL_CSHARP)\include" \
    164161      /fo version.res \
    165       version.rc 
    166      
    167 xapian_wrap.obj : xapian_wrap.cc 
     162      version.rc
     163
     164xapian_wrap.obj : xapian_wrap.cc
    168165     $(CPP) @<<
    169166  $(CPP_PROJ) $**
    170167<<

  • win32_examples.mak 

    diff -ru win32msvc_svn15917/win32_examples.mak win32/win32_examples.mak
    old new  
    2727                $(INTDIR)\simpleindex.obj \
    2828                $(INTDIR)\simplesearch.obj \
    2929                $(INTDIR)\copydatabase.obj
    30                
     30
    3131SRCS =          $(INTDIR)\delve.cc \
    3232                $(INTDIR)\quest.cc \
    3333                $(INTDIR)\simpleexpand.cc \
    … …  
    3636                $(INTDIR)\copydatabase.cc
    3737
    3838PROGRAMS = "$(OUTDIR)\delve.exe" "$(OUTDIR)\quest.exe" \
    39 "$(OUTDIR)\simpleexpand.exe" "$(OUTDIR)\simpleindex.exe" "$(OUTDIR)\simplesearch.exe" "$(OUTDIR)\copydatabase.exe" 
     39"$(OUTDIR)\simpleexpand.exe" "$(OUTDIR)\simpleindex.exe" "$(OUTDIR)\simplesearch.exe" "$(OUTDIR)\copydatabase.exe"
    4040
    4141ALL : $(PROGRAMS)
    4242
    … …  
    5959
    6060PROGRAM_DEPENDENCIES = $(XAPIAN_LIBS)
    6161
    62  
     62
    6363# delve.exe
    6464# quest.exe
    6565# simpleexpand.exe
    … …  
    7171    $(LINK32) @<<
    7272  $(ALL_LINK32_FLAGS) /out:"$(OUTDIR)\copydatabase.exe" $(DEF_FLAGS) "$(INTDIR)\copydatabase.obj"
    7373<<
    74     $(MANIFEST) "$(OUTDIR)\copydatabase.exe.manifest" -outputresource:"$(OUTDIR)\copydatabase.exe;1"
     74#$(MANIFEST) "$(OUTDIR)\copydatabase.exe.manifest" -outputresource:"$(OUTDIR)\copydatabase.exe;1"
    7575    -@erase "$(OUTDIR)\copydatabase.exe.manifest"
    7676
    7777
    … …  
    8080    $(LINK32) @<<
    8181  $(ALL_LINK32_FLAGS) /out:"$(OUTDIR)\delve.exe" $(DEF_FLAGS) "$(INTDIR)\delve.obj"
    8282<<
    83     $(MANIFEST) "$(OUTDIR)\delve.exe.manifest" -outputresource:"$(OUTDIR)\delve.exe;1"
     83#$(MANIFEST) "$(OUTDIR)\delve.exe.manifest" -outputresource:"$(OUTDIR)\delve.exe;1"
    8484    -@erase "$(OUTDIR)\delve.exe.manifest"
    8585
    8686"$(OUTDIR)\quest.exe" : "$(OUTDIR)" $(DEF_FILE) "$(INTDIR)\quest.obj" \
    … …  
    8888    $(LINK32) @<<
    8989  $(ALL_LINK32_FLAGS) /out:"$(OUTDIR)\quest.exe" $(DEF_FLAGS) "$(INTDIR)\quest.obj"
    9090<<
    91     $(MANIFEST) "$(OUTDIR)\quest.exe.manifest" -outputresource:"$(OUTDIR)\quest.exe;1"
     91#$(MANIFEST) "$(OUTDIR)\quest.exe.manifest" -outputresource:"$(OUTDIR)\quest.exe;1"
    9292    -@erase "$(OUTDIR)\quest.exe.manifest"
    9393
    9494
    … …  
    9797    $(LINK32) @<<
    9898  $(ALL_LINK32_FLAGS) /out:"$(OUTDIR)\simpleexpand.exe" $(DEF_FLAGS) "$(INTDIR)\simpleexpand.obj"
    9999<<
    100     $(MANIFEST) "$(OUTDIR)\simpleexpand.exe.manifest" -outputresource:"$(OUTDIR)\simpleexpand.exe;1"
     100#$(MANIFEST) "$(OUTDIR)\simpleexpand.exe.manifest" -outputresource:"$(OUTDIR)\simpleexpand.exe;1"
    101101    -@erase "$(OUTDIR)\simpleexpand.exe.manifest"
    102102
    103103"$(OUTDIR)\simpleindex.exe" : "$(OUTDIR)" $(DEF_FILE) "$(INTDIR)\simpleindex.obj" \
    … …  
    105105    $(LINK32) @<<
    106106  $(ALL_LINK32_FLAGS) /out:"$(OUTDIR)\simpleindex.exe" $(DEF_FLAGS) "$(INTDIR)\simpleindex.obj"
    107107<<
    108     $(MANIFEST) "$(OUTDIR)\simpleindex.exe.manifest" -outputresource:"$(OUTDIR)\simpleindex.exe;1"
     108#$(MANIFEST) "$(OUTDIR)\simpleindex.exe.manifest" -outputresource:"$(OUTDIR)\simpleindex.exe;1"
    109109    -@erase "$(OUTDIR)\simpleindex.exe.manifest"
    110110
    111111"$(OUTDIR)\simplesearch.exe" : "$(OUTDIR)" $(DEF_FILE) "$(INTDIR)\simplesearch.obj" \
    … …  
    113113    $(LINK32) @<<
    114114  $(ALL_LINK32_FLAGS) /out:"$(OUTDIR)\simplesearch.exe" $(DEF_FLAGS) "$(INTDIR)\simplesearch.obj"
    115115<<
    116     $(MANIFEST) "$(OUTDIR)\simplesearch.exe.manifest" -outputresource:"$(OUTDIR)\simplesearch.exe;1"
     116#$(MANIFEST) "$(OUTDIR)\simplesearch.exe.manifest" -outputresource:"$(OUTDIR)\simplesearch.exe;1"
    117117    -@erase "$(OUTDIR)\simplesearch.exe.manifest"
    118118
    119119
    120120# inference rules, showing how to create one type of file from another with the same root name
    121121{.}.cc{$(INTDIR)}.obj::
    122122        $(CPP) @<<
    123         $(CPP_PROJ) $< 
     123        $(CPP_PROJ) $<
    124124<<
    125125
    126126{.}.cc{$(CPP_SBRS)}.sbr::
    127127   $(CPP) @<<
    128    $(CPP_PROJ) $< 
     128   $(CPP_PROJ) $<
    129129<<
    130130
    131131# Calculate any header dependencies and automatically insert them into this file
    132132HEADERS :
    133133    -@erase deps.d
    134134    $(CPP) -showIncludes $(CPP_PROJ) $(SRCS) >>deps.d
    135     if exist "..\win32\$(DEPEND)" ..\win32\$(DEPEND) 
     135    if exist "..\win32\$(DEPEND)" ..\win32\$(DEPEND)
    136136# DO NOT DELETE THIS LINE -- xapdep depends on it.

  • win32_languages.mak 

    diff -ru win32msvc_svn15917/win32_languages.mak win32/win32_languages.mak
    old new  
    1212OUTDIR=..\win32\$(XAPIAN_DEBUG_OR_RELEASE)\libs
    1313INTDIR=.\
    1414
    15 SBL_OPTIONS=-c++ -u 
     15SBL_OPTIONS=-c++ -u
    1616SBL=compiler\snowball.exe
    1717
    18 ALL : MAKEFROMSBL "$(OUTDIR)\liblanguages.lib" 
     18ALL : MAKEFROMSBL "$(OUTDIR)\liblanguages.lib"
    1919
    2020LIBLANGUAGES_OBJS= \
    2121                 $(INTDIR)\stem.obj \
    22                  $(INTDIR)\steminternal.obj \
     22                 $(INTDIR)\steminternal.obj \
     23                                                                 $(INTDIR)\armenian.obj \
     24                                                                $(INTDIR)\basque.obj \
     25                                                                 $(INTDIR)\catalan.obj \
    2326                 $(INTDIR)\danish.obj \
    2427                 $(INTDIR)\dutch.obj \
    2528                 $(INTDIR)\english.obj \
    … …  
    3841                 $(INTDIR)\swedish.obj \
    3942                 $(INTDIR)\romanian.obj \
    4043                 $(INTDIR)\kraaij_pohlmann.obj \
    41                  $(INTDIR)\turkish.obj 
     44                 $(INTDIR)\turkish.obj
    4245
    43 LIBLANGUAGES_SOURCES= \
     46LIBLANGUAGES_SOURCES= \
     47                                                                $(INTDIR)\armenian.cc \
     48                                                                $(INTDIR)\basque.cc \
     49                                                                 $(INTDIR)\catalan.cc \
    4450                 $(INTDIR)\danish.cc \
    4551                 $(INTDIR)\dutch.cc \
    4652                 $(INTDIR)\english.cc \
    … …  
    5965                 $(INTDIR)\swedish.cc \
    6066                 $(INTDIR)\romanian.cc \
    6167                 $(INTDIR)\kraaij_pohlmann.cc \
    62                  $(INTDIR)\turkish.cc 
     68                 $(INTDIR)\turkish.cc
    6369
    64 LIBLANGUAGES_HEADERS= \
     70LIBLANGUAGES_HEADERS= \
     71                                                                armenian.h \
     72                                                                basque.h \
     73                                                                 catalan.h \
    6574                 danish.h \
    6675                 dutch.h \
    6776                 english.h \
    … …  
    8089                 swedish.h \
    8190                 romanian.h \
    8291                 kraaij_pohlmann.h \
    83                  turkish.h 
     92                 turkish.h
    8493
    8594MAKEFROMSBL: $(LIBLANGUAGES_SOURCES) ".\allsnowballheaders.h"
    86                  
     95
    8796CLEAN :
    8897        -@erase "$(OUTDIR)\liblanguages.lib"
    8998        -@erase "*.pch"
    … …  
    110119
    111120
    112121# Generate .h and .cc files from Snowball algorithms using Snowball compiler
    113        
     122".\armenian.h" ".\armenian.cc" : ".\armenian.sbl"
     123        $(SBL) armenian.sbl $(SBL_OPTIONS) -o armenian -n InternalStemArmenian -p SnowballStemImplementation
     124
     125".\basque.h" ".\basque.cc" : ".\basque.sbl"
     126        $(SBL) basque.sbl $(SBL_OPTIONS) -o basque -n InternalStemBasque -p SnowballStemImplementation
     127
     128".\catalan.h" ".\catalan.cc" : ".\catalan.sbl"
     129        $(SBL) catalan.sbl $(SBL_OPTIONS) -o catalan -n InternalStemCatalan -p SnowballStemImplementation
     130
    114131".\danish.h" ".\danish.cc" : ".\danish.sbl"
    115132        $(SBL) danish.sbl $(SBL_OPTIONS) -o danish -n InternalStemDanish -p SnowballStemImplementation
    116133
    … …  
    155172
    156173".\kraaij_pohlmann.h" ".\kraaij_pohlmann.cc" : ".\kraaij_pohlmann.sbl"
    157174        $(SBL) kraaij_pohlmann.sbl $(SBL_OPTIONS) -o kraaij_pohlmann -n InternalStemKraaij_pohlmann -p SnowballStemImplementation
    158                
     175
    159176".\romanian.h" ".\romanian.cc" : ".\romanian.sbl"
    160         $(SBL) romanian.sbl $(SBL_OPTIONS) -o romanian -n InternalStemRomanian -p SnowballStemImplementation   
     177        $(SBL) romanian.sbl $(SBL_OPTIONS) -o romanian -n InternalStemRomanian -p SnowballStemImplementation
    161178
    162179".\turkish.h" ".\turkish.cc" : ".\turkish.sbl"
    163         $(SBL) turkish.sbl $(SBL_OPTIONS) -o turkish -n InternalStemTurkish -p SnowballStemImplementation       
     180        $(SBL) turkish.sbl $(SBL_OPTIONS) -o turkish -n InternalStemTurkish -p SnowballStemImplementation
    164181
    165182".\finnish.h" ".\finnish.cc" : ".\finnish.sbl"
    166183        $(SBL) finnish.sbl $(SBL_OPTIONS) -o finnish -n InternalStemFinnish -p SnowballStemImplementation
    … …  
    169186        $(SBL) lovins.sbl $(SBL_OPTIONS) -o lovins -n InternalStemLovins -p SnowballStemImplementation
    170187
    171188
    172 "$(INTDIR)\stem.obj" : ".\stem.cc" 
     189"$(INTDIR)\stem.obj" : ".\stem.cc"
    173190    $(CPP) @<<
    174191  $(CPP_PROJ) $**
    175192<<
    176193
    177194
    178 "$(INTDIR)\steminternal.obj" : ".\steminternal.cc" $(LIBLANGUAGES_SOURCES) 
     195"$(INTDIR)\steminternal.obj" : ".\steminternal.cc" $(LIBLANGUAGES_SOURCES)
    179196    $(CPP) @<<
    180197  $(CPP_PROJ) $**
    181198<<
    182199
    183 ".\allsnowballheaders.h": ".\generate-allsnowballheaders" 
     200".\allsnowballheaders.h": ".\generate-allsnowballheaders"
    184201    if not exist languages\. md languages
    185202    $(PERL_EXE) generate-allsnowballheaders $(LIBLANGUAGES_HEADERS)
    186203    copy languages\allsnowballheaders.h
    187204    del languages\allsnowballheaders.h
    188205    rmdir languages
    189  
     206
    190207".\generate-allsnowballheaders": ".\generate-allsnowballheaders.in" Makefile
    191208    $(PERL_EXE) -pe "BEGIN{$$perl=shift @ARGV} s,\@PERL\@,$$perl," "$(PERL_EXE)" generate-allsnowballheaders.in > generate-allsnowballheaders
    192209

  • win32_tests.mak 

    diff -ru win32msvc_svn15917/win32_tests.mak win32/win32_tests.mak
    old new  
    1313INTDIR= ..\tests
    1414
    1515
    16 PROGRAM_APITEST= "$(OUTDIR)\apitest.exe" 
    17 PROGRAM_INTERNALTEST= "$(OUTDIR)\internaltest.exe" 
     16PROGRAM_APITEST= "$(OUTDIR)\apitest.exe"
     17PROGRAM_INTERNALTEST= "$(OUTDIR)\internaltest.exe"
    1818PROGRAM_QUERYPARSERTEST= "$(OUTDIR)\queryparsertest.exe"
    1919PROGRAM_STEMTEST= "$(OUTDIR)\stemtest.exe"
    2020PROGRAM_TERMGENTEST= "$(OUTDIR)\termgentest.exe"
    … …  
    2222
    2323ALL : $(CLEAN_COLLATED_HEADERS) $(PROGRAM_APITEST) $(PROGRAM_INTERNALTEST) \
    2424 $(PROGRAM_QUERYPARSERTEST) $(PROGRAM_STEMTEST) $(PROGRAM_TERMGENTEST) $(PROGRAM_UNITTEST)
    25  
    26  
    27 APITEST : $(PROGRAM_APITEST) 
    28 STEMTEST : $(PROGRAM_STEMTEST) 
    29 INTERNALTEST : $(PROGRAM_INTERNALTEST) 
    30 QUERYPARSERTEST : $(PROGRAM_QUERYPARSERTEST) 
    31 TERMGENTEST : $(PROGRAM_TERMGENTEST) 
    32 UNITTEST : $(PROGRAM_UNITTEST) 
     25
     26
     27APITEST : $(PROGRAM_APITEST)
     28STEMTEST : $(PROGRAM_STEMTEST)
     29INTERNALTEST : $(PROGRAM_INTERNALTEST)
     30QUERYPARSERTEST : $(PROGRAM_QUERYPARSERTEST)
     31TERMGENTEST : $(PROGRAM_TERMGENTEST)
     32UNITTEST : $(PROGRAM_UNITTEST)
    3333
    3434
    3535DOTEST :
    … …  
    4242    termgentest
    4343    unittest
    4444
    45    
     45
    4646#    remotetest
    4747#  $(PROGRAM_REMOTETEST) not built
    48 # REMOTETEST : $(PROGRAM_REMOTETEST) 
    49 #PROGRAM_REMOTETEST= "$(OUTDIR)\remotetest.exe" 
     48# REMOTETEST : $(PROGRAM_REMOTETEST)
     49#PROGRAM_REMOTETEST= "$(OUTDIR)\remotetest.exe"
    5050
    5151# object files
    52  
    53 STEMTEST_OBJS= "$(OUTDIR)\stemtest.obj" 
     52
     53STEMTEST_OBJS= "$(OUTDIR)\stemtest.obj"
    5454
    5555APITEST_OBJS= \
    5656    "$(OUTDIR)\apitest.obj" \
    … …  
    7777    "$(OUTDIR)\api_scalability.obj" \
    7878    "$(OUTDIR)\api_serialise.obj" \
    7979    "$(OUTDIR)\api_sorting.obj" \
    80     "$(OUTDIR)\api_sortingold.obj" \
    8180    "$(OUTDIR)\api_spelling.obj" \
    8281    "$(OUTDIR)\api_stem.obj" \
    8382    "$(OUTDIR)\api_transdb.obj" \
    … …  
    8685    "$(OUTDIR)\api_valuestream.obj" \
    8786    "$(OUTDIR)\api_wrdb.obj" \
    8887    "$(OUTDIR)\dbcheck.obj"
    89    
     88
    9089INTERNALTEST_OBJS= "$(OUTDIR)\internaltest.obj"
    91    
     90
    9291QUARTZTEST_OBJS= "$(OUTDIR)\quartztest.obj"
    9392
    9493QUERYPARSERTEST_OBJS= "$(OUTDIR)\queryparsertest.obj"
    95    
    96 REMOTETEST_OBJS= "$(OUTDIR)\remotetest.obj"   
    9794
    98 TERMGENTEST_OBJS= "$(OUTDIR)\termgentest.obj"   
     95REMOTETEST_OBJS= "$(OUTDIR)\remotetest.obj"
     96
     97TERMGENTEST_OBJS= "$(OUTDIR)\termgentest.obj"
    9998
    100 UNITTEST_OBJS= "$(OUTDIR)\unittest.obj"   
     99UNITTEST_OBJS= "$(OUTDIR)\unittest.obj"
    101100
    102101SRC = \
    103102    "$(INTDIR)\apitest.cc" \
    … …  
    132131    "$(INTDIR)\api_scalability.cc" \
    133132    "$(INTDIR)\api_serialise.cc" \
    134133    "$(INTDIR)\api_sorting.cc" \
    135     "$(INTDIR)\api_sortingold.cc" \
    136134    "$(INTDIR)\api_spelling.cc" \
    137135    "$(INTDIR)\api_stem.cc" \
    138136    "$(INTDIR)\api_transdb.cc" \
    … …  
    140138    "$(INTDIR)\api_valuestats.cc" \
    141139    "$(INTDIR)\api_valuestream.cc" \
    142140    "$(INTDIR)\api_wrdb.cc"
    143    
     141
    144142COLLATED_APITEST_HEADERS=\
    145143    "$(INTDIR)\api_anydb.h" \
    146144    "$(INTDIR)\api_backend.h" \
    … …  
    164162    "$(INTDIR)\api_scalability.h" \
    165163    "$(INTDIR)\api_serialise.h" \
    166164    "$(INTDIR)\api_sorting.h" \
    167     "$(INTDIR)\api_sortingold.h" \
    168165    "$(INTDIR)\api_opsynonym.h" \
    169166    "$(INTDIR)\api_spelling.h" \
    170167    "$(INTDIR)\api_transdb.h" \
    … …  
    172169    "$(INTDIR)\api_valuestats.h" \
    173170    "$(INTDIR)\api_valuestream.h" \
    174171    "$(INTDIR)\api_wrdb.h"
    175    
     172
    176173CLEAN_COLLATED_HEADERS:
    177174    -@erase api_collated.h
    178175    -@erase $(COLLATED_APITEST_HEADERS)
    179176
    180 CLEAN : 
    181     -@erase $(PROGRAM_APITEST) 
    182     -@erase $(PROGRAM_INTERNALTEST) 
    183     -@erase $(PROGRAM_QUERYPARSERTEST) 
     177CLEAN :
     178    -@erase $(PROGRAM_APITEST)
     179    -@erase $(PROGRAM_INTERNALTEST)
     180    -@erase $(PROGRAM_QUERYPARSERTEST)
    184181    -@erase $(PROGRAM_REMOTETEST)
    185182    -@erase $(PROGRAM_STEMTEST)
    186183    -@erase $(PROGRAM_TERMGENTEST)
    … …  
    209206    if exist ".multichert" rmdir ".multichert" /s /q
    210207    if exist ".multibrass" rmdir ".multibrass" /s /q
    211208    if exist ".quartztmp" rmdir ".quartztmp" /s /q
    212    
    213    
    214    
     209
     210
     211
    215212CPP_PROJ=$(CPPFLAGS_EXTRA) \
    216213 -I ".." -I "..\tests" -I "harness" -I"..\backends\quartz" \
    217  -Fo"$(INTDIR)\\" -Fd"$(INTDIR)\\" -Tp$(INPUTNAME) 
     214 -Fo"$(INTDIR)\\" -Fd"$(INTDIR)\\" -Tp$(INPUTNAME)
    218215
    219216CPP_OBJS=..\win32\Tests$(XAPIAN_DEBUG_OR_RELEASE)
    220217CPP_SBRS=.
    221218
    222    
     219
    223220api_collated.h api_all.h: collate-test $(COLLATED_APITEST_SOURCES)
    224     $(PERL_EXE) "$(INTDIR)/collate-test" "$(INTDIR)" api_collated.h api_all.h $(COLLATED_APITEST_SOURCES) 
     221    $(PERL_EXE) "$(INTDIR)/collate-test" "$(INTDIR)" api_collated.h api_all.h $(COLLATED_APITEST_SOURCES)
    225222
    226223"$(INTDIR)/api_generated.cc": generate-api_generated
    227224    $(PERL_EXE) "$(INTDIR)/generate-api_generated" > api_generated.cc
    228    
     225
    229226LINK32=link.exe
    230227ALL_LINK32_FLAGS=$(LINK32_FLAGS) $(XAPIAN_LIBS) "$(OUTLIBDIR)\libtest.lib"
    231228
    232 PROGRAM_DEPENDENCIES = $(XAPIAN_LIBS) "$(OUTLIBDIR)\libtest.lib" 
     229PROGRAM_DEPENDENCIES = $(XAPIAN_LIBS) "$(OUTLIBDIR)\libtest.lib"
    233230
    234231# executables
    235232"$(OUTDIR)\termgentest.exe" : "$(OUTDIR)" $(DEF_FILE) $(TERMGENTEST_OBJS) \
    … …  
    277274# inference rules, showing how to create one type of file from another with the same root name
    278275{.}.cc{$(INTDIR)}.obj::
    279276    $(CPP) @<<
    280     $(CPP_PROJ) $< 
     277    $(CPP_PROJ) $<
    281278<<
    282279
    283280{.}.cc{$(CPP_SBRS)}.sbr::
    284281   $(CPP) @<<
    285    $(CPP_PROJ) $< 
     282   $(CPP_PROJ) $<
    286283<<
    287284
    288285# Calculate any header dependencies and automatically insert them into this file
    … …  
    290287    -@erase deps.d
    291288    $(CPP) -showIncludes $(CPP_PROJ) $(SRC) >>deps.d
    292289    $(CPP) -showIncludes $(CPP_PROJ) $(COLLATED_APITEST_SOURCES) >>deps.d
    293     if exist "..\win32\$(DEPEND)" ..\win32\$(DEPEND) 
     290    if exist "..\win32\$(DEPEND)" ..\win32\$(DEPEND)
    294291# DO NOT DELETE THIS LINE -- xapdep depends on it.

  • win32_testsuite.mak 

    diff -ru win32msvc_svn15917/win32_testsuite.mak win32/win32_testsuite.mak
    old new  
    1313
    1414BUILD_LIBRARIES = "$(OUTDIR)\libtest.lib"
    1515
    16 ALL : $(BUILD_LIBRARIES) 
     16ALL : $(BUILD_LIBRARIES)
    1717
    1818OBJS= \
    1919        $(INTDIR)\backendmanager.obj \
    20         $(INTDIR)\backendmanager_flint.obj \
    2120        $(INTDIR)\backendmanager_brass.obj \
    2221        $(INTDIR)\backendmanager_chert.obj \
    2322        $(INTDIR)\backendmanager_inmemory.obj \
    … …  
    3635
    3736SRCS= \
    3837        $(INTDIR)\backendmanager.cc \
    39         $(INTDIR)\backendmanager_flint.cc \
    4038        $(INTDIR)\backendmanager_brass.cc \
    4139        $(INTDIR)\backendmanager_chert.cc \
    4240        $(INTDIR)\backendmanager_inmemory.cc \
    … …  
    7775# inference rules, showing how to create one type of file from another with the same root name
    7876{.}.cc{$(INTDIR)}.obj::
    7977        $(CPP) @<<
    80         $(CPP_PROJ) $< 
     78        $(CPP_PROJ) $<
    8179<<
    8280
    8381{.}.cc{$(CPP_SBRS)}.sbr::
    8482   $(CPP) @<<
    85    $(CPP_PROJ) $< 
     83   $(CPP_PROJ) $<
    8684<<
    8785
    8886# Calculate any header dependencies and automatically insert them into this file
    8987HEADERS :
    9088    -@erase deps.d
    9189    $(CPP) -showIncludes $(CPP_PROJ) $(SRCS) >>deps.d
    92     if exist "..\..\win32\$(DEPEND)" ..\..\win32\$(DEPEND) 
     90    if exist "..\..\win32\$(DEPEND)" ..\..\win32\$(DEPEND)
    9391# DO NOT DELETE THIS LINE -- xapdep depends on it.

  • xapdep/xapdep.mak 

    diff -ru win32msvc_svn15917/xapdep/xapdep.mak win32/xapdep/xapdep.mak
    old new  
    1111    -@erase "$(OUTDIR)\*.idb
    1212
    1313CPP=cl.exe
    14 CPP_PROJ=/nologo /W3 /EHsc /O2 /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D STANDALONE=1 /D OBJSUFFIX=\".obj\" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
     14CPP_PROJ=/nologo /W3 /EHsc /O2 /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D STANDALONE=1 /D OBJSUFFIX=\".obj\" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c
    1515
    1616.c{$(INTDIR)}.obj::
    1717   $(CPP) @<<
    18    $(CPP_PROJ) $< 
     18   $(CPP_PROJ) $<
    1919<<
    2020
    2121.c{$(INTDIR)}.sbr::
    2222   $(CPP) @<<
    23    $(CPP_PROJ) $< 
     23   $(CPP_PROJ) $<
    2424<<
    2525
    2626LINK32=link.exe
    27 LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /incremental:no /pdb:"$(OUTDIR)\xapdep.pdb" /machine:I386 /out:"$(OUTDIR)\xapdep.exe"
    28 LINK32_OBJS= "$(INTDIR)\xapdep.obj" 
     27LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /incremental:no /pdb:"$(OUTDIR)\xapdep.pdb" /MACHINE:AMD64 /out:"$(OUTDIR)\xapdep.exe"
     28LINK32_OBJS= "$(INTDIR)\xapdep.obj"
    2929
    3030"$(OUTDIR)\xapdep.exe" : "$(OUTDIR)" $(LINK32_OBJS)
    3131    $(LINK32) @<<