commit 48aae9bcb587dc6fd87da22511489a6eb3e143aa
Author: Uwe Stöhr <uwesto...@lyx.org>
Date: Sun Feb 18 15:52:57 2018 +0100
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
---
development/Makefile.am | 1 -
.../Win32/packaging/installer/gui/LaTeXFolder.nsh | 2 +-
.../Win32/packaging/installer/gui/external.nsh | 2 +-
.../packaging/installer/include/EnvVarUpdate.nsh | 2 +-
.../Win32/packaging/installer/include/LaTeX.nsh | 2 +-
.../Win32/packaging/installer/include/LyXUtils.nsh | 2 +-
.../packaging/installer/include/declarations.nsh | 2 +-
.../packaging/installer/include/detection.nsh | 2 +-
.../packaging/installer/include/dictionaries.nsh | 2 +-
.../Win32/packaging/installer/include/filelist.nsh | 2 +-
.../Win32/packaging/installer/include/gui.nsh | 2 +-
.../Win32/packaging/installer/include/nsis.nsh | 2 +-
.../packaging/installer/include/variables.nsh | 2 +-
.../installer/information/InstallerStructure.odg | Bin 17038 -> 18284 bytes
.../installer/information/InstallerStructure.pdf | Bin 27492 -> 37336 bytes
development/Win32/packaging/installer/lyx.nsi | 55 --------------------
development/Win32/packaging/installer/settings.nsh | 2 +-
.../Win32/packaging/installer/setup/configure.nsh | 2 +-
.../Win32/packaging/installer/setup/install.nsh | 2 +-
.../Win32/packaging/installer/setup/uninstall.nsh | 2 +-
20 files changed, 16 insertions(+), 72 deletions(-)
diff --git a/development/Makefile.am b/development/Makefile.am
index 0a1b3df..ec5a94f 100644
--- a/development/Makefile.am
+++ b/development/Makefile.am
@@ -91,7 +91,6 @@ Win32/packaging/installer/ChangeLog.txt \
Win32/packaging/installer/DictionaryMirrors.txt \
Win32/packaging/installer/HunspellDictionaryNames.txt \
Win32/packaging/installer/license.rtf \
-Win32/packaging/installer/lyx.nsi \
Win32/packaging/installer/lyx-bundle.nsi \
Win32/packaging/installer/lyx-standard.nsi \
Win32/packaging/installer/Packages.txt \
diff --git a/development/Win32/packaging/installer/gui/LaTeXFolder.nsh
b/development/Win32/packaging/installer/gui/LaTeXFolder.nsh
index 0ab0e8c..2041727 100644
--- a/development/Win32/packaging/installer/gui/LaTeXFolder.nsh
+++ b/development/Win32/packaging/installer/gui/LaTeXFolder.nsh
@@ -1,4 +1,4 @@
-Function LatexFolder
+Function LatexFolder
!insertmacro INSTALLOPTIONS_EXTRACT_AS "gui\io_latex.ini" "io_latex.ini"
# generate the installer page
diff --git a/development/Win32/packaging/installer/gui/external.nsh
b/development/Win32/packaging/installer/gui/external.nsh
index 003a582..b2aa949 100644
--- a/development/Win32/packaging/installer/gui/external.nsh
+++ b/development/Win32/packaging/installer/gui/external.nsh
@@ -1,4 +1,4 @@
-/*
+/*
external.nsh
diff --git a/development/Win32/packaging/installer/include/EnvVarUpdate.nsh
b/development/Win32/packaging/installer/include/EnvVarUpdate.nsh
index 974bc67..12de15f 100644
--- a/development/Win32/packaging/installer/include/EnvVarUpdate.nsh
+++ b/development/Win32/packaging/installer/include/EnvVarUpdate.nsh
@@ -1,4 +1,4 @@
-/**
+/**
* EnvVarUpdate.nsh
* : Environmental Variables: append, prepend, and remove entries
*
diff --git a/development/Win32/packaging/installer/include/LaTeX.nsh
b/development/Win32/packaging/installer/include/LaTeX.nsh
index ecb82b4..63de0e1 100644
--- a/development/Win32/packaging/installer/include/LaTeX.nsh
+++ b/development/Win32/packaging/installer/include/LaTeX.nsh
@@ -1,4 +1,4 @@
-/*
+/*
LaTeX.nsh
Handling of LaTeX distributions
diff --git a/development/Win32/packaging/installer/include/LyXUtils.nsh
b/development/Win32/packaging/installer/include/LyXUtils.nsh
index c513b3b..ee3a471 100644
--- a/development/Win32/packaging/installer/include/LyXUtils.nsh
+++ b/development/Win32/packaging/installer/include/LyXUtils.nsh
@@ -1,4 +1,4 @@
-# This script contains the following functions:
+# This script contains the following functions:
#
# - LaTeXCheck (check installed LaTeX-system),
# (only used by Small and Complete installer), uses:
diff --git a/development/Win32/packaging/installer/include/declarations.nsh
b/development/Win32/packaging/installer/include/declarations.nsh
index 82d428c..d3ae07f 100644
--- a/development/Win32/packaging/installer/include/declarations.nsh
+++ b/development/Win32/packaging/installer/include/declarations.nsh
@@ -1,4 +1,4 @@
-/*
+/*
declaration.nsh
diff --git a/development/Win32/packaging/installer/include/detection.nsh
b/development/Win32/packaging/installer/include/detection.nsh
index 5fd7011..493f03f 100644
--- a/development/Win32/packaging/installer/include/detection.nsh
+++ b/development/Win32/packaging/installer/include/detection.nsh
@@ -1,4 +1,4 @@
-/*
+/*
detection.nsh
diff --git a/development/Win32/packaging/installer/include/dictionaries.nsh
b/development/Win32/packaging/installer/include/dictionaries.nsh
index 415b19c..0247177 100644
--- a/development/Win32/packaging/installer/include/dictionaries.nsh
+++ b/development/Win32/packaging/installer/include/dictionaries.nsh
@@ -1,4 +1,4 @@
-/*
+/*
dictionaries.nsh
Handling of hunspell / MyThes dictionaries
diff --git a/development/Win32/packaging/installer/include/filelist.nsh
b/development/Win32/packaging/installer/include/filelist.nsh
index aede99d..c2c7827 100644
--- a/development/Win32/packaging/installer/include/filelist.nsh
+++ b/development/Win32/packaging/installer/include/filelist.nsh
@@ -1,4 +1,4 @@
-/*
+/*
filelist.nsh
diff --git a/development/Win32/packaging/installer/include/gui.nsh
b/development/Win32/packaging/installer/include/gui.nsh
index b077677..04fd530 100644
--- a/development/Win32/packaging/installer/include/gui.nsh
+++ b/development/Win32/packaging/installer/include/gui.nsh
@@ -1,4 +1,4 @@
-/*
+/*
gui.nsh
diff --git a/development/Win32/packaging/installer/include/nsis.nsh
b/development/Win32/packaging/installer/include/nsis.nsh
index 5e6b513..e04d177 100644
--- a/development/Win32/packaging/installer/include/nsis.nsh
+++ b/development/Win32/packaging/installer/include/nsis.nsh
@@ -1,4 +1,4 @@
-/*
+/*
nsis.nsh
diff --git a/development/Win32/packaging/installer/include/variables.nsh
b/development/Win32/packaging/installer/include/variables.nsh
index c2fd83a..85d91ff 100644
--- a/development/Win32/packaging/installer/include/variables.nsh
+++ b/development/Win32/packaging/installer/include/variables.nsh
@@ -1,4 +1,4 @@
-/*
+/*
variables.nsh
diff --git
a/development/Win32/packaging/installer/information/InstallerStructure.odg
b/development/Win32/packaging/installer/information/InstallerStructure.odg
index 301cd76..ea8f381 100644
Binary files
a/development/Win32/packaging/installer/information/InstallerStructure.odg and
b/development/Win32/packaging/installer/information/InstallerStructure.odg
differ
diff --git
a/development/Win32/packaging/installer/information/InstallerStructure.pdf
b/development/Win32/packaging/installer/information/InstallerStructure.pdf
index d604b2d..27c3c32 100644
Binary files
a/development/Win32/packaging/installer/information/InstallerStructure.pdf and
b/development/Win32/packaging/installer/information/InstallerStructure.pdf
differ
diff --git a/development/Win32/packaging/installer/lyx.nsi
b/development/Win32/packaging/installer/lyx.nsi
deleted file mode 100644
index c63bf33..0000000
--- a/development/Win32/packaging/installer/lyx.nsi
+++ /dev/null
@@ -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}"
diff --git a/development/Win32/packaging/installer/settings.nsh
b/development/Win32/packaging/installer/settings.nsh
index 0d94fc7..aa7ca16 100644
--- a/development/Win32/packaging/installer/settings.nsh
+++ b/development/Win32/packaging/installer/settings.nsh
@@ -12,7 +12,7 @@ These typically need to be modified for each LyX release
!define APP_VERSION_MAJOR 2
!define APP_VERSION_MINOR 3
!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_VERSION_BUILD 1 # Start with 1 for the installer releases of each
version
diff --git a/development/Win32/packaging/installer/setup/configure.nsh
b/development/Win32/packaging/installer/setup/configure.nsh
index 3de31b3..c61fdd3 100644
--- a/development/Win32/packaging/installer/setup/configure.nsh
+++ b/development/Win32/packaging/installer/setup/configure.nsh
@@ -1,4 +1,4 @@
-/*
+/*
configure.nsh
diff --git a/development/Win32/packaging/installer/setup/install.nsh
b/development/Win32/packaging/installer/setup/install.nsh
index bc5b38b..15bc275 100644
--- a/development/Win32/packaging/installer/setup/install.nsh
+++ b/development/Win32/packaging/installer/setup/install.nsh
@@ -1,4 +1,4 @@
-/*
+/*
install.nsh
diff --git a/development/Win32/packaging/installer/setup/uninstall.nsh
b/development/Win32/packaging/installer/setup/uninstall.nsh
index 8767c6e..1d1d383 100644
--- a/development/Win32/packaging/installer/setup/uninstall.nsh
+++ b/development/Win32/packaging/installer/setup/uninstall.nsh
@@ -1,4 +1,4 @@
-/*
+/*
uninstall.nsh
