yetangitu/recoll
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Pure mingw build ok

Browse source
This commit is contained in:
Jean-Francois Dockes 2015-10-08 15:32:01 +02:00
parent 474ecc2b08
commit acb0a9012a
4 changed files with 23 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/filters/rclexecm.py
View file

@ -73,6 +73,10 @@ class RclExecM:
if sys.platform != "win32": if sys.platform != "win32":
outfile.write(data) outfile.write(data)
else: else:
# On windows, writing big chunks can fail with a "not enough space"
# error. Seems a combined windows/python bug, depending on versions.
# See https://bugs.python.org/issue11395
# In any case, just break it up
total = len(data) total = len(data)
bs = 4*1024 bs = 4*1024
offset = 0 offset = 0

6
src/windows/execmd_w.cpp
View file

@ -376,6 +376,12 @@ ExecCmd::~ExecCmd()
} }
} }
// This does nothing under windows, but defining it avoids ifdefs in multiple
// places
void ExecCmd::useVfork(bool)
{
}
bool ExecCmd::which(const string& cmd, string& exe, const char* path) bool ExecCmd::which(const string& cmd, string& exe, const char* path)
{ {
static vector<string> s_pathelts; static vector<string> s_pathelts;

22
src/windows/mkinstdir.sh
View file

@ -17,9 +17,10 @@ ANTIWORD=c:/recolldeps/antiword
CONFIGURATION=Debug CONFIGURATION=Debug
PLATFORM=x64 PLATFORM=x64
GUIBIN=c:/recoll/src/build-librecoll-Desktop_Qt_5_5_0_MinGW_32bit-Debug/debug/librecoll.dll LIBR=C:/recoll/src/windows/build-librecoll-Desktop_Qt_5_5_0_MinGW_32bit-Debug/debug/librecoll.dll
GUILIB=c:/Users/Bill/recoll/src/build-recoll-Desktop_Qt_5_5_0_MinGW_32bit-Debug/debug/recoll.exe GUIBIN=C:/Users/Bill/recoll/src/build-recoll-Desktop_Qt_5_5_0_MinGW_32bit-Debug/debug/recoll.exe
RCLIDX=C:/recoll/src/windows/build-recollindex-Desktop_Qt_5_5_0_MinGW_32bit-Debug/debug/recollindex.exe
RCLQ=C:/recoll/src/windows/build-recollq-Desktop_Qt_5_5_0_MinGW_32bit-Debug/debug/recollq.exe
################ ################
# Script: # Script:
@ -41,11 +42,14 @@ cc()
copyrecoll() copyrecoll()
{ {
bindir=$RECOLL/windows/$PLATFORM/$CONFIGURATION/ # bindir=$RECOLL/windows/$PLATFORM/$CONFIGURATION/
# cc $bindir/recollindex.exe $DESTDIR
cc $bindir/recollindex.exe $DESTDIR # cc $bindir/recollq.exe $DESTDIR
cc $bindir/recollq.exe $DESTDIR # cc $bindir/pthreadVC2.dll $DESTDIR
cc $bindir/pthreadVC2.dll $DESTDIR cp $LIBR $DESTDIR || fatal copy librecoll
cp $GUIBIN $DESTDIR || fatal copy recoll.exe
cp $RCLIDX $DESTDIR || fatal copy recollindex.exe
cp $RCLQ $DESTDIR || fatal copy recollq.exe
cc $RECOLL/sampleconf/fields $DESTDIR/Share/examples cc $RECOLL/sampleconf/fields $DESTDIR/Share/examples
cc $RECOLL/sampleconf/fragbuts.xml $DESTDIR/Share/examples cc $RECOLL/sampleconf/fragbuts.xml $DESTDIR/Share/examples
@ -62,8 +66,6 @@ copyrecoll()
cp $RECOLL/qtgui/i18n/*.qm $DESTDIR/Share/translations cp $RECOLL/qtgui/i18n/*.qm $DESTDIR/Share/translations
cp $GUIBIN $DESTDIR || fatal copy recoll.exe
cp $GUILIB $DESTDIR || fatal copy Gui librecoll
} }
copyantiword() copyantiword()

2
src/windows/qmkrecoll/recollindex.pro
View file

@ -29,7 +29,7 @@ windows {
# Visual Studio # Visual Studio
} }
LIBS += \ LIBS += \
C:/recoll/src/build-librecoll-Desktop_Qt_5_5_0_MinGW_32bit-Debug/debug/librecoll.dll \ C:/recoll/src/windows/build-librecoll-Desktop_Qt_5_5_0_MinGW_32bit-Debug/debug/librecoll.dll \
c:/recolldeps/xapian/xapian-core-1.2.21/.libs/libxapian-22.dll \ c:/recolldeps/xapian/xapian-core-1.2.21/.libs/libxapian-22.dll \
c:/recolldeps/zlib-1.2.8/zlib1.dll \ c:/recolldeps/zlib-1.2.8/zlib1.dll \
-liconv -lshlwapi -lpsapi -lkernel32 -liconv -lshlwapi -lpsapi -lkernel32