[QGIS Commit] r10447 - branches/Version-1_0/ms-windows

[svn_qgis at osgeo.org]

Author: timlinux
Date: 2009-03-31 09:17:07 -0400 (Tue, 31 Mar 2009)
New Revision: 10447

Modified:
   branches/Version-1_0/ms-windows/QGIS-Installer.nsi
Log:
Fix uninstallation to properly remove all files if using msvc built binaries

Modified: branches/Version-1_0/ms-windows/QGIS-Installer.nsi
===================================================================
--- branches/Version-1_0/ms-windows/QGIS-Installer.nsi	2009-03-31 12:38:18 UTC (rev 10446)
+++ branches/Version-1_0/ms-windows/QGIS-Installer.nsi	2009-03-31 13:17:07 UTC (rev 10447)
@@ -378,7 +378,7 @@
 	
 	CreateDirectory "$SMPROGRAMS\${QGIS_BASE}"
 	
-	CreateShortCut "$SMPROGRAMS\${QGIS_BASE}\${QGIS_BASE}.lnk" "$INSTALL_DIR\qgis.exe" ""\
+	CreateShortCut "$SMPROGRAMS\${QGIS_BASE}\${QGIS_BASE}.lnk" "$INSTALL_DIR\bin\qgis.exe" ""\
 	"$INSTALL_DIR\icons\QGIS.ico" "" SW_SHOWNORMAL "" "Launch ${COMPLETE_NAME}"
 	
 	CreateShortCut "$SMPROGRAMS\${QGIS_BASE}\Quantum GIS Web Site.lnk" "$INSTALL_DIR\QGIS-WebSite.url" ""\
@@ -514,11 +514,13 @@
 	Delete "$INSTDIR\QGIS-WebSite.url"
 		
 	Delete "$INSTDIR\*.dll"	
+	Delete "$INSTDIR\*.csv"	
 	
 	Delete "$INSTDIR\icons\QGIS.ico"
 	Delete "$INSTDIR\icons\QGIS_Web.ico"
 	
 	;remove folders
+	RMDir /r "$INSTDIR\bin"
 	RMDir /r "$INSTDIR\doc"
 	RMDir /r "$INSTDIR\grass"
 	RMDir /r "$INSTDIR\i18n"