Win installer: backport some of the recent changes

This commit is contained in:
Uwe Stöhr 2017-11-20 21:19:12 +01:00
parent 324a0679ee
commit 778ebb3953
7 changed files with 44 additions and 18 deletions

View File

@ -28,6 +28,7 @@ tools/README \
tools/count_total_lines_of_compiled_code.sh \ tools/count_total_lines_of_compiled_code.sh \
tools/count_lines_of_included_code.sh \ tools/count_lines_of_included_code.sh \
tools/lyxeditor \ tools/lyxeditor \
Win32/packaging/icons/Lydia.svg \
Win32/packaging/icons/lyx_doc.svg \ Win32/packaging/icons/lyx_doc.svg \
Win32/packaging/icons/lyx_32x32.png \ Win32/packaging/icons/lyx_32x32.png \
Win32/packaging/icons/lyx_doc_32x32.png \ Win32/packaging/icons/lyx_doc_32x32.png \
@ -46,6 +47,7 @@ Win32/packaging/installer/include/declarations.nsh \
Win32/packaging/installer/include/declarations.nsh.cmake \ Win32/packaging/installer/include/declarations.nsh.cmake \
Win32/packaging/installer/include/detection.nsh \ Win32/packaging/installer/include/detection.nsh \
Win32/packaging/installer/include/dictionaries.nsh \ Win32/packaging/installer/include/dictionaries.nsh \
Win32/packaging/installer/include/EnvVarUpdate.nsh \
Win32/packaging/installer/include/filelist.nsh \ Win32/packaging/installer/include/filelist.nsh \
Win32/packaging/installer/include/gui.nsh \ Win32/packaging/installer/include/gui.nsh \
Win32/packaging/installer/include/init.nsh \ Win32/packaging/installer/include/init.nsh \
@ -53,6 +55,11 @@ Win32/packaging/installer/include/LaTeX.nsh \
Win32/packaging/installer/include/LyXUtils.nsh \ Win32/packaging/installer/include/LyXUtils.nsh \
Win32/packaging/installer/include/nsis.nsh \ Win32/packaging/installer/include/nsis.nsh \
Win32/packaging/installer/include/variables.nsh \ Win32/packaging/installer/include/variables.nsh \
Win32/packaging/installer/information/InstallerStructure.odg \
Win32/packaging/installer/information/InstallerStructure.pdf \
Win32/packaging/installer/information/ISO_3166.html \
Win32/packaging/installer/information/iso639.htm \
Win32/packaging/installer/information/WinLangCode.htm \
Win32/packaging/installer/lang/arabic.nsh \ Win32/packaging/installer/lang/arabic.nsh \
Win32/packaging/installer/lang/basque.nsh \ Win32/packaging/installer/lang/basque.nsh \
Win32/packaging/installer/lang/catalan.nsh \ Win32/packaging/installer/lang/catalan.nsh \
@ -75,6 +82,7 @@ Win32/packaging/installer/lang/romanian.nsh \
Win32/packaging/installer/lang/slovak.nsh \ Win32/packaging/installer/lang/slovak.nsh \
Win32/packaging/installer/lang/spanish.nsh \ Win32/packaging/installer/lang/spanish.nsh \
Win32/packaging/installer/lang/swedish.nsh \ Win32/packaging/installer/lang/swedish.nsh \
Win32/packaging/installer/lang/TranslatedLanguages.nsh \
Win32/packaging/installer/lang/turkish.nsh \ Win32/packaging/installer/lang/turkish.nsh \
Win32/packaging/installer/lang/ukrainian.nsh \ Win32/packaging/installer/lang/ukrainian.nsh \
Win32/packaging/installer/setup/configure.nsh \ Win32/packaging/installer/setup/configure.nsh \
@ -88,6 +96,8 @@ Win32/packaging/installer/lyx.nsi \
Win32/packaging/installer/lyx.nsi.cmake \ Win32/packaging/installer/lyx.nsi.cmake \
Win32/packaging/installer/lyx-bundle.nsi \ Win32/packaging/installer/lyx-bundle.nsi \
Win32/packaging/installer/lyx-standard.nsi \ Win32/packaging/installer/lyx-standard.nsi \
Win32/packaging/installer/Packages.txt \
Win32/packaging/installer/Readme.txt \
Win32/packaging/installer/settings.nsh \ Win32/packaging/installer/settings.nsh \
Win32/packaging/installer/settings.nsh.cmake \ Win32/packaging/installer/settings.nsh.cmake \
Win32/packaging/installer/ThesaurusDictionaryNames.txt \ Win32/packaging/installer/ThesaurusDictionaryNames.txt \

View File

