installer:

- fix to Update Installer
- move InstallerStructure graphics

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

diff --git a/development/Win32/packaging/installer/LyXWinInstaller/InstallActions-update.nsh b/development/Win32/packaging/installer/LyXWinInstaller/InstallActions-update.nsh
index 344f14279259ee6236be7baecdc1cbbe5447b3af..e15f4b8e9661fd01cfcd46a7398e4705e8d3fa61 100644 (file)
--- a/development/Win32/packaging/installer/LyXWinInstaller/InstallActions-update.nsh
+++ b/development/Win32/packaging/installer/LyXWinInstaller/InstallActions-update.nsh
@@ -51,18 +51,11 @@ Section "-Installation actions" SecInstallation
   # Refresh registry setings for the uninstaller
   Call RefreshRegUninst
   
-  # Create a batch file to start LyX with the environment variables set
+  # replace the lyx.exe in lyx.bat with LyXLauncher.exe
   # !only needed in this version! remove it for the next release
-  ClearErrors
-  Delete "${PRODUCT_BAT}"
-  FileOpen $R1 "${PRODUCT_BAT}" w
-  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'
-  FileClose $R1
-  IfErrors 0 +2
-   MessageBox MB_OK|MB_ICONEXCLAMATION "$(CreateCmdFilesFailed)"
+  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"
@@ -172,7 +165,7 @@ Function InstDirChange
    
    # set new PATH_PREFIX in the file lyxrc.dist
    FileOpen $R1 "$INSTDIR\Resources\lyxrc.dist" a
-   FileRead $R1 $PathPrefix
+   FileRead $R1 $PathPrefix # the whole file content is now in $PathPrefix
    ${WordReplace} $PathPrefix "${PRODUCT_VERSION_OLD}" "LyX ${PRODUCT_VERSION}" "+" $PathPrefix
    FileSeek $R1 0 # set file pointer to the beginning
    FileWrite $R1 '$PathPrefix' # overwrite the existing path with the actual one

diff --git a/development/Win32/packaging/installer/LyXWinInstaller/InstallerStructure.odg b/development/Win32/packaging/installer/LyXWinInstaller/InstallerStructure.odg
deleted file mode 100644 (file)
index 20e96a9..0000000
Binary files a/development/Win32/packaging/installer/LyXWinInstaller/InstallerStructure.odg and /dev/null differ

diff --git a/development/Win32/packaging/installer/LyXWinInstaller/InstallerStructure.pdf b/development/Win32/packaging/installer/LyXWinInstaller/InstallerStructure.pdf
deleted file mode 100644 (file)
index d0069c3..0000000
Binary files a/development/Win32/packaging/installer/LyXWinInstaller/InstallerStructure.pdf and /dev/null differ

diff --git a/development/Win32/packaging/installer/LyXWinInstaller/Settings.nsh b/development/Win32/packaging/installer/LyXWinInstaller/Settings.nsh
index 5912fcc32b0e00d4612e60d1956e54b9af6d449b..0e227ff8182fb33f5147fbd16d31de2703856252 100644 (file)
--- a/development/Win32/packaging/installer/LyXWinInstaller/Settings.nsh
+++ b/development/Win32/packaging/installer/LyXWinInstaller/Settings.nsh
@@ -1,7 +1,7 @@
 # installer settings
 # You should need to change only these macros for new releases.
 
-!define PRODUCT_DIR "c:\lyx\LyXPackage"
+!define PRODUCT_DIR "D:\LyXPackage1.5"
 !define PRODUCT_NAME "LyX"
 !define PRODUCT_VERSION "1.5svn-02-05-2007"
 !define PRODUCT_VERSION_SHORT "150svn"

diff --git a/development/Win32/packaging/installer/LyXWinInstaller/informations/InstallerStructure.odg b/development/Win32/packaging/installer/LyXWinInstaller/informations/InstallerStructure.odg
new file mode 100644 (file)
index 0000000..20e96a9
Binary files /dev/null and b/development/Win32/packaging/installer/LyXWinInstaller/informations/InstallerStructure.odg differ

diff --git a/development/Win32/packaging/installer/LyXWinInstaller/informations/InstallerStructure.pdf b/development/Win32/packaging/installer/LyXWinInstaller/informations/InstallerStructure.pdf
new file mode 100644 (file)
index 0000000..d0069c3
Binary files /dev/null and b/development/Win32/packaging/installer/LyXWinInstaller/informations/InstallerStructure.pdf differ