Ticket #530: patch48.patch

File patch48.patch, 5.7 KB (added by Charlie Hull, 14 years ago)

The remainder of the changes, including a much simpler Changelog patch.

  • xapian-maintainer-tools/win32msvc/ChangeLog

     
     1Wed Jan 05 14:23:00 GMT 2011  Charlie Hull <charlie@flax.co.uk>
     2
     3    * README: add details of patch to api/compactor.cc and diritor.h
     4    * win32_backends_brass.mak, win32_backends_flint.mak, win32_backends_chert.mak:
     5    add brass_compact.cc etc.
     6    * win32_api.mak: add compactor.cc
     7    * win32_bin.mak: remove separate compactors and add xapian_chert_update.exe
     8    * win32_bindings_csharp.mak: add Compactor.cs
     9    * config.h.omega.win32: add uid_t, S_IRUSR,S_IWGRP,S_IROTH, geteuid(),
     10    PKGLIBBINDIR definitions
     11    * win32_applications_omega.mak: add svnparse.cc, pkglibbindir.cc
     12   
    113Fri Sep 03 13:35:00 GMT 2010  Charlie Hull <charlie@flax.co.uk>
    214
    315        * README: remove details of some patches that are no longer necessary

  • xapian-maintainer-tools/win32msvc/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.2.3"
     86#define PACKAGE_STRING "xapian-omega 1.2.4"
    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.2.3"
     92#define PACKAGE_VERSION "1.2.4"
    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.2.3"
     109#define VERSION "1.2.4"
    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). */
    … …  
    125125# define ssize_t long
    126126#endif
    127127
     128/* Define to `unsigned int' if <sys/types.h> does not define. */
     129#define uid_t unsigned int
     130
    128131/* Define rare() as identity, since we don't have this in MSVC (See
    129132 * the section "Branch Prediction Hints" in xapian-core/HACKING) */
    130133#define rare(COND) (COND)
    … …  
    147150# pragma warning(disable:4003)
    148151#endif
    149152
     153/* These fstat() flags do not exist on Windows */
     154#define S_IRUSR S_IREAD
     155#define S_IRGRP 0
     156#define S_IROTH 0
     157
     158/* geteuid() has no direct equivalent */
     159#define geteuid() 0
     160
     161/* no defined helper directory */
     162#define PKGLIBBINDIR ""
     163 No newline at end of file

  • xapian-maintainer-tools/win32msvc/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.2.3"
     102#define PACKAGE_STRING "xapian-core 1.2.4"
    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.2.3"
     108#define PACKAGE_VERSION "1.2.4"
    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.2.3"
     131#define VERSION "1.2.4"
    132132
    133133/* Define if you want debugging to be enabled (will cause some slow down) */
    134134/* #undef XAPIAN_DEBUG */

  • xapian-maintainer-tools/win32msvc/config.mak

     
    2424# win32_applications_omega.mak
    2525# win32_bindings_python.mak
    2626# and any other bindings mak files
    27 XAPIAN_APPLICATIONS=..\..\xapian-omega
     27XAPIAN_APPLICATIONS=..\..\xapian-applications\omega
    2828XAPIAN_BINDINGS=..\..\xapian-bindings
    2929
    3030#  ------------- Perl settings-------------

  • xapian-maintainer-tools/win32msvc/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
    1414
    1515!IF "$(OS)" == "Windows_NT"
    1616NULL=
    … …  
    7474        "$(OUTDIR)\freemem.obj" \
    7575        "$(OUTDIR)\msvc_dirent.obj" \
    7676        "$(OUTDIR)\xpsxmlparse.obj" \
    77         "$(OUTDIR)\str.obj"
     77        "$(OUTDIR)\str.obj" \
     78        "$(OUTDIR)\svgparse.obj" \
     79    "$(OUTDIR)\pkglibbindir.obj"
    7880       
    79        
    8081SCRIPTINDEX_OBJS= \
    8182        "$(OUTDIR)\scriptindex.obj" \
    8283        "$(OUTDIR)\myhtmlparse.obj" \
    … …  
    158159        "$(OUTDIR)\common\stringutils.cc" \
    159160        "$(OUTDIR)\common\str.cc" \
    160161        "$(OUTDIR)\common\safe.cc" \
    161         "$(OUTDIR)\transform.cc"
    162    
     162        "$(OUTDIR)\transform.cc" \
     163    "$(OUTDIR)\svgparse.cc" \
     164    "$(OUTDIR)\pkglibbindir.cc"
    163165       
    164166CLEAN :
    165167        -@erase $(PROGRAMS)
    … …  
    274276    -@erase deps.d
    275277    $(CPP) -showIncludes $(CPP_PROJ) $(SRCS) >>deps.d
    276278    if exist "$(XAPIAN_CORE_REL_OMEGA)\win32\$(DEPEND)" $(XAPIAN_CORE_REL_OMEGA)\win32\$(DEPEND)
    277 # DO NOT DELETE THIS LINE -- xapdep depends on it.
    278  No newline at end of file
     279# DO NOT DELETE THIS LINE -- xapdep depends on it.