* support/scripts/sdcc.nsi: remove uninstall.exe after uninstallation,

  fixed typo

git-svn-id: https://sdcc.svn.sourceforge.net/svnroot/sdcc/trunk/sdcc@5159 4a8a32a2-be11-0410-ad9d-d568d2c75423

diff --git a/ChangeLog b/ChangeLog
index 7bf46a1a11b076b0487fef5cb08bec7ce249c557..43ce07a7b39c6283e617fa0800ed8ef7ff46bcc5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-05-19 Borut Razem <borut.razem AT siol.net>
+
+       * support/scripts/sdcc.nsi: remove uninstall.exe after uninstallation,
+         fixed typo
+
 2008-05-18 Borut Razem <borut.razem AT siol.net>
 
        * support/Utils/dbuf_string.[ch]: added dbuf_chomp(),
@@ -49,7 +54,6 @@
 2008-05-05 Borut Razem <borut.razem AT siol.net>
 
        * support/regression/Makefile.in,
-         support/regression/fwk/lib/testfwk.c,
          support/regression/ports/ds390/spec.mk,
          support/regression/ports/hc08/spec.mk,
          support/regression/ports/mcs51-common/spec.mk,

diff --git a/support/scripts/sdcc.nsi b/support/scripts/sdcc.nsi
index faf9895ba8683de8950820c2046f98cf8f2c2df9..645ac65d7b30611ef779a02a53ada838e32c392f 100644 (file)
--- a/support/scripts/sdcc.nsi
+++ b/support/scripts/sdcc.nsi
@@ -256,7 +256,7 @@ ${Function} SDCC.InstFilesLeave
 ${FunctionEnd}
 
 ; Finish page - add to path
-!define MUI_FINISHPAGE_TEXT "Confirm the checkbox if you won to add SDCC binary directory to the PATH environment variable"
+!define MUI_FINISHPAGE_TEXT "Confirm the checkbox if you want to add SDCC binary directory to the PATH environment variable"
 !define MUI_FINISHPAGE_SHOWREADME_TEXT "Add $INSTDIR\bin to the PATH"
 !define MUI_FINISHPAGE_SHOWREADME_FUNCTION SDCC.AddBinToPath
 !define MUI_FINISHPAGE_SHOWREADME
@@ -1306,12 +1306,17 @@ ${Function} SDCC.PageLeaveReinstall
   ;Run uninstaller
   HideWindow
 
-  ClearErrors
-  ; ExecWait doesn't wait if _?=$INSTDIR is not defined!
-  ExecWait '$R1 _?=$INSTDIR'
-
   ${If} $R0 == "2"
+    ; Uninstall only: uninstaller should be removed
+    ClearErrors
+    ; ExecWait doesn't wait if _?=$INSTDIR is not defined!
+    ExecWait '$R1'
     Quit
+  ${Else}
+    ; Uninstal & Reinstall: uninstaller will be rewritten
+    ClearErrors
+    ; ExecWait doesn't wait if _?=$INSTDIR is not defined!
+    ExecWait '$R1 _?=$INSTDIR'
   ${EndIf}
 
   BringToFront