@ -1,23 +1,36 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?> <?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Sodipodi ("http://www.sodipodi.com/") --> <!-- Created with Sodipodi ("http://www.sodipodi.com/") -->
<svg <svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg"
xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
id="svg1" id="svg1"
sodipodi:version="0.32" sodipodi:version="0.32"
inkscape:version="0.42.2" inkscape:version="0.92.2 (5c3e80d, 2017-08-06)"
width="128.00000pt" width="128.00000pt"
height="128.00000pt" height="128.00000pt"
sodipodi:docname="Lydia.svg" sodipodi:docname="Lydia.svg"
sodipodi:docbase="F:\LyXPackageUsti\icons"
inkscape:export-filename="F:\LyXPackageUsti\icons\Lydia.ico" inkscape:export-filename="F:\LyXPackageUsti\icons\Lydia.ico"
inkscape:export-xdpi="18.500000" inkscape:export-xdpi="18.500000"
inkscape:export-ydpi="18.500000"> inkscape:export-ydpi="18.500000"
version="1.1">
<metadata <metadata
id="metadata126" /> id="metadata126">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
</cc:Work>
</rdf:RDF>
</metadata>
<defs <defs
id="defs3"> id="defs3">
<linearGradient <linearGradient
@ -393,7 +406,9 @@
inkscape:window-height="721" inkscape:window-height="721"
inkscape:window-x="-4" inkscape:window-x="-4"
inkscape:window-y="-4" inkscape:window-y="-4"
inkscape:current-layer="svg1" /> inkscape:current-layer="svg1"
showgrid="false"
inkscape:window-maximized="0" />
<g <g
transform="matrix(1.179090,0.000000,0.000000,1.296631,-18.68231,-19.71797)" transform="matrix(1.179090,0.000000,0.000000,1.296631,-18.68231,-19.71797)"
id="g731"> id="g731">
@ -451,7 +466,7 @@
style="fill:#bd3200;fill-rule:evenodd;stroke-width:0.57499999" /> style="fill:#bd3200;fill-rule:evenodd;stroke-width:0.57499999" />
<path <path
transform="matrix(1.726901,0.000000,0.000000,1.726901,-13.97865,2.029577)" transform="matrix(1.726901,0.000000,0.000000,1.726901,-13.97865,2.029577)"
d="M 70.491480 30.108479 A 8.9068661 8.9068661 0 1 1 52.677748,30.108479 A 8.9068661 8.9068661 0 1 1 70.491480 30.108479 z" d="m 70.49148,30.108479 a 8.9068661,8.9068661 0 0 1 -8.906866,8.906866 8.9068661,8.9068661 0 0 1 -8.906866,-8.906866 8.9068661,8.9068661 0 0 1 8.906866,-8.906867 8.9068661,8.9068661 0 0 1 8.906866,8.906867 z"
sodipodi:ry="8.9068661" sodipodi:ry="8.9068661"
sodipodi:rx="8.9068661" sodipodi:rx="8.9068661"
sodipodi:cy="30.108479" sodipodi:cy="30.108479"
@ -476,7 +491,7 @@
style="fill:url(#linearGradient1525);fill-rule:evenodd;stroke-width:0.57499999" /> style="fill:url(#linearGradient1525);fill-rule:evenodd;stroke-width:0.57499999" />
<path <path
transform="matrix(1.389462,0.000000,0.000000,1.389462,7.172151,12.65069)" transform="matrix(1.389462,0.000000,0.000000,1.389462,7.172151,12.65069)"
d="M 70.491480 30.108479 A 8.9068661 8.9068661 0 1 1 52.677748,30.108479 A 8.9068661 8.9068661 0 1 1 70.491480 30.108479 z" d="m 70.49148,30.108479 a 8.9068661,8.9068661 0 0 1 -8.906866,8.906866 8.9068661,8.9068661 0 0 1 -8.906866,-8.906866 8.9068661,8.9068661 0 0 1 8.906866,-8.906867 8.9068661,8.9068661 0 0 1 8.906866,8.906867 z"
sodipodi:ry="8.9068661" sodipodi:ry="8.9068661"
sodipodi:rx="8.9068661" sodipodi:rx="8.9068661"
sodipodi:cy="30.108479" sodipodi:cy="30.108479"
@ -486,7 +501,7 @@
sodipodi:type="arc" /> sodipodi:type="arc" />
<path <path
transform="matrix(1.429954,0.000000,0.000000,1.429954,6.286480,10.63843)" transform="matrix(1.429954,0.000000,0.000000,1.429954,6.286480,10.63843)"
d="M 67.437697 31.126406 A 5.8530831 5.8530831 0 1 1 55.731531,31.126406 A 5.8530831 5.8530831 0 1 1 67.437697 31.126406 z" d="m 67.437697,31.126406 a 5.8530831,5.8530831 0 0 1 -5.853083,5.853083 5.8530831,5.8530831 0 0 1 -5.853083,-5.853083 5.8530831,5.8530831 0 0 1 5.853083,-5.853083 5.8530831,5.8530831 0 0 1 5.853083,5.853083 z"
sodipodi:ry="5.8530831" sodipodi:ry="5.8530831"
sodipodi:rx="5.8530831" sodipodi:rx="5.8530831"
sodipodi:cy="31.126406" sodipodi:cy="31.126406"
@ -512,7 +527,7 @@
style="fill:#52980f;fill-rule:evenodd;stroke-width:0.57499999" /> style="fill:#52980f;fill-rule:evenodd;stroke-width:0.57499999" />
<path <path
transform="matrix(1.318402,0.000000,0.000000,1.318402,36.93339,7.749206)" transform="matrix(1.318402,0.000000,0.000000,1.318402,36.93339,7.749206)"
d="M 51.150857 35.452599 A 9.1613474 9.1613474 0 1 1 32.828162,35.452599 A 9.1613474 9.1613474 0 1 1 51.150857 35.452599 z" d="m 51.150857,35.452599 a 9.1613474,9.1613474 0 0 1 -9.161347,9.161347 9.1613474,9.1613474 0 0 1 -9.161348,-9.161347 9.1613474,9.1613474 0 0 1 9.161348,-9.161348 9.1613474,9.1613474 0 0 1 9.161347,9.161348 z"
sodipodi:ry="9.1613474" sodipodi:ry="9.1613474"
sodipodi:rx="9.1613474" sodipodi:rx="9.1613474"
sodipodi:cy="35.452599" sodipodi:cy="35.452599"
@ -522,7 +537,7 @@
sodipodi:type="arc" /> sodipodi:type="arc" />
<path <path
transform="matrix(1.671651,0.000000,0.000000,1.671651,-3.918064,5.232760)" transform="matrix(1.671651,0.000000,0.000000,1.671651,-3.918064,5.232760)"
d="M 51.150857 35.452599 A 9.1613474 9.1613474 0 1 1 32.828162,35.452599 A 9.1613474 9.1613474 0 1 1 51.150857 35.452599 z" d="m 51.150857,35.452599 a 9.1613474,9.1613474 0 0 1 -9.161347,9.161347 9.1613474,9.1613474 0 0 1 -9.161348,-9.161347 9.1613474,9.1613474 0 0 1 9.161348,-9.161348 9.1613474,9.1613474 0 0 1 9.161347,9.161348 z"
sodipodi:ry="9.1613474" sodipodi:ry="9.1613474"
sodipodi:rx="9.1613474" sodipodi:rx="9.1613474"
sodipodi:cy="35.452599" sodipodi:cy="35.452599"
@ -532,7 +547,7 @@
sodipodi:type="arc" /> sodipodi:type="arc" />
<path <path
transform="matrix(1.318402,0.000000,0.000000,1.318402,11.09669,17.21056)" transform="matrix(1.318402,0.000000,0.000000,1.318402,11.09669,17.21056)"
d="M 51.150857 35.452599 A 9.1613474 9.1613474 0 1 1 32.828162,35.452599 A 9.1613474 9.1613474 0 1 1 51.150857 35.452599 z" d="m 51.150857,35.452599 a 9.1613474,9.1613474 0 0 1 -9.161347,9.161347 9.1613474,9.1613474 0 0 1 -9.161348,-9.161347 9.1613474,9.1613474 0 0 1 9.161348,-9.161348 9.1613474,9.1613474 0 0 1 9.161347,9.161348 z"
sodipodi:ry="9.1613474" sodipodi:ry="9.1613474"
sodipodi:rx="9.1613474" sodipodi:rx="9.1613474"
sodipodi:cy="35.452599" sodipodi:cy="35.452599"
@ -542,7 +557,7 @@
sodipodi:type="arc" /> sodipodi:type="arc" />
<path <path
transform="matrix(1.318402,0.000000,0.000000,1.318402,11.09667,16.84664)" transform="matrix(1.318402,0.000000,0.000000,1.318402,11.09667,16.84664)"
d="M 51.150857 35.452599 A 9.1613474 9.1613474 0 1 1 32.828162,35.452599 A 9.1613474 9.1613474 0 1 1 51.150857 35.452599 z" d="m 51.150857,35.452599 a 9.1613474,9.1613474 0 0 1 -9.161347,9.161347 9.1613474,9.1613474 0 0 1 -9.161348,-9.161347 9.1613474,9.1613474 0 0 1 9.161348,-9.161348 9.1613474,9.1613474 0 0 1 9.161347,9.161348 z"
sodipodi:ry="9.1613474" sodipodi:ry="9.1613474"
sodipodi:rx="9.1613474" sodipodi:rx="9.1613474"
sodipodi:cy="35.452599" sodipodi:cy="35.452599"
@ -552,7 +567,7 @@
sodipodi:type="arc" /> sodipodi:type="arc" />
<path <path
transform="matrix(1.429954,0.000000,0.000000,1.429954,6.971427,11.22306)" transform="matrix(1.429954,0.000000,0.000000,1.429954,6.971427,11.22306)"
d="M 48.351557 36.216045 A 6.1075649 6.1075649 0 1 1 36.136427,36.216045 A 6.1075649 6.1075649 0 1 1 48.351557 36.216045 z" d="m 48.351557,36.216045 a 6.1075649,6.1075649 0 0 1 -6.107565,6.107565 6.1075649,6.1075649 0 0 1 -6.107565,-6.107565 6.1075649,6.1075649 0 0 1 6.107565,-6.107565 6.1075649,6.1075649 0 0 1 6.107565,6.107565 z"
sodipodi:ry="6.1075649" sodipodi:ry="6.1075649"
sodipodi:rx="6.1075649" sodipodi:rx="6.1075649"
sodipodi:cy="36.216045" sodipodi:cy="36.216045"
@ -562,7 +577,7 @@
sodipodi:type="arc" /> sodipodi:type="arc" />
<path <path
transform="matrix(1.099494,0.000000,0.000000,1.099494,18.05623,20.13574)" transform="matrix(1.099494,0.000000,0.000000,1.099494,18.05623,20.13574)"
d="M 48.351557 36.216045 A 6.1075649 6.1075649 0 1 1 36.136427,36.216045 A 6.1075649 6.1075649 0 1 1 48.351557 36.216045 z" d="m 48.351557,36.216045 a 6.1075649,6.1075649 0 0 1 -6.107565,6.107565 6.1075649,6.1075649 0 0 1 -6.107565,-6.107565 6.1075649,6.1075649 0 0 1 6.107565,-6.107565 6.1075649,6.1075649 0 0 1 6.107565,6.107565 z"
sodipodi:ry="6.1075649" sodipodi:ry="6.1075649"
sodipodi:rx="6.1075649" sodipodi:rx="6.1075649"
sodipodi:cy="36.216045" sodipodi:cy="36.216045"
@ -572,7 +587,7 @@
sodipodi:type="arc" /> sodipodi:type="arc" />
<path <path
transform="matrix(1.099494,0.000000,0.000000,1.099494,44.87933,12.47874)" transform="matrix(1.099494,0.000000,0.000000,1.099494,44.87933,12.47874)"
d="M 48.351557 36.216045 A 6.1075649 6.1075649 0 1 1 36.136427,36.216045 A 6.1075649 6.1075649 0 1 1 48.351557 36.216045 z" d="m 48.351557,36.216045 a 6.1075649,6.1075649 0 0 1 -6.107565,6.107565 6.1075649,6.1075649 0 0 1 -6.107565,-6.107565 6.1075649,6.1075649 0 0 1 6.107565,-6.107565 6.1075649,6.1075649 0 0 1 6.107565,6.107565 z"
sodipodi:ry="6.1075649" sodipodi:ry="6.1075649"
sodipodi:rx="6.1075649" sodipodi:rx="6.1075649"
sodipodi:cy="36.216045" sodipodi:cy="36.216045"

Before

Width:  |  Height:  |  Size: 28 KiB

After

Width:  |  Height:  |  Size: 29 KiB

View File

@ -247,7 +247,6 @@ fontawesome
mwcls mwcls
paper paper
powerdot powerdot
pst-grad
koma-script koma-script
revtex revtex
textcase textcase
@ -256,6 +255,7 @@ sciposter
boxedminipage boxedminipage
seminar seminar
multido multido
niceframe-type1
pst-3d pst-3d
pst-arrow pst-arrow
pst-fr3d pst-fr3d
@ -263,9 +263,11 @@ pst-math
pst-node pst-node
pst-ovl pst-ovl
pst-plot pst-plot
pst-grad
pst-slpe pst-slpe
pst-tools pst-tools
pstricks-add pstricks-add
xetex-pstricks
simplecv simplecv
spie spie
cite cite

View File

@ -1 +0,0 @@
http://msdn.microsoft.com/en-en/goglobal/bb964654.aspx