Get uncompression to work and fix a few other issues

This commit is contained in:
Jean-Francois Dockes
2015-10-13 16:48:16 +02:00
parent a02a611694
commit 8324f09d19
8 changed files with 65 additions and 28 deletions
+2 -2
View File
@@ -149,8 +149,8 @@ text/x-python = exec python rclpython
text/x-shellscript = internal text/plain
text/x-srt = internal text/plain
application/xml = execm python rclxml
text/xml = execm python rclxml
application/xml = execm python rclxml.py
text/xml = execm python rclxml.py
# Using these instead of the two above would index all parameter and tag
# names, attribute values etc, instead of just the text content.
#application/xml = internal text/plain
+11 -7
View File
@@ -62,9 +62,9 @@ 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). Needed for unrtf
CONFIGURATION=Release
PLATFORM=Win32
# missing Qt VS2015 support).
#CONFIGURATION=Release
#PLATFORM=Win32
################
# Script:
@@ -82,12 +82,14 @@ copyqt()
{
cd $DESTDIR
$QTBIN/windeployqt recoll.exe
chkcp $QTBIN/libwinpthread-1.dll $DESTDIR
}
copyxapian()
{
chkcp $LIBXAPIAN $DESTDIR
}
copyzlib()
{
chkcp $ZLIB/zlib1.dll $DESTDIR
@@ -133,7 +135,8 @@ copyantiword()
copyunrtf()
{
bindir=$UNRTF/Windows/$PLATFORM/$CONFIGURATION
# bindir=$UNRTF/Windows/$PLATFORM/$CONFIGURATION
bindir=$UNRTF/Windows/
test -d $FILTERS/Share || mkdir -p $FILTERS/Share || exit 1
chkcp $bindir/unrtf.exe $FILTERS
@@ -158,8 +161,7 @@ copyepub()
copypyexiv2()
{
cp -rp $PYEXIV2/pyexiv2 $FILTERS
# Check
chkcp $PYEXIV2/pyexiv2/exif.py $FILTERS/pyexiv2
chkcp $PYEXIV2/libexiv2python.pyd $FILTERS/
}
copyxslt()
@@ -170,10 +172,12 @@ copyxslt()
copypoppler()
{
test -d $FILTERS/poppler || mkdir $FILTERS/poppler || \
fatal cant create poppler dir
for f in pdftotext.exe libpoppler.dll freetype6.dll jpeg62.dll \
libpng16-16.dll zlib1.dll libtiff3.dll \
libgcc_s_dw2-1.dll libstdc++-6.dll; do
chkcp $POPPLER/bin/$f $FILTERS/
chkcp $POPPLER/bin/$f $FILTERS/poppler
done
}
+1 -2
View File
@@ -32,6 +32,5 @@ windows {
C:/recoll/src/windows/build-librecoll-Desktop_Qt_5_5_0_MinGW_32bit-Debug/debug/librecoll.dll \
-lshlwapi -lpsapi -lkernel32
INCLUDEPATH += ../../windows \
C:/temp/xapian-core-1.2.8/include
INCLUDEPATH += ../../windows
}
+1 -2
View File
@@ -30,6 +30,5 @@ windows {
C:/recoll/src/windows/build-librecoll-Desktop_Qt_5_5_0_MinGW_32bit-Debug/debug/librecoll.dll \
-lshlwapi -lpsapi -lkernel32
INCLUDEPATH += ../../windows \
C:/recolldeps/xapian/xapian-core-1.2.8/include
INCLUDEPATH += ../../windows
}