installer:

- more initialization work for next version
- reflect latest SVN commits
- fix bug, see changelog

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18180 a592a061-630c-0410-9148-cb99ea01b6c8

development/Win32/packaging/installer/LyXWinInstaller/Changelog.txt

@@ -1,14 +1,18 @@
 Version LyX 1.5svn-xx-05-2007
 - LyX 1.5svn from xx-05-2007
 
+- fix bug that LyX's menu language setting was ignored when LyX is
+  started by double-clicking on a LyX-file
+
 
 Version LyX 1.5svn-02-05-2007
 - LyX 1.5svn from 02-05-2007
+  - support for Armenian
 
 - LyX's console window is now hidden -> updated source code Readmes
 - fix bug that file associations were set also when the user has chosen
   to leave them untouched
-- Update installer: new option to choose wheter the file associations
+- Update installer: new option to choose whether the file associations
   should be updated or not
 - Update installer: fix uninstalling
 - Update installer: fix that a subfolder of the old install folder

development/Win32/packaging/installer/LyXWinInstaller/ConfigLyX.nsh

@@ -104,7 +104,7 @@ Function ConfigureLyX
    # write informations about file type
    WriteRegStr SHCTX "Software\Classes\${PRODUCT_REGNAME}" "" "${PRODUCT_NAME} Document"
    WriteRegStr SHCTX "Software\Classes\${PRODUCT_REGNAME}\DefaultIcon" "" "${PRODUCT_EXE}"
-   WriteRegStr SHCTX "Software\Classes\${PRODUCT_REGNAME}\Shell\open\command" "" '"${LAUNCHER_EXE}" "%1"'
+   WriteRegStr SHCTX "Software\Classes\${PRODUCT_REGNAME}\Shell\open\command" "" '"${PRODUCT_BAT}" "%1"'
    # write informations about file extensions
    WriteRegStr SHCTX "Software\Classes\${PRODUCT_EXT}" "" "${PRODUCT_REGNAME}"
    WriteRegStr SHCTX "Software\Classes\${PRODUCT_EXT}" "Content Type" "${PRODUCT_MIME_TYPE}"  

development/Win32/packaging/installer/LyXWinInstaller/Deleted.nsh

@@ -2,6 +2,8 @@ Function DeleteFiles
 
  # list with deleted files for LyX 1.5svn xx-05-2007
  Delete "$INSTDIR\Resources\examples\cv.lyx"
+ Delete "$INSTDIR\Resources\examples\TableExamples.lyx"
+ Delete "$INSTDIR\Resources\examples\de\TableExamples.lyx"
  Delete "$INSTDIR\Resources\layouts\cv.layout"
  Delete "$INSTDIR\Resources\tex\cv.cls"
 

development/Win32/packaging/installer/LyXWinInstaller/InstallActions-update.nsh

@@ -86,7 +86,7 @@ Section "-Installation actions" SecInstallation
    # write informations about file type
    WriteRegStr SHCTX "Software\Classes\${PRODUCT_REGNAME}" "" "${PRODUCT_NAME} Document"
    WriteRegStr SHCTX "Software\Classes\${PRODUCT_REGNAME}\DefaultIcon" "" "${PRODUCT_EXE}"
-   WriteRegStr SHCTX "Software\Classes\${PRODUCT_REGNAME}\Shell\open\command" "" '"${LAUNCHER_EXE}" "%1"'
+   WriteRegStr SHCTX "Software\Classes\${PRODUCT_REGNAME}\Shell\open\command" "" '"${PRODUCT_BAT}" "%1"'
    # write informations about file extensions
    WriteRegStr SHCTX "Software\Classes\${PRODUCT_EXT}" "" "${PRODUCT_REGNAME}"
    WriteRegStr SHCTX "Software\Classes\${PRODUCT_EXT}" "Content Type" "${PRODUCT_MIME_TYPE}"  

development/Win32/packaging/installer/LyXWinInstaller/Settings.nsh

@@ -3,7 +3,7 @@
 
 !define PRODUCT_DIR "D:\LyXPackage1.5"
 !define PRODUCT_NAME "LyX"
