Changeset 52827 in vbox for trunk/src/VBox/Installer/win

Timestamp:

Sep 23, 2014 10:51:30 AM (10 years ago)

Author:

vboxsync

Message:

Windows installer: small refinement of installer script

Location:

trunk/src/VBox/Installer/win

Files:

• Properties.wxi (modified) (2 diffs)
• VirtualBox.wxs (modified) (2 diffs)

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

@@ -29 +29 @@
       <?define Property_Win64        = "yes" ?>
 
-      <?if $(env.VBOX_SIGNING_MODE) != none ?>
+      <?if $(env.VBOX_SIGNING_MODE) ?>
           <?define Property_DriverLegacy = "no" ?>
       <?else ?>
@@ -40 +40 @@
       <?define Property_Win64        = "no" ?>
 
-      <?if $(env.VBOX_SIGNING_MODE) != none ?>
+      <?if $(env.VBOX_SIGNING_MODE) ?>
           <!-- Note: Settings this to 'no' breaks Windows 2000 installs (!) -->
           <?define Property_DriverLegacy = "yes" ?>

trunk/src/VBox/Installer/win/VirtualBox.wxs

@@ -188 +188 @@
 
     <Directory Id="TARGETDIR" Name="SourceDir">
-        <Directory Id="$(var.Property_ProgramFiles)" Name="PFiles">
-            <Directory Id="INSTALLDIR" Name="$(env.VBOX_PRODUCT)">
+            <Directory Id="INSTALLDIR">
 <?if $(env.VBOX_WITH_MSM_INSTALL) = "yes" ?>
                 <Merge Id="msm_VBoxApp" Language="!(loc.LANG)" SourceFile="$(var.Property_VBoxMergeApp)" DiskId="1" />
@@ -294 +293 @@
 
             </Directory>
-        </Directory>
     </Directory> <!-- TARGETDIR -->