[popfile-commit] windows installer.nsi,1.107,1.108

[<xue...@us...>]

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

Modified Files:
	installer.nsi 
Log Message:
Version information updated, stop destroying local registers in .onInit (to make it easier to debug)

Index: installer.nsi
===================================================================
RCS file: /cvsroot/popfile/windows/installer.nsi,v
retrieving revision 1.107
retrieving revision 1.108
diff -C2 -d -r1.107 -r1.108
*** installer.nsi	13 Aug 2003 16:36:57 -0000	1.107
--- installer.nsi	18 Aug 2003 12:15:51 -0000	1.108
***************
*** 93,98 ****
  #   <NSIS Language NAME>-pfi.nsh  - holds strings used on the custom pages and elsewhere
  #
! # Once these files have been prepared and placed in the 'languages' directory with the other
! # *-mui.nsh and *-pfi.nsh files, add a new '!insertmacro PFI_LANG_LOAD' line to load these
  # two new files and, if there is a suitable POPFile UI language file for the new language,
  # add a suitable '!insertmacro UI_LANG_CONFIG' line in the section which handles the optional
--- 93,98 ----
  #   <NSIS Language NAME>-pfi.nsh  - holds strings used on the custom pages and elsewhere
  #
! # Once these files have been prepared and placed in the 'windows\languages' directory with the
! # other *-mui.nsh and *-pfi.nsh files, add a new '!insertmacro PFI_LANG_LOAD' line to load these
  # two new files and, if there is a suitable POPFile UI language file for the new language,
  # add a suitable '!insertmacro UI_LANG_CONFIG' line in the section which handles the optional
***************
*** 105,114 ****
  
    !define MUI_PRODUCT   "POPFile"
! 
!   !ifndef ENGLISH_ONLY
!     !define MUI_VERSION   "0.20.0 (ML)"
!   !else
!     !define MUI_VERSION   "0.20.0 (English)"
!   !endif
  
    !define C_README        "v0.19.1.change"
--- 105,109 ----
  
    !define MUI_PRODUCT   "POPFile"
!   !define MUI_VERSION   "0.20.0 (CVS)"
  
    !define C_README        "v0.19.1.change"
***************
*** 162,167 ****
  #--------------------------------------------------------------------------
  
-   ; This feature is "under construction" (and has not yet been documented in NSIS user manual)
- 
    ; 'VIProductVersion' format is X.X.X.X where X is a number in range 0 to 65535
    ; representing the following values: Major.Minor.Release.Build
--- 157,160 ----
***************
*** 177,187 ****
  
    !ifndef ENGLISH_ONLY
!     VIAddVersionKey "Build" "Multi-Language (Experimental)"
    !else
!     VIAddVersionKey "Build" "English-Only (Experimental)"
    !endif
  
    VIAddVersionKey "Build Date/Time" "${__DATE__} @ ${__TIME__}"
!   VIAddVersionKey "Build Script" "${__FILE__} (${__TIMESTAMP__})"
  
  #----------------------------------------------------------------------------------------
--- 170,180 ----
  
    !ifndef ENGLISH_ONLY
!     VIAddVersionKey "Build" "Multi-Language (CVS)"
    !else
!     VIAddVersionKey "Build" "English-Only (CVS)"
    !endif
  
    VIAddVersionKey "Build Date/Time" "${__DATE__} @ ${__TIME__}"
!   VIAddVersionKey "Build Script" "${__FILE__}$\r$\n(${__TIMESTAMP__})"
  
  #----------------------------------------------------------------------------------------
***************
*** 459,462 ****
--- 452,459 ----
    !define L_LINE                $R7
    
+   Push ${L_INPUT_FILE_HANDLE}
+   Push ${L_OUTPUT_FILE_HANDLE}
+   Push ${L_LINE}
+   
    ; Conditional compilation: if ENGLISH_ONLY is defined, support only 'English'
  
***************
*** 491,494 ****
--- 488,495 ----
    FileClose ${L_INPUT_FILE_HANDLE}
    FileClose ${L_OUTPUT_FILE_HANDLE}
+   
+   Pop ${L_LINE}
+   Pop ${L_OUTPUT_FILE_HANDLE}
+   Pop ${L_INPUT_FILE_HANDLE}
    
    !undef L_INPUT_FILE_HANDLE