merge

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;

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 = \

src/windows/mkinstdir.sh

@@ -40,6 +40,13 @@ 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/
+CHM=c:/recolldeps/pychm
+
+# 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
@@ -81,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()
@@ -181,6 +191,27 @@ 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
+}
+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 || \
         fatal mkdir $d failed
@@ -198,3 +229,5 @@ copyxslt
 copymutagen
 copyepub
 copypyexiv2
+copywpd
+copychm