Switch to unified view

a/src/windows/mkinstdir.sh b/src/windows/mkinstdir.sh
...
...
38
LIBXAPIAN=c:/temp/xapian-core-1.2.21/.libs/libxapian-22.dll
38
LIBXAPIAN=c:/temp/xapian-core-1.2.21/.libs/libxapian-22.dll
39
MUTAGEN=C:/temp/mutagen-1.31/
39
MUTAGEN=C:/temp/mutagen-1.31/
40
EPUB=C:/temp/epub-0.5.2
40
EPUB=C:/temp/epub-0.5.2
41
ZLIB=c:/temp/zlib-1.2.8
41
ZLIB=c:/temp/zlib-1.2.8
42
POPPLER=c:/temp/poppler-0.36/
42
POPPLER=c:/temp/poppler-0.36/
43
LIBWPD=c:/temp/libwpd/libwpd-0.10.0/
44
LIBREVENGE=c:/temp/libwpd/librevenge-0.0.1.jfd/
45
CHM=c:/recolldeps/pychm
46
47
# Where to find libgcc_s_dw2-1.dll for progs which need it copied
48
gccpath=`which gcc`
49
MINGWBIN=`dirname $gccpath`
43
50
44
# Where to copy the Qt Dlls from:
51
# Where to copy the Qt Dlls from:
45
QTBIN=C:/Qt/5.5/mingw492_32/bin
52
QTBIN=C:/Qt/5.5/mingw492_32/bin
46
53
47
# Qt arch
54
# Qt arch
...
...
79
86
80
# Note: can't build static recoll as there is no static qtwebkit (ref: 5.5.0)
87
# Note: can't build static recoll as there is no static qtwebkit (ref: 5.5.0)
81
copyqt()
88
copyqt()
82
{
89
{
83
    cd $DESTDIR
90
    cd $DESTDIR
91
    PATH=$QTBIN:$PATH
92
    export PATH
84
    $QTBIN/windeployqt recoll.exe
93
    $QTBIN/windeployqt recoll.exe
85
    chkcp $QTBIN/libwinpthread-1.dll $DESTDIR
94
    chkcp $QTBIN/libwinpthread-1.dll $DESTDIR
95
    chkcp $QTBIN/libstdc++-6.dll $DESTDIR
86
}
96
}
87
97
88
copyxapian()
98
copyxapian()
89
{
99
{
90
    chkcp $LIBXAPIAN $DESTDIR
100
    chkcp $LIBXAPIAN $DESTDIR
...
...
177
    for f in pdftotext.exe libpoppler.dll freetype6.dll jpeg62.dll \
187
    for f in pdftotext.exe libpoppler.dll freetype6.dll jpeg62.dll \
178
             libpng16-16.dll zlib1.dll libtiff3.dll \
188
             libpng16-16.dll zlib1.dll libtiff3.dll \
179
             libgcc_s_dw2-1.dll libstdc++-6.dll; do
189
             libgcc_s_dw2-1.dll libstdc++-6.dll; do
180
        chkcp $POPPLER/bin/$f $FILTERS/poppler
190
        chkcp $POPPLER/bin/$f $FILTERS/poppler
181
    done
191
    done
192
}
193
194
copywpd()
195
{
196
    DEST=$FILTERS/wpd
197
    test -d $DEST || mkdir $DEST || fatal cant create poppler dir $DEST
198
199
    for f in librevenge-0.0.dll librevenge-generators-0.0.dll \
200
             librevenge-stream-0.0.dll; do
201
        chkcp $LIBREVENGE/src/lib/.libs/$f $DEST
202
    done
203
    chkcp $LIBWPD/src/lib/.libs/libwpd-0.10.dll $DEST
204
    chkcp $LIBWPD/src/conv/html/.libs/wpd2html.exe $DEST
205
    chkcp $MINGWBIN/libgcc_s_dw2-1.dll $DEST
206
    chkcp $MINGWBIN/libstdc++-6.dll $DEST
207
    chkcp $ZLIB/zlib1.dll $DEST
208
}
209
copychm()
210
{
211
    DEST=$FILTERS
212
    cp -rp $CHM/chm $DEST || fatal "can't copy pychm"
182
}
213
}
183
214
184
for d in doc examples filters images translations; do
215
for d in doc examples filters images translations; do
185
    test -d $DESTDIR/Share/$d || mkdir -p $DESTDIR/Share/$d || \
216
    test -d $DESTDIR/Share/$d || mkdir -p $DESTDIR/Share/$d || \
186
        fatal mkdir $d failed
217
        fatal mkdir $d failed
...
...
196
copyunrtf
227
copyunrtf
197
copyxslt
228
copyxslt
198
copymutagen
229
copymutagen
199
copyepub
230
copyepub
200
copypyexiv2
231
copypyexiv2
232
copywpd
233
copychm