[popfile-commit] windows installer.nsi,1.145,1.146

[<jgr...@us...>]

Update of /cvsroot/popfile/windows
In directory sc8-pr-cvs1:/tmp/cvs-serv28087/windows

Modified Files:
	installer.nsi 
Log Message:
Create a single place where the POPFile version number is stored. 
POPFile now reads its version number from a file called popfile_version
which is stored in the POPFile subdirectory.  This file is created
by the build process from information in vars.mak.

engine/vars.mak:

Add variables to hold the major, minor and revision numbers of the 
POPFile version and a variable that holds the name of the file that
will contains the POPFile version information.

engine/popfile.pl
engine/popfile-tray.pl:

Remove explicit set of the POPFile version number, this is now handled
by POPFile::Loader::CORE_loader_init.

engine/POPFile/Loader.pm:

CORE_loader_init looks for the file popfile_version in the same directory
and if found reads and sets the version number from it.

windows/installer.nsi:

Installer script reads the variables set in vars.mak to set the version
number being built.


Index: installer.nsi
===================================================================
RCS file: /cvsroot/popfile/windows/installer.nsi,v
retrieving revision 1.145
retrieving revision 1.146
diff -C2 -d -r1.145 -r1.146
*** installer.nsi	4 Nov 2003 23:18:44 -0000	1.145
--- installer.nsi	5 Nov 2003 15:08:23 -0000	1.146
***************
*** 114,121 ****
    ;--------------------------------------------------------------------------
  
    !define MUI_PRODUCT   "POPFile"
!   !define MUI_VERSION   "0.20.1"
  
!   !define C_README        "v0.20.1.change"
    !define C_RELEASE_NOTES "..\engine\${C_README}"
  
--- 114,126 ----
    ;--------------------------------------------------------------------------
  
+   ReadEnvStr C_POPFILE_MAJOR_VERSION "POPFILE_MAJOR_VERSION"
+   ReadEnvStr C_POPFILE_MINOR_VERSION "POPFILE_MINOR_VERSION"
+   ReadEnvStr C_POPFILE_REVISION      "POPFILE_REVISION" 
+   ReadEnvStr C_POPFILE_RC            "RC" 
+ 
    !define MUI_PRODUCT   "POPFile"
!   !define MUI_VERSION   "${C_POPFILE_MAJOR_VERSION}.${C_POPFILE_MINOR_VERSION}.${C_POPFILE_REVISION}${RC}"
  
!   !define C_README        "v${C_POPFILE_MAJOR_VERSION}.${C_POPFILE_MINOR_VERSION}.${C_POPFILE_REVISION}.change"
    !define C_RELEASE_NOTES "..\engine\${C_README}"
  
***************
*** 184,188 ****
    ; representing the following values: Major.Minor.Release.Build
  
!   VIProductVersion "0.20.1.0"
  
    VIAddVersionKey "ProductName" "${MUI_PRODUCT}"
--- 189,193 ----
    ; representing the following values: Major.Minor.Release.Build
  
!   VIProductVersion "${C_POPFILE_MAJOR_VERSION}.${C_POPFILE_MINOR_VERSION}.${C_POPFILE_REVISION}.0"
  
    VIAddVersionKey "ProductName" "${MUI_PRODUCT}"