diff --git a/development/Win32/packaging/installer/LyXWinInstaller/InstallActions-update.nsh b/development/Win32/packaging/installer/LyXWinInstaller/InstallActions-update.nsh index 344f142792..e15f4b8e96 100644 --- 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/Settings.nsh b/development/Win32/packaging/installer/LyXWinInstaller/Settings.nsh index 5912fcc32b..0e227ff818 100644 --- 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/InstallerStructure.odg b/development/Win32/packaging/installer/LyXWinInstaller/informations/InstallerStructure.odg similarity index 100% rename from development/Win32/packaging/installer/LyXWinInstaller/InstallerStructure.odg rename to development/Win32/packaging/installer/LyXWinInstaller/informations/InstallerStructure.odg diff --git a/development/Win32/packaging/installer/LyXWinInstaller/InstallerStructure.pdf b/development/Win32/packaging/installer/LyXWinInstaller/informations/InstallerStructure.pdf similarity index 100% rename from development/Win32/packaging/installer/LyXWinInstaller/InstallerStructure.pdf rename to development/Win32/packaging/installer/LyXWinInstaller/informations/InstallerStructure.pdf