move setting for display version to settings.nsh

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24742 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/development/Win32/packaging/installer/gui/reinstall.nsh b/development/Win32/packaging/installer/gui/reinstall.nsh
index 81f1d0df56a88a9c97bae824d9ba7b5a945abe25..af1c11fcfde294dc10bb0910693c4d4b9768e0fc 100644 (file)
--- a/development/Win32/packaging/installer/gui/reinstall.nsh
+++ b/development/Win32/packaging/installer/gui/reinstall.nsh
@@ -22,7 +22,7 @@ Function PageReinstall
   # If so, some registry key like Software/Lyx16 should exist
   ReadRegStr $InstalledVersion SHELL_CONTEXT ${APP_REGKEY} "Version"
 
-  ${If} $InstalledVersion != "${APP_VERSION}"
+  ${If} $InstalledVersion != "${APP_VERSION_NUMBER}"
     # Different version, go ahead
     Abort
   ${EndIf}

diff --git a/development/Win32/packaging/installer/include/declarations.nsh b/development/Win32/packaging/installer/include/declarations.nsh
index 428141c8a2625283cd1563e1212cc858686b51d6..0453778255e80ad7cc7b4e6bbd51aa1e03a60161 100644 (file)
--- a/development/Win32/packaging/installer/include/declarations.nsh
+++ b/development/Win32/packaging/installer/include/declarations.nsh
@@ -85,7 +85,6 @@ SetCompressor /SOLID lzma
 # Names and version
 
 !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_SERIES_NAME "${APP_VERSION_MAJOR}.${APP_VERSION_MINOR}"
 !define APP_SERIES_KEY "${APP_VERSION_MAJOR}${APP_VERSION_MINOR}"

diff --git a/development/Win32/packaging/installer/settings.nsh b/development/Win32/packaging/installer/settings.nsh
index 73704fede7c9498c8f485e322fe05005eb73a9ff..86adfb202380762fcd9538a4ed71c35bd0d8b529 100644 (file)
--- a/development/Win32/packaging/installer/settings.nsh
+++ b/development/Win32/packaging/installer/settings.nsh
@@ -14,6 +14,8 @@ These typically need to be modified for each LyX release
 !define APP_VERSION_REVISION 0\r
 !define APP_VERSION_BUILD 0 # Start with 1 for the installer releases of each version\r
 \r
+!define /date APP_VERSION "${APP_VERSION_MAJOR}.${APP_VERSION_MINOR}svn %Y%m%d" # Version to display\r
+\r
 #--------------------------------\r
 # Installer file name\r
 \r

diff --git a/development/Win32/packaging/installer/setup/configure.nsh b/development/Win32/packaging/installer/setup/configure.nsh
index e6e908be7dc415e5fe7d20391c26ba4fdbd7c747..e7cb47b2d74683f22ece368d3735f15aa9e9810a 100644 (file)
--- a/development/Win32/packaging/installer/setup/configure.nsh
+++ b/development/Win32/packaging/installer/setup/configure.nsh
@@ -42,7 +42,7 @@ Section -InstallData
 
   # Registry information
   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} "ImageMagick Path" $PathImageMagick