directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pamarce...@apache.org
Subject svn commit: r763653 - /directory/studio/trunk/tools/Windows Installer/windows_installer.nsi
Date Thu, 09 Apr 2009 13:49:15 GMT
Author: pamarcelot
Date: Thu Apr  9 13:49:14 2009
New Revision: 763653

URL: http://svn.apache.org/viewvc?rev=763653&view=rev
Log:
Fixed a bug when running the uninstaller from the installer (some directories were not correctly
deleted).

Modified:
    directory/studio/trunk/tools/Windows Installer/windows_installer.nsi

Modified: directory/studio/trunk/tools/Windows Installer/windows_installer.nsi
URL: http://svn.apache.org/viewvc/directory/studio/trunk/tools/Windows%20Installer/windows_installer.nsi?rev=763653&r1=763652&r2=763653&view=diff
==============================================================================
--- directory/studio/trunk/tools/Windows Installer/windows_installer.nsi (original)
+++ directory/studio/trunk/tools/Windows Installer/windows_installer.nsi Thu Apr  9 13:49:14
2009
@@ -183,11 +183,8 @@
         # Adding installer source files
         File /r "${SourceFolder}\*"
         
-        # Closing uninstall log
-        !insertmacro UNINSTALL.LOG_CLOSE_INSTALL
-        
         # Storing install location
-        WriteRegStr "${INSTDIR_REG_ROOT}" "SOFTWARE\${Application}" "InstallDir" "$INSTDIR"
+        WriteRegStr "${INSTDIR_REG_ROOT}" "SOFTWARE\${Application}" "InstallDir" $INSTDIR
 
         # Creating directories in the start menu
         CreateDirectory "$SMPROGRAMS\Apache Directory Studio"
@@ -210,12 +207,19 @@
         
         # Creating a shortcut to the uninstaller
         CreateShortCut "$SMPROGRAMS\Apache Directory Studio\Uninstall.lnk" "$INSTDIR\Uninstall.exe"
"" "$INSTDIR\Uninstall.exe" 0
+        
+        # Closing uninstall log
+        !insertmacro UNINSTALL.LOG_CLOSE_INSTALL
     SectionEnd
     
     # Uninstaller section
     Section Uninstall
-        # Removing installed files
+        # Removing installed files (one line per directory is mandatory)
         !insertmacro UNINSTALL.LOG_UNINSTALL "$INSTDIR"
+        !insertmacro UNINSTALL.LOG_UNINSTALL "$INSTDIR\configuration"
+        !insertmacro UNINSTALL.LOG_UNINSTALL "$INSTDIR\plugins"
+        !insertmacro UNINSTALL.LOG_UNINSTALL "$INSTDIR\features"
+        Delete "$INSTDIR\Uninstall.exe"
          
         # Finishing uninstall
         !insertmacro UNINSTALL.LOG_END_UNINSTALL



Mime
View raw message