Author: uwestoehr
Date: Mon Jan 30 22:13:00 2012
New Revision: 40688
URL: http://www.lyx.org/trac/changeset/40688
Log:
installer:
- fix a bug in detection of Gnumeric
- update to latest third-party products
Modified:
lyx-devel/trunk/development/Win32/packaging/installer/include/detection.nsh
lyx-devel/trunk/development/Win32/packaging/installer/settings.nsh
Modified:
lyx-devel/trunk/development/Win32/packaging/installer/include/detection.nsh
==============================================================================
--- lyx-devel/trunk/development/Win32/packaging/installer/include/detection.nsh
Mon Jan 30 01:45:38 2012 (r40687)
+++ lyx-devel/trunk/development/Win32/packaging/installer/include/detection.nsh
Mon Jan 30 22:13:00 2012 (r40688)
@@ -136,6 +136,7 @@
ReadRegStr $0 HKLM
"Software\Classes\Applications\gnumeric.exe\shell\Open\command" ""
${if} $0 != ""
StrCpy $0 $0 -18 # remove "gnumeric.exe" "%1""
+ StrCpy $0 $0 "" 1 # remove the leading quote
StrCpy $GnumericPath $0
${endif}
Modified: lyx-devel/trunk/development/Win32/packaging/installer/settings.nsh
==============================================================================
--- lyx-devel/trunk/development/Win32/packaging/installer/settings.nsh Mon Jan
30 01:45:38 2012 (r40687)
+++ lyx-devel/trunk/development/Win32/packaging/installer/settings.nsh Mon Jan
30 22:13:00 2012 (r40688)
@@ -12,7 +12,7 @@
!define APP_VERSION_MAJOR 2
!define APP_VERSION_MINOR 0
!define APP_VERSION_REVISION 2
-!define APP_VERSION_BUILD 4 # Start with 1 for the installer releases of each
version
+!define APP_VERSION_BUILD 5 # Start with 1 for the installer releases of each
version
!define APP_VERSION
"${APP_VERSION_MAJOR}.${APP_VERSION_MINOR}.${APP_VERSION_REVISION}" # Version
to display
@@ -50,12 +50,12 @@
!define JabRefVersion "2.7"
!define MiKTeXDeliveredVersion "2.9"
-!define ImageMagickVersion "6.7.4"
+!define ImageMagickVersion "6.7.5"
# definitions for the Complete installer
!if ${SETUPTYPE} == BUNDLE
!define JabRefInstall "external\JabRef-2.7-setup.exe"
- !define MiKTeXInstall "$INSTDIR\external\basic-miktex-2.9.4250.exe"
+ !define MiKTeXInstall "$INSTDIR\external\basic-miktex-2.9.4407.exe"
!define SIZE_DOWNLOAD_LATEX 160106
!define SIZE_LATEX 380000
!endif
