Windows: build file changes, mainly switch to xapian 1.4.5

src/windows/mkinstdir.sh

@@ -35,10 +35,11 @@ UNRTF=c:/unrtf
 ANTIWORD=c:/recolldeps/antiword
 PYXSLT=C:/recolldeps/pyxslt
 PYEXIV2=C:/recolldeps/pyexiv2
-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.2.21/.libs/libxapian-22.dll
+LIBXAPIAN=c:/temp/xapian-core-1.4.5/.libs/libxapian-30.dll
 MUTAGEN=C:/temp/mutagen-1.32/
 EPUB=C:/temp/epub-0.5.2
+FUTURE=C:/temp/python2-future
 ZLIB=c:/temp/zlib-1.2.8
 POPPLER=c:/temp/poppler-0.36/
 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 $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()
 {
@@ -238,6 +246,7 @@ copypoppler
 copyantiword
 copyunrtf
 copyxslt
+copyfuture
 copymutagen
 copyepub
 copypyexiv2

src/windows/qmkrecoll/librecoll.pro

@@ -129,15 +129,14 @@ windows {
     contains(QMAKE_CC, cl){
         # 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
 #  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
 }
 

src/windows/recoll-setup.iss

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