You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ah...@apache.org on 2007/05/02 02:07:36 UTC

svn commit: r534279 - /maven/maven-1/plugins/trunk/nsis/src/plugin-resources/templates/setup.jelly

Author: aheritier
Date: Tue May  1 17:07:35 2007
New Revision: 534279

URL: http://svn.apache.org/viewvc?view=rev&rev=534279
Log:
cosmetics changes....

Modified:
    maven/maven-1/plugins/trunk/nsis/src/plugin-resources/templates/setup.jelly

Modified: maven/maven-1/plugins/trunk/nsis/src/plugin-resources/templates/setup.jelly
URL: http://svn.apache.org/viewvc/maven/maven-1/plugins/trunk/nsis/src/plugin-resources/templates/setup.jelly?view=diff&rev=534279&r1=534278&r2=534279
==============================================================================
--- maven/maven-1/plugins/trunk/nsis/src/plugin-resources/templates/setup.jelly (original)
+++ maven/maven-1/plugins/trunk/nsis/src/plugin-resources/templates/setup.jelly Tue May  1 17:07:35 2007
@@ -125,7 +125,7 @@
 
 <util:available file="${maven.nsis.src}/desktop-shortcuts.nsh">
 ; OPTIONAL Desktop Shortcut 
-Section "Create Desktop Shortcut"
+Section "Create Desktop Shortcut(s)"
   !include "desktop-shortcuts.nsh"
 SectionEnd
 </util:available>
@@ -136,28 +136,22 @@
    WriteUninstaller "$$INSTDIR\Uninst.exe"
 SectionEnd
 
-; -------------------------------------------------------------- Maven Uninstaller
+; -------------------------------------------------------------- Uninstaller
 Section "Uninstall"
-  ; remove registry keys
-  DeleteRegKey HKLM "$${PROJECT_REG_UNINSTALL_KEY}"
-  DeleteRegKey HKLM "$${PROJECT_REG_KEY}"
-
-  <util:available file="${maven.nsis.src}/registry-uninstall.nsh">
-    !include "registry-uninstall.nsh"
-  </util:available>
-
-  ; remove files
+  DetailPrint "Remove files"
   Delete $$INSTDIR\*.*
-
   ; MUST REMOVE UNINSTALLER, too
   Delete $$INSTDIR\Uninst.exe
-
   !include "remove-shortcuts.nsh"
-
   ; Recursively remove files and directories used
   ; this should also take care of the installer  
   RMDir /r "$$INSTDIR"
-
+  DetailPrint "Remove registry keys"
+  DeleteRegKey HKLM "$${PROJECT_REG_UNINSTALL_KEY}"
+  DeleteRegKey HKLM "$${PROJECT_REG_KEY}"
+  <util:available file="${maven.nsis.src}/registry-uninstall.nsh">
+    !include "registry-uninstall.nsh"
+  </util:available>
 SectionEnd
 
 ; -------------------------------------------------------------- Add Images to the Installer / UnInstaller