Win installer: big file cleanup

- update the file list in Makefile.am
- don't try to build it via CMake because this requires more than CMakeLists.txt. If it should nevertheless be built via CMake the .cmake files need to be rewritten from scratch
- remove unused and outdated files
- update  an SVG file
This commit is contained in:
Uwe Stöhr 2017-11-20 21:05:16 +01:00
parent bdea2c6139
commit 081a9035cf
12 changed files with 50 additions and 270 deletions

View File

@ -522,13 +522,15 @@ else()
endif()
mark_as_advanced(LYX_MAN_DIR)
if(LYX_INSTALL AND WIN32)
message(STATUS "Configuring NSIS files")
configure_file(development/Win32/packaging/installer/lyx.nsi.cmake ${CMAKE_BINARY_DIR}/installer/lyx.nsi @ONLY)
configure_file(development/Win32/packaging/installer/settings.nsh.cmake ${CMAKE_BINARY_DIR}/installer/settings-cmake.nsh @ONLY)
configure_file(development/Win32/packaging/installer/include/declarations.nsh.cmake ${CMAKE_BINARY_DIR}/installer/declarations-cmake.nsh @ONLY)
message(STATUS "NSIS files are created in ${CMAKE_BINARY_DIR}/installer")
endif()
# The Win installer cannot be built by CMake because one needs to install plugins for NSIS
# see the Readme.txt of the installer
#if(LYX_INSTALL AND WIN32)
# message(STATUS "Configuring NSIS files")
# configure_file(development/Win32/packaging/installer/lyx.nsi.cmake ${CMAKE_BINARY_DIR}/installer/lyx.nsi @ONLY)
# configure_file(development/Win32/packaging/installer/settings.nsh.cmake ${CMAKE_BINARY_DIR}/installer/settings-cmake.nsh @ONLY)
# configure_file(development/Win32/packaging/installer/include/declarations.nsh.cmake ${CMAKE_BINARY_DIR}/installer/declarations-cmake.nsh @ONLY)
# message(STATUS "NSIS files are created in ${CMAKE_BINARY_DIR}/installer")
#endif()
if(NOT GROUP_CODE)
#set(GROUP_CODE "The Golden Code")

View File

@ -27,6 +27,7 @@ tools/README \
tools/count_total_lines_of_compiled_code.sh \
tools/count_lines_of_included_code.sh \
tools/lyxeditor \
Win32/packaging/icons/Lydia.svg \
Win32/packaging/icons/lyx_doc.svg \
Win32/packaging/icons/lyx_32x32.png \
Win32/packaging/icons/lyx_doc_32x32.png \
@ -42,9 +43,9 @@ Win32/packaging/installer/gui/external.nsh \
Win32/packaging/installer/gui/io_latex.ini \
Win32/packaging/installer/gui/LaTeXFolder.nsh \
Win32/packaging/installer/include/declarations.nsh \
Win32/packaging/installer/include/declarations.nsh.cmake \
Win32/packaging/installer/include/detection.nsh \
Win32/packaging/installer/include/dictionaries.nsh \
Win32/packaging/installer/include/EnvVarUpdate.nsh \
Win32/packaging/installer/include/filelist.nsh \
Win32/packaging/installer/include/gui.nsh \
Win32/packaging/installer/include/init.nsh \
@ -52,6 +53,11 @@ Win32/packaging/installer/include/LaTeX.nsh \
Win32/packaging/installer/include/LyXUtils.nsh \
Win32/packaging/installer/include/nsis.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/basque.nsh \
Win32/packaging/installer/lang/catalan.nsh \
@ -74,6 +80,7 @@ Win32/packaging/installer/lang/romanian.nsh \
Win32/packaging/installer/lang/slovak.nsh \
Win32/packaging/installer/lang/spanish.nsh \
Win32/packaging/installer/lang/swedish.nsh \
Win32/packaging/installer/lang/TranslatedLanguages.nsh \
Win32/packaging/installer/lang/turkish.nsh \
Win32/packaging/installer/lang/ukrainian.nsh \
Win32/packaging/installer/setup/configure.nsh \
@ -84,11 +91,11 @@ Win32/packaging/installer/DictionaryMirrors.txt \
Win32/packaging/installer/HunspellDictionaryNames.txt \
Win32/packaging/installer/license.rtf \
Win32/packaging/installer/lyx.nsi \
Win32/packaging/installer/lyx.nsi.cmake \
Win32/packaging/installer/lyx-bundle.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.cmake \
Win32/packaging/installer/ThesaurusDictionaryNames.txt \
Win32/pdfview/pdfview.nsi \
Win32/vld/cmake/CMakeLists.txt \

