tris/recoll
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Indexing works. Needs more helpers

Browse Source
This commit is contained in:
Jean-Francois Dockes 2020-04-06 09:43:58 +01:00
parent 6999284c42
commit a0b7b3a38b
8 changed files with 149 additions and 150 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/qtgui/recoll-win.pro
View File

@ -120,17 +120,19 @@ windows {
contains(QMAKE_CC, cl){
# MSVC
RECOLLDEPS = ../../../recolldeps-vc
DEFINES += USING_STATIC_LIBICONV
LIBS += \
-L../windows/build-librecoll-Desktop_Qt_5_14_1_MSVC2017_32bit-Release/release \
-L../windows/build-librecoll-Desktop_Qt_5_14_1_MSVC2017_32bit-Release/release \
-llibrecoll \
$$RECOLLDEPS/libxml2/libxml2-2.9.4+dfsg1/win32/bin.msvc/libxml2.lib \
$$RECOLLDEPS/libxslt/libxslt-1.1.29/win32/bin.msvc/libxslt.lib \
-L../windows/build-libxapian-Desktop_Qt_5_14_1_MSVC2017_32bit-Release/release \
$$RECOLLDEPS/libxml2/libxml2-2.9.4+dfsg1/win32/bin.msvc/libxml2.lib \
$$RECOLLDEPS/libxslt/libxslt-1.1.29/win32/bin.msvc/libxslt.lib \
-L../windows/build-libxapian-Desktop_Qt_5_14_1_MSVC2017_32bit-Release/release \
-llibxapian \
$$RECOLLDEPS/zlib-1.2.11/zdll.lib \
$$RECOLLDEPS/libiconv-for-windows/lib/libiconv.lib \
-lrpcrt4 -lws2_32 -luser32 \
-lshlwapi -lpsapi -lkernel32
-L$$RECOLLDEPS/build-libiconv-Desktop_Qt_5_14_1_MSVC2017_32bit-Release/release \
-llibiconv \
$$RECOLLDEPS/zlib-1.2.11/zdll.lib \
-lrpcrt4 -lws2_32 -luser32 \
-lshlwapi -lpsapi -lkernel32
}
}

182
src/windows/mkinstdir.sh
View File

