[popfile-commit] windows installer.nsi,1.38,1.39

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

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

Modified Files:
	installer.nsi 
Log Message:
Made MUI page commands use the recommended order. "WriteUninstaller" now executed before creating the START MENU entries (to ensure correct icon appears in the menu).

Index: installer.nsi
===================================================================
RCS file: /cvsroot/popfile/windows/installer.nsi,v
retrieving revision 1.38
retrieving revision 1.39
diff -C2 -d -r1.38 -r1.39
*** installer.nsi	27 Apr 2003 14:29:55 -0000	1.38
--- installer.nsi	4 May 2003 20:44:23 -0000	1.39
***************
*** 45,48 ****
--- 45,50 ----
  #--------------------------------------------------------------------------
  
+   !define MUI_CUSTOMPAGECOMMANDS
+ 
    !define MUI_WELCOMEPAGE
    !define MUI_LICENSEPAGE
***************
*** 57,65 ****
    !define MUI_FINISHPAGE
  
-   !define MUI_UNINSTALLER
-   !define MUI_UNCONFIRMPAGE
- 
-   !define MUI_CUSTOMPAGECOMMANDS
- 
    ; The icon files for the installer and uninstaller must have the same structure. For example,
    ; if one icon file contains a 32x32 16-colour image and a 16x16 16-colour image then the other
--- 59,62 ----
***************
*** 69,72 ****
--- 66,72 ----
    !define MUI_UNICON  "remove.ico" 
  
+   !define MUI_UNINSTALLER
+   !define MUI_UNCONFIRMPAGE
+ 
  #--------------------------------------------------------------------------
  # User Registers (Global)
***************
*** 333,336 ****
--- 333,343 ----
    File "C:\Perl58\lib\warnings\register.pm"
  
+   ; Create the uninstall program BEFORE creating the shortcut to it
+   ; (this ensures that the correct "uninstall" icon appears in the START MENU shortcut)
+   
+   SetOutPath $INSTDIR
+   Delete $INSTDIR\uninstall.exe
+   WriteUninstaller $INSTDIR\uninstall.exe
+ 
    ; Create the START MENU entries
  
***************
*** 363,370 ****
                       "$INSTDIR\wperl.exe" popfile.pl
  skip_autostart_set:
- 
-   SetOutPath $INSTDIR
-   Delete $INSTDIR\uninstall.exe
-   WriteUninstaller $INSTDIR\uninstall.exe
    
    ; Create entry in the Control Panel's "Add/Remove Programs" list
--- 370,373 ----