[dreimer] 41721: Installer Fixes: * Installer starts the Uninstaller of the old Version again. * Installer does not accidentially kill the whole Start menu again. * Installer uninstalls charch too. * Fixed some line skippers. Biiiiig thx to care2debug for the help. This would not have been possible without it.

Author: dreimer
Date: Wed Jul  1 03:07:04 2009
New Revision: 41721

URL: http://svn.reactos.org/svn/reactos?rev=41721&view=rev
Log:
Installer Fixes:
* Installer starts the Uninstaller of the old Version again.
* Installer does not accidentially kill the whole Start menu again.
* Installer uninstalls charch too.
* Fixed some line skippers.
Biiiiig thx to care2debug for the help. This would not have been possible without it.

Modified:
    trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt
    trunk/tools/RosBE/RosBE-Windows/RosBE.nsi
    trunk/tools/RosBE/RosBE-Windows/RosBE64.nsi

Modified: trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Cha…
==============================================================================
--- trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt [iso-8859-1] (original)
+++ trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt [iso-8859-1] Wed Jul  1 03:07:04
2009
@@ -1,4 +1,13 @@
-*** Jul xxth, 2009 - RosBE 1.4.4 Released
+*** Oct XXth, 2009 - RosBE 1.4.5 Released
+
+- Installer Fixes:
+  * Installer starts the Uninstaller of the old Version again.
+  * Installer does not accidentially kill the whole Start menu again.
+  * Installer uninstalls charch too.
+  * Fixed some line skippers.
+(care2debug, Daniel Reimer)
+
+*** Jul 29th, 2009 - RosBE 1.4.4 Released
 
 - Reverted to the old GCC. Because of the optimization we have problems running ROS on
Pentium I PCs. (Colin Finck)
 - Updated SVN to 1.6.3 (Daniel Reimer)
@@ -9,8 +18,9 @@
 - Updated: NSIS to 2.45 (Daniel Reimer)
 - Added a way to enable/disable the Version Show up (Daniel Reimer)
 - Fixed a bug with not activating settings in options.ps1 (Daniel Reimer)
-- Added a way to enable/disable the Version Show up (Daniel Reimer)
-- Fixed a bug with not activating settings in options.ps1 (Daniel Reimer)
+- Added a while-like loop into Batch where already used in PS. This makes it possible to
get more than 10 Updates
+  and realizes the Log show feature in SSVN in Batch too. (Victor Martinez, Daniel
Reimer)
+- Killed a forgotten regression test from update.ps1 (Daniel Reimer)
 
 *** May 26th, 2009 - RosBE 1.4.3 Released
 

Modified: trunk/tools/RosBE/RosBE-Windows/RosBE.nsi
URL:
http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/RosBE.ns…
==============================================================================
--- trunk/tools/RosBE/RosBE-Windows/RosBE.nsi [iso-8859-1] (original)
+++ trunk/tools/RosBE/RosBE-Windows/RosBE.nsi [iso-8859-1] Wed Jul  1 03:07:04 2009
@@ -448,13 +448,17 @@
     ;;
     RMDir /r /REBOOTOK "$INSTDIR\i386"
     RMDir /r /REBOOTOK "$INSTDIR\Tools"
+    StrCmp $ICONS_GROUP "" NO_SHORTCUTS
     RMDir /r /REBOOTOK "$SMPROGRAMS\$ICONS_GROUP"
+    NO_SHORTCUTS:
     Delete /REBOOTOK "$INSTDIR\Build.cmd"
     Delete /REBOOTOK "$INSTDIR\Build-Multi.cmd"
     Delete /REBOOTOK "$INSTDIR\Build-Shared.cmd"
     Delete /REBOOTOK "$INSTDIR\Build.ps1"
     Delete /REBOOTOK "$INSTDIR\chdefdir.cmd"
     Delete /REBOOTOK "$INSTDIR\chdefdir.ps1"
+    Delete /REBOOTOK "$INSTDIR\charch.cmd"
+    Delete /REBOOTOK "$INSTDIR\charch.ps1"
     Delete /REBOOTOK "$INSTDIR\chdefgcc.cmd"
     Delete /REBOOTOK "$INSTDIR\chdefgcc.ps1"
     Delete /REBOOTOK "$INSTDIR\Clean.cmd"
@@ -533,6 +537,7 @@
         Push $R0
         Call GetParent
         Pop $PREVIOUSINSTDIR
+        Pop $R0
         ExecWait '$R0 _?=$PREVIOUSINSTDIR'
     UninstallPrevious_no:
 FunctionEnd

Modified: trunk/tools/RosBE/RosBE-Windows/RosBE64.nsi
URL:
http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/RosBE64.…
==============================================================================
--- trunk/tools/RosBE/RosBE-Windows/RosBE64.nsi [iso-8859-1] (original)
+++ trunk/tools/RosBE/RosBE-Windows/RosBE64.nsi [iso-8859-1] Wed Jul  1 03:07:04 2009
@@ -255,6 +255,7 @@
         Push $R0
         Call GetParent
         Pop $PREVIOUSINSTDIR
+        Pop $R0
         ExecWait '$R0 _?=$PREVIOUSINSTDIR'
     UninstallPrevious_no:
 FunctionEnd