View File

@ -1,23 +1,36 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Sodipodi ("http://www.sodipodi.com/") -->
<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="http://www.w3.org/2000/svg"
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"
id="svg1"
sodipodi:version="0.32"
inkscape:version="0.42.2"
inkscape:version="0.92.2 (5c3e80d, 2017-08-06)"
width="128.00000pt"
height="128.00000pt"
sodipodi:docname="Lydia.svg"
sodipodi:docbase="F:\LyXPackageUsti\icons"
inkscape:export-filename="F:\LyXPackageUsti\icons\Lydia.ico"
inkscape:export-xdpi="18.500000"
inkscape:export-ydpi="18.500000">
inkscape:export-ydpi="18.500000"
version="1.1">
<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
id="defs3">
<linearGradient
@ -393,7 +406,9 @@
inkscape:window-height="721"
inkscape:window-x="-4"
inkscape:window-y="-4"
inkscape:current-layer="svg1" />
inkscape:current-layer="svg1"
showgrid="false"
inkscape:window-maximized="0" />
<g
transform="matrix(1.179090,0.000000,0.000000,1.296631,-18.68231,-19.71797)"
id="g731">
@ -451,7 +466,7 @@
style="fill:#bd3200;fill-rule:evenodd;stroke-width:0.57499999" />
<path
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:rx="8.9068661"
sodipodi:cy="30.108479"
@ -476,7 +491,7 @@
style="fill:url(#linearGradient1525);fill-rule:evenodd;stroke-width:0.57499999" />
<path
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:rx="8.9068661"
sodipodi:cy="30.108479"
@ -486,7 +501,7 @@
sodipodi:type="arc" />
<path
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:rx="5.8530831"
sodipodi:cy="31.126406"
@ -512,7 +527,7 @@
style="fill:#52980f;fill-rule:evenodd;stroke-width:0.57499999" />
<path
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:rx="9.1613474"
sodipodi:cy="35.452599"
@ -522,7 +537,7 @@
sodipodi:type="arc" />
<path
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:rx="9.1613474"
sodipodi:cy="35.452599"
@ -532,7 +547,7 @@
sodipodi:type="arc" />
<path
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:rx="9.1613474"
sodipodi:cy="35.452599"
@ -542,7 +557,7 @@
sodipodi:type="arc" />
<path
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:rx="9.1613474"
sodipodi:cy="35.452599"
@ -552,7 +567,7 @@
sodipodi:type="arc" />
<path
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:rx="6.1075649"
sodipodi:cy="36.216045"
@ -562,7 +577,7 @@
sodipodi:type="arc" />
<path
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:rx="6.1075649"
sodipodi:cy="36.216045"
@ -572,7 +587,7 @@
sodipodi:type="arc" />
<path
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:rx="6.1075649"
sodipodi:cy="36.216045"

Before

Width:  |  Height:  |  Size: 28 KiB

After

Width:  |  Height:  |  Size: 29 KiB

View File

