diff --git a/src/bincimapmime/mime-parsefull.cc b/src/bincimapmime/mime-parsefull.cc index 5b8b78b8..a394daa2 100644 --- a/src/bincimapmime/mime-parsefull.cc +++ b/src/bincimapmime/mime-parsefull.cc @@ -23,6 +23,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * -------------------------------------------------------------------- */ +#include "autoconfig.h" + #include #include #include diff --git a/src/bincimapmime/mime-parseonlyheader.cc b/src/bincimapmime/mime-parseonlyheader.cc index fc15a461..1710e4b8 100644 --- a/src/bincimapmime/mime-parseonlyheader.cc +++ b/src/bincimapmime/mime-parseonlyheader.cc @@ -23,6 +23,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * -------------------------------------------------------------------- */ +#include "autoconfig.h" + #include "mime.h" #include "mime-utils.h" #include "mime-inputsource.h" diff --git a/src/bincimapmime/mime-printbody.cc b/src/bincimapmime/mime-printbody.cc index 68629974..11606147 100644 --- a/src/bincimapmime/mime-printbody.cc +++ b/src/bincimapmime/mime-printbody.cc @@ -23,6 +23,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * -------------------------------------------------------------------- */ +#include "autoconfig.h" #include "mime.h" #include "mime-utils.h" diff --git a/src/bincimapmime/mime.cc b/src/bincimapmime/mime.cc index 2c866698..9281a9e1 100644 --- a/src/bincimapmime/mime.cc +++ b/src/bincimapmime/mime.cc @@ -23,6 +23,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * -------------------------------------------------------------------- */ +#include "autoconfig.h" + #include #include #include diff --git a/src/common/conf_post.h b/src/common/conf_post.h index 578a85f7..f67cab32 100644 --- a/src/common/conf_post.h +++ b/src/common/conf_post.h @@ -1,9 +1,9 @@ #ifdef _WIN32 -#include "safewindows.h" #ifdef _MSC_VER +#include "safewindows.h" // gmtime is supposedly thread-safe on windows #define gmtime_r(A, B) gmtime(A) #define localtime_r(A,B) localtime(A) @@ -19,6 +19,12 @@ typedef int mode_t; #else // End _MSC_VER -> Gminw +// Allow use of features specific to Windows 7 or later. +#define WINVER 0x0601 +#define _WIN32_WINNT 0x0601 +#define LOGFONTW void +#include "safewindows.h" + #undef RCL_ICONV_INBUF_CONST #define timegm portable_timegm diff --git a/src/index/idxstatus.cpp b/src/index/idxstatus.cpp index 63596c8f..0295038f 100644 --- a/src/index/idxstatus.cpp +++ b/src/index/idxstatus.cpp @@ -14,7 +14,7 @@ * Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ - +#include "autoconfig.h" #include "idxstatus.h" diff --git a/src/internfile/mh_execm.cpp b/src/internfile/mh_execm.cpp index 432529a3..397f759b 100644 --- a/src/internfile/mh_execm.cpp +++ b/src/internfile/mh_execm.cpp @@ -14,6 +14,8 @@ * Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#include "autoconfig.h" + #include #include diff --git a/src/internfile/mh_html.cpp b/src/internfile/mh_html.cpp index d6d60f9e..c94d2d26 100644 --- a/src/internfile/mh_html.cpp +++ b/src/internfile/mh_html.cpp @@ -14,6 +14,7 @@ * Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#include "autoconfig.h" #include "cstr.h" #include "mimehandler.h" diff --git a/src/query/docseqhist.cpp b/src/query/docseqhist.cpp index e579c230..04b22e6d 100644 --- a/src/query/docseqhist.cpp +++ b/src/query/docseqhist.cpp @@ -14,6 +14,8 @@ * Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#include "autoconfig.h" + #include "docseqhist.h" #include diff --git a/src/query/filtseq.cpp b/src/query/filtseq.cpp index 25d26379..f56efc00 100644 --- a/src/query/filtseq.cpp +++ b/src/query/filtseq.cpp @@ -14,6 +14,7 @@ * Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#include "autoconfig.h" #include "log.h" #include "filtseq.h" diff --git a/src/query/plaintorich.cpp b/src/query/plaintorich.cpp index 30bed741..86352b4a 100644 --- a/src/query/plaintorich.cpp +++ b/src/query/plaintorich.cpp @@ -14,6 +14,7 @@ * Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#include "autoconfig.h" #include #include diff --git a/src/query/recollq.cpp b/src/query/recollq.cpp index 645b1973..c91fab9a 100644 --- a/src/query/recollq.cpp +++ b/src/query/recollq.cpp @@ -15,6 +15,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ // Takes a query and run it, no gui, results to stdout +#include "autoconfig.h" #include #include diff --git a/src/query/sortseq.cpp b/src/query/sortseq.cpp index 1bbc1a2e..67bf4759 100644 --- a/src/query/sortseq.cpp +++ b/src/query/sortseq.cpp @@ -14,10 +14,13 @@ * Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#include "autoconfig.h" + +#include "sortseq.h" + #include #include "log.h" -#include "sortseq.h" using std::string; diff --git a/src/rcldb/rcldb.cpp b/src/rcldb/rcldb.cpp index 913ee19f..2445a46c 100644 --- a/src/rcldb/rcldb.cpp +++ b/src/rcldb/rcldb.cpp @@ -1701,7 +1701,7 @@ bool Db::addOrUpdate(const string &udi, const string &parent_udi, Doc &doc) // won't work). time_t mtime = atoll(doc.dmtime.empty() ? doc.fmtime.c_str() : doc.dmtime.c_str()); - struct tm tmb{0}; + struct tm tmb{0,0,0,0,0,0,0,0,0}; localtime_r(&mtime, &tmb); char buf[50]; // It's actually 9, but use 50 to suppress warnings. snprintf(buf, 50, "%04d%02d%02d", diff --git a/src/utils/pathut.cpp b/src/utils/pathut.cpp index d8244bdc..150bbc7d 100644 --- a/src/utils/pathut.cpp +++ b/src/utils/pathut.cpp @@ -119,7 +119,9 @@ using namespace std; #ifdef _WIN32 -#include +//#include +#include + /// Convert \ separators to / void path_slashize(string& s) { diff --git a/src/windows/mkinstdir.sh b/src/windows/mkinstdir.sh index bbbcb34e..3f72ee32 100644 --- a/src/windows/mkinstdir.sh +++ b/src/windows/mkinstdir.sh @@ -22,8 +22,8 @@ test -d $DESTDIR || mkdir $DESTDIR || fatal cant create $DESTDIR ################################ # Local values (to be adjusted) -BUILD=MSVC -#BUILD=MINGW +#BUILD=MSVC +BUILD=MINGW if test $BUILD = MSVC ; then # Recoll src tree @@ -40,14 +40,14 @@ if test $BUILD = MSVC ; then PYRECOLL=${RCL}/python/recoll/ else # Recoll src tree - RCL=c:/recoll/src/ + RCL=/c/recoll/src/ # Recoll dependancies - RCLDEPS=c:/recolldeps/ - QTA=Desktop_Qt_5_8_0_MinGW_32bit-Release/release + RCLDEPS=/c/recolldeps/ + QTA=Desktop_Qt_5_8_0_MinGW_32bit-Release/release/ LIBXAPIAN=${RCLDEPS}/mingw/xapian-core-1.4.11/.libs/libxapian-30.dll ZLIB=${RCLDEPS}/mingw/zlib-1.2.8 QTGCCBIN=C:/qt/Qt5.8.0/Tools/mingw530_32/bin/ - QTBIN=C:/Qt/Qt5.8.0/5.8/mingw53_32/bin + QTBIN=C:/Qt/Qt5.8.0/5.8/mingw53_32/bin/ MINGWBIN=$QTBIN PATH=$MINGWBIN:$QTGCCBIN:$PATH export PATH @@ -132,8 +132,9 @@ copyqt() copypython() { - mkdir -p $DESTDIR/Share/filters/python - rsync -av $PYTHON/* $DESTDIR/Share/filters/python + set -x + mkdir -p ${DESTDIR}Share/filters/python + rsync -av $PYTHON/ ${DESTDIR}Share/filters/python || exit 1 chkcp $PYTHON/python.exe $DESTDIR/Share/filters/python/python.exe chkcp $MISC/hwp5html $FILTERS } @@ -158,7 +159,7 @@ copyrecoll() chkcp $RCL/doc/user/usermanual.html $DESTDIR/Share/doc chkcp $RCL/doc/user/docbook-xsl.css $DESTDIR/Share/doc mkdir -p $DESTDIR/Share/doc/webhelp - rsync -av $RCL/doc/user/webhelp/docs/* $DESTDIR/Share/doc/webhelp + rsync -av $RCL/doc/user/webhelp/docs/* $DESTDIR/Share/doc/webhelp || exit 1 chkcp $RCL/sampleconf/fields $DESTDIR/Share/examples chkcp $RCL/sampleconf/fragbuts.xml $DESTDIR/Share/examples chkcp $RCL/windows/mimeconf $DESTDIR/Share/examples @@ -184,7 +185,7 @@ copyantiword() bindir=$ANTIWORD/ test -d $Filters/Resources || mkdir -p $FILTERS/Resources || exit 1 chkcp $bindir/antiword.exe $FILTERS - rsync -av $ANTIWORD/Resources/* $FILTERS/Resources + rsync -av $ANTIWORD/Resources/* $FILTERS/Resources || exit 1 } copyunrtf() diff --git a/src/windows/qmkrecoll/librecoll.pro b/src/windows/qmkrecoll/librecoll.pro index 99e3e89e..d159ece5 100644 --- a/src/windows/qmkrecoll/librecoll.pro +++ b/src/windows/qmkrecoll/librecoll.pro @@ -143,7 +143,7 @@ windows { $$RECOLLDEPS/mingw/libxml2/libxml2-2.9.4+dfsg1/win32/bin.mingw/libxml2.a \ $$RECOLLDEPS/mingw/xapian-core-1.4.11/.libs/libxapian-30.dll \ $$RECOLLDEPS/mingw/zlib-1.2.8/zlib1.dll \ - -lshell32 -liconv -lshlwapi -lpsapi -lkernel32 + -luuid -luser32 -lshell32 -liconv -lshlwapi -lpsapi -lkernel32 INCLUDEPATH += ../../windows \ $$RECOLLDEPS/mingw/xapian-core-1.4.11/include \ $$RECOLLDEPS/mingw/libxslt/libxslt-1.1.29/ \