From: Richard Kimberly Heck <rikiheck@lyx.org>
Date: Thu, 30 Aug 2018 20:06:15 +0000 (-0400)
Subject: Remove MiKTeX update warning and update version etc.
X-Git-Tag: 2.3.1~6
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=ca0055dbb906bceeb7b235849c7ec77a88bc5db9;p=features.git

Remove MiKTeX update warning and update version etc.
---

diff --git a/development/Win32/packaging/installer/include/gui.nsh b/development/Win32/packaging/installer/include/gui.nsh
index 898e3d0891..7c512f53d0 100644
--- a/development/Win32/packaging/installer/include/gui.nsh
+++ b/development/Win32/packaging/installer/include/gui.nsh
@@ -24,31 +24,6 @@ BrandingText " "
 !define MUI_WELCOMEFINISHPAGE_BITMAP "${SETUP_WIZARDIMAGE}"
 !define MUI_UNWELCOMEFINISHPAGE_BITMAP "${SETUP_WIZARDIMAGE}"
 
-Function CheckUpdateMiKTeX
-${if} $LatexInstalled != "MiKTeX"
-	#MessageBox MB_OK "No MiKTeX?"
-	Return
-${EndIf}
-${if} ${SETUPTYPE} == BUNDLE
-	Return
-${EndIf}
-
-!define MUI_PAGE_HEADER_TEXT "$(MikTeXUpdateHeader)"
-!define MUI_PAGE_HEADER_SUBTEXT "  "
-
-!include nsDialogs.nsh
-nsDialogs::Create 1018
-Pop $R0
-${If} $R0 == error
-    Abort
-${EndIf}
-
-${NSD_CreateLabel} 0 0 100% 60% "$(MiKTeXUpdateMsg)"
-Pop $R0
-nsDialogs::Show
-
-FunctionEnd
-
 #--------------------------------
 # Pages
 
@@ -60,7 +35,6 @@ FunctionEnd
 
 # Show the license.
 !insertmacro MUI_PAGE_LICENSE "${FILES_LICENSE}"
-Page custom CheckUpdateMiKTeX
 
 # Decision if it should be installed as admin or not
 !insertmacro MULTIUSER_PAGE_INSTALLMODE
diff --git a/development/Win32/packaging/installer/settings.nsh b/development/Win32/packaging/installer/settings.nsh
index dfa02ed32d..0ba2118b5d 100644
--- a/development/Win32/packaging/installer/settings.nsh
+++ b/development/Win32/packaging/installer/settings.nsh
@@ -11,10 +11,10 @@ These typically need to be modified for each LyX release
 
 !define APP_VERSION_MAJOR 2
 !define APP_VERSION_MINOR 3
-!define APP_VERSION_REVISION 0
+!define APP_VERSION_REVISION 1
 !define APP_VERSION_EMERGENCY "" # use "1" for an emergency release of LyX otherwise ""
 !define APP_EMERGENCY_DOT "" # use "." for an emergency release of LyX otherwise ""
-!define APP_VERSION_BUILD 005 # Start with 1 for the installer releases of each version
+!define APP_VERSION_BUILD 1 # Start with 1 for the installer releases of each version
 
 !define APP_VERSION "${APP_VERSION_MAJOR}.${APP_VERSION_MINOR}.${APP_VERSION_REVISION}${APP_EMERGENCY_DOT}${APP_VERSION_EMERGENCY}" # Version to display
 
@@ -54,6 +54,6 @@ These typically need to be modified for each LyX release
 
 # definitions for the Complete installer
 !if ${SETUPTYPE} == BUNDLE
- !define MiKTeXInstall "$INSTDIR\basic-miktex-2.9.6643.exe"
- !define MiKTeXInstaller "${FILES_BASE}\basic-miktex-2.9.6643.exe"
+ !define MiKTeXInstall "$INSTDIR\basic-miktex-2.9.6813-x64.exe"
+ !define MiKTeXInstaller "${FILES_BASE}\basic-miktex-2.9.6813-x64.exe"
 !endif