Ticket #171: patch7.patch

File patch7.patch, 7.2 KB (added by Charlie Hull, 17 years ago)

Adds version information to DLLs

  • Makefile

     
    115115   if exist $(XAPIAN_BINDINGS) copy $(XAPIAN_BINDINGS)\xapian-version.h.in $(XAPIAN_BINDINGS)\xapian-version.h
    116116   if exist $(XAPIAN_BINDINGS) copy win32_bindings_python.mak $(XAPIAN_BINDINGS)\python\Makefile
    117117   if not exist $(XAPIAN_BINDINGS)\python\doccomments.i copy doccomments.i $(XAPIAN_BINDINGS)\python
     118   if exist $(XAPIAN_BINDINGS) copy version.rc.python $(XAPIAN_BINDINGS)\python\version.rc
    118119   if exist $(XAPIAN_BINDINGS) copy win32_bindings_php.mak $(XAPIAN_BINDINGS)\php\Makefile
     120   if exist $(XAPIAN_BINDINGS) copy version.rc.php $(XAPIAN_BINDINGS)\php\version.rc
    119121   if exist $(XAPIAN_APPLICATIONS) copy win32_applications_omega.mak $(XAPIAN_APPLICATIONS)\omega\Makefile
    120122   if exist $(XAPIAN_APPLICATIONS) copy config.mak $(XAPIAN_APPLICATIONS)\omega
    121123   if exist $(XAPIAN_APPLICATIONS) copy config.h.omega.win32 $(XAPIAN_APPLICATIONS)\omega\config.h

  • NEWS

     
    2929
    3030 Xapian-core version 1.0.1 (2007-6-15)
    3131 
    32  * added header files dependencies and use inference rules where possible
    33  No newline at end of file
     32 * added header files dependencies and use inference rules where possible
     33 
     34 Xapian-core version 1.0.2 (2007-7-05)
     35 
     36 * use new Makedepend tool to calculate header dependencies automatically
     37 
     38 Xapian-core SVN HEAD:
     39 
     40 * add version information to bindings DLLs
     41 No newline at end of file

  • README

     
    11README for Xapian/Visual C++ Tools
    22==================================
    3 2007-06-19
     32007-07-05
    44
    55Make files, some extra headers and associated tools for compiling Xapian on
    66Win32 using the Microsoft Visual C++ compilers. This is particularly useful
    … …  
    198198
    199199The binaries end up in xapian-core-0.x.y\win32\Release or \Debug if you are building a Debug build (see below)
    200200
     201NOTE: currently you will see various warnings of the form:
     202
     203..\win32\makedepend.exe: warning:  .\error.cc (reading C:/Program Files/Microsoft Visual Studio 8/VC/INCLUDE/sys/stat.h), line 23: #error ERROR: Only Win32 target supported!
     204
     205These are caused by the Makedepend program and can safely be ignored.
     206
    201207Debug builds
    202208===========
    203209

  • version.rc.php

     
     1#include "winres.h"
     2#include "xapian\version.h"
     3#include "php_version.h"
     4
     5VS_VERSION_INFO VERSIONINFO
     6 FILEVERSION XAPIAN_MAJOR_VERSION,XAPIAN_MINOR_VERSION,XAPIAN_REVISION
     7 PRODUCTVERSION XAPIAN_MAJOR_VERSION,XAPIAN_MINOR_VERSION,XAPIAN_REVISION
     8 FILEFLAGSMASK 0x3fL
     9#ifdef _DEBUG
     10 FILEFLAGS VS_FF_DEBUG
     11#else
     12 FILEFLAGS 0x0L
     13#endif
     14 FILEOS VOS__WINDOWS32
     15 FILETYPE VFT_DLL
     16BEGIN
     17    BLOCK "StringFileInfo"
     18    BEGIN
     19        BLOCK "040904b0"
     20        BEGIN
     21            VALUE "ProductName", "Xapian"
     22            VALUE "ProductVersion", XAPIAN_VERSION
     23            VALUE "FileDescription", "Xapian " XAPIAN_VERSION " bindings for PHP " PHP_VERSION
     24            VALUE "LegalCopyright", "Copyright (C) 2007 Xapian"
     25            VALUE "FileVersion", XAPIAN_VERSION
     26            VALUE "URL", "http://www.xapian.org/"
     27            VALUE "LegalTrademarks", "Xapian is an Open Source Search Engine Library released under the GPL."
     28        END
     29    END
     30END
     31 No newline at end of file

  • version.rc.python

     
     1#include "winres.h"
     2#include "xapian\version.h"
     3#include "pythonversion.h"
     4
     5VS_VERSION_INFO VERSIONINFO
     6 FILEVERSION XAPIAN_MAJOR_VERSION,XAPIAN_MINOR_VERSION,XAPIAN_REVISION
     7 PRODUCTVERSION XAPIAN_MAJOR_VERSION,XAPIAN_MINOR_VERSION,XAPIAN_REVISION
     8 FILEFLAGSMASK 0x3fL
     9#ifdef _DEBUG
     10 FILEFLAGS VS_FF_DEBUG
     11#else
     12 FILEFLAGS 0x0L
     13#endif
     14 FILEOS VOS__WINDOWS32
     15 FILETYPE VFT_DLL
     16BEGIN
     17    BLOCK "StringFileInfo"
     18    BEGIN
     19        BLOCK "040904b0"
     20        BEGIN
     21            VALUE "ProductName", "Xapian"
     22            VALUE "ProductVersion", XAPIAN_VERSION
     23            VALUE "FileDescription", "Xapian " XAPIAN_VERSION " bindings for Python " PYTHON_VERSION
     24            VALUE "LegalCopyright", "Copyright (C) 2007 Xapian"
     25            VALUE "FileVersion", XAPIAN_VERSION
     26            VALUE "URL", "http://www.xapian.org/"
     27            VALUE "LegalTrademarks", "Xapian is an Open Source Search Engine Library released under the GPL."
     28        END
     29    END
     30END
     31 No newline at end of file

  • win32_api.mak

     
    3333             $(INTDIR)\version.obj \
    3434             $(INTDIR)\editdistance.obj \
    3535             $(INTDIR)\valuerangeproccompat.obj \
    36              $(INTDIR)\matchspy.obj
     36             $(INTDIR)\matchspy.obj \
     37             $(INTDIR)\sortable-serialise.obj
    3738SRCS= \
    3839             $(INTDIR)\error.cc \
    3940             $(INTDIR)\errorhandler.cc \
    … …  
    5253             $(INTDIR)\version.cc \
    5354             $(INTDIR)\editdistance.cc  \
    5455             $(INTDIR)\valuerangeproccompat.cc \
    55              $(INTDIR)\matchspy.cc
     56             $(INTDIR)\matchspy.cc \
     57             $(INTDIR)\sortable-serialise.cc
    5658
    5759             
    5860CLEAN :

  • win32_bindings_php.mak

     
    1313
    1414!INCLUDE $(XAPIAN_CORE_REL_PHP)\win32\config.mak
    1515
    16 LIB_XAPIAN_OBJS= ".\xapian_wrap.obj"
     16LIB_XAPIAN_OBJS= ".\xapian_wrap.obj" ".\version.res"
    1717
    1818CPP=cl.exe
    1919RSC=rc.exe
    … …  
    9797# Rules
    9898#
    9999
     100".\version.res": version.rc
     101    $(RSC) /v \
     102      /fo version.res \
     103      /I "$(XAPIAN_CORE_REL_PHP)\include" \
     104      /I "$(PHP_SRC_DIR)\main" \
     105      /d PHP_MAJOR_VERSION="\"$(PHP_MAJOR_VERSION)\"" \
     106      version.rc
     107
    100108".\xapian_wrap.obj" : "php$(PHP_MAJOR_VERSION)\xapian_wrap.cc"
    101109     $(CPP) @<<
    102110  $(CPP_PROJ) $**

  • win32_bindings_python.mak

     
    1414
    1515!INCLUDE $(XAPIAN_CORE_REL_PYTHON)\win32\config.mak
    1616
    17 LIB_XAPIAN_OBJS= ".\xapian_wrap.obj"
     17LIB_XAPIAN_OBJS= ".\xapian_wrap.obj" ".\version.res"
    1818
    1919OUTDIR=$(XAPIAN_CORE_REL_PYTHON)\win32\$(XAPIAN_DEBUG_OR_RELEASE)\Python
    2020INTDIR=.\
    … …  
    108108# Rules
    109109#
    110110
     111".\version.res": version.rc
     112    "$(PYTHON_EXE)" -c \
     113        "import platform; \
     114        f=open('pythonversion.h','w'); \
     115        f.write('#define PYTHON_VERSION \"'); \
     116        f.write(platform.python_version()); \
     117        f.write('\"\n'); \
     118        f.close();"
     119    $(RSC) /v \
     120      /fo version.res \
     121      /I "$(XAPIAN_CORE_REL_PYTHON)\include" \
     122      version.rc
     123
     124
    111125".\xapian_wrap.obj" : "modern/xapian_wrap.cc"
    112126     $(CPP) @<<
    113127  $(CPP_PROJ) $**