From 806c7856f21fce09f20ae31c6c1b5cb01dd69f1a Mon Sep 17 00:00:00 2001
From: Jean-Francois Dockes <jfd@recoll.org>
Date: Fri, 30 Oct 2015 11:39:25 +0100
Subject: [PATCH 1/3] Change 'which' so that it processes relative paths like
 wpd/wpd2html.exe

---
 src/windows/execmd_w.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/windows/execmd_w.cpp b/src/windows/execmd_w.cpp
index b8319283..fc8658c5 100644
--- a/src/windows/execmd_w.cpp
+++ b/src/windows/execmd_w.cpp
@@ -401,7 +401,7 @@ bool ExecCmd::which(const string& cmd, string& exe, const char* path)
         pep = &s_pathelts;
     }
 
-    if (cmd.find_first_of("/\\") != string::npos) {
+    if (path_isabsolute(cmd)) {
         if (is_exe_base(cmd)) {
             exe = cmd;
             return true;

From 0291c39be62e791ea5a3c48922b8b367619e07e5 Mon Sep 17 00:00:00 2001
From: Jean-Francois Dockes <jfd@recoll.org>
Date: Fri, 30 Oct 2015 11:39:50 +0100
Subject: [PATCH 2/3] Support wordperfect with libwpd

---
 src/windows/mimeconf     |  2 ++
 src/windows/mkinstdir.sh | 45 ++++++++++++++++++++++++++++++----------
 2 files changed, 36 insertions(+), 11 deletions(-)

diff --git a/src/windows/mimeconf b/src/windows/mimeconf
index 0f0e14f5..b8b98e12 100644
--- a/src/windows/mimeconf
+++ b/src/windows/mimeconf
@@ -79,6 +79,8 @@ application/vnd.sun.xml.writer = execm python rclsoff.py
 application/vnd.sun.xml.writer.global = execm python rclsoff.py
 application/vnd.sun.xml.writer.template = execm python rclsoff.py
 
+application/vnd.wordperfect = exec wpd/wpd2html;mimetype=text/html
+
 application/vnd.openxmlformats-officedocument.wordprocessingml.document = \
  execm python rclopxml.py
 application/vnd.openxmlformats-officedocument.wordprocessingml.template = \
diff --git a/src/windows/mkinstdir.sh b/src/windows/mkinstdir.sh
index ec920fc1..f4a4d2dc 100644
--- a/src/windows/mkinstdir.sh
+++ b/src/windows/mkinstdir.sh
@@ -40,6 +40,12 @@ MUTAGEN=C:/temp/mutagen-1.31/
 EPUB=C:/temp/epub-0.5.2
 ZLIB=c:/temp/zlib-1.2.8
 POPPLER=c:/temp/poppler-0.36/
+LIBWPD=c:/temp/libwpd/libwpd-0.10.0/
+LIBREVENGE=c:/temp/libwpd/librevenge-0.0.1.jfd/
+
+# Where to find libgcc_s_dw2-1.dll for progs which need it copied
+gccpath=`which gcc`
+MINGWBIN=`dirname $gccpath`
 
 # Where to copy the Qt Dlls from:
 QTBIN=C:/Qt/5.5/mingw492_32/bin
@@ -181,20 +187,37 @@ copypoppler()
     done
 }
 
+copywpd()
+{
+    DEST=$FILTERS/wpd
+    test -d $DEST || mkdir $DEST || fatal cant create poppler dir $DEST
+
+    for f in librevenge-0.0.dll librevenge-generators-0.0.dll \
+             librevenge-stream-0.0.dll; do
+        chkcp $LIBREVENGE/src/lib/.libs/$f $DEST
+    done
+    chkcp $LIBWPD/src/lib/.libs/libwpd-0.10.dll $DEST
+    chkcp $LIBWPD/src/conv/html/.libs/wpd2html.exe $DEST
+    chkcp $MINGWBIN/libgcc_s_dw2-1.dll $DEST
+    chkcp $MINGWBIN/libstdc++-6.dll $DEST
+    chkcp $ZLIB/zlib1.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
 
 # copyrecoll must stay before copyqt so that windeployqt can do its thing
-copyrecoll
-copyqt
-copyxapian
-copyzlib
-copypoppler
-copyantiword
-copyunrtf
-copyxslt
-copymutagen
-copyepub
-copypyexiv2
+#copyrecoll
+#copyqt
+#copyxapian
+#copyzlib
+#copypoppler
+#copyantiword
+#copyunrtf
+#copyxslt
+#copymutagen
+#copyepub
+#copypyexiv2
+copywpd

From c0f1ec78d3e7653eebdfac68fa106b81ab01dc01 Mon Sep 17 00:00:00 2001
From: Jean-Francois Dockes <jfd@recoll.org>
Date: Fri, 30 Oct 2015 15:42:08 +0100
Subject: [PATCH 3/3] Add pychm install

---
 src/windows/mkinstdir.sh | 32 +++++++++++++++++++++-----------
 1 file changed, 21 insertions(+), 11 deletions(-)

diff --git a/src/windows/mkinstdir.sh b/src/windows/mkinstdir.sh
index f4a4d2dc..b48c3711 100644
--- a/src/windows/mkinstdir.sh
+++ b/src/windows/mkinstdir.sh
@@ -42,6 +42,7 @@ ZLIB=c:/temp/zlib-1.2.8
 POPPLER=c:/temp/poppler-0.36/
 LIBWPD=c:/temp/libwpd/libwpd-0.10.0/
 LIBREVENGE=c:/temp/libwpd/librevenge-0.0.1.jfd/
+CHM=c:/recolldeps/pychm
 
 # Where to find libgcc_s_dw2-1.dll for progs which need it copied
 gccpath=`which gcc`
@@ -87,8 +88,11 @@ chkcp()
 copyqt()
 {
     cd $DESTDIR
+    PATH=$QTBIN:$PATH
+    export PATH
     $QTBIN/windeployqt recoll.exe
     chkcp $QTBIN/libwinpthread-1.dll $DESTDIR
+    chkcp $QTBIN/libstdc++-6.dll $DESTDIR
 }
 
 copyxapian()
@@ -202,6 +206,11 @@ copywpd()
     chkcp $MINGWBIN/libstdc++-6.dll $DEST
     chkcp $ZLIB/zlib1.dll $DEST
 }
+copychm()
+{
+    DEST=$FILTERS
+    cp -rp $CHM/chm $DEST || fatal "can't copy pychm"
+}
 
 for d in doc examples filters images translations; do
     test -d $DESTDIR/Share/$d || mkdir -p $DESTDIR/Share/$d || \
@@ -209,15 +218,16 @@ for d in doc examples filters images translations; do
 done
 
 # copyrecoll must stay before copyqt so that windeployqt can do its thing
-#copyrecoll
-#copyqt
-#copyxapian
-#copyzlib
-#copypoppler
-#copyantiword
-#copyunrtf
-#copyxslt
-#copymutagen
-#copyepub
-#copypyexiv2
+copyrecoll
+copyqt
+copyxapian
+copyzlib
+copypoppler
+copyantiword
+copyunrtf
+copyxslt
+copymutagen
+copyepub
+copypyexiv2
 copywpd
+copychm