[popfile-commit] windows installer-SecPOPFile-body.nsh, 1.3.2.5, 1.3.2.6

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

Update of /cvsroot/popfile/windows
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13221

Modified Files:
      Tag: b0_22_2
	installer-SecPOPFile-body.nsh 
Log Message:
Extra data stored in the "Add/Remove Program" entry to stop Windows from
making wild guesses about how much space the POPFile program occupies.

Index: installer-SecPOPFile-body.nsh
===================================================================
RCS file: /cvsroot/popfile/windows/installer-SecPOPFile-body.nsh,v
retrieving revision 1.3.2.5
retrieving revision 1.3.2.6
diff -C2 -d -r1.3.2.5 -r1.3.2.6
*** installer-SecPOPFile-body.nsh	6 Feb 2006 16:52:03 -0000	1.3.2.5
--- installer-SecPOPFile-body.nsh	29 Aug 2006 15:56:37 -0000	1.3.2.6
***************
*** 205,209 ****
    Delete "$G_ROOTDIR\popfileib-584.exe"
    Delete "$G_ROOTDIR\popfile-service-584.exe"
!   
    ; The experimental 'setup-repack587.exe' installer had to use 'perlmsgcap.exe' since the
    ; NSIS-based replacements were not compatible with the standard "Message Capture" utility
--- 205,209 ----
    Delete "$G_ROOTDIR\popfileib-584.exe"
    Delete "$G_ROOTDIR\popfile-service-584.exe"
! 
    ; The experimental 'setup-repack587.exe' installer had to use 'perlmsgcap.exe' since the
    ; NSIS-based replacements were not compatible with the standard "Message Capture" utility
***************
*** 212,216 ****
  
    ; Install the POPFile EXE files
!   
    File "..\engine\popfile.exe"
    File "..\engine\popfilef.exe"
--- 212,216 ----
  
    ; Install the POPFile EXE files
! 
    File "..\engine\popfile.exe"
    File "..\engine\popfilef.exe"
***************
*** 230,236 ****
    File /nonfatal "test\pfidiag.exe"
    File "msgcapture.exe"
!   
    IfFileExists "$G_ROOTDIR\pfimsgcapture.exe" 0 app_paths
!   Delete "$G_ROOTDIR\pfimsgcapture.exe"  
    File "/oname=pfimsgcapture.exe" "msgcapture.exe"
  
--- 230,236 ----
    File /nonfatal "test\pfidiag.exe"
    File "msgcapture.exe"
! 
    IfFileExists "$G_ROOTDIR\pfimsgcapture.exe" 0 app_paths
!   Delete "$G_ROOTDIR\pfimsgcapture.exe"
    File "/oname=pfimsgcapture.exe" "msgcapture.exe"
  
***************
*** 468,471 ****
--- 468,473 ----
    WriteRegStr HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\${C_PFI_PRODUCT}" \
                "UninstallString" "$G_ROOTDIR\uninstall.exe"
+   WriteRegStr HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\${C_PFI_PRODUCT}" \
+               "InstallLocation" "$G_ROOTDIR"
    WriteRegDWORD HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\${C_PFI_PRODUCT}" \
                "NoModify" "1"
***************
*** 479,482 ****
--- 481,486 ----
    WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${C_PFI_PRODUCT}" \
                "UninstallString" "$G_ROOTDIR\uninstall.exe"
+   WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${C_PFI_PRODUCT}" \
+               "InstallLocation" "$G_ROOTDIR"
    WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${C_PFI_PRODUCT}" \
                "NoModify" "1"