diff options
| author | Lorry Tar Creator <lorry-tar-importer@baserock.org> | 2014-03-26 19:21:20 +0000 |
|---|---|---|
| committer | <> | 2014-05-08 15:03:54 +0000 |
| commit | fb123f93f9f5ce42c8e5785d2f8e0edaf951740e (patch) | |
| tree | c2103d76aec5f1f10892cd1d3a38e24f665ae5db /src/VBox/Additions/WINNT/Installer/VBoxGuestAdditionsUninstall.nsh | |
| parent | 58ed4748338f9466599adfc8a9171280ed99e23f (diff) | |
| download | VirtualBox-master.tar.gz | |
Imported from /home/lorry/working-area/delta_VirtualBox/VirtualBox-4.3.10.tar.bz2.HEADVirtualBox-4.3.10master
Diffstat (limited to 'src/VBox/Additions/WINNT/Installer/VBoxGuestAdditionsUninstall.nsh')
| -rw-r--r-- | src/VBox/Additions/WINNT/Installer/VBoxGuestAdditionsUninstall.nsh | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/src/VBox/Additions/WINNT/Installer/VBoxGuestAdditionsUninstall.nsh b/src/VBox/Additions/WINNT/Installer/VBoxGuestAdditionsUninstall.nsh index 7138102c..d99bd55b 100644 --- a/src/VBox/Additions/WINNT/Installer/VBoxGuestAdditionsUninstall.nsh +++ b/src/VBox/Additions/WINNT/Installer/VBoxGuestAdditionsUninstall.nsh @@ -4,7 +4,7 @@ ; ; -; Copyright (C) 2006-2012 Oracle Corporation +; Copyright (C) 2006-2013 Oracle Corporation ; ; This file is part of VirtualBox Open Source Edition (OSE), as ; available from http://www.virtualbox.org. This file is free software; @@ -69,10 +69,10 @@ FunctionEnd !macro Uninstall un Function ${un}Uninstall - DetailPrint "Uninstalling system files ..." + ${LogVerbose} "Uninstalling system files ..." !ifdef _DEBUG - DetailPrint "Detected OS version: Windows $g_strWinVersion" - DetailPrint "System Directory: $g_strSystemDir" + ${LogVerbose} "Detected OS version: Windows $g_strWinVersion" + ${LogVerbose} "System Directory: $g_strSystemDir" !endif ; Which OS are we using? @@ -85,6 +85,7 @@ Function ${un}Uninstall StrCmp $g_strWinVersion "Vista" vista ; Windows Vista StrCmp $g_strWinVersion "7" vista ; Windows 7 StrCmp $g_strWinVersion "8" vista ; Windows 8 + StrCmp $g_strWinVersion "8_1" vista ; Windows 8.1 / Windows Server 2012 R2 ${If} $g_bForceInstall == "true" Goto vista ; Assume newer OS than we know of ... @@ -127,10 +128,10 @@ FunctionEnd !macro UninstallInstDir un Function ${un}UninstallInstDir - DetailPrint "Uninstalling directory ..." + ${LogVerbose} "Uninstalling directory ..." !ifdef _DEBUG - DetailPrint "Detected OS version: Windows $g_strWinVersion" - DetailPrint "System Directory: $g_strSystemDir" + ${LogVerbose} "Detected OS version: Windows $g_strWinVersion" + ${LogVerbose} "System Directory: $g_strSystemDir" !endif ; Which OS are we using? @@ -143,6 +144,7 @@ Function ${un}UninstallInstDir StrCmp $g_strWinVersion "Vista" vista ; Windows Vista StrCmp $g_strWinVersion "7" vista ; Windows 7 StrCmp $g_strWinVersion "8" vista ; Windows 8 + StrCmp $g_strWinVersion "8_1" vista ; Windows 8.1 / Windows Server 2012 R2 ${If} $g_bForceInstall == "true" Goto vista ; Assume newer OS than we know of ... |