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

installer: fix 2 minor bugs

Browse Source 
- correct required space for German thesaurus
- fix display problem of EPS and PDF images for a certain installation constellation
This commit is contained in:
Uwe Stöhr 2012-11-16 01:21:47 +01:00
parent 751bb129c8
commit af6d19176c
5 changed files with 18 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
development/Win32/packaging/installer/ChangeLog.txt
View File

@ -1,4 +1,10 @@
Changelog for LyX-205-3:
Changelog for LyX-205-4:
- fixed bug that EPS and PDF images were not be displayed if LyX was installed this time without admin privileges
but an older LyX version was once installed with admin privileges
- correct the required disk space for the German thesaurus dictionaries
Changelog for LyX-205-3:
- fixed infinite loop when starting the installer and not having Ghostscript previously installed (LyX bug #8417)
- updated to JabRef 2.8.1
- updated French and Spanish translation of the installer messages

4
development/Win32/packaging/installer/include/init.nsh
View File

@ -442,12 +442,12 @@ SectionEnd
Section /o "Deutsch (D/A)" SecTGermanDA
StrCpy $ThesCodes "de_DE$ThesCodes"
AddSize 5360
AddSize 14600
SectionEnd
Section /o "Deutsch (CH)" SecTGermanCH
StrCpy $ThesCodes "de_CH$ThesCodes"
AddSize 5360
AddSize 14600
SectionEnd
Section /o "English (GB)" SecTEnglishGB

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

@ -12,7 +12,7 @@ These typically need to be modified for each LyX release
!define APP_VERSION_MAJOR 2
!define APP_VERSION_MINOR 0
!define APP_VERSION_REVISION 5
!define APP_VERSION_BUILD 3 # Start with 1 for the installer releases of each version
!define APP_VERSION_BUILD 4 # 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

1
development/Win32/packaging/installer/setup/install.nsh
View File

@ -88,6 +88,7 @@ Section -ProgramFiles SecProgramFiles
WriteRegStr SHCTX "SOFTWARE\ImageMagick\Current" "LibPath" "$INSTDIR\imagemagick"
WriteRegDWORD SHCTX "SOFTWARE\ImageMagick\Current" "QuantumDepth" 0x00000010
WriteRegStr SHCTX "SOFTWARE\ImageMagick\Current" "Version" "${ImageMagickVersion}"
WriteRegStr SHCTX "SOFTWARE\ImageMagick" "OnlyWithLyX" "Yes${APP_SERIES_KEY}"
# Components of Ghostscript
${if} $GhostscriptPath == ""

24
development/Win32/packaging/installer/setup/uninstall.nsh
View File

@ -18,16 +18,6 @@ Section "un.LyX" un.SecUnProgramFiles
# need them and these few files don't harm to stay in LaTeX
# Binaries
#!insertmacro FileListLyXBin Delete "$INSTDIR\bin\"
#!insertmacro FileListQtBin Delete "$INSTDIR\bin\"
#!insertmacro FileListDll Delete "$INSTDIR\bin\"
#!insertmacro FileListMSVC Delete "$INSTDIR\bin\"
#!insertmacro FileListNetpbmBin Delete "$INSTDIR\bin\"
#!insertmacro FileListDTLBin Delete "$INSTDIR\bin\"
#!insertmacro FileListDvipostBin Delete "$INSTDIR\bin\"
#!insertmacro FileListPDFToolsBin Delete "$INSTDIR\bin\"
#!insertmacro FileListPDFViewBin Delete "$INSTDIR\bin\"
#!insertmacro FileListMetaFile2EPS Delete "$INSTDIR\bin\"
RMDir /r "$INSTDIR\bin"
# Resources
@ -36,25 +26,25 @@ Section "un.LyX" un.SecUnProgramFiles
# Python
RMDir /r "$INSTDIR\python"
# Components of ImageMagick
#!insertmacro FileListImageMagick Delete "$INSTDIR\imagemagick\"
#!insertmacro FileListMSVC Delete "$INSTDIR\imagemagick\"
# ImageMagick
RMDir /r "$INSTDIR\imagemagick"
ReadRegStr $0 SHCTX "SOFTWARE\ImageMagick" "OnlyWithLyX" # test if it was installed together with this LyX version
${if} $0 == "Yes${APP_SERIES_KEY}"
WriteRegStr SHCTX "SOFTWARE\Classes\Applications" "AutoRun" ""
DeleteRegKey SHCTX "Software\ImageMagick"
${endif}
# Components of Ghostscript
#!insertmacro FileListGhostscript Delete "$INSTDIR\ghostscript\"
#!insertmacro FileListMSVC Delete "$INSTDIR\ghostscript\"
RMDir /r "$INSTDIR\ghostscript"
# delete start menu folder
ReadRegStr $0 SHCTX "${APP_UNINST_KEY}" "StartMenu"
RMDir /r "$0"
#Delete "$SMPROGRAMS\${APP_NAME} ${APP_SERIES_NAME}.lnk"
# delete desktop icon
Delete "$DESKTOP\${APP_NAME} ${APP_SERIES_NAME}.lnk"
# remove file extension .lyx
ReadRegStr $0 SHCTX "${APP_DIR_REGKEY}" "OnlyWithLyX" # special entry to test if they were registered by this LyX version
ReadRegStr $0 SHCTX "${APP_DIR_REGKEY}" "OnlyWithLyX" # test if they were registered by this LyX version
${if} $0 == "Yes${APP_SERIES_KEY}"
ReadRegStr $R0 SHCTX "Software\Classes\${APP_EXT}" ""
${if} $R0 == "${APP_REGNAME_DOC}"