From 15cc242e1ff3bd47d6fb74c8d0181d29dad2c567 Mon Sep 17 00:00:00 2001 From: Jean-Francois Dockes Date: Thu, 16 Dec 2021 17:38:07 +0000 Subject: [PATCH] Windows: also build and ship xapian-check --- src/windows/mkinstdir.sh | 3 ++- src/windows/qmkrecoll/xapian-check.pro | 37 ++++++++++++++++++++++++++ 2 files changed, 39 insertions(+), 1 deletion(-) create mode 100644 src/windows/qmkrecoll/xapian-check.pro diff --git a/src/windows/mkinstdir.sh b/src/windows/mkinstdir.sh index addc2ffa..f37654c7 100644 --- a/src/windows/mkinstdir.sh +++ b/src/windows/mkinstdir.sh @@ -70,7 +70,7 @@ GUIBIN=$RCL/build-recoll-win-${QTA}/${qtsdir}/recoll.exe RCLIDX=$RCLW/build-recollindex-${QTA}/${qtsdir}/recollindex.exe RCLQ=$RCLW/build-recollq-${QTA}/${qtsdir}/recollq.exe RCLS=$RCLW/build-rclstartw-${QTA}/${qtsdir}/rclstartw.exe - +XAPC=$RCLW/build-xapian-check-${QTA}/xapian-check.exe #PYTHON=${RCLDEPS}py-python3 PYTHON=${RCLDEPS}python-3.7.9-embed-win32 UNRTF=${RCLDEPS}unrtf @@ -162,6 +162,7 @@ copyrecoll() chkcp $LIBR $DESTDIR chkcp $MINGWBIN/libgcc_s_dw2-1.dll $DESTDIR else + chkcp $XAPC $DESTDIR chkcp $LIBXML $DESTDIR chkcp $LIBXSLT $DESTDIR fi diff --git a/src/windows/qmkrecoll/xapian-check.pro b/src/windows/qmkrecoll/xapian-check.pro new file mode 100644 index 00000000..2ce444e7 --- /dev/null +++ b/src/windows/qmkrecoll/xapian-check.pro @@ -0,0 +1,37 @@ +TARGET = xapian-check +QT -= core gui +CONFIG += console +CONFIG -= app_bundle +TEMPLATE = app + +DEFINES += HAVE_CONFIG_H + +RECOLLDEPS = ../../../../recolldeps/msvc +XAPIANDIR = $$RECOLLDEPS/xapian-core/ + +SOURCES += \ + $$XAPIANDIR/bin/xapian-check.cc + +INCLUDEPATH += $$XAPIANDIR \ + $$XAPIANDIR/include \ + $$XAPIANDIR/common + +windows { + DEFINES += __WIN32__ + DEFINES += UNICODE + contains(QMAKE_CC, cl){ + # msvc + DEFINES += USING_STATIC_LIBICONV + INCLUDEPATH += \ + ../../../../recolldeps/msvc/zlib-1.2.11/ \ + ../../../../recolldeps/msvc/wlibiconv/include + LIBS += \ + -L../build-libxapian-Desktop_Qt_5_14_2_MSVC2017_32bit-Release/release \ + -llibxapian \ + -L$$RECOLLDEPS/build-libiconv-Desktop_Qt_5_14_2_MSVC2017_32bit-Release/release/ \ + -llibiconv \ + $$RECOLLDEPS/zlib-1.2.11/zdll.lib \ + -lrpcrt4 -lws2_32 -luser32 -lshell32 \ + -lshlwapi -lpsapi -lkernel32 + } +}