Changeset 34446 in vbox

Timestamp:

Nov 29, 2010 10:16:22 AM (14 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

68220

Message:

Windows Guest Additions installer: Set reboot flag also on debug build, include "r" in debug revision string.

File:

• trunk/src/VBox/Additions/WINNT/Installer/VBoxGuestAdditions.nsi (modified) (2 diffs)

trunk/src/VBox/Additions/WINNT/Installer/VBoxGuestAdditions.nsi

@@ -115 +115 @@
   ; Set branding text which appears on the horizontal line at the bottom
 !ifdef _DEBUG
-  BrandingText "VirtualBox Windows Additions $%VBOX_VERSION_STRING% ($%VBOX_SVN_REV%) - Debug Build"
+  BrandingText "VirtualBox Windows Additions $%VBOX_VERSION_STRING% (r$%VBOX_SVN_REV%) - Debug Build"
 !else
   BrandingText "VirtualBox Windows Additions $%VBOX_VERSION_STRING%"
@@ -677 +677 @@
   WriteRegStr HKLM "${PRODUCT_INSTALL_KEY}" "InstallDir" "$INSTDIR"
 
-!ifndef _DEBUG
-  SetRebootFlag true  ; This will show a reboot page at end of installation
-!endif
+  ; Set the reboot flag to tell the finish page that is should
+  ; default to the "reboot now" entry
+  SetRebootFlag true
 
 exit: