From 1e33d37c0a26438e6ec3dfac99ea74b45df712bc Mon Sep 17 00:00:00 2001 From: Jean-Francois Dockes Date: Sun, 11 Oct 2015 10:18:39 +0200 Subject: [PATCH] none --- .hgignore | 1 + src/windows/mkinstdir.sh | 24 ++++++++++++++++++++++++ 2 files changed, 25 insertions(+) diff --git a/.hgignore b/.hgignore index b3592592..b6cc9203 100644 --- a/.hgignore +++ b/.hgignore @@ -89,6 +89,7 @@ src/qtgui/.ui/* src/qtgui/Makefile src/qtgui/qrc_recoll.cpp src/qtgui/recoll +src/qtgui/recoll.pro src/qtgui/recoll.app src/sampleconf/rclmon.sh src/sampleconf/recoll.conf diff --git a/src/windows/mkinstdir.sh b/src/windows/mkinstdir.sh index 02647259..35169593 100644 --- a/src/windows/mkinstdir.sh +++ b/src/windows/mkinstdir.sh @@ -25,6 +25,11 @@ PLATFORM=Win32 LIBXAPIAN=c:/recolldeps/xapian/xapian-core-1.2.21/.libs/libxapian-22.dll +MUTAGEN=C:/recolldeps/mutagen-1.31/ + +# Where to copy the Qt Dlls from: +QTBIN=C:/Qt/5.5/mingw492_32/bin + # Qt arch QTA=Desktop_Qt_5_5_0_MinGW_32bit @@ -54,6 +59,19 @@ chkcp() cp $@ || fatal cp $@ failed } +# Note: can't build static recoll as there is no static qtwebkit (ref: 5.5.0) +copyqt() +{ + for dll in Qt5Cored.dll Qt5Guid.dll Qt5MultimediaWidgetsd.dll \ + Qt5Multimediad.dll Qt5Networkd.dll Qt5OpenGLd.dll \ + Qt5Positioningd.dll Qt5PrintSupportd.dll Qt5Qmld.dll Qt5Quickd.dll \ + Qt5Sensorsd.dll Qt5Sqld.dll Qt5WebChanneld.dll Qt5WebKitWidgetsd.dll \ + Qt5WebKitd.dll Qt5Widgetsd.dll Qt5Xmld.dll icudt54.dll \ + icuin54.dll icuuc54.dll ; do + chkcp $QTBIN/$dll $DESTDIR + done +} + copyxapian() { chkcp $LIBXAPIAN $DESTDIR @@ -104,6 +122,12 @@ copyunrtf() chkcp $UNRTF/outputs/SYMBOL.charmap $FILTERS/Share } +copymutagen() +{ + cp -rp $MUTAGEN/build/lib/mutagen $FILTERS + # chkcp to check that mutagen is where we think it is + chkcp $MUTAGEN/build/lib/mutagen/mp3.py $FILTERS/mutagen +} for d in doc examples filters images translations; do test -d $DESTDIR/Share/$d || mkdir -p $DESTDIR/Share/$d || \