@ -1,52 +0,0 @@
babel-albanian
babel-bahasa
babel-basque
babel-belarusian
babel-bosnian
babel-breton
babel-bulgarian
babel-catalan
babel-croatian
babel-czech
babel-danish
babel-dutch
babel-english
babel-esperanto
babel-estonian
babel-finnish
babel-french
babel-friulan
babel-galician
babel-german
babel-greek
babel-hebrew
babel-hungarian
babel-icelandic
babel-interlingua
babel-irish
babel-italian
babel-kurmanji
babel-latin
babel-latvian
babel-macedonian
babel-norsk
babel-piedmontese
babel-polish
babel-portuges
babel-romanian
babel-romansh
babel-russian
babel-samin
babel-scottish
babel-serbian
babel-serbianc
babel-slovak
babel-slovenian
babel-sorbian
babel-spanish
babel-swedish
babel-thai
babel-turkish
babel-ukrainian
babel-vietnamese
babel-welsh

View File

@ -1,99 +0,0 @@
/*
declaration.nsh
Configuration of LyX installer
*/
SetCompressor /SOLID lzma
#--------------------------------
# File locations
!define FILES_LICENSE "${FILES_INSTALLER}\license.rtf"
!define FILES_ICONS "${FILES_INSTALLER}\..\icons"
!define FILES_PDFVIEW "${FILES_DEPS}\bin"
!define FILES_MSVC "${FILES_DEPS}\bin"
!define FILES_PYTHON "${FILES_DEPS}\python"
!define FILES_IMAGEMAGICK "${FILES_DEPS}\imagemagick"
!define FILES_GHOSTSCRIPT "${FILES_DEPS}\ghostscript"
!define FILES_NETPBM "${FILES_DEPS}\bin"
!define FILES_DTL "${FILES_DEPS}\bin"
!define FILES_DVIPOST "${FILES_DEPS}\bin"
!define FILES_DVIPOST_PKG "${FILES_DEPS}\tex"
!define FILES_PDFTOOLS "${FILES_DEPS}\bin"
!define FILES_METAFILE2EPS "${FILES_DEPS}\bin"
#--------------------------------
# Locations of components to download
# CTAN and SourceForge select a mirror automatically
!define DOWNLOAD_LATEX "http://mirrors.ctan.org/systems/win32/miktex/setup/${SETUPFILE_LATEX}"
#--------------------------------
# Locations of setup files for components (for bundled setup)
!define INSTALL_LATEX "${SETUPFILE_LATEX}"
#--------------------------------
# Names and version
!define APP_NAME "LyX"
!define APP_VERSION_NUMBER "${APP_VERSION_MAJOR}.${APP_VERSION_MINOR}.${APP_VERSION_PATCH}.${APP_VERSION_REVISION}"
!define APP_SERIES_NAME "${APP_VERSION_MAJOR}.${APP_VERSION_MINOR}"
!define APP_SERIES_KEY "${APP_VERSION_MAJOR}${APP_VERSION_MINOR}"
!define APP_DIR "${APP_NAME}${APP_SERIES_KEY}"
!define APP_DIR_USERDATA "${APP_NAME}${APP_SERIES_KEY}"
!define APP_INFO "${APP_NAME} - The Document Processor"
!define APP_COPYRIGHT "LyX is Copyright © 1995 by Matthias Ettrich, 1995-2011 LyX Team"
!define APP_RUN "bin\LyX.exe"
!define APP_REGKEY "Software\${APP_NAME}${APP_SERIES_KEY}"
!define APP_REGKEY_SETUP "Software\${APP_NAME}${APP_SERIES_KEY}\Setup"
!define APP_REGKEY_SETTINGS "Software\${APP_NAME}${APP_SERIES_KEY}\Settings"
!define APP_REGNAME_DOC "LyX.Document"
!define APP_EXT ".lyx"
!define APP_MIME_TYPE "application/lyx"
#--------------------------------
# Setup settings
# Output file name can be configured using command line paramaters like
# /DExeFile=/path/to/installer
!ifndef SETUPTYPE
!define SETUPTYPE STANDARD
!endif
!if ${SETUPTYPE} == STANDARD
!define SETUP_EXE ${ExeFile}
!else if ${SETUPTYPE} == BUNDLE
!define SETUP_EXE ${BundleExeFile}
!define BUNDLESETUP_LATEX
!endif
!define SETUP_ICON "${FILES_ICONS}\lyx.ico"
!define SETUP_HEADERIMAGE "${FILES_INSTALLER}\graphics\header.bmp"
!define SETUP_WIZARDIMAGE "${FILES_INSTALLER}\graphics\wizard.bmp"
!define SETUP_UNINSTALLER "Uninstall-${APP_NAME}.exe"
!define SETUP_UNINSTALLER_KEY "${APP_NAME}${APP_SERIES_KEY}"
#--------------------------------
# Names of binaries to identify compontents
!define BIN_LATEX "tex.exe"
!define BIN_BIBTEXEDITOR "JabRef.exe"
#--------------------------------
# Custom NSIS plug-ins
!addplugindir "${FILES_NSISPLUGINS}"

