VirtualBox

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


Ignore:
Timestamp:
Nov 17, 2015 2:13:20 PM (9 years ago)
Author:
vboxsync
Message:

bugref:8101. Windows MSM build is affected. It is passed public property NETWORKTYPE from outside into the merge modules now.

Location:
trunk/src/VBox/Installer/win
Files:
10 edited

Legend:

Unmodified
Added
Removed

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

    r58599 r58721  
    2020     case we're building the installer as MSM modules -->
    2121
    22 <!-- Default property for network adapter type -->
    23 <Property Id="NETWORKTYPE" Value="NDIS6" Secure="yes"/>
    24 
    25 <!-- Force NDIS5 on pre-Vista -->
    26 <SetProperty Id="NETWORKTYPE" After="CostFinalize" Value="NDIS5"><![CDATA[(NETWORKTYPE="NDIS6") AND (VersionNT < 600)]]></SetProperty>
    27 
    2822  <!-- Whether or not a desktop shortcut should be created. -->
    2923  <Property Id="VBOX_INSTALLDESKTOPSHORTCUT" Value="1" Secure="yes"/>

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

    r56299 r58721  
    2525              Source="$(env.PATH_OUT)\bin\VBoxNetAdp.cat" />
    2626<?endif ?>
    27         <Condition><![CDATA[NETWORKTYPE="NDIS5"]]></Condition>
     27
     28<?if $(env.VBOX_WITH_MSM_INSTALL) = "yes" ?>
     29        <Condition><![CDATA[(localMSMNetworkType="NDIS5")]]></Condition>
     30<?else ?>
     31        <Condition><![CDATA[(NETWORKTYPE="NDIS5")]]></Condition>
     32<?endif ?>
     33
    2834    </Component>
    2935

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

    r58599 r58721  
    3434                 SummaryCodepage="1252"/>
    3535
     36
    3637        <?include PublicProperties.wxi ?>
     38
     39<?if $(env.VBOX_WITH_MSM_INSTALL) = "yes" ?>
     40        <Property Id="localMSMNetworkType" Value="Empty" />
     41        <Configuration Name="passedNetworkType" Format="Text" DefaultValue="Not passed"/>
     42        <Substitution Table="CustomAction" Row="setNetworkTypeADP" Column="Target" Value="[=passedNetworkType]"/>
     43        <CustomAction Id="setNetworkTypeADP" Property="localMSMNetworkType" Value="[localMSMNetworkType]" Execute="immediate" />
     44        <CustomAction Id="correctNetworkTypeADP" Property="localMSMNetworkType" Value="NDIS5" Execute="immediate" />
     45<?endif ?>
    3746
    3847        <!-- Here comes the file/directory list -->
    … …  
    4857        <Binary Id="VBoxInstallHelper" SourceFile="$(env.PATH_OUT)\bin\VBoxInstallHelper.dll" />
    4958        <?include VBoxMergeNetAdpCA.wxi ?>
    50 
     59       
    5160        <InstallExecuteSequence>
     61<?if $(env.VBOX_WITH_MSM_INSTALL) = "yes" ?>
     62            <Custom Action="setNetworkTypeADP" After="CostInitialize"/>
     63            <Custom Action="correctNetworkTypeADP" After="setNetworkTypeADP">
     64                <![CDATA[(VersionNT < 600)]]>
     65            </Custom>
     66<?endif ?>
    5267            <?include VBoxMergeNetAdpSeq.wxi ?>
    5368        </InstallExecuteSequence>

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

    r58412 r58721  
    2525              Source="$(env.PATH_OUT)\bin\VBoxNetAdp6.cat" />
    2626<?endif ?>
    27 <?if $(env.VBOX_WITH_MSM_INSTALL) = "no" ?>
    28         <Condition><![CDATA[NETWORKTYPE="NDIS6"]]></Condition>
     27
     28<?if $(env.VBOX_WITH_MSM_INSTALL) = "yes" ?>
     29        <Condition><![CDATA[(localMSMNetworkType="NDIS6")]]></Condition>
     30<?else ?>
     31        <Condition><![CDATA[(NETWORKTYPE="NDIS6")]]></Condition>
    2932<?endif ?>
     33
    3034    </Component>
    3135

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

    r58599 r58721  
    3434                 SummaryCodepage="1252"/>
    3535
     36
    3637        <?include PublicProperties.wxi ?>
     38
     39<?if $(env.VBOX_WITH_MSM_INSTALL) = "yes" ?>
     40        <Property Id="localMSMNetworkType" Value="NDIS6" />
     41        <Configuration Name="passedNetworkType" Format="Text" DefaultValue="Not passed"/>
     42        <Substitution Table="CustomAction" Row="setNetworkTypeADP6" Column="Target" Value="[=passedNetworkType]"/>
     43        <CustomAction Id="setNetworkTypeADP6" Property="localMSMNetworkType" Value="[localMSMNetworkType]" Execute="immediate" />
     44        <CustomAction Id="correctNetworkTypeADP6" Property="localMSMNetworkType" Value="NDIS5" Execute="immediate" />
     45<?endif ?>
    3746
    3847        <!-- Here comes the file/directory list -->
    … …  
    5059
    5160        <InstallExecuteSequence>
     61<?if $(env.VBOX_WITH_MSM_INSTALL) = "yes" ?>
     62            <Custom Action="setNetworkTypeADP6" After="CostInitialize"/>
     63            <Custom Action="correctNetworkTypeADP6" After="setNetworkTypeADP6">
     64                <![CDATA[(VersionNT < 600)]]>
     65            </Custom>
     66<?endif ?>
    5267            <?include VBoxMergeNetAdp6Seq.wxi ?>
    5368        </InstallExecuteSequence>

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

    r56299 r58721  
    3030              Source="$(env.PATH_OUT)\bin\VBoxNetFlt.cat" />
    3131<?endif ?>
    32         <Condition><![CDATA[NETWORKTYPE="NDIS5"]]></Condition>
     32
     33<?if $(env.VBOX_WITH_MSM_INSTALL) = "yes" ?>
     34        <Condition><![CDATA[(localMSMNetworkType="NDIS5")]]></Condition>
     35<?else ?>
     36        <Condition><![CDATA[(NETWORKTYPE="NDIS5")]]></Condition>
     37<?endif ?>
     38
    3339    </Component>
    3440

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

    r58599 r58721  
    3434                 SummaryCodepage="1252"/>
    3535
    36         <?include PublicProperties.wxi ?>                 
     36
     37        <?include PublicProperties.wxi ?>
     38
     39<?if $(env.VBOX_WITH_MSM_INSTALL) = "yes" ?>
     40        <Property Id="localMSMNetworkType" Value="Empty" />
     41        <Configuration Name="passedNetworkType" Format="Text" DefaultValue="Not passed"/>
     42        <Substitution Table="CustomAction" Row="setNetworkTypeFLT" Column="Target" Value="[=passedNetworkType]"/>
     43        <CustomAction Id="setNetworkTypeFLT" Property="localMSMNetworkType" Value="[localMSMNetworkType]" Execute="immediate" />
     44        <CustomAction Id="correctNetworkTypeFLT" Property="localMSMNetworkType" Value="NDIS5" Execute="immediate" />
     45<?endif ?>
    3746
    3847        <!-- Here comes the file/directory list -->
    … …  
    5059
    5160        <InstallExecuteSequence>
     61<?if $(env.VBOX_WITH_MSM_INSTALL) = "yes" ?>
     62            <Custom Action="setNetworkTypeFLT" After="CostInitialize"/>
     63            <Custom Action="correctNetworkTypeFLT" After="setNetworkTypeFLT">
     64                <![CDATA[(VersionNT < 600)]]>
     65            </Custom>
     66<?endif ?>
    5267            <?include VBoxMergeNetFltSeq.wxi ?>
    5368        </InstallExecuteSequence>

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

    r58412 r58721  
    2626              Source="$(env.PATH_OUT)\bin\VBoxNetLwf.cat" />
    2727<?endif ?>
    28 <?if $(env.VBOX_WITH_MSM_INSTALL) = "no" ?>
    29         <Condition><![CDATA[NETWORKTYPE="NDIS6"]]></Condition>
     28
     29<?if $(env.VBOX_WITH_MSM_INSTALL) = "yes" ?>
     30        <Condition><![CDATA[(localMSMNetworkType="NDIS6")]]></Condition>
     31<?else ?>
     32        <Condition><![CDATA[(NETWORKTYPE="NDIS6")]]></Condition>
    3033<?endif ?>
     34
    3135    </Component>
    3236

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

    r58599 r58721  
    3434                 SummaryCodepage="1252"/>
    3535
     36
    3637        <?include PublicProperties.wxi ?>
     38
     39<?if $(env.VBOX_WITH_MSM_INSTALL) = "yes" ?>
     40        <Property Id="localMSMNetworkType" Value="NDIS6" />
     41        <Configuration Name="passedNetworkType" Format="Text" DefaultValue="Not passed"/>
     42        <Substitution Table="CustomAction" Row="setNetworkTypeLWF" Column="Target" Value="[=passedNetworkType]"/>
     43        <CustomAction Id="setNetworkTypeLWF" Property="localMSMNetworkType" Value="[localMSMNetworkType]" Execute="immediate" />
     44        <CustomAction Id="correctNetworkTypeLWF" Property="localMSMNetworkType" Value="NDIS5" Execute="immediate" />
     45<?endif ?>
    3746
    3847        <!-- Here comes the file/directory list -->
    … …  
    5059
    5160        <InstallExecuteSequence>
     61<?if $(env.VBOX_WITH_MSM_INSTALL) = "yes" ?>
     62            <Custom Action="setNetworkTypeLWF" After="CostInitialize"/>
     63            <Custom Action="correctNetworkTypeLWF" After="setNetworkTypeLWF">
     64                <![CDATA[(VersionNT < 600)]]>
     65            </Custom>
     66<?endif ?>
    5267            <?include VBoxMergeNetLwfSeq.wxi ?>
    5368        </InstallExecuteSequence>

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

    r58599 r58721  
    6161    <Property Id="ARPURLINFOABOUT">http://www.virtualbox.org</Property>
    6262    <Property Id="ARPURLUPDATEINFO">http://www.virtualbox.org</Property>
     63   
     64    <Property Id="NETWORKTYPE" Value="NDIS6" Secure="yes"/>
     65
     66<?if $(env.VBOX_WITH_MSM_INSTALL) = "no" ?>
     67    <!-- Force NDIS5 on pre-Vista -->
     68    <SetProperty Id="NETWORKTYPE" After="CostFinalize" Value="NDIS5"><![CDATA[(VersionNT < 600)]]></SetProperty>
     69<?endif ?>
    6370
    6471    <!-- Install the product for all users on the system -->
    … …  
    241248                        <Directory Id="dir_NetFlt" Name="netflt">
    242249    <?if $(env.VBOX_WITH_MSM_INSTALL) = "yes" ?>
    243                             <Merge Id="msm_VBoxNetworkFlt" Language="!(loc.LANG)" SourceFile="$(var.Property_VBoxMergeNetworkFlt)" DiskId="1" />
     250                            <Merge Id="msm_VBoxNetworkFlt" Language="!(loc.LANG)" SourceFile="$(var.Property_VBoxMergeNetworkFlt)" DiskId="1">
     251                            <ConfigurationData Name="passedNetworkType" Value="[NETWORKTYPE]"/>
     252                            </Merge>
    244253    <?else ?>
    245254                            <Directory Id="msm_VBoxNetworkFltFolder" FileSource=".">
    … …  
    251260                        <Directory Id="dir_NetAdp" Name="netadp">
    252261<?if $(env.VBOX_WITH_MSM_INSTALL) = "yes" ?>
    253                             <Merge Id="msm_VBoxNetworkAdp" Language="!(loc.LANG)" SourceFile="$(var.Property_VBoxMergeNetworkAdp)" DiskId="1" />
     262                            <Merge Id="msm_VBoxNetworkAdp" Language="!(loc.LANG)" SourceFile="$(var.Property_VBoxMergeNetworkAdp)" DiskId="1">
     263                            <ConfigurationData Name="passedNetworkType" Value="[NETWORKTYPE]"/>
     264                            </Merge>
    254265<?else ?>
    255266                            <Directory Id="msm_VBoxNetworkAdpFolder" FileSource=".">
    … …  
    262273                        <Directory Id="dir_NetLwf" Name="netlwf">
    263274    <?if $(env.VBOX_WITH_MSM_INSTALL) = "yes" ?>
    264                             <Merge Id="msm_VBoxNetworkLwf" Language="!(loc.LANG)" SourceFile="$(var.Property_VBoxMergeNetworkLwf)" DiskId="1" />
     275                            <Merge Id="msm_VBoxNetworkLwf" Language="!(loc.LANG)" SourceFile="$(var.Property_VBoxMergeNetworkLwf)" DiskId="1">
     276                            <ConfigurationData Name="passedNetworkType" Value="[NETWORKTYPE]"/>
     277                            </Merge>
    265278    <?else ?>
    266279                            <Directory Id="msm_VBoxNetworkLwfFolder" FileSource=".">
    … …  
    272285                        <Directory Id="dir_NetAdp6" Name="netadp6">
    273286<?if $(env.VBOX_WITH_MSM_INSTALL) = "yes" ?>
    274                             <Merge Id="msm_VBoxNetworkAdp6" Language="!(loc.LANG)" SourceFile="$(var.Property_VBoxMergeNetworkAdp6)" DiskId="1" />
     287                            <Merge Id="msm_VBoxNetworkAdp6" Language="!(loc.LANG)" SourceFile="$(var.Property_VBoxMergeNetworkAdp6)" DiskId="1">
     288                            <ConfigurationData Name="passedNetworkType" Value="[NETWORKTYPE]"/>
     289                            </Merge>
    275290<?else ?>
    276291                            <Directory Id="msm_VBoxNetworkAdp6Folder" FileSource=".">
Note: See TracChangeset for help on using the changeset viewer.

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