tris/recoll
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Windows: small adjustments to installation tree creation script

Browse Source
This commit is contained in:
Jean-Francois Dockes 2019-01-23 14:54:22 +01:00
parent 53fa41189c
commit 5365490d94
1 changed files with 23 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
src/windows/mkinstdir.sh
View File

@ -24,24 +24,27 @@ test -d $DESTDIR || mkdir $DESTDIR || fatal cant create $DESTDIR
# Recoll src tree # Recoll src tree
RCL=c:/recoll/src/ RCL=c:/recoll/src/
RCLW=$RCL/windows/
# Recoll dependancies
RCLDEPS=c:/recolldeps/
ReleaseBuild=y ReleaseBuild=y
PYTHON=c:/recolldeps/python2 PYTHON=${RCLDEPS}python2
UNRTF=c:/recolldeps/unrtf UNRTF=${RCLDEPS}unrtf
ANTIWORD=c:/recolldeps/antiword ANTIWORD=${RCLDEPS}antiword
PYXSLT=C:/recolldeps/pyxslt PYXSLT=${RCLDEPS}pyxslt
PYEXIV2=C:/recolldeps/pyexiv2 PYEXIV2=${RCLDEPS}pyexiv2
#LIBXAPIAN=c:/temp/xapian-core-1.2.21/.libs/libxapian-22.dll LIBXAPIAN=${RCLDEPS}xapian-core-1.4.5/.libs/libxapian-30.dll
LIBXAPIAN=c:/recolldeps/xapian-core-1.4.5/.libs/libxapian-30.dll MUTAGEN=${RCLDEPS}mutagen-1.32/
MUTAGEN=C:/recolldeps/mutagen-1.32/ EPUB=${RCLDEPS}epub-0.5.2
EPUB=C:/recolldeps/epub-0.5.2 FUTURE=${RCLDEPS}python2-future
FUTURE=C:/recolldeps/python2-future ZLIB=${RCLDEPS}zlib-1.2.8
ZLIB=c:/recolldeps/zlib-1.2.8 POPPLER=${RCLDEPS}poppler-0.36/
POPPLER=c:/recolldeps/poppler-0.36/ LIBWPD=${RCLDEPS}libwpd/libwpd-0.10.0/
LIBWPD=c:/recolldeps/libwpd/libwpd-0.10.0/ LIBREVENGE=${RCLDEPS}libwpd/librevenge-0.0.1.jfd/
LIBREVENGE=c:/recolldeps/libwpd/librevenge-0.0.1.jfd/ CHM=${RCLDEPS}pychm
CHM=c:/recolldeps/pychm MISC=${RCLDEPS}misc
# Where to find libgcc_s_dw2-1.dll for progs which need it copied # Where to find libgcc_s_dw2-1.dll for progs which need it copied
gccpath=`which gcc` gccpath=`which gcc`
@ -53,8 +56,6 @@ QTBIN=C:/Qt/Qt5.8.0/5.8/mingw53_32/bin
# Qt arch # Qt arch
QTA=Desktop_Qt_5_8_0_MinGW_32bit QTA=Desktop_Qt_5_8_0_MinGW_32bit
RCLW=$RCL/windows/
if test X$ReleaseBuild = X'y'; then if test X$ReleaseBuild = X'y'; then
qtsdir=release qtsdir=release
else else
@ -118,7 +119,8 @@ copyzlib()
} }
copypython() copypython()
{ {
cp -rp $PYTHON $DESTDIR/Share/filters mkdir -p $DESTDIR/Share/filters/python
cp -rp $PYTHON/* $DESTDIR/Share/filters/python
chkcp $PYTHON/python.exe $DESTDIR/Share/filters/python/python.exe chkcp $PYTHON/python.exe $DESTDIR/Share/filters/python/python.exe
} }
copyrecoll() copyrecoll()
@ -174,9 +176,8 @@ copyunrtf()
chkcp $bindir/unrtf.exe $FILTERS chkcp $bindir/unrtf.exe $FILTERS
chkcp $UNRTF/outputs/*.conf $FILTERS/Share chkcp $UNRTF/outputs/*.conf $FILTERS/Share
chkcp $UNRTF/outputs/SYMBOL.charmap $FILTERS/Share chkcp $UNRTF/outputs/SYMBOL.charmap $FILTERS/Share
# libiconv2 is not present in qt, get it from mingw direct. is C, should # libiconv-2 originally comes from mingw
# be compatible chkcp $MISC/libiconv-2.dll $FILTERS
chkcp c:/MinGW/bin/libiconv-2.dll $FILTERS
} }
copymutagen() copymutagen()
@ -194,7 +195,7 @@ copyepub()
} }
# We used to copy the future module to the filters dir, but it is now # We used to copy the future module to the filters dir, but it is now
# part of the Python installation we copy (2 dirs: # part of the origin Python tree in recolldeps. (2 dirs:
# site-packages/builtins, site-packages/future) # site-packages/builtins, site-packages/future)
copyfuture() copyfuture()
{ {