anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-22 10:00:33 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Remove MiKTeX update warning and update version etc.

Browse Source
This commit is contained in:
Richard Kimberly Heck 2018-08-30 16:06:15 -04:00
parent 65bc3149ab
commit ca0055dbb9
2 changed files with 4 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
development/Win32/packaging/installer/include/gui.nsh
View File

@ -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

8
development/Win32/packaging/installer/settings.nsh
View File

@ -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