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

diff --git a/development/Makefile.am b/development/Makefile.am
index 0a1b3df5041f217e568e4c06ce5fcc152d2fa7f1..ec5a94feadec9333bb837afa8970fff44c52c030 100644 (file)
--- 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 0ab0e8cc48da95c4f2f4c7ba0adae69173a79de0..2041727d0fa26751cd429106f580d77f25881248 100644 (file)
--- 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 003a582aab7081bea232237c8c81120fe72347b2..b2aa949248e87572e455b2e871e0d9c809986381 100644 (file)
--- 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 974bc672252cea9ed3dda58740488e65ab7a1431..12de15fdf88a262f59eb7ccb371738409a64c83f 100644 (file)
--- 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 ecb82b4c9a4d85031664815deefbadc8a0cb7693..63de0e1a49881392e16846ce7822eecc3b243f64 100644 (file)
--- 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 c513b3ba055cd6b2c2ec018d20e957962ffbe0df..ee3a4710caedda57c9367d3096b925e38cc835d3 100644 (file)
--- 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 82d428cea6ca811434ae923e6e8219df1ff66fd2..d3ae07fc4ad63927f73fbc83810564c8ccc0b6a2 100644 (file)
--- 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 5fd7011ee50f892f783bf4dd7b3f5cfaea40c7ce..493f03f5e4af48302d8f915f7f0748383556860e 100644 (file)
--- 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 415b19cad9badcb64df6db78cb3c863eccf95a79..02471773c0698417c988ddc91cb6c173997a86e1 100644 (file)
--- 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 aede99d76337cff64bcfb26741123cc55a7e0a7e..c2c782722638d056cc6cd6ce3edf0f907b8501a6 100644 (file)
--- 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 b077677f424f18f1ff7816949558aad3a3240b84..04fd5304159e79e2cc53aed114798358b80c7e2c 100644 (file)
--- 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 5e6b513f35126e1b30438af1596c5e03dff823f1..e04d1776b46e6f7e6d1eef43bf0e271e413cc170 100644 (file)
--- 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 c2fd83adc4a6e271e8c71b885ed3867785072805..85d91ff960b759ab974ff1f77bc3b9808e553b2e 100644 (file)
--- 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 301cd7643f04419a7b68ae8fd808f2f1c0ea4286..ea8f381ed4d1efa891ccd3b23a4917c564ba50fd 100644 (file)
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 d604b2ddac44c10107f0a7df74fa5477796b46dc..27c3c32efd5b369296d9d117a11ee58e05b84b96 100644 (file)
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 (file)
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 0d94fc7fc7cd8fdb74c4152632a6adbade1c4b2d..aa7ca16ff4635820b5f35fcc669ac0b60f42c3b4 100644 (file)
--- 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 3de31b3e97253d9a7fa2732f8a81bac460a361b2..c61fdd33ae433ce2ccf64deb5ed9cfaff9014171 100644 (file)
--- 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 bc5b38bf6f3394e88b3ab8ddf023c3a1944457c8..15bc2758548d39f755c98333c486415571d93174 100644 (file)
--- 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 8767c6e0fafca91b09e35daac996aba2ece0638f..1d1d383c602dedc6639e85ca20f7ab8db36abd75 100644 (file)
--- a/development/Win32/packaging/installer/setup/uninstall.nsh
+++ b/development/Win32/packaging/installer/setup/uninstall.nsh
@@ -1,4 +1,4 @@
-/*
+/*
 
 uninstall.nsh