installer: final preparation prepare for the alpha 2 release

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24480 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Uwe Stöhr 2008-04-24 01:34:33 +00:00
parent 72c31a4e73
commit 5f799621b9
4 changed files with 15 additions and 12 deletions

View File

@ -106,7 +106,7 @@ Function ConfigureLyX
# register the extension .lyx # register the extension .lyx
${if} $CreateFileAssociations == "true" ${if} $CreateFileAssociations == "true"
WriteRegStr HKLM "${PRODUCT_DIR_REGKEY}" "OnlyWithLyX" "Yes${PRODUCT_VERSION_SHORT}" # special entry to test if they were registered by this LyX version WriteRegStr SHCTX "${PRODUCT_DIR_REGKEY}" "OnlyWithLyX" "Yes${PRODUCT_VERSION_SHORT}" # special entry to test if they were registered by this LyX version
# write informations about file type # write informations about file type
WriteRegStr SHCTX "Software\Classes\${PRODUCT_REGNAME}" "" "${PRODUCT_NAME} Document" WriteRegStr SHCTX "Software\Classes\${PRODUCT_REGNAME}" "" "${PRODUCT_NAME} Document"
WriteRegStr SHCTX "Software\Classes\${PRODUCT_REGNAME}\DefaultIcon" "" "${PRODUCT_EXE}" WriteRegStr SHCTX "Software\Classes\${PRODUCT_REGNAME}\DefaultIcon" "" "${PRODUCT_EXE}"

View File

@ -3,7 +3,7 @@
!define PRODUCT_DIR "D:\LyXPackage1.6" !define PRODUCT_DIR "D:\LyXPackage1.6"
!define PRODUCT_NAME "LyX" !define PRODUCT_NAME "LyX"
!define PRODUCT_VERSION "1.6alpha2" !define PRODUCT_VERSION "1.6.0alpha2"
!define PRODUCT_VERSION_SHORT "16svn3" !define PRODUCT_VERSION_SHORT "16svn3"
!define PRODUCT_SUBFOLDER "lyx16" !define PRODUCT_SUBFOLDER "lyx16"
!define PRODUCT_LICENSE_FILE "${PRODUCT_DIR}\License.txt" !define PRODUCT_LICENSE_FILE "${PRODUCT_DIR}\License.txt"
@ -35,10 +35,11 @@ BrandingText "LyXWinInstaller v4.03 - ${INSTALLER_VERSION}"
!define SHCNF_IDLIST 0 !define SHCNF_IDLIST 0
!define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\lyx.exe" !define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\lyx.exe"
!define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\LyX${PRODUCT_VERSION_SHORT}" !define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\LyX${PRODUCT_VERSION_SHORT}"
!define PRODUCT_DIR_REGKEY_2 "Software\LyX\LyX-${PRODUCT_VERSION}"
# definitions for the Update installer # definitions for the Update installer
!if ${INSTALLER_VERSION} == "Update" !if ${INSTALLER_VERSION} == "Update"
!define PRODUCT_UNINST_KEY_OLD "Software\Microsoft\Windows\CurrentVersion\Uninstall\LyX153" !define PRODUCT_UNINST_KEY_OLD "Software\Microsoft\Windows\CurrentVersion\Uninstall\LyX16svn2"
!define PRODUCT_VERSION_OLD "LyX 1.6svn-r24066" !define PRODUCT_VERSION_OLD "LyX 1.6svn-r24066"
!define PRODUCT_VERSION_SHORT_OLD "16svn2" !define PRODUCT_VERSION_SHORT_OLD "16svn2"
!define JabRefVersion "2.3.1" # could be an older version !define JabRefVersion "2.3.1" # could be an older version

View File

@ -115,12 +115,6 @@ Section "un.LyX" un.SecUnProgramFiles
RMDir /r "$0" RMDir /r "$0"
# delete desktop icon # delete desktop icon
Delete "$DESKTOP\LyX ${PRODUCT_VERSION}.lnk" Delete "$DESKTOP\LyX ${PRODUCT_VERSION}.lnk"
# delete registry entries
DeleteRegKey HKCU "${PRODUCT_UNINST_KEY}"
DeleteRegKey SHCTX "${PRODUCT_UNINST_KEY}"
DeleteRegKey SHCTX "${PRODUCT_DIR_REGKEY}"
DeleteRegKey HKCR "Applications\lyx.exe"
DeleteRegKey HKCR "Applications\lyx.bat"
# Aiksaurus # Aiksaurus
!insertmacro FileCheck $5 "meanings.dat" "${AiksaurusDir}" # macro from LyXUtils.nsh !insertmacro FileCheck $5 "meanings.dat" "${AiksaurusDir}" # macro from LyXUtils.nsh
@ -145,6 +139,14 @@ Section "un.LyX" un.SecUnProgramFiles
${endif} ${endif}
${endif} ${endif}
# delete registry entries
DeleteRegKey HKCU "${PRODUCT_UNINST_KEY}"
DeleteRegKey SHCTX "${PRODUCT_UNINST_KEY}"
DeleteRegKey SHCTX "${PRODUCT_DIR_REGKEY}"
DeleteRegKey HKCU "${PRODUCT_DIR_REGKEY_2}"
DeleteRegKey HKCR "Applications\lyx.exe"
DeleteRegKey HKCR "Applications\lyx.bat"
# the following can only be done with admin permissions # the following can only be done with admin permissions
${if} $Answer == "yes" # if admin ${if} $Answer == "yes" # if admin

View File

@ -4,10 +4,10 @@
[toolbars] [toolbars]
standard = 0 0 0 21 standard = 0 0 0 21
extra = 0 0 0 55 extra = 0 0 0 55
view/update = 0 3 1245 89 view/update = 0 3 780 89
minibuffer = 1 1 0 0 minibuffer = 1 1 0 0
review = 2 0 0 0 review = 2 0 0 0
table = 2 1 0 911
mathmacrotemplate = 2 1 0 0 mathmacrotemplate = 2 1 0 0
math = 2 1 0 0 math = 2 1 0 0
math_panels = 2 1 0 0 math_panels = 2 1 0 0
table = 2 1 0 0