@ -22,24 +22,55 @@ test -d $DESTDIR || mkdir $DESTDIR || fatal cant create $DESTDIR
################################
# Local values (to be adjusted)
# Recoll src tree
RCL=c:/recoll/src/
BUILD=MSVC
#BUILD=MINGW
if test $BUILD = MSVC ; then
# Recoll src tree
RCL=c:/users/bill/documents/recoll/src/
# Recoll dependancies
RCLDEPS=c:/users/bill/documents/recolldeps-vc/
QTA=Desktop_Qt_5_14_1_MSVC2017_32bit-Release/release
LIBXAPIAN=${RCL}windows/build-libxapian-${QTA}/libxapian.dll
LIBXML=${RCLDEPS}libxml2/libxml2-2.9.4+dfsg1/win32/bin.msvc/libxml2.dll
LIBXSLT=${RCLDEPS}libxslt/libxslt-1.1.29/win32/bin.msvc/libxslt.dll
LIBICONV=${RCLDEPS}build-libiconv-Desktop_Qt_5_14_1_MSVC2017_32bit-Release/release/libiconv.dll
ZLIB=${RCLDEPS}zlib-1.2.11
QTBIN=C:/Qt/5.14.1/msvc2017/bin
else
# Recoll src tree
RCL=c:/recoll/src/
# Recoll dependancies
RCLDEPS=c:/recolldeps/
LIBXAPIAN=${RCLDEPS}xapian-core-1.4.11/.libs/libxapian-30.dll
ZLIB=${RCLDEPS}zlib-1.2.8
QTBIN=C:/Qt/Qt5.8.0/5.8/mingw53_32/bin
QTGCCBIN=C:/qt/Qt5.8.0/Tools/mingw530_32/bin/
QTA=Desktop_Qt_5_8_0_MinGW_32bit/release
PATH=$MINGWBIN:$QTGCCBIN:$PATH
export PATH
fi
# Where to find libgcc_s_dw2-1.dll et all for progs compiled with
# c:/MinGW (as opposed to the mingw bundled with qt). This is the same
# for either a msvc or mingw build of recoll itself.
MINGWBIN=C:/MinGW/bin
RCLW=$RCL/windows/
# Recoll dependancies
RCLDEPS=c:/recolldeps/
ReleaseBuild=y
LIBR=$RCLW/build-librecoll-${QTA}/${qtsdir}/librecoll.dll
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
PYTHON=${RCLDEPS}py-python3
UNRTF=${RCLDEPS}unrtf
ANTIWORD=${RCLDEPS}antiword
PYXSLT=${RCLDEPS}pyxslt
PYEXIV2=${RCLDEPS}pyexiv2
LIBXAPIAN=${RCLDEPS}xapian-core-1.4.11/.libs/libxapian-30.dll
MUTAGEN=${RCLDEPS}mutagen-1.32/
EPUB=${RCLDEPS}epub-0.5.2
FUTURE=${RCLDEPS}python2-future
ZLIB=${RCLDEPS}zlib-1.2.8
POPPLER=${RCLDEPS}poppler-0.68.0/
LIBWPD=${RCLDEPS}libwpd/libwpd-0.10.0/
LIBREVENGE=${RCLDEPS}libwpd/librevenge-0.0.1.jfd/
@ -48,38 +79,6 @@ MISC=${RCLDEPS}misc
LIBPFF=${RCLDEPS}pffinstall
ASPELL=${RCLDEPS}/aspell-0.60.7/aspell-installed
# Where to copy the Qt Dlls from:
QTBIN=C:/Qt/Qt5.8.0/5.8/mingw53_32/bin
QTGCCBIN=C:/qt/Qt5.8.0/Tools/mingw530_32/bin/
# Where to find libgcc_s_dw2-1.dll et all for progs compiled with c:/MinGW
# (as opposed to the mingw bundled with qt
MINGWBIN=C:/MinGW/bin
PATH=$MINGWBIN:$QTGCCBIN:$PATH
export PATH
# Qt arch
QTA=Desktop_Qt_5_8_0_MinGW_32bit
if test X$ReleaseBuild = X'y'; then
qtsdir=release
else
qtsdir=debug
fi
LIBR=$RCLW/build-librecoll-${QTA}-${qtsdir}/${qtsdir}/librecoll.dll
GUIBIN=$RCL/build-recoll-win-${QTA}-${qtsdir}/${qtsdir}/recoll.exe
RCLIDX=$RCLW/build-recollindex-${QTA}-${qtsdir}/${qtsdir}/recollindex.exe
RCLQ=$RCLW/build-recollq-${QTA}-${qtsdir}/${qtsdir}/recollq.exe
RCLS=$RCLW/build-rclstartw-${QTA}-${qtsdir}/${qtsdir}/rclstartw.exe
# Needed for a VS build (which we did not ever complete because of
# missing Qt VS2015 support).
#CONFIGURATION=Release
#PLATFORM=Win32
################
# Script:
FILTERS=$DESTDIR/Share/filters
@ -97,38 +96,32 @@ chkcp()
cp $@ || fatal cp $@ failed
}
# Note: can't build static recoll as there is no static qtwebkit (ref: 5.5.0)
# Note: can't build static recoll as there is no static qtwebkit (ref:
# 5.5.0)
copyqt()
{
cd $DESTDIR
PATH=$QTBIN:$PATH
export PATH
$QTBIN/windeployqt recoll.exe
# Apparently because the webkit part was grafted "by hand" on the
# Qt set, we need to copy some dll explicitly
addlibs="Qt5Core.dll Qt5Multimedia.dll \
Qt5MultimediaWidgets.dll Qt5Network.dll Qt5OpenGL.dll \
Qt5Positioning.dll Qt5PrintSupport.dll Qt5Sensors.dll \
Qt5Sql.dll icudt57.dll \
icuin57.dll icuuc57.dll libQt5WebKit.dll \
libQt5WebKitWidgets.dll \
libxml2-2.dll libxslt-1.dll"
for i in $addlibs;do
chkcp $QTBIN/$i $DESTDIR
done
chkcp $QTBIN/libwinpthread-1.dll $DESTDIR
chkcp $QTBIN/libstdc++-6.dll $DESTDIR
if test $BUILD = MINGW;then
# Apparently because the webkit part was grafted "by hand" on
# the Qt set, we need to copy some dll explicitly
addlibs="Qt5Core.dll Qt5Multimedia.dll \
Qt5MultimediaWidgets.dll Qt5Network.dll Qt5OpenGL.dll \
Qt5Positioning.dll Qt5PrintSupport.dll Qt5Sensors.dll \
Qt5Sql.dll icudt57.dll \
icuin57.dll icuuc57.dll libQt5WebKit.dll \
libQt5WebKitWidgets.dll \
libxml2-2.dll libxslt-1.dll"
for i in $addlibs;do
chkcp $QTBIN/$i $DESTDIR
done
chkcp $QTBIN/libwinpthread-1.dll $DESTDIR
chkcp $QTBIN/libstdc++-6.dll $DESTDIR
fi
}
copyxapian()
{
chkcp $LIBXAPIAN $DESTDIR
}
copyzlib()
{
chkcp $ZLIB/zlib1.dll $DESTDIR
}
copypython()
{
mkdir -p $DESTDIR/Share/filters/python
@ -137,17 +130,21 @@ copypython()
}
copyrecoll()
{
# bindir=$RCL/windows/$PLATFORM/$CONFIGURATION/
# chkcp $bindir/recollindex.exe $DESTDIR
# chkcp $bindir/recollq.exe $DESTDIR
# chkcp $bindir/pthreadVC2.dll $DESTDIR
chkcp $LIBR $DESTDIR
chkcp $GUIBIN $DESTDIR
chkcp $RCLIDX $DESTDIR
chkcp $RCLQ $DESTDIR
chkcp $RCLS $DESTDIR
chkcp $MINGWBIN/libgcc_s_dw2-1.dll $DESTDIR
chkcp $ZLIB/zlib1.dll $DESTDIR
chkcp $LIBXAPIAN $DESTDIR
if test $BUILD = MINGW;then
chkcp $LIBR $DESTDIR
chkcp $MINGWBIN/libgcc_s_dw2-1.dll $DESTDIR
else
chkcp $LIBXML $DESTDIR
chkcp $LIBXSLT $DESTDIR
# chkcp $LIBICONV $DESTDIR
fi
chkcp $RCL/COPYING $DESTDIR/COPYING.txt
chkcp $RCL/doc/user/usermanual.html $DESTDIR/Share/doc
chkcp $RCL/doc/user/docbook-xsl.css $DESTDIR/Share/doc
@ -166,7 +163,7 @@ copyrecoll()
rm -f $FILTERS/rclimg*
chkcp $RCL/filters/* $FILTERS
rm -f $FILTERS/rclimg $FILTERS/rclimg.py
chkcp $RCLDEPS/rclimg/rclimg.exe $FILTERS
#LATER chkcp $RCLDEPS/rclimg/rclimg.exe $FILTERS
chkcp $RCL/qtgui/mtpics/* $DESTDIR/Share/images
chkcp $RCL/qtgui/i18n/*.qm $DESTDIR/Share/translations
}
@ -227,7 +224,7 @@ copypyexiv2()
chkcp $PYEXIV2/libexiv2python.pyd $FILTERS/
}
copyxslt()
copypyxslt()
{
chkcp $PYXSLT/libxslt.py $FILTERS/
cp -rp $PYXSLT/* $FILTERS
@ -296,14 +293,8 @@ copyaspell()
chkcp $MINGWBIN/libstdc++-6.dll $DEST
}
for d in doc examples filters images translations; do
test -d $DESTDIR/Share/$d || mkdir -p $DESTDIR/Share/$d || \
fatal mkdir $d failed
done
# First check that the config is ok
cmp -s $RCL/common/autoconfig.h $RCL/common/autoconfig-win.h || \
diff -q $RCL/common/autoconfig.h $RCL/common/autoconfig-win.h || \
fatal autoconfig.h and autoconfig-win.h differ
VERSION=`cat $RCL/VERSION`
CFVERS=`grep PACKAGE_VERSION $RCL/common/autoconfig.h | \
@ -311,28 +302,33 @@ cut -d ' ' -f 3 | sed -e 's/"//g'`
test "$VERSION" = "$CFVERS" ||
fatal Versions in VERSION and autoconfig.h differ
echo Packaging version $CFVERS
copyaspell
for d in doc examples filters images translations; do
test -d $DESTDIR/Share/$d || mkdir -p $DESTDIR/Share/$d || \
fatal mkdir $d failed
done
#LATER copyaspell
# copyrecoll must stay before copyqt so that windeployqt can do its thing
copyrecoll
copyqt
copyxapian
copyzlib
copypoppler
copyantiword
copyunrtf
copyxslt
#LATER copypyxslt
#LATER copypoppler
#LATER copyantiword
#LATER copyunrtf
# Copied into python3 and installed with it
#copyfuture
copymutagen
#LATER copymutagen
# Switched to perl for lack of python3 version
#copypyexiv2
copywpd
#LATER copywpd
# Chm is now copied into the python tree, which is installed by copypython
#copychm
copypff
#LATER copypff
# Note that pychm and pyhwp are pre-copied into the py-python3 python
# distribution directory. The latter also needs olefile and six (also copied)
copypython
# distribution directory. The latter also needs olefile and six (also
# copied)
#LATER copypython

17
src/windows/qmkrecoll/librecoll.pro
View File

@ -15,7 +15,9 @@ DEFINES += PSAPI_VERSION=1
DEFINES += READFILE_ENABLE_MINIZ
DEFINES += READFILE_ENABLE_MD5
DEFINES += READFILE_ENABLE_ZLIB
# VC only defines __WIN32, not __WIN32__ . For some reason xapian uses __WIN32__ which it actually defines in conf_post.h if __WIN32 is set. Reason: mystery.
# VC only defines __WIN32, not __WIN32__ . For some reason xapian uses
# __WIN32__ which it actually defines in conf_post.h if __WIN32 is
# set. Reason: mystery.
DEFINES += __WIN32__
SOURCES += \
@ -151,22 +153,13 @@ windows {
# Visual Studio
RECOLLDEPS = ../../../../recolldeps-vc
CONFIG += staticlib
LIBS += \
$$RECOLLDEPS/libxml2/libxml2-2.9.4+dfsg1/win32/bin.msvc/libxml2.lib \
$$RECOLLDEPS/libxslt/libxslt-1.1.29/win32/bin.msvc/libxslt.lib \
-L../build-libxapian-Desktop_Qt_5_14_1_MSVC2017_32bit-Release/release \
-llibxapian \
$$RECOLLDEPS/zlib-1.2.11/zdll.lib \
$$RECOLLDEPS/libiconv-for-windows/lib/libiconv.lib \
-lrpcrt4 -lws2_32 -luser32 \
-lshlwapi -lpsapi -lkernel32
DEFINES += USING_STATIC_LIBICONV
INCLUDEPATH += ../../windows \
$$RECOLLDEPS/xapian-core-1.4.15/include \
$$RECOLLDEPS/zlib-1.2.11/ \
$$RECOLLDEPS/libxslt/libxslt-1.1.29/ \
$$RECOLLDEPS/libxml2/libxml2-2.9.4+dfsg1/include \
$$RECOLLDEPS/libiconv-for-windows/include
$$RECOLLDEPS/wlibiconv/include
QMAKE_CXXFLAGS_WARN_ON -= -w34100
QMAKE_CXXFLAGS += -wd4100
}

14
src/windows/qmkrecoll/libxapian.pro
View File

@ -7,7 +7,6 @@ DEFINES += __WIN32__
DEFINES -= _UNICODE
DEFINES -= UNICODE
DEFINES += HAVE_CONFIG_H
CONFIG += staticlib
XAPIANDIR = ../../../../recolldeps-vc/xapian-core-1.4.15/
@ -242,14 +241,11 @@ INCLUDEPATH += $$XAPIANDIR $$XAPIANDIR/include \
windows {
contains(QMAKE_CC, cl){
# Visual Studio
LIBS += \
../../../../recolldeps-vc/zlib-1.2.11/zdll.lib \
../../../../recolldeps-vc/libiconv-for-windows/lib/libiconv.lib \
-lrpcrt4 -lws2_32 \
-lshlwapi -lpsapi -lkernel32
# msvc
CONFIG += staticlib
DEFINES += USING_STATIC_LIBICONV
INCLUDEPATH += \
../../../../recolldeps-vc/zlib-1.2.11/ \
../../../../recolldeps-vc/libiconv-for-windows/include
}
../../../../recolldeps-vc/wlibiconv/include
}
}

5
src/windows/qmkrecoll/rclstartw.pro
View File

@ -7,7 +7,7 @@ TEMPLATE = app
DEFINES += BUILDING_RECOLL
DEFINES += UNICODE
DEFINES += PSAPI_VERSION=1
DEFINES += __WIN32__
SOURCES += \
../rclstartw.cpp
@ -24,8 +24,7 @@ windows {
contains(QMAKE_CC, cl){
# Visual Studio
}
LIBS += \
-liconv -lshlwapi -lpsapi -lkernel32
LIBS += -lshlwapi -lpsapi -lkernel32
INCLUDEPATH += ../../windows
}

29
src/windows/qmkrecoll/recollindex.pro
View File

@ -31,21 +31,22 @@ windows {
-lshlwapi -lpsapi -lkernel32
}
contains(QMAKE_CC, cl){
# MSVC
RECOLLDEPS = ../../../../recolldeps-vc
LIBS += \
-L../build-librecoll-Desktop_Qt_5_14_1_MSVC2017_32bit-Release/release \
-llibrecoll \
$$RECOLLDEPS/libxml2/libxml2-2.9.4+dfsg1/win32/bin.msvc/libxml2.lib \
$$RECOLLDEPS/libxslt/libxslt-1.1.29/win32/bin.msvc/libxslt.lib \
-L../build-libxapian-Desktop_Qt_5_14_1_MSVC2017_32bit-Release/release \
-llibxapian \
$$RECOLLDEPS/zlib-1.2.11/zdll.lib \
$$RECOLLDEPS/libiconv-for-windows/lib/libiconv.lib \
-lrpcrt4 -lws2_32 -luser32 \
-lshlwapi -lpsapi -lkernel32
# MSVC
RECOLLDEPS = ../../../../recolldeps-vc
DEFINES += USING_STATIC_LIBICONV
LIBS += \
-L../build-librecoll-Desktop_Qt_5_14_1_MSVC2017_32bit-Release/release \
-llibrecoll \
$$RECOLLDEPS/libxml2/libxml2-2.9.4+dfsg1/win32/bin.msvc/libxml2.lib \
$$RECOLLDEPS/libxslt/libxslt-1.1.29/win32/bin.msvc/libxslt.lib \
-L../build-libxapian-Desktop_Qt_5_14_1_MSVC2017_32bit-Release/release \
-llibxapian \
$$RECOLLDEPS/zlib-1.2.11/zdll.lib \
-L$$RECOLLDEPS/build-libiconv-Desktop_Qt_5_14_1_MSVC2017_32bit-Release/release \
-llibiconv \
-lrpcrt4 -lws2_32 -luser32 \
-lshlwapi -lpsapi -lkernel32
}
INCLUDEPATH += ../../windows
}

33
src/windows/qmkrecoll/recollq.pro
View File

@ -9,7 +9,7 @@ TEMPLATE = app
DEFINES += BUILDING_RECOLL
DEFINES += UNICODE
DEFINES += PSAPI_VERSION=1
DEFINES += __WIN32__
SOURCES += \
../../query/recollqmain.cpp
@ -19,16 +19,29 @@ INCLUDEPATH += ../../common ../../index ../../internfile ../../query \
../../xaposix ../../confgui ../../bincimapmime
windows {
contains(QMAKE_CC, gcc){
# MingW
QMAKE_CXXFLAGS += -std=c++11 -Wno-unused-parameter
}
contains(QMAKE_CC, cl){
# Visual Studio
}
LIBS += \
C:/recoll/src/windows/build-librecoll-Desktop_Qt_5_8_0_MinGW_32bit-Release/release/librecoll.dll \
contains(QMAKE_CC, gcc){
MingW
QMAKE_CXXFLAGS += -std=c++11 -Wno-unused-parameter
LIBS += \
C:/recoll/src/windows/build-librecoll-Desktop_Qt_5_8_0_MinGW_32bit-Release/release/librecoll.dll \
-lshlwapi -lpsapi -lkernel32
}
contains(QMAKE_CC, cl){
# Visual Studio
RECOLLDEPS = ../../../../recolldeps-vc
LIBS += \
-L../build-librecoll-Desktop_Qt_5_14_1_MSVC2017_32bit-Release/release \
-llibrecoll \
$$RECOLLDEPS/libxml2/libxml2-2.9.4+dfsg1/win32/bin.msvc/libxml2.lib \
$$RECOLLDEPS/libxslt/libxslt-1.1.29/win32/bin.msvc/libxslt.lib \
-L../build-libxapian-Desktop_Qt_5_14_1_MSVC2017_32bit-Release/release \
-llibxapian \
-L$$RECOLLDEPS/build-libiconv-Desktop_Qt_5_14_1_MSVC2017_32bit-Release/release/ \
-llibiconv \
$$RECOLLDEPS/zlib-1.2.11/zdll.lib \
-lrpcrt4 -lws2_32 -luser32 \
-lshlwapi -lpsapi -lkernel32
}
INCLUDEPATH += ../../windows
}

1
src/windows/rclstartw.cpp
View File

@ -21,7 +21,6 @@
#include <stdlib.h>
#include "safewindows.h"
#include "pathut.h"
#include "transcode.h"
using namespace std;