-!define PRODUCT_VERSION "1.5svn-02-05-2007"
+!define PRODUCT_VERSION "1.5svn-xx-05-2007"
 !define PRODUCT_VERSION_SHORT "150svn"
 !define PRODUCT_SUBFOLDER "lyx15"
 !define PRODUCT_LICENSE_FILE "${PRODUCT_DIR}\License.txt"
@@ -19,12 +19,12 @@
 !define PRODUCT_INFO_URL "http://www.lyx.org/"
 !define LAUNCHER_EXE "$INSTDIR\bin\LyXLauncher.exe"
 
-BrandingText "LyXWinInstaller v3.14 - ${INSTALLER_VERSION}"
+BrandingText "LyXWinInstaller v3.15 - ${INSTALLER_VERSION}"
 
 # to check later if this installer version is running at the same time
-!define INSTALLER_EXE "LyXWin${PRODUCT_VERSION_SHORT}${INSTALLER_VERSION}-3-14.exe"
+!define INSTALLER_EXE "LyXWin${PRODUCT_VERSION_SHORT}${INSTALLER_VERSION}-3-15.exe"
-!define INSTALLER2_EXE "LyXWin${PRODUCT_VERSION_SHORT}${INSTALLER2_VERSION}-3-14.exe"
+!define INSTALLER2_EXE "LyXWin${PRODUCT_VERSION_SHORT}${INSTALLER2_VERSION}-3-15.exe"
-!define INSTALLER3_EXE "LyXWin${PRODUCT_VERSION_SHORT}${INSTALLER3_VERSION}-3-14.exe"
+!define INSTALLER3_EXE "LyXWin${PRODUCT_VERSION_SHORT}${INSTALLER3_VERSION}-3-15.exe"
 !define VERSION_BITMAP "${PRODUCT_DIR}\icons\lyx_logo_vert${PRODUCT_VERSION_SHORT}.bmp"
 
 # Replaced by HKLM or HKCU depending on SetShellVarContext.

development/Win32/packaging/installer/LyXWinInstaller/Updated.nsh

@@ -8,15 +8,14 @@ Function UpdateModifiedFiles
  File "${PRODUCT_SOURCEDIR}\Resources\unicodesymbols"
  File /r "${PRODUCT_SOURCEDIR}\Resources\locale" # always here
  SetOutPath "$INSTDIR\Resources\doc"
- #File "${PRODUCT_SOURCEDIR}\Resources\doc\EmbeddedObjects.lyx"
+ File "${PRODUCT_SOURCEDIR}\Resources\doc\EmbeddedObjects.lyx"
  File "${PRODUCT_SOURCEDIR}\Resources\doc\LaTeXConfig.lyx.in"
  File "${PRODUCT_SOURCEDIR}\Resources\doc\TOC.lyx" # must be here when another \doc file has been changed
- #SetOutPath "$INSTDIR\Resources\doc\de"
+ SetOutPath "$INSTDIR\Resources\doc\de"
- #File "${PRODUCT_SOURCEDIR}\Resources\doc\de\TOC.lyx" # must be here when another \doc file has been changed
+ File "${PRODUCT_SOURCEDIR}\Resources\doc\de\TOC.lyx" # must be here when another \doc file has been changed
- #File "${PRODUCT_SOURCEDIR}\Resources\doc\de\UserGuide.lyx"
+ File "${PRODUCT_SOURCEDIR}\Resources\doc\de\UserGuide.lyx"
- #SetOutPath "$INSTDIR\Resources\doc\es"
+ SetOutPath "$INSTDIR\Resources\examples\de"
- #File "${PRODUCT_SOURCEDIR}\Resources\doc\es\EmbeddedObjects.lyx"
+ File "${PRODUCT_SOURCEDIR}\Resources\examples\de\TabellenBeispiel.lyx"
- #File "${PRODUCT_SOURCEDIR}\Resources\doc\es\TOC.lyx" # must be here when another \doc file has been changed
  SetOutPath "$INSTDIR\Resources\layouts"
  File "${PRODUCT_SOURCEDIR}\Resources\layouts\simplecv.layout"