From 14ab888d926b1e4cb3f2463bff5b80e1fe2af6e9 Mon Sep 17 00:00:00 2001
From: borutr <borutr@4a8a32a2-be11-0410-ad9d-d568d2c75423>
Date: Sun, 30 Mar 2008 08:34:44 +0000
Subject: [PATCH] * Small Device C Compiler 2.8.0 released * .version,
 doc/sdccman.lyx: changed sdcc version to 2.8.1 * support/scripts/sdcc.nsi:
 added finish page; this version   was used for 2.8.0 release

git-svn-id: https://sdcc.svn.sourceforge.net/svnroot/sdcc/trunk/sdcc@5121 4a8a32a2-be11-0410-ad9d-d568d2c75423
---
 .version                 |  2 +-
 ChangeLog                |  7 +++++++
 doc/sdccman.lyx          |  2 +-
 support/scripts/sdcc.nsi | 33 ++++++++++++++++++++++-----------
 4 files changed, 31 insertions(+), 13 deletions(-)

diff --git a/.version b/.version
index 834f2629..dbe59006 100644
--- a/.version
+++ b/.version
@@ -1 +1 @@
-2.8.0
+2.8.1
diff --git a/ChangeLog b/ChangeLog
index a8be6874..4367b750 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-03-30 Borut Razem <borut.razem AT siol.net>
+
+	* Small Device C Compiler 2.8.0 released
+	* .version, doc/sdccman.lyx: changed sdcc version to 2.8.1
+	* support/scripts/sdcc.nsi: added finish page; this version
+	  was used for 2.8.0 release
+
 2008-03-23 Borut Razem <borut.razem AT siol.net>
 
 	* src/pic/gen.h: Q&D solution for the bug, found by Jim Paris
diff --git a/doc/sdccman.lyx b/doc/sdccman.lyx
index f3ed932f..17698189 100644
--- a/doc/sdccman.lyx
+++ b/doc/sdccman.lyx
@@ -104,7 +104,7 @@ SDCC Compiler User Guide
 \begin_layout Date
 
 \size normal
-SDCC 2.8.0
+SDCC 2.8.1
 \size footnotesize
 
 \newline
diff --git a/support/scripts/sdcc.nsi b/support/scripts/sdcc.nsi
index b5f07e1f..5ca1890c 100644
--- a/support/scripts/sdcc.nsi
+++ b/support/scripts/sdcc.nsi
@@ -93,7 +93,7 @@
   StrCpy $SDCC.StrStack2 $SDCC.StrStack1
   StrCpy $SDCC.StrStack1 $SDCC.StrStack0
   StrCpy $SDCC.StrStack0 $SDCC.FunctionName
-  StrCpy $SDCC.FunctionName ${NAME}
+  StrCpy $SDCC.FunctionName "${NAME}"
 !macroend
 
 !define SDCC.PopStr "!insertmacro MACRO_SDCC_PopStr"
@@ -255,10 +255,15 @@ ${Function} SDCC.InstFilesLeave
   ${EndIf}
 ${FunctionEnd}
 
-; Finish page
+; 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_SHOWREADME_TEXT "Add $INSTDIR\bin to the PATH"
 !define MUI_FINISHPAGE_SHOWREADME_FUNCTION SDCC.AddBinToPath
 !define MUI_FINISHPAGE_SHOWREADME
+!define MUI_FINISHPAGE_BUTTON "Next"
+!insertmacro MUI_PAGE_FINISH
+
+; Finish page - reboot
 !insertmacro MUI_PAGE_FINISH
 
 ${Function} SDCC.AddBinToPath
@@ -271,6 +276,7 @@ ${FunctionEnd}
 ; Uninstaller pages
 !insertmacro MUI_UNPAGE_CONFIRM
 !insertmacro MUI_UNPAGE_INSTFILES
+!insertmacro MUI_UNPAGE_FINISH
 
 ; Language files
 !insertmacro MUI_LANGUAGE "English"
@@ -779,6 +785,14 @@ ${SectionEnd}
 ${Section} Uninstall SECUNINSTALL
   !insertmacro MUI_STARTMENU_GETFOLDER Application $MUI_STARTMENUPAGE_VARIABLE
 
+  ${DebugMsg} "removing path $INSTDIR\bin"
+  Push "$INSTDIR\bin"
+  Call un.SDCC.RemoveFromPath
+
+; Clean the registry
+  DeleteRegKey ${UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}"
+  DeleteRegKey ${SDCC_ROOT_KEY} "Software\${PRODUCT_NAME}"
+
   Delete "$SMPROGRAMS\$MUI_STARTMENUPAGE_VARIABLE\GPL 2 License.lnk"
   Delete "$SMPROGRAMS\$MUI_STARTMENUPAGE_VARIABLE\Change Log.lnk"
 !ifdef FULL_DOC
@@ -964,14 +978,6 @@ ${Section} Uninstall SECUNINSTALL
   RMDir "$INSTDIR\bin"
 
   RMDir "$INSTDIR"
-
-  ${DebugMsg} "removing path $INSTDIR\bin"
-  Push "$INSTDIR\bin"
-  Call un.SDCC.RemoveFromPath
-
-; Clean the registry
-  DeleteRegKey ${UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}"
-  DeleteRegKey ${SDCC_ROOT_KEY} "Software\${PRODUCT_NAME}"
 ;;;;  SetAutoClose true
 ${SectionEnd}
 
@@ -1024,8 +1030,10 @@ ${Function} SDCC.AddToPath
               ${If} $2 = 26        ; DOS EOF
                 FileSeek $1 -1 END ; write over EOF
               ${Endif}
+              ${DebugMsg} "adding line $\r$\nSET PATH=%PATH%;$3$\r$\n"
               FileWrite $1 "$\r$\nSET PATH=%PATH%;$3$\r$\n"
               FileClose $1
+              ${DebugMsg} "SetRebootFlag true"
               SetRebootFlag true
             ${Else}
               ;System PATH variable is at:
@@ -1098,6 +1106,8 @@ ${Function} ${un}SDCC.RemoveFromPath
       ${Else}
         ; This is the line I'm looking for:
         ; don't copy it
+        ${DebugMsg} "removing line $0"
+        ${DebugMsg} "SetRebootFlag true"
         SetRebootFlag true
         Goto nextLine
       ${EndIf}
@@ -1296,7 +1306,8 @@ ${Function} SDCC.PageLeaveReinstall
   HideWindow
 
   ClearErrors
-  ExecWait '$R1'
+  ; ExecWait doesn't wait if _?=$INSTDIR is not defined!
+  ExecWait '$R1 _?=$INSTDIR'
 
   ${If} $R0 == "2"
     Quit
-- 
2.30.2