Win installer: convert all files to Unicode

- at the moment some files were in Unicode, some in CP1252 which can make unnecessary troubles
- remove an obsolete file
- update InstallerStructure.odg
This commit is contained in:
Uwe Stöhr 2018-02-18 15:52:57 +01:00
parent 946ca59b21
commit 48aae9bcb5
20 changed files with 16 additions and 72 deletions

View File

@ -91,7 +91,6 @@ Win32/packaging/installer/ChangeLog.txt \
Win32/packaging/installer/DictionaryMirrors.txt \ Win32/packaging/installer/DictionaryMirrors.txt \
Win32/packaging/installer/HunspellDictionaryNames.txt \ Win32/packaging/installer/HunspellDictionaryNames.txt \
Win32/packaging/installer/license.rtf \ Win32/packaging/installer/license.rtf \
Win32/packaging/installer/lyx.nsi \
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/Packages.txt \

View File

@ -1,4 +1,4 @@
Function LatexFolder Function LatexFolder
!insertmacro INSTALLOPTIONS_EXTRACT_AS "gui\io_latex.ini" "io_latex.ini" !insertmacro INSTALLOPTIONS_EXTRACT_AS "gui\io_latex.ini" "io_latex.ini"
# generate the installer page # generate the installer page

View File

@ -1,4 +1,4 @@
/* /*
external.nsh external.nsh

View File

@ -1,4 +1,4 @@
/** /**
* EnvVarUpdate.nsh * EnvVarUpdate.nsh
* : Environmental Variables: append, prepend, and remove entries * : Environmental Variables: append, prepend, and remove entries
* *

View File

@ -1,4 +1,4 @@
/* /*
LaTeX.nsh LaTeX.nsh
Handling of LaTeX distributions Handling of LaTeX distributions

View File

@ -1,4 +1,4 @@
# This script contains the following functions: # This script contains the following functions:
# #
# - LaTeXCheck (check installed LaTeX-system), # - LaTeXCheck (check installed LaTeX-system),
# (only used by Small and Complete installer), uses: # (only used by Small and Complete installer), uses:

View File

@ -1,4 +1,4 @@
/* /*
declaration.nsh declaration.nsh

View File

@ -1,4 +1,4 @@
/* /*
detection.nsh detection.nsh

View File

@ -1,4 +1,4 @@
/* /*
dictionaries.nsh dictionaries.nsh
Handling of hunspell / MyThes dictionaries Handling of hunspell / MyThes dictionaries

View File

@ -1,4 +1,4 @@
/* /*
filelist.nsh filelist.nsh

View File

@ -1,4 +1,4 @@
/* /*
gui.nsh gui.nsh

View File

@ -1,4 +1,4 @@
/* /*
nsis.nsh nsis.nsh

View File

@ -1,4 +1,4 @@
/* /*
variables.nsh variables.nsh

View File

@ -1,55 +0,0 @@
/*
NSIS Script - LyX 2.1 Installer for Win32
Authors: Joost Verburg, Angus Leeming, Uwe Stöhr
Compatible with NSIS 2.46
*/
# Do a Cyclic Redundancy Check to make sure the installer
# was not corrupted by the download.
CRCCheck force
#
# Make the installer as small as possible.
SetCompressor /SOLID lzma
# installer settings like version numbers
!include settings.nsh
# declarations of LyX's registry keys and installer variant
!include include\declarations.nsh
# definitions of global variables
!include include\variables.nsh
# configuration of standard NSIS header files
!include include\nsis.nsh
# list of files to be included in the installer
!include include\filelist.nsh
# detect third-party programs like Inkscape and LaTeX
!include include\detection.nsh
# set up the installer pages
!include include\gui.nsh
# sets the install sections and checks the system on starting the un/installer
!include include\init.nsh
# install LyX and needed third-party programs like Python etc.
!include setup\install.nsh
# uninstall LyX and all programs that were installed together with LyX
!include setup\uninstall.nsh
# configure LyX (set start menu and write registry entries)
!include setup\configure.nsh
# provides downloads of external programs
#!include gui\external.nsh
#--------------------------------
# Output file
Outfile "${SETUP_EXE}"

View File

@ -12,7 +12,7 @@ These typically need to be modified for each LyX release
!define APP_VERSION_MAJOR 2 !define APP_VERSION_MAJOR 2
!define APP_VERSION_MINOR 3 !define APP_VERSION_MINOR 3
!define APP_VERSION_REVISION 0 !define APP_VERSION_REVISION 0
!define APP_VERSION_EMERGENCY "RC-2" # use "1" for an emergency release of LyX otherwise "" !define APP_VERSION_EMERGENCY "" # use "1" for an emergency release of LyX otherwise ""
!define APP_EMERGENCY_DOT "" # use "." for an emergency release of LyX otherwise "" !define APP_EMERGENCY_DOT "" # use "." for an emergency release of LyX otherwise ""
!define APP_VERSION_BUILD 1 # Start with 1 for the installer releases of each version !define APP_VERSION_BUILD 1 # Start with 1 for the installer releases of each version

View File

@ -1,4 +1,4 @@
/* /*
configure.nsh configure.nsh

View File

@ -1,4 +1,4 @@
/* /*
install.nsh install.nsh

View File

@ -1,4 +1,4 @@
/* /*
uninstall.nsh uninstall.nsh