[popfile-commit] windows installer.nsi,1.69,1.70

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

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

Modified Files:
	installer.nsi 
Log Message:
Use a GLOBAL variable to control how the Release Notes are displayed.

Index: installer.nsi
===================================================================
RCS file: /cvsroot/popfile/windows/installer.nsi,v
retrieving revision 1.69
retrieving revision 1.70
diff -C2 -d -r1.69 -r1.70
*** installer.nsi	20 Jun 2003 11:57:40 -0000	1.69
--- installer.nsi	22 Jun 2003 15:44:49 -0000	1.70
***************
*** 156,159 ****
--- 156,160 ----
    !define STARTUP  $2   ; automatic startup flag (1 = yes, 0 = no)
    !define CFG      $3   ; general purpose file handle
+   !define NOTEPAD  $4   ; path to notepad.exe ("" = not found in search path)
  
  #--------------------------------------------------------------------------
***************
*** 243,248 ****
    MessageBox MB_YESNO "Display POPFile Release Notes ?$\r$\n$\r$\n\
        'Yes' recommended if you are upgrading." IDNO exit
!   SearchPath ${L_RESULT} notepad.exe
!   StrCmp ${L_RESULT} "" use_file_association
    ExecWait 'notepad.exe "$PLUGINSDIR\release.txt"'
    GoTo exit
--- 244,249 ----
    MessageBox MB_YESNO "Display POPFile Release Notes ?$\r$\n$\r$\n\
        'Yes' recommended if you are upgrading." IDNO exit
!   SearchPath ${NOTEPAD} notepad.exe
!   StrCmp ${NOTEPAD} "" use_file_association
    ExecWait 'notepad.exe "$PLUGINSDIR\release.txt"'
    GoTo exit
***************
*** 286,291 ****
    File "..\engine\license"
    File "${RELEASE_NOTES}"
!   SearchPath ${CFG} notepad.exe
!   StrCmp ${CFG} "" 0 readme_ok
    File /oname=${README}.txt "${RELEASE_NOTES}"
  
--- 287,291 ----
    File "..\engine\license"
    File "${RELEASE_NOTES}"
!   StrCmp ${NOTEPAD} "" 0 readme_ok
    File /oname=${README}.txt "${RELEASE_NOTES}"
  
***************
*** 1307,1312 ****
    Push ${L_TEMP}
    
!   SearchPath ${L_TEMP} notepad.exe
!   StrCmp ${L_TEMP} "" use_file_association
    Exec 'notepad.exe "$INSTDIR\${README}"'
    goto exit
--- 1307,1311 ----
    Push ${L_TEMP}
    
!   StrCmp ${NOTEPAD} "" use_file_association
    Exec 'notepad.exe "$INSTDIR\${README}"'
    goto exit