VirtualBox

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


Ignore:
Timestamp:
Apr 25, 2018 2:19:58 PM (7 years ago)
Author:
vboxsync
svn:sync-xref-src-repo-rev:
122281
Message:

Installer/win: Trying to fix windows 10 detection. VersionNT stops at 603 because the microsoft buggers is running the MSI installer in 8.1 compatibilitiy mode or something similarlly stupid (go figure). Renamed Properties.wxi to Defines.wix (they're preprocessor defines, not properties) and added CommonProperties.wix for stuff like the new property that indicates whether we're installing on windows 10 (VBOX_IS_WINDOW_10). bugref:8691

Location:
trunk/src/VBox/Installer/win
Files:
14 edited
1 copied
1 moved

Legend:

Unmodified
Added
Removed

  • trunk/src/VBox/Installer/win/CommonProperties.wxi

    r72019 r72020  
    11<?xml version="1.0" encoding="utf-8"?>
    22<!--
    3     VirtualBox Windows Installation Script (WiX)
     3    VirtualBox Windows Installation Script (WiX), common properties (private).
    44
    5     Copyright (C) 2014-2016 Oracle Corporation
     5    Copyright (C) 2014-2018 Oracle Corporation
    66
    77    This file is part of VirtualBox Open Source Edition (OSE), as
    … …  
    1717         xmlns:difxapp="http://schemas.microsoft.com/wix/DifxAppExtension">
    1818
    19   <!-- TODO: Add "VBox" prefix! -->
    20   <?define Property_RegKey = "Software\$(env.VBOX_VENDOR_SHORT)\VirtualBox" ?>
    21   <?define Property_RegKeyInstall = "Software\$(env.VBOX_VENDOR_SHORT)\VirtualBox\Install" ?>
    22   <?define Property_Upgrade = "yes" ?>
    23   <?define Property_Version = "$(env.VBOX_VERSION_STRING_RAW)" ?>
    24   <?define Property_VersionExt = "$(env.VBOX_VERSION_STRING)" ?>
    25 
    26   <?if $(env.BUILD_TARGET_ARCH) = "amd64" ?>
    27       <?define Property_ProgramFiles = "ProgramFiles64Folder" ?>
    28       <?define Property_Platform     = "x64" ?>
    29       <?define Property_Win64        = "yes" ?>
    30 
    31       <?if $(env.VBOX_SIGNING_MODE)!= none ?>
    32           <?define Property_DriverLegacy = "no" ?>
    33       <?else ?>
    34           <?define Property_DriverLegacy = "yes" ?>
    35       <?endif ?>
    36 
    37   <?else ?>
    38       <?define Property_ProgramFiles = "ProgramFilesFolder" ?>
    39       <?define Property_Platform     = "x86" ?>
    40       <?define Property_Win64        = "no" ?>
    41 
    42       <?if $(env.VBOX_SIGNING_MODE)!= none ?>
    43           <!-- Note: Settings this to 'no' breaks Windows 2000 installs (!) -->
    44           <?define Property_DriverLegacy = "yes" ?>
    45       <?else ?>
    46           <?define Property_DriverLegacy = "yes" ?>
    47       <?endif ?>
    48 
    49   <?endif ?>
    50 
    51   <!-- If we build a combined installer (32- and 64-bit in one installer), we
    52        use two installer "disks": One for all platform-specific stuff and one which
    53        contains all common (platform independent) stuff (like manuals, bitmaps etc) -->
    54   <?if $(env.VBOX_WITH_COMBINED_PACKAGE) = "yes" ?>
    55       <?define Property_DiskIdCommon = "2" ?>
    56   <?else ?>
    57       <?define Property_DiskIdCommon = "1" ?>
    58   <?endif ?>
     19  <Property Id="VBOX_IS_WINDOW_10">
     20    <DirectorySearch Id="DirSearchForWindows10NtDll" Path="[SystemFolder]" Depth="0">
     21      <FileSearch Name="ntdll.dll" MinVersion="6.4.10000.0"/>
     22    </DirectorySearch>
     23  </Property>
    5924
    6025</Include>
     26

  • trunk/src/VBox/Installer/win/Defines.wxi

    r72012 r72020  
    11<?xml version="1.0" encoding="utf-8"?>
    22<!--
    3     VirtualBox Windows Installation Script (WiX)
     3    VirtualBox Windows Installation Script (WiX), preprocessor defines.
    44
    55    Copyright (C) 2014-2016 Oracle Corporation

  • trunk/src/VBox/Installer/win/Makefile.kmk

    r71955 r72020  
    502502#
    503503$(PATH_SUB_CURRENT)/VirtualBox.wxs: \
    504         $(PATH_SUB_CURRENT)/Properties.wxi \
     504        $(PATH_SUB_CURRENT)/CommonProperties.wxi \
     505        $(PATH_SUB_CURRENT)/Defines.wxi \
    505506        $(PATH_SUB_CURRENT)/VBoxMergeApp.wxi
    506507
    … …  
    658659
    659660$(eval BLDDIRS += $(VBOX_WIN_INST_REPACK_DIR)/files-VirtualBox_$(lang)/)
    660 $(eval OTHER_CLEAN += $(VBOX_REPACK_FILES_VirtualBox_$(lang)) $(VBOX_WIN_INST_REPACK_DIR)/VirtualBox_$(lang).files)
     661$(eval OTHER_CLEAN += $(VBOX_REPACK_FILES_VirtualBox_$(lang)) $(VBOX_WIN_INST_REPACK_DIR)/VirtualBox_$(lang).files $(VBOX_WIN_INST_OUT_DIR)/$(lang)/VirtualBox_$(lang).wixobj.dep)
    661662endef
    662663
    … …  
    783784        $(QUIET)$(VBOX_XSLTPROC) $(VBOX_PATH_WIN_INST_SRC)/dep2.xsl "$$@" | sort  | $(SED) '$!N; /^\(.*\)\n\1$$$$/!P; D' >> "[email protected]"
    784785        $(QUIET)$(APPEND) -n '[email protected]' '' ''
     786
     787$(eval OTHER_CLEAN += $(VBOX_WIN_INST_OUT_DIR)/VBoxMerge$(module)_$(lang).wixobj)
    785788endef
    786789
    … …  
    940943                ) ) \
    941944               'copy /y "$(@F)" "$(notdir $(PACKAGE_NAME_FINAL))" || exit /b1' \
    942                 '@echo Create multilanguage MSI: $(@F)'
     945                '@echo Create multilanguage MSI: $(notdir $(PACKAGE_NAME_FINAL))'
    943946
    944947# Copy multilingual installer to bin.

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

    r72004 r72020  
    3838<?if $(env.VBOX_SIGNING_MODE) != none ?>
    3939            <Component Id="cp_VBoxDrvCat_PreW10" Guid="673195c2-f315-42e7-ff00-5acbd91ea0bd" Win64="$(var.Property_Win64)">
    40                 <Condition><![CDATA[(VersionNT < 1000)]]></Condition>
     40                <Condition><![CDATA[(NOT VBOX_IS_WINDOW_10)]]></Condition>
    4141                <File Id="file_VBoxDrv_PreW10.cat" Name="VBoxDrv.cat" Source="$(env.PATH_OUT)\bin\VBoxDrv-PreW10.cat" />
    4242            </Component>
    4343            <Component Id="cp_VBoxDrvCat_W10" Guid="589be90d-0286-4684-503d-a1681f9587bc" Win64="$(var.Property_Win64)">
    44                 <Condition><![CDATA[(VersionNT >= 1000)]]></Condition>
     44                <Condition><![CDATA[(VBOX_IS_WINDOW_10)]]></Condition>
    4545                <File Id="file_VBoxDrv.cat" Name="VBoxDrv.cat" Source="$(env.PATH_OUT)\bin\VBoxDrv.cat" />
    4646            </Component>

  • trunk/src/VBox/Installer/win/VBoxMergeApp.wxs

    r69407 r72020  
    1414-->
    1515
    16 <?include Properties.wxi ?>
    17 
    1816<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
    1917     xmlns:difxapp="http://schemas.microsoft.com/wix/DifxAppExtension">
     18
     19    <?include Properties.wxi ?>
    2020
    2121    <!-- Note: GUIDs in WiX *must* be uppercase! -->
    … …  
    4949                 SummaryCodepage="1252"/>
    5050
     51        <?include CommonProperties.wxi ?>
    5152        <?include PublicProperties.wxi ?>
    5253

  • trunk/src/VBox/Installer/win/VBoxMergeCOM32On64.wxs

    r64339 r72020  
    1414-->
    1515
    16 <?include Properties.wxi ?>
    17 
    1816<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
    1917     xmlns:difxapp="http://schemas.microsoft.com/wix/DifxAppExtension">
     18
     19    <?include Properties.wxi ?>
    2020
    2121    <Module Id="msm_VBoxCOM32On64"
    … …  
    3434                 SummaryCodepage="1252"/>
    3535
     36        <?include CommonProperties.wxi ?>
    3637        <?include PublicProperties.wxi ?>
    3738

  • trunk/src/VBox/Installer/win/VBoxMergeNetAdp.wxs

    r69407 r72020  
    1414-->
    1515
    16 <?include Properties.wxi ?>
    17 
    1816<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
    1917     xmlns:difxapp="http://schemas.microsoft.com/wix/DifxAppExtension">
     18
     19    <?include Properties.wxi ?>
    2020
    2121    <Module Id="msm_VBoxNetworkAdp"
    … …  
    3535
    3636
     37        <?include CommonProperties.wxi ?>
    3738        <?include PublicProperties.wxi ?>
    3839

  • trunk/src/VBox/Installer/win/VBoxMergeNetAdp6.wxi

    r72004 r72020  
    2020        <File Id="file_VBoxNetAdp6_PreW10.cat" Name="VBoxNetAdp6.cat" Source="$(env.PATH_OUT)\bin\VBoxNetAdp6-PreW10.cat" />
    2121    <?if $(env.VBOX_WITH_MSM_INSTALL) = "yes" ?>
    22         <Condition><![CDATA[(localMSMNetworkType="NDIS6") AND (VersionNT < 1000)]]></Condition>
     22        <Condition><![CDATA[(localMSMNetworkType="NDIS6") AND (NOT VBOX_IS_WINDOW_10)]]></Condition>
    2323    <?else ?>
    24         <Condition><![CDATA[(NETWORKTYPE="NDIS6") AND (VersionNT < 1000)]]></Condition>
     24        <Condition><![CDATA[(NETWORKTYPE="NDIS6") AND (NOT VBOX_IS_WINDOW_10)]]></Condition>
    2525    <?endif ?>
    2626    </Component>
    … …  
    2828        <File Id="file_VBoxNetAdp6_W10.cat" Name="VBoxNetAdp6.cat" Source="$(env.PATH_OUT)\bin\VBoxNetAdp6.cat" />
    2929    <?if $(env.VBOX_WITH_MSM_INSTALL) = "yes" ?>
    30         <Condition><![CDATA[(localMSMNetworkType="NDIS6") AND (VersionNT >= 1000)]]></Condition>
     30        <Condition><![CDATA[(localMSMNetworkType="NDIS6") AND (VBOX_IS_WINDOW_10)]]></Condition>
    3131    <?else ?>
    32         <Condition><![CDATA[(NETWORKTYPE="NDIS6") AND (VersionNT >= 1000)]]></Condition>
     32        <Condition><![CDATA[(NETWORKTYPE="NDIS6") AND (VBOX_IS_WINDOW_10)]]></Condition>
    3333    <?endif ?>
    3434    </Component>

  • trunk/src/VBox/Installer/win/VBoxMergeNetAdp6.wxs

    r69407 r72020  
    1414-->
    1515
    16 <?include Properties.wxi ?>
    17 
    1816<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
    1917     xmlns:difxapp="http://schemas.microsoft.com/wix/DifxAppExtension">
     18
     19    <?include Properties.wxi ?>
    2020
    2121    <Module Id="msm_VBoxNetworkAdp6"
    … …  
    3535
    3636
     37        <?include CommonProperties.wxi ?>
    3738        <?include PublicProperties.wxi ?>
    3839

  • trunk/src/VBox/Installer/win/VBoxMergeNetFlt.wxs

    r69407 r72020  
    1414-->
    1515
    16 <?include Properties.wxi ?>
    17 
    1816<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
    1917     xmlns:difxapp="http://schemas.microsoft.com/wix/DifxAppExtension">
     18
     19    <?include Properties.wxi ?>
    2020
    2121    <Module Id="msm_VBoxNetworkFlt"
    … …  
    3535
    3636
     37        <?include CommonProperties.wxi ?>
    3738        <?include PublicProperties.wxi ?>
    3839

  • trunk/src/VBox/Installer/win/VBoxMergeNetLwf.wxi

    r72004 r72020  
    2222        <File Id="file_VBoxNetLwf_PreW10.cat" Name="VBoxNetLwf.cat" Source="$(env.PATH_OUT)\bin\VBoxNetLwf-PreW10.cat" />
    2323    <?if $(env.VBOX_WITH_MSM_INSTALL) = "yes" ?>
    24         <Condition><![CDATA[(localMSMNetworkType="NDIS6") AND (VersionNT < 1000)]]></Condition>
     24        <Condition><![CDATA[(localMSMNetworkType="NDIS6") AND (NOT VBOX_IS_WINDOW_10)]]></Condition>
    2525    <?else ?>
    26         <Condition><![CDATA[(NETWORKTYPE="NDIS6") AND (VersionNT < 1000)]]></Condition>
     26        <Condition><![CDATA[(NETWORKTYPE="NDIS6") AND (NOT VBOX_IS_WINDOW_10)]]></Condition>
    2727    <?endif ?>
    2828    </Component>
    … …  
    3030        <File Id="file_VBoxNetLwf_W10.cat" Name="VBoxNetLwf.cat" Source="$(env.PATH_OUT)\bin\VBoxNetLwf.cat" />
    3131    <?if $(env.VBOX_WITH_MSM_INSTALL) = "yes" ?>
    32         <Condition><![CDATA[(localMSMNetworkType="NDIS6") AND (VersionNT >= 1000)]]></Condition>
     32        <Condition><![CDATA[(localMSMNetworkType="NDIS6") AND (VBOX_IS_WINDOW_10)]]></Condition>
    3333    <?else ?>
    34         <Condition><![CDATA[(NETWORKTYPE="NDIS6") AND (VersionNT >= 1000)]]></Condition>
     34        <Condition><![CDATA[(NETWORKTYPE="NDIS6") AND (VBOX_IS_WINDOW_10)]]></Condition>
    3535    <?endif ?>
    3636    </Component>

  • trunk/src/VBox/Installer/win/VBoxMergeNetLwf.wxs

    r69407 r72020  
    1414-->
    1515
    16 <?include Properties.wxi ?>
    17 
    1816<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
    1917     xmlns:difxapp="http://schemas.microsoft.com/wix/DifxAppExtension">
     18
     19    <?include Properties.wxi ?>
    2020
    2121    <Module Id="msm_VBoxNetworkLwf"
    … …  
    3535
    3636
     37        <?include CommonProperties.wxi ?>
    3738        <?include PublicProperties.wxi ?>
    3839

  • trunk/src/VBox/Installer/win/VBoxMergePython.wxs

    r58599 r72020  
    1414-->
    1515
    16 <?include Properties.wxi ?>
    17 
    1816<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
    1917     xmlns:difxapp="http://schemas.microsoft.com/wix/DifxAppExtension">
     18
     19    <?include Properties.wxi ?>
    2020
    2121    <Module Id="msm_VBoxPython"
    … …  
    3434                 SummaryCodepage="1252"/>
    3535
     36        <?include CommonProperties.wxi ?>
    3637        <?include PublicProperties.wxi ?>
    3738

  • trunk/src/VBox/Installer/win/VBoxMergeUSB.wxi

    r72004 r72020  
    2020<?if $(env.VBOX_SIGNING_MODE)!= none ?>
    2121        <Component Id="cp_USBFilterDriverCat_PreW10" Guid="ef18fb4d-4530-40db-2957-de2dc90243ab" Win64="$(var.Property_Win64)">
    22             <Condition><![CDATA[(VersionNT < 1000)]]></Condition>
     22            <Condition><![CDATA[(NOT VBOX_IS_WINDOW_10)]]></Condition>
    2323            <File Id="file_VBoxUSBMon_PreW10.cat" Name="VBoxUSBMon.cat" Source="$(env.PATH_OUT)\bin\VBoxUSBMon-PreW10.cat" />
    2424        </Component>
    2525        <Component Id="cp_USBFilterDriverCat_W10" Guid="341ce4ca-d00e-4a43-f4e3-453eacc6b493" Win64="$(var.Property_Win64)">
    26             <Condition><![CDATA[(VersionNT >= 1000)]]></Condition>
     26            <Condition><![CDATA[(VBOX_IS_WINDOW_10)]]></Condition>
    2727            <File Id="file_VBoxUSBMon_W10.cat" Name="VBoxUSBMon.cat" Source="$(env.PATH_OUT)\bin\VBoxUSBMon.cat" />
    2828        </Component>
    … …  
    4141<?if $(env.VBOX_SIGNING_MODE)!= none ?>
    4242        <Component Id="cp_USBDeviceDriverCat_PreW10" Guid="43cc14cb-06e9-46c2-d507-20423150ccbd" Win64="$(var.Property_Win64)">
    43             <Condition><![CDATA[(VersionNT < 1000)]]></Condition>
     43            <Condition><![CDATA[(NOT VBOX_IS_WINDOW_10)]]></Condition>
    4444            <File Id="file_VBoxUSB_PreW10.cat" Name="VBoxUSB.cat" Source="$(env.PATH_OUT)\bin\VBoxUSB-PreW10.cat" />
    4545        </Component>
    4646        <Component Id="cp_USBDeviceDriverCat_W10" Guid="2127015e-7a96-4b8d-6015-b1e51a75b5ba" Win64="$(var.Property_Win64)">
    47             <Condition><![CDATA[(VersionNT >= 1000)]]></Condition>
     47            <Condition><![CDATA[(VBOX_IS_WINDOW_10)]]></Condition>
    4848            <File Id="file_VBoxUSB_W10.cat" Name="VBoxUSB.cat" Source="$(env.PATH_OUT)\bin\VBoxUSB.cat" />
    4949        </Component>

  • trunk/src/VBox/Installer/win/VBoxMergeUSB.wxs

    r58599 r72020  
    1414-->
    1515
    16 <?include Properties.wxi ?>
    17 
    1816<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
    1917     xmlns:difxapp="http://schemas.microsoft.com/wix/DifxAppExtension">
     18
     19    <?include Properties.wxi ?>
    2020
    2121    <Module Id="msm_VBoxUSB"

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

    r72004 r72020  
    1717     xmlns:difxapp="http://schemas.microsoft.com/wix/DifxAppExtension">
    1818
    19     <?include Properties.wxi ?>
     19    <?include Defines.wxi ?>
    2020
    2121<?if $(env.VBOX_WITH_MSM_INSTALL) = "yes" ?>
    … …  
    5656             InstallPrivileges="elevated"
    5757             Platform="$(var.Property_Platform)"/>
     58
     59    <?include CommonProperties.wxi ?>
    5860
    5961    <!-- Global properties -->
Note: See TracChangeset for help on using the changeset viewer.

© 2025 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette