diff --git a/development/Win32/packaging/AltInstaller/ChangeLog.txt b/development/Win32/packaging/AltInstaller/ChangeLog.txt index 33e9237076..f9412dcb9f 100644 --- a/development/Win32/packaging/AltInstaller/ChangeLog.txt +++ b/development/Win32/packaging/AltInstaller/ChangeLog.txt @@ -1,6 +1,8 @@ Version 3.25 - LyX 1.5.6 +- updated to MiKTeX 2.7 (build 3107) +- updated to ImageMagick 6.4.2-1 - support to set Ukrainian as LyX's menu language - When Aspell is installed together with this installer (this will be the case when Aspell is not already installed), now every user on the PC diff --git a/development/Win32/packaging/AltInstaller/LyXInstaller-complete.nsi b/development/Win32/packaging/AltInstaller/LyXInstaller-complete.nsi index 8bbf226b34..6eda299539 100644 --- a/development/Win32/packaging/AltInstaller/LyXInstaller-complete.nsi +++ b/development/Win32/packaging/AltInstaller/LyXInstaller-complete.nsi @@ -55,6 +55,7 @@ Var MiKTeXPath Var InstallGSview Var InstallJabRef Var SVGPath +Var AppFiles # Variables used by all installer versions !include "Variables.nsh" diff --git a/development/Win32/packaging/AltInstaller/LyXInstaller-small.nsi b/development/Win32/packaging/AltInstaller/LyXInstaller-small.nsi index 85d8ef895b..a35bec16a6 100644 --- a/development/Win32/packaging/AltInstaller/LyXInstaller-small.nsi +++ b/development/Win32/packaging/AltInstaller/LyXInstaller-small.nsi @@ -53,6 +53,7 @@ Var MiKTeXVersion Var MiKTeXUser Var State Var SVGPath +Var AppFiles # Variables used by all installer versions !include "Variables.nsh" diff --git a/development/Win32/packaging/AltInstaller/LyXInstaller-update.nsi b/development/Win32/packaging/AltInstaller/LyXInstaller-update.nsi index 16d6ff7ed6..5bb86a0819 100644 --- a/development/Win32/packaging/AltInstaller/LyXInstaller-update.nsi +++ b/development/Win32/packaging/AltInstaller/LyXInstaller-update.nsi @@ -37,6 +37,7 @@ SetCompressor lzma Var INSTDIR_NEW Var INSTDIR_OLD +Var AppPath # Variables used by all installer versions !include "Variables.nsh" diff --git a/development/Win32/packaging/AltInstaller/LyXUtils.nsh b/development/Win32/packaging/AltInstaller/LyXUtils.nsh index 8de5de61dd..1bb951e2eb 100644 --- a/development/Win32/packaging/AltInstaller/LyXUtils.nsh +++ b/development/Win32/packaging/AltInstaller/LyXUtils.nsh @@ -408,7 +408,7 @@ FunctionEnd StrCpy $UserList $UserList "" $Pointer # cut off the first username in the list # generate the string for the current user # AppPre and AppSuff are generated in the macro "AppPreSuff" - StrCpy $AppPath "$AppPre\$0\$AppSuff\${PRODUCT_SUBFOLDER}" + StrCpy $AppPath "$AppPre\$0\$AppSuff\$AppSubfolder" # read the preferences file to test if it exists FileOpen $R1 "$AppPath\$FileName" r IfErrors doneA @@ -420,7 +420,7 @@ FunctionEnd ready: # now do the same for the last user name StrCpy $0 $UserList - StrCpy $AppPath "$AppPre\$0\$AppSuff\${PRODUCT_SUBFOLDER}" + StrCpy $AppPath "$AppPre\$0\$AppSuff\$AppSubfolder" FileOpen $R1 "$AppPath\$FileName" r IfErrors doneB FileClose $R1 diff --git a/development/Win32/packaging/AltInstaller/Settings.nsh b/development/Win32/packaging/AltInstaller/Settings.nsh index 5b22a59a34..ce20599081 100644 --- a/development/Win32/packaging/AltInstaller/Settings.nsh +++ b/development/Win32/packaging/AltInstaller/Settings.nsh @@ -3,8 +3,8 @@ !define PRODUCT_DIR "D:\LyXPackage1.5" !define PRODUCT_NAME "LyX" -!define PRODUCT_VERSION "1.5.5" -!define PRODUCT_VERSION_SHORT "155" +!define PRODUCT_VERSION "1.5.6" +!define PRODUCT_VERSION_SHORT "156" !define PRODUCT_SUBFOLDER "lyx15" !define PRODUCT_LICENSE_FILE "${PRODUCT_DIR}\License.txt" !define PRODUCT_SOURCEDIR "${PRODUCT_DIR}\LyX" @@ -43,7 +43,7 @@ BrandingText "LyXWinInstaller v3.25 - ${INSTALLER_VERSION}" !define PRODUCT_VERSION_OLD "LyX 1.5.5" !define PRODUCT_VERSION_SHORT_OLD "155" !define JabRefVersion "2.3.1" # could be an older version - !define ImageMagickVersion_Old "6.3.8" # could be an older version + !define ImageMagickVersion_Old "6.4.1" # could be an older version !define GhostscriptVersion_Old "8.62" # could be an older version !define MiKTeXDeliveredVersion "2.7" # could be an older version !endif @@ -58,14 +58,14 @@ BrandingText "LyXWinInstaller v3.25 - ${INSTALLER_VERSION}" !if ${INSTALLER_VERSION} == "Complete" !define GSviewInstall "external\gsv49w32.exe" !define JabRefInstall "external\JabRef-2.3.1-Setup.exe" - !define MiKTeXInstall "$INSTDIR\external\basic-miktex-2.7.3053.exe" + !define MiKTeXInstall "$INSTDIR\external\basic-miktex-2.7.3107.exe" !define JabRefVersion "2.3.1" !define MiKTeXDeliveredVersion "2.7" !endif !define ClassFileDir "${PRODUCT_SOURCEDIR}\Resources\tex" -!define ImageMagickVersion "6.4.1" +!define ImageMagickVersion "6.4.2" # for some odd reason the ImageMagick folder may not be a subfolder of $INSTDIR\bin! !define ImageMagickDir "$INSTDIR\etc\ImageMagick" !define GhostscriptDir "$INSTDIR\etc\Ghostscript" diff --git a/development/Win32/packaging/AltInstaller/Updated.nsh b/development/Win32/packaging/AltInstaller/Updated.nsh index 083114679b..d898a87691 100644 --- a/development/Win32/packaging/AltInstaller/Updated.nsh +++ b/development/Win32/packaging/AltInstaller/Updated.nsh @@ -4,8 +4,8 @@ Function UpdateModifiedFiles SetOutPath "$INSTDIR\bin" # always here File "${PRODUCT_SOURCEDIR}\bin\lyx.exe" # always here File "${PRODUCT_SOURCEDIR}\bin\tex2lyx.exe" # always here - SetOutPath "$INSTDIR\Resources\bin\Lib" - File "${PRODUCT_SOURCEDIR}\Resources\bin\Lib\copy.py" + SetOutPath "$INSTDIR\bin\Lib" + File "${PRODUCT_SOURCEDIR}\bin\Lib\copy.py" File /r "${PRODUCT_SOURCEDIR}\Resources\locale" # always here SetOutPath "$INSTDIR\Resources" File "${PRODUCT_SOURCEDIR}\Resources\configure.py" @@ -39,9 +39,6 @@ Function UpdateModifiedFiles SetOutPath "$INSTDIR\Resources\templates" File "${PRODUCT_SOURCEDIR}\Resources\templates\aa.lyx" File "${PRODUCT_SOURCEDIR}\Resources\templates\JSS-article.lyx" - SetOutPath "$INSTDIR\Resources\man\man1" - #File "${PRODUCT_SOURCEDIR}\Resources\man\man1\lyx.1" - SetOutPath "$INSTDIR\Resources\ui" FunctionEnd diff --git a/development/Win32/packaging/AltInstaller/Variables.nsh b/development/Win32/packaging/AltInstaller/Variables.nsh index ffcc009561..de6bc17e2f 100644 --- a/development/Win32/packaging/AltInstaller/Variables.nsh +++ b/development/Win32/packaging/AltInstaller/Variables.nsh @@ -8,7 +8,6 @@ Var LatexPath Var MiKTeXInstalled Var PythonPath Var Answer -Var AppFiles Var AppPre Var AppSubfolder Var AppSuff