Switch to unified view

a/src/windows/mkinstdir.sh b/src/windows/mkinstdir.sh
...
...
49
49
50
RCLW=$RCL/windows/
50
RCLW=$RCL/windows/
51
51
52
if test X$ReleaseBuild = X'y'; then
52
if test X$ReleaseBuild = X'y'; then
53
    qtsdir=release
53
    qtsdir=release
54
    qtlibsuff=
55
else
54
else
56
    qtsdir=debug
55
    qtsdir=debug
57
    qtlibsuff=d
58
fi
56
fi
59
LIBR=$RCLW/build-librecoll-${QTA}-${qtsdir}/${qtsdir}/librecoll.dll
57
LIBR=$RCLW/build-librecoll-${QTA}-${qtsdir}/${qtsdir}/librecoll.dll
60
GUIBIN=$RCL/build-recoll-win-${QTA}-${qtsdir}/${qtsdir}/recoll.exe
58
GUIBIN=$RCL/build-recoll-win-${QTA}-${qtsdir}/${qtsdir}/recoll.exe
61
RCLIDX=$RCLW/build-recollindex-${QTA}-${qtsdir}/${qtsdir}/recollindex.exe
59
RCLIDX=$RCLW/build-recollindex-${QTA}-${qtsdir}/${qtsdir}/recollindex.exe
62
RCLQ=$RCLW/build-recollq-${QTA}-${qtsdir}/${qtsdir}/recollq.exe
60
RCLQ=$RCLW/build-recollq-${QTA}-${qtsdir}/${qtsdir}/recollq.exe
...
...
80
}
78
}
81
79
82
# Note: can't build static recoll as there is no static qtwebkit (ref: 5.5.0)
80
# Note: can't build static recoll as there is no static qtwebkit (ref: 5.5.0)
83
copyqt()
81
copyqt()
84
{
82
{
85
    for dll in Qt5Core${qtlibsuff}.dll Qt5Gui${qtlibsuff}.dll \
83
    cd $DESTDIR
86
        Qt5MultimediaWidgets${qtlibsuff}.dll \
84
    $QTBIN/windeployqt recoll.exe
87
        Qt5Multimedia${qtlibsuff}.dll Qt5Network${qtlibsuff}.dll \
88
        Qt5OpenGL${qtlibsuff}.dll Qt5Positioning${qtlibsuff}.dll \
89
        Qt5PrintSupport${qtlibsuff}.dll Qt5Qml${qtlibsuff}.dll \
90
        Qt5Quick${qtlibsuff}.dll Qt5Sensors${qtlibsuff}.dll \
91
        Qt5Sql${qtlibsuff}.dll Qt5WebChannel${qtlibsuff}.dll \
92
        Qt5WebKitWidgets${qtlibsuff}.dll Qt5WebKit${qtlibsuff}.dll \
93
        Qt5Widgets${qtlibsuff}.dll Qt5Xml${qtlibsuff}.dll icudt54.dll \
94
        icuin54.dll icuuc54.dll libgcc_s_dw2-1.dll libwinpthread-1.dll \
95
        libstdc++-6.dll ; do 
96
        chkcp $QTBIN/$dll $DESTDIR
97
    done
98
}
85
}
99
86
100
copyxapian()
87
copyxapian()
101
{
88
{
102
    chkcp $LIBXAPIAN $DESTDIR
89
    chkcp $LIBXAPIAN $DESTDIR
...
...
178
copyxslt()
165
copyxslt()
179
{
166
{
180
    chkcp $PYXSLT/libxslt.py $FILTERS/
167
    chkcp $PYXSLT/libxslt.py $FILTERS/
181
    cp -rp $PYXSLT/* $FILTERS
168
    cp -rp $PYXSLT/* $FILTERS
182
}
169
}
170
183
copypoppler()
171
copypoppler()
184
{
172
{
185
    for f in pdftotext.exe libpoppler.dll freetype6.dll jpeg62.dll \
173
    for f in pdftotext.exe libpoppler.dll freetype6.dll jpeg62.dll \
186
             libpng16-16.dll zlib1.dll libtiff3.dll \
174
             libpng16-16.dll zlib1.dll libtiff3.dll \
187
             libgcc_s_dw2-1.dll libstdc++-6.dll; do
175
             libgcc_s_dw2-1.dll libstdc++-6.dll; do
188
        chkcp $POPPLER/bin/$f $FILTERS/
176
        chkcp $POPPLER/bin/$f $FILTERS/
189
    done
177
    done
190
}
178
}
191
179
192
193
194
for d in doc examples filters images translations; do
180
for d in doc examples filters images translations; do
195
    test -d $DESTDIR/Share/$d || mkdir -p $DESTDIR/Share/$d || \
181
    test -d $DESTDIR/Share/$d || mkdir -p $DESTDIR/Share/$d || \
196
        fatal mkdir $d failed
182
        fatal mkdir $d failed
197
done
183
done
198
184
185
# copyrecoll must stay before copyqt so that windeployqt can do its thing
186
copyrecoll
199
copyqt
187
copyqt
200
copyxapian
188
copyxapian
201
copyzlib
189
copyzlib
202
copyrecoll
203
copypoppler
190
copypoppler
204
copyantiword
191
copyantiword
205
copyunrtf
192
copyunrtf
206
copyxslt
193
copyxslt
207
copymutagen
194
copymutagen