[ros-diffs] [dreimer] 30264: Fix Icon and Uninstall Procedure. This should be the Final Commit for the Installer.

Author: dreimer
Date: Thu Nov  8 13:14:57 2007
New Revision: 30264

URL: http://svn.reactos.org/svn/reactos?rev=30264&view=rev
Log:
Fix Icon and Uninstall Procedure. This should be the Final Commit for the Installer.

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

Modified: trunk/tools/RosBE-Windows/Root/ChangeLog.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/ChangeLog…
==============================================================================
--- trunk/tools/RosBE-Windows/Root/ChangeLog.txt (original)
+++ trunk/tools/RosBE-Windows/Root/ChangeLog.txt Thu Nov  8 13:14:57 2007
@@ -2,7 +2,7 @@
 
 - Updated: GCC 4.1.3 Build 20071015 with recent patches to get makex run under Vista.
(Peter Ward, TODO: name of tamlin)
 - Updated: Binutils 2.18.50 Build 20071015. (Peter Ward)
-- Updated: NASM to 0.99.05 (Daniel Reimer)
+- Updated: NASM to 0.99.06 (Daniel Reimer)
 
 - Updated RosBE Configuration Tool. (Pierre Schweitzer, Peter Ward, Daniel Reimer)
    - Added French translation. (Pierre Schweitzer)

Modified: trunk/tools/RosBE-Windows/RosBE.nsi
URL:
http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/RosBE.nsi?rev=…
==============================================================================
--- trunk/tools/RosBE-Windows/RosBE.nsi (original)
+++ trunk/tools/RosBE-Windows/RosBE.nsi Thu Nov  8 13:14:57 2007
@@ -200,7 +200,7 @@
     !insertmacro MUI_STARTMENU_WRITE_BEGIN Application
         CreateDirectory "$SMPROGRAMS\$ICONS_GROUP"
         SetOutPath $REACTOS_SOURCE_DIRECTORY
-        CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\ReactOS Build Environment.lnk"
"$SYSDIR\cmd.exe" '/k "$INSTDIR\RosBE.cmd"'
"$INSTDIR\reactos.ico"
+        CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\ReactOS Build Environment.lnk"
"$SYSDIR\cmd.exe" '/k "$INSTDIR\RosBE.cmd"'
"$INSTDIR\terminal.ico"
         SetOutPath $INSTDIR
         CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\Uninstall RosBE.lnk" \
                        "$INSTDIR\Uninstall-${PRODUCT_VERSION}.exe"
@@ -218,7 +218,7 @@
     ;; Add our desktop shortcuts.
     ;;
     SetOutPath $REACTOS_SOURCE_DIRECTORY
-    CreateShortCut "$DESKTOP\ReactOS Build Environment.lnk"
"$SYSDIR\cmd.exe" '/k "$INSTDIR\RosBE.cmd"'
"$INSTDIR\reactos.ico"
+    CreateShortCut "$DESKTOP\ReactOS Build Environment.lnk"
"$SYSDIR\cmd.exe" '/k "$INSTDIR\RosBE.cmd"'
"$INSTDIR\terminal.ico"
 SectionEnd
 
 Section /o "Quick Launch Shortcuts" SEC10
@@ -228,7 +228,7 @@
     ;; Add our quick launch shortcuts.
     ;;
     SetOutPath $REACTOS_SOURCE_DIRECTORY
-    CreateShortCut "$QUICKLAUNCH\ReactOS Build Environment.lnk"
"$SYSDIR\cmd.exe" '/k "$INSTDIR\RosBE.cmd"'
"$INSTDIR\reactos.ico"
+    CreateShortCut "$QUICKLAUNCH\ReactOS Build Environment.lnk"
"$SYSDIR\cmd.exe" '/k "$INSTDIR\RosBE.cmd"'
"$INSTDIR\terminal.ico"
 SectionEnd
 
 Section -Post SEC11
@@ -278,6 +278,7 @@
     Delete /REBOOTOK "$INSTDIR\TimeDate.cmd"
     Delete /REBOOTOK "$INSTDIR\readme.pdf"
     Delete /REBOOTOK "$INSTDIR\reactos.ico"
+    Delete /REBOOTOK "$INSTDIR\terminal.ico"
     Delete /REBOOTOK "$INSTDIR\RosBE.mac"
     Delete /REBOOTOK "$INSTDIR\ChangeLog.txt"
     Delete /REBOOTOK "$INSTDIR\LICENSE.txt"