anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2025-01-18 21:45:24 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

move setting for display version to settings.nsh

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_5_X@24743 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Joost Verburg 2008-05-12 23:05:17 +00:00
parent ed50979864
commit 948ae05710
4 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
development/Win32/packaging/installer/gui/reinstall.nsh
View File

@ -22,7 +22,7 @@ Function PageReinstall
# If so, some registry key like Software/Lyx16 should exist # If so, some registry key like Software/Lyx16 should exist
ReadRegStr $InstalledVersion SHELL_CONTEXT ${APP_REGKEY} "Version" ReadRegStr $InstalledVersion SHELL_CONTEXT ${APP_REGKEY} "Version"
${If} $InstalledVersion != "${APP_VERSION}" ${If} $InstalledVersion != "${APP_VERSION_NUMBER}"
# Different version, go ahead # Different version, go ahead
Abort Abort
${EndIf} ${EndIf}

1
development/Win32/packaging/installer/include/declarations.nsh
View File

@ -85,7 +85,6 @@ SetCompressor /SOLID lzma
# Names and version # Names and version
!define APP_NAME "LyX" !define APP_NAME "LyX"
!define /date APP_VERSION "${APP_VERSION_MAJOR}.${APP_VERSION_MINOR}svn %Y%m%d"
!define APP_VERSION_NUMBER "${APP_VERSION_MAJOR}.${APP_VERSION_MINOR}.${APP_VERSION_REVISION}.${APP_VERSION_BUILD}" !define APP_VERSION_NUMBER "${APP_VERSION_MAJOR}.${APP_VERSION_MINOR}.${APP_VERSION_REVISION}.${APP_VERSION_BUILD}"
!define APP_SERIES_NAME "${APP_VERSION_MAJOR}.${APP_VERSION_MINOR}" !define APP_SERIES_NAME "${APP_VERSION_MAJOR}.${APP_VERSION_MINOR}"
!define APP_SERIES_KEY "${APP_VERSION_MAJOR}${APP_VERSION_MINOR}" !define APP_SERIES_KEY "${APP_VERSION_MAJOR}${APP_VERSION_MINOR}"

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

@ -14,6 +14,8 @@ These typically need to be modified for each LyX release
!define APP_VERSION_REVISION 5 !define APP_VERSION_REVISION 5
!define APP_VERSION_BUILD 0 # Start with 1 for the installer releases of each version !define APP_VERSION_BUILD 0 # Start with 1 for the installer releases of each version
!define /date APP_VERSION "${APP_VERSION_MAJOR}.${APP_VERSION_MINOR}svn %Y%m%d" # Version to display
#-------------------------------- #--------------------------------
# Installer file name # Installer file name

2
development/Win32/packaging/installer/setup/configure.nsh
View File

@ -42,7 +42,7 @@ Section -InstallData
# Registry information # Registry information
WriteRegStr SHELL_CONTEXT ${APP_REGKEY} "" $INSTDIR WriteRegStr SHELL_CONTEXT ${APP_REGKEY} "" $INSTDIR
WriteRegStr SHELL_CONTEXT ${APP_REGKEY} "Version" "${APP_VERSION}" WriteRegStr SHELL_CONTEXT ${APP_REGKEY} "Version" "${APP_VERSION_NUMBER}"
WriteRegStr SHELL_CONTEXT ${APP_REGKEY_SETUP} "LaTeX Path" $PathLaTeX WriteRegStr SHELL_CONTEXT ${APP_REGKEY_SETUP} "LaTeX Path" $PathLaTeX
WriteRegStr SHELL_CONTEXT ${APP_REGKEY_SETUP} "ImageMagick Path" $PathImageMagick WriteRegStr SHELL_CONTEXT ${APP_REGKEY_SETUP} "ImageMagick Path" $PathImageMagick