View File

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

View File

@ -1,13 +0,0 @@
Necessary codepages:
currently:
all files: UTF-8Y
old:
turkish.nsh: ISO-8859-9
czech.nsh, hungarian.nsh, polish.nsh, romanian.nsh, slovak.nsh: Windows cp-1250
japanese.nsh: Shift_JIS
ukrainian.nsh: Windows cp-1251
arabic.nsh: Windows cp-1256
all other files are in Windows cp-1252

View File

@ -1,29 +0,0 @@
/*
NSIS Script - LyX 2.0 Installer for Win32
Authors: Joost Verburg, Angus Leeming, Uwe Stöhr
Compatible with NSIS 2.46
*/
!addincludedir @CMAKE_SOURCE_DIR@/development/Win32/packaging/installer
!include settings-cmake.nsh
!include declarations-cmake.nsh
!include include\variables.nsh
!include include\nsis.nsh
!include include\filelist.nsh
!include include\detection.nsh
!include include\gui.nsh
!include include\init.nsh
!include setup\install.nsh
!include setup\uninstall.nsh
!include setup\configure.nsh
!include gui\external.nsh
!include gui\reinstall.nsh
#--------------------------------
# Output file
Outfile "${SETUP_EXE}"

View File

@ -1,50 +0,0 @@
/*
Settings for LyX installer
These typically need to be modified for each LyX release
*/
#--------------------------------
# Version number
!define APP_VERSION_MAJOR @LYX_MAJOR_VERSION@
!define APP_VERSION_MINOR @LYX_MINOR_VERSION@
!define APP_VERSION_PATCH @LYX_PATCH_VERSION@
!define APP_VERSION_REVISION @LYX_REVISION_VERSION@
#!define APP_VERSION_BUILD 0 # isn't revision number enough?
!define /date APP_VERSION "@LYX_MAJOR_VERSION@.@LYX_MINOR_VERSION@.@LYX_PATCH_VERSION@-@LYX_REVISION_VERSION@" # Version to display
#--------------------------------
# Installer file name
# Typical names for the release are "LyX-2.0.0-1-Installer.exe" etc.
!ifndef ExeFile
!define /date ExeFile "LyX-${APP_VERSION}-Installer.exe"
!endif
!ifndef BundleExeFile
!define /date BundleExeFile "LyX-${APP_VERSION}-Installer-Bundle.exe"
!endif
!ifndef MinimalExeFile
!define /date MinimalExeFile "LyX-${APP_VERSION}-Installer-Minimal.exe"
!endif
#--------------------------------
# File locations
!define FILES_LYX "@CMAKE_INSTALL_PREFIX_ABSOLUTE@"
!define FILES_DEPS "@LYX_DEPENDENCIES_DIR@/deps20"
!define FILES_BUNDLE "@CMAKE_BINARY_DIR@/depsbundle" #TODO Where is it? Where does it comes from?
!define FILES_QT "@QT_INCLUDE_DIR@/.."
!define FILES_INSTALLER "@CMAKE_SOURCE_DIR@/development/Win32/packaging/installer"
#--------------------------------
# MiKTeX
# Sizes in KB
!define SETUPFILE_LATEX "basic-miktex-2.9.4146.exe"
!define SIZE_DOWNLOAD_LATEX 160106
!define SIZE_LATEX 380000