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

Windows: build file changes, mainly switch to xapian 1.4.5

Browse Source
This commit is contained in:
Jean-Francois Dockes 2018-10-12 12:01:31 +02:00
parent 96c6fd74b4
commit 37ee7b2388
3 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/windows/mkinstdir.sh
View File

@ -35,10 +35,11 @@ UNRTF=c:/unrtf
ANTIWORD=c:/recolldeps/antiword ANTIWORD=c:/recolldeps/antiword
PYXSLT=C:/recolldeps/pyxslt PYXSLT=C:/recolldeps/pyxslt
PYEXIV2=C:/recolldeps/pyexiv2 PYEXIV2=C:/recolldeps/pyexiv2
LIBXAPIAN=c:/temp/xapian-core-1.2.21/.libs/libxapian-22.dll #LIBXAPIAN=c:/temp/xapian-core-1.2.21/.libs/libxapian-22.dll
#LIBXAPIAN=c:/temp/xapian-core-1.4.1/.libs/libxapian-30.dll LIBXAPIAN=c:/temp/xapian-core-1.4.5/.libs/libxapian-30.dll
MUTAGEN=C:/temp/mutagen-1.32/ MUTAGEN=C:/temp/mutagen-1.32/
EPUB=C:/temp/epub-0.5.2 EPUB=C:/temp/epub-0.5.2
FUTURE=C:/temp/python2-future
ZLIB=c:/temp/zlib-1.2.8 ZLIB=c:/temp/zlib-1.2.8
POPPLER=c:/temp/poppler-0.36/ POPPLER=c:/temp/poppler-0.36/
LIBWPD=c:/temp/libwpd/libwpd-0.10.0/ LIBWPD=c:/temp/libwpd/libwpd-0.10.0/
@ -177,6 +178,13 @@ copyepub()
# chkcp to check that epub is where we think it is # chkcp to check that epub is where we think it is
chkcp $EPUB/build/lib/epub/opf.py $FILTERS/epub chkcp $EPUB/build/lib/epub/opf.py $FILTERS/epub
} }
copyfuture()
{
cp -rp $FUTURE/future $FILTERS/
cp -rp $FUTURE/builtins $FILTERS/
# chkcp to check that things are where we think they are
chkcp $FUTURE/future/builtins/newsuper.pyc $FILTERS/future/builtins
}
copypyexiv2() copypyexiv2()
{ {
@ -238,6 +246,7 @@ copypoppler
copyantiword copyantiword
copyunrtf copyunrtf
copyxslt copyxslt
copyfuture
copymutagen copymutagen
copyepub copyepub
copypyexiv2 copypyexiv2

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

@ -129,15 +129,14 @@ windows {
contains(QMAKE_CC, cl){ contains(QMAKE_CC, cl){
# Visual Studio # Visual Studio
} }
# LIBS += c:/temp/xapian-core-1.4.1/.libs/libxapian-30.dll \ LIBS += c:/temp/xapian-core-1.4.5/.libs/libxapian-30.dll \
c:/temp/zlib-1.2.8/zlib1.dll -liconv -lshlwapi -lpsapi -lkernel32
INCLUDEPATH += ../../windows \
C:/temp/xapian-core-1.4.5/include
# LIBS += c:/temp/xapian-core-1.2.21/.libs/libxapian-22.dll \
# c:/temp/zlib-1.2.8/zlib1.dll -liconv -lshlwapi -lpsapi -lkernel32 # c:/temp/zlib-1.2.8/zlib1.dll -liconv -lshlwapi -lpsapi -lkernel32
# INCLUDEPATH += ../../windows \ # INCLUDEPATH += ../../windows \
# C:/temp/xapian-core-1.4.1/include
LIBS += c:/temp/xapian-core-1.2.21/.libs/libxapian-22.dll \
c:/temp/zlib-1.2.8/zlib1.dll -liconv -lshlwapi -lpsapi -lkernel32
INCLUDEPATH += ../../windows \
C:/temp/xapian-core-1.2.21/include C:/temp/xapian-core-1.2.21/include
} }

2
src/windows/recoll-setup.iss
View File

@ -2,7 +2,7 @@
; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES! ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
#define MyAppName "Recoll" #define MyAppName "Recoll"
#define MyAppVersion "1.24.1-20180120-fd3287" #define MyAppVersion "1.24.1-20180517-96c6fd"
#define MyAppPublisher "Recoll.org" #define MyAppPublisher "Recoll.org"
#define MyAppURL "http://www.recoll.org" #define MyAppURL "http://www.recoll.org"
#define MyAppExeName "recoll.exe" #define MyAppExeName "recoll.exe"