Changeset 64347 in vbox for trunk/src/VBox

Timestamp:

Oct 21, 2016 9:17:21 AM (8 years ago)

Author:

vboxsync

Message:

Installer/win: minor cleanup, removing commented out bits (which won't be activated and contain INSTALLDIR references which wouldn't work anyway in the MSM case)

File:

• trunk/src/VBox/Installer/win/VBoxMergeApp.wxi (modified) (3 diffs)

trunk/src/VBox/Installer/win/VBoxMergeApp.wxi

@@ -113 +113 @@
 
 
-    <!--
-
-    <Component Id="cp_StartMenuShortcut" Guid="1C137D24-E599-47BD-98D0-2F62F202A8EA" Win64="$(var.Property_Win64)">
-        <RegistryValue Root="HKCU" Key="$(var.Property_RegKeyInstall)" Type="string"
-                       Value="installed" KeyPath="yes" />
-        <Shortcut Id="ShortcutStartMenuVBox" Directory="ProgramMenuDir"
-                  Name="VirtualBox" WorkingDirectory="INSTALLDIR" Advertise="no" Target="VirtualBox.exe" />
-        <RemoveFolder Id="ShortcutStartMenuVBoxRemove" On="uninstall" />
-    </Component>-->
-
     <!---->
 
@@ -193 +183 @@
               Source="$(env.PATH_OUT)\bin\VBoxManage.exe" />
         <File Id="file_VBoxHeadless.exe" Name="VBoxHeadless.exe"
-              Source="$(env.PATH_OUT)\bin\VBoxHeadless.exe">
-            <!-- Create a simple shortcut for VBoxVRDP, which is not present anymore, pointing to VBoxHeadless.exe -->
-       <!--     <Shortcut Id="ShortcutVBoxVRDP" Directory="INSTALLDIR" Name="VBoxVRDP" Show="normal" WorkingDirectory="INSTALLDIR"/> -->
-        </File>
+              Source="$(env.PATH_OUT)\bin\VBoxHeadless.exe" />
 <?if $(env.VBOX_WITH_HARDENING) = "yes" ?>
         <File Id="file_VBoxHeadless.dll" Name="VBoxHeadless.dll"
@@ -229 +216 @@
 <?endif ?>
 <?if $(env.VBOX_WITH_DTRACE) = "yes" ?>
-         <File Id="file_VBoxDTrace.exe" Name="VBoxDTrace.exe" Source="$(env.PATH_OUT)\bin\VBoxDTrace.exe" />
+        <File Id="file_VBoxDTrace.exe" Name="VBoxDTrace.exe" Source="$(env.PATH_OUT)\bin\VBoxDTrace.exe" />
 <?endif ?>
         <!-- VBox DLL files -->