Installer:

- initialize for next release
- small bugfix
- reflect cv.xxx removal

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

diff --git a/development/Win32/packaging/installer/LyXWinInstaller/Changelog.txt b/development/Win32/packaging/installer/LyXWinInstaller/Changelog.txt
index ecaa72ab3f06f825c24657a6ab03f0af121ba56e..91171ec2eb03d427b14a3ca6171b53d7707533f0 100644 (file)
--- a/development/Win32/packaging/installer/LyXWinInstaller/Changelog.txt
+++ b/development/Win32/packaging/installer/LyXWinInstaller/Changelog.txt
@@ -1,4 +1,8 @@
-Version LyX 1.5svn-02-05-2007
+Version LyX 1.5svn-xx-05-2007
+- LyX 1.5svn from xx-05-2007
+
+
+Version LyX 1.5svn-02-05-2007
 - LyX 1.5svn from 02-05-2007
 
 - LyX's console window is now hidden -> updated source code Readmes

diff --git a/development/Win32/packaging/installer/LyXWinInstaller/ConfigLyX.nsh b/development/Win32/packaging/installer/LyXWinInstaller/ConfigLyX.nsh
index 688564b5dcf561c541bb818d26f091852a747cd0..aa81a7b69698818f4b3fc7056f5fd6c0038639e4 100644 (file)
--- a/development/Win32/packaging/installer/LyXWinInstaller/ConfigLyX.nsh
+++ b/development/Win32/packaging/installer/LyXWinInstaller/ConfigLyX.nsh
@@ -43,7 +43,7 @@ Function ConfigureLyX
   FileWrite $R1 '@echo off$\r$\n\
                 SET LANG=$LangCode$\r$\n\
                 SET AIK_DATA_DIR=${AiksaurusDir}$\r$\n\
-                start "${PRODUCT_NAME}" "${LAUNCHER_NAME}" %*$\r$\n'
+                start "${PRODUCT_NAME}" "${LAUNCHER_EXE}" %*$\r$\n'
   FileClose $R1
   IfErrors 0 +2
    MessageBox MB_OK|MB_ICONEXCLAMATION "$(CreateCmdFilesFailed)"

diff --git a/development/Win32/packaging/installer/LyXWinInstaller/Deleted.nsh b/development/Win32/packaging/installer/LyXWinInstaller/Deleted.nsh
index d4ff73c2f398cc7699e6c4ac65e7d36b35de4547..c6f33e6db789c86ed6d67f65a3e51fc3af35ca93 100644 (file)
--- a/development/Win32/packaging/installer/LyXWinInstaller/Deleted.nsh
+++ b/development/Win32/packaging/installer/LyXWinInstaller/Deleted.nsh
@@ -1,15 +1,9 @@
 Function DeleteFiles
 
- # list with deleted files for LyX 1.5svn 02-05-2007
- Delete "$INSTDIR\Resources\examples\decimal.lyx"
- Delete "$INSTDIR\Resources\examples\g-brief2.lyx"
- Delete "$INSTDIR\Resources\examples\de\decimal.lyx"
- Delete "$INSTDIR\Resources\images\toc-view.xpm"  
- Delete "$INSTDIR\Resources\templates\CV-image.eps"
- Delete "$INSTDIR\Resources\templates\CV-image.png"
- Delete "$INSTDIR\Resources\templates\biblioExample.bib"
- Delete "$INSTDIR\Resources\templates\europeCV.lyx"
- Delete "$INSTDIR\Resources\templates\modernCV.lyx"
+ # list with deleted files for LyX 1.5svn xx-05-2007
+ Delete "$INSTDIR\Resources\examples\cv.lyx"
+ Delete "$INSTDIR\Resources\layouts\cv.layout"
+ Delete "$INSTDIR\Resources\tex\cv.cls"
 
 FunctionEnd
 

diff --git a/development/Win32/packaging/installer/LyXWinInstaller/InstallActions-update.nsh b/development/Win32/packaging/installer/LyXWinInstaller/InstallActions-update.nsh
index e15f4b8e9661fd01cfcd46a7398e4705e8d3fa61..7465f09ee724490b2b004474b8c0611d7bbf99aa 100644 (file)
--- a/development/Win32/packaging/installer/LyXWinInstaller/InstallActions-update.nsh
+++ b/development/Win32/packaging/installer/LyXWinInstaller/InstallActions-update.nsh
@@ -51,12 +51,6 @@ Section "-Installation actions" SecInstallation
   # Refresh registry setings for the uninstaller
   Call RefreshRegUninst
   
-  # replace the lyx.exe in lyx.bat with LyXLauncher.exe
-  # !only needed in this version! remove it for the next release
-  StrCpy $OldString "lyx.exe"
-  StrCpy $NewString "${LAUNCHER_NAME}"
-  ${LineFind} "${PRODUCT_BAT}" "" "1:-1" "ReplaceLineContent" # macro from TextFunc.nsh # calls Function ReplaceLineContent
-  
   # register LyX
   ${if} $CreateFileAssociations == "true"
    WriteRegStr SHCTX "${PRODUCT_DIR_REGKEY}" "" "${PRODUCT_EXE}"

diff --git a/development/Win32/packaging/installer/LyXWinInstaller/LaTeX.nsh b/development/Win32/packaging/installer/LyXWinInstaller/LaTeX.nsh
index 77d69a6c960dab7bcdc3c27979f340297a1df422..5e6e6755dcc729094ea9e9c00d803272f6d22d18 100644 (file)
--- a/development/Win32/packaging/installer/LyXWinInstaller/LaTeX.nsh
+++ b/development/Win32/packaging/installer/LyXWinInstaller/LaTeX.nsh
@@ -85,9 +85,7 @@ Function ConfigureMiKTeX
   ${if} $Pointer != "-1" # if something was found
    IntOp $Pointer $Pointer - 1 # jump before the first "\" of "\miktex\bin"
    StrCpy $String $String "$Pointer" # $String is now the part before "\miktex\bin"
-   # install LaTeX class files
-   SetOutPath "$String\tex\latex"
-   File "${ClassFileDir}\cv.cls"
+   # install LyX's special LaTeX class files
    CreateDirectory "$String\tex\latex\lyx"
    SetOutPath "$String\tex\latex\lyx"
    File "${ClassFileDir}\lyxchess.sty"

diff --git a/development/Win32/packaging/installer/LyXWinInstaller/Settings.nsh b/development/Win32/packaging/installer/LyXWinInstaller/Settings.nsh
index 0e227ff8182fb33f5147fbd16d31de2703856252..1e64139fae3eb7844b16f92dbb572ac0c4319d11 100644 (file)
--- a/development/Win32/packaging/installer/LyXWinInstaller/Settings.nsh
+++ b/development/Win32/packaging/installer/LyXWinInstaller/Settings.nsh
@@ -17,7 +17,6 @@
 !define PRODUCT_HELP_LINK "http://www.lyx.org/internet/mailing.php"
 !define PRODUCT_ABOUT_URL "http://www.lyx.org/about/"
 !define PRODUCT_INFO_URL "http://www.lyx.org/"
-!define LAUNCHER_NAME "LyXLauncher.exe"
 !define LAUNCHER_EXE "$INSTDIR\bin\LyXLauncher.exe"
 
 BrandingText "LyXWinInstaller v3.14 - ${INSTALLER_VERSION}"

diff --git a/development/Win32/packaging/installer/LyXWinInstaller/Updated.nsh b/development/Win32/packaging/installer/LyXWinInstaller/Updated.nsh
index ff6f49cbce62cebdccb3b3307645d2db51bb4abe..b4f2b50e0c6c713e605182da44cbebfcd4bb9a1a 100644 (file)
--- a/development/Win32/packaging/installer/LyXWinInstaller/Updated.nsh
+++ b/development/Win32/packaging/installer/LyXWinInstaller/Updated.nsh
@@ -1,63 +1,24 @@
 Function UpdateModifiedFiles
 
- # list with modified files for LyX 1.5svn 02-05-2007
+ # list with modified files for LyX 1.5svn xx-05-2007
  SetOutPath "$INSTDIR\bin"
- File "${PRODUCT_SOURCEDIR}\bin\Console.dll"
  File "${PRODUCT_SOURCEDIR}\bin\lyx.exe" # always here
- File "${PRODUCT_SOURCEDIR}\bin\LyXLauncher.exe"
  File "${PRODUCT_SOURCEDIR}\bin\tex2lyx.exe" # always here
  SetOutPath "$INSTDIR\Resources"
- File "${PRODUCT_SOURCEDIR}\Resources\encodings"
- File "${PRODUCT_SOURCEDIR}\Resources\languages"
  File "${PRODUCT_SOURCEDIR}\Resources\unicodesymbols"
  File /r "${PRODUCT_SOURCEDIR}\Resources\locale" # always here
- SetOutPath "$INSTDIR\Resources\bind"
- File "${PRODUCT_SOURCEDIR}\Resources\bind\sciword.bind"
  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"
- File "${PRODUCT_SOURCEDIR}\Resources\doc\de\Customization.lyx"
- File "${PRODUCT_SOURCEDIR}\Resources\doc\de\Extended.lyx"
- File "${PRODUCT_SOURCEDIR}\Resources\doc\de\Tutorial.lyx"
- 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"
- SetOutPath "$INSTDIR\Resources\doc\es"
- File "${PRODUCT_SOURCEDIR}\Resources\doc\es\EmbeddedObjects.lyx"
- File "${PRODUCT_SOURCEDIR}\Resources\doc\es\TOC.lyx" # must be here when another \doc file has been changed
- SetOutPath "$INSTDIR\Resources\doc\it"
- File "${PRODUCT_SOURCEDIR}\Resources\doc\it\Customization.lyx"
- File "${PRODUCT_SOURCEDIR}\Resources\doc\it\TOC.lyx" # must be here when another \doc file has been changed
- SetOutPath "$INSTDIR\Resources\examples"
- File "${PRODUCT_SOURCEDIR}\Resources\examples\CV-image.eps"
- File "${PRODUCT_SOURCEDIR}\Resources\examples\CV-image.png"
- File "${PRODUCT_SOURCEDIR}\Resources\examples\armenian-article.lyx"
- File "${PRODUCT_SOURCEDIR}\Resources\examples\biblioExample.bib"
- File "${PRODUCT_SOURCEDIR}\Resources\examples\europeCV.lyx"
- File "${PRODUCT_SOURCEDIR}\Resources\examples\modernCV.lyx"
- File "${PRODUCT_SOURCEDIR}\Resources\examples\simplecv.lyx"
- SetOutPath "$INSTDIR\Resources\examples\de"
- File "${PRODUCT_SOURCEDIR}\Resources\examples\de\Dezimal.lyx"
- SetOutPath "$INSTDIR\Resources\images"
- File "${PRODUCT_SOURCEDIR}\Resources\images\dialog-toggle_toc.xpm"
- File "${PRODUCT_SOURCEDIR}\Resources\images\math-superscript.xpm"
- File "${PRODUCT_SOURCEDIR}\Resources\images\tabular-feature_set-rotate-cell.xpm"
- File "${PRODUCT_SOURCEDIR}\Resources\images\tabular-feature_set-rotate-tabular.xpm"
- SetOutPath "$INSTDIR\Resources\images\math"
- File "${PRODUCT_SOURCEDIR}\Resources\images\math\super.xpm"
+ #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\UserGuide.lyx"
+ #SetOutPath "$INSTDIR\Resources\doc\es"
+ #File "${PRODUCT_SOURCEDIR}\Resources\doc\es\EmbeddedObjects.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\armenian-article.layout"
  File "${PRODUCT_SOURCEDIR}\Resources\layouts\simplecv.layout"
- SetOutPath "$INSTDIR\Resources\lyx2lyx"
- File "${PRODUCT_SOURCEDIR}\Resources\lyx2lyx\LyX.py"
- File "${PRODUCT_SOURCEDIR}\Resources\lyx2lyx\lyx_1_5.py"
- SetOutPath "$INSTDIR\Resources\scripts"
- File "${PRODUCT_SOURCEDIR}\Resources\scripts\tex_copy.py"
- SetOutPath "$INSTDIR\Resources\ui"
- File "${PRODUCT_SOURCEDIR}\Resources\ui\classic.ui"
- File "${PRODUCT_SOURCEDIR}\Resources\ui\stdmenus.inc"
- File "${PRODUCT_SOURCEDIR}\Resources\ui\stdtoolbars.inc"
 
 FunctionEnd