From 57d653669a7456bc787e6ba56f48f3cf58c10e06 Mon Sep 17 00:00:00 2001
From: Joost Verburg <joostverburg@users.sourceforge.net>
Date: Mon, 12 May 2008 23:04:13 +0000
Subject: [PATCH] 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
---
 development/Win32/packaging/installer/gui/reinstall.nsh        | 2 +-
 development/Win32/packaging/installer/include/declarations.nsh | 1 -
 development/Win32/packaging/installer/settings.nsh             | 2 ++
 development/Win32/packaging/installer/setup/configure.nsh      | 2 +-
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/development/Win32/packaging/installer/gui/reinstall.nsh b/development/Win32/packaging/installer/gui/reinstall.nsh
index 81f1d0df56..af1c11fcfd 100644
--- 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 428141c8a2..0453778255 100644
--- 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 73704fede7..86adfb2023 100644
--- 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
 !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
 
diff --git a/development/Win32/packaging/installer/setup/configure.nsh b/development/Win32/packaging/installer/setup/configure.nsh
index e6e908be7d..e7cb47b2d7 100644
--- 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