Changeset 107296 in vbox for trunk/src/VBox/Installer/win/VirtualBox.wxs
- Timestamp:
- Dec 12, 2024 11:07:22 AM (5 weeks ago)
- File:
-
- 1 edited
-
trunk/src/VBox/Installer/win/VirtualBox.wxs (modified) (8 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/VBox/Installer/win/VirtualBox.wxs
r107015 r107296 37 37 <?define Property_VBoxMergeUSB = "$(env.VBOX_WIN_INST_MERGE_USB)" ?> 38 38 <?endif?> 39 <?if $(env.VBOX_WITH_NETFLT) = "yes" And $(env.KBUILD_TARGET_ARCH) = "amd64" ?>40 <?define Property_VBoxMergeNetworkFlt = "$(env.VBOX_WIN_INST_MERGE_NETFLT)" ?>41 <?endif?>42 39 <?if $(env.VBOX_WITH_NETADP) = "yes" ?> 43 <?if $(env.KBUILD_TARGET_ARCH) = "amd64" ?>44 <?define Property_VBoxMergeNetworkAdp = "$(env.VBOX_WIN_INST_MERGE_NETADP)" ?>45 <?endif?>46 40 <?define Property_VBoxMergeNetworkAdp6 = "$(env.VBOX_WIN_INST_MERGE_NETADP6)" ?> 47 41 <?endif?> … … 70 64 71 65 <Property Id="NETWORKTYPE" Value="NDIS6" Secure="yes" /> 72 73 <?if $(env.VBOX_WITH_MSM_INSTALL) = "no" ?>74 <!-- Force NDIS5 on pre-Vista -->75 <SetProperty Id="NETWORKTYPE" After="LaunchConditions" Value="NDIS5" Condition="(VersionNT < 600)" />76 <?endif?>77 66 78 67 <!-- Whether or not registering of known desktop shortcut for the Quick Launch Bar should be created --> … … 237 226 <?include VBoxMergeCOM32On64CA.wxi ?> 238 227 <?endif?> 239 <?if $(env.VBOX_WITH_NETFLT) = "yes" ?> 240 <?if $(env.KBUILD_TARGET_ARCH) = "amd64" ?> 241 <?include VBoxMergeNetFltCA.wxi ?> 242 <?endif?> 228 <?if $(env.VBOX_WITH_NETADP) = "yes" ?> 243 229 <?include VBoxMergeNetLwfCA.wxi ?> 244 <?endif?>245 <?if $(env.VBOX_WITH_NETADP) = "yes" ?>246 <?if $(env.KBUILD_TARGET_ARCH) = "amd64" ?>247 <?include VBoxMergeNetAdpCA.wxi ?>248 <?endif?>249 230 <?include VBoxMergeNetAdp6CA.wxi ?> 250 231 <?endif?> … … 367 348 <Feature Id="VBoxNetworkFlt" Title="VirtualBox Bridged Networking" Level="1" Description="!(loc.VB_NetFltDriver)" ConfigurableDirectory="INSTALLDIR" TypicalDefault="install" Display="expand" AllowAdvertise="no"> 368 349 <?if $(env.VBOX_WITH_MSM_INSTALL) = "yes" ?> 369 <?if $(env.KBUILD_TARGET_ARCH) = "amd64" ?>370 <MergeRef Id="msm_VBoxNetworkFlt" />371 <?endif?>372 350 <MergeRef Id="msm_VBoxNetworkLwf" /> 373 351 <?else?> 374 <?if $(env.KBUILD_TARGET_ARCH) = "amd64" ?>375 <ComponentRef Id="cp_NetFltDriver" />376 <?endif?>377 352 <?if $(env.VBOX_SIGNING_MODE) != none ?> 378 353 <?if $(env.KBUILD_TARGET_ARCH) = "amd64" ?> … … 380 355 <?endif?> 381 356 <ComponentRef Id="cp_NetLwfDriverCat_W10" /> 382 <?endif?>357 <?endif?> 383 358 <ComponentRef Id="cp_NetLwfDriver" /> 384 <?endif?>359 <?endif?> 385 360 </Feature> 386 361 <Feature Id="VBoxNetworkAdp" Title="VirtualBox Host-Only Networking" Level="1" Description="!(loc.VB_NetAdpDriver)" ConfigurableDirectory="INSTALLDIR" TypicalDefault="install" Display="expand" AllowAdvertise="no"> 387 <?if $(env.VBOX_WITH_MSM_INSTALL) = "yes" ?> 388 <?if $(env.KBUILD_TARGET_ARCH) = "amd64" ?> 389 <MergeRef Id="msm_VBoxNetworkAdp" /> 390 <?endif?> 362 <?if $(env.VBOX_WITH_MSM_INSTALL) = "yes" ?> 391 363 <MergeRef Id="msm_VBoxNetworkAdp6" /> 392 <?else?> 393 <?if $(env.KBUILD_TARGET_ARCH) = "amd64" ?> 394 <ComponentRef Id="cp_NetAdpDriver" /> 395 <?endif?> 364 <?else?> 396 365 <?if $(env.VBOX_SIGNING_MODE) != none ?> 397 366 <?if $(env.KBUILD_TARGET_ARCH) = "amd64" ?> … … 483 452 <?include VBoxMergeCOM32On64Seq.wxi ?> 484 453 <?endif?> 485 <?if $(env.VBOX_WITH_NETFLT) = "yes" ?> 486 <?if $(env.KBUILD_TARGET_ARCH) = amd64 ?> <!-- @todo bird: Remove this and use Adp6, we don't support XP any more. --> 487 <?include VBoxMergeNetFltSeq.wxi ?> 488 <?endif?> 454 <?if $(env.VBOX_WITH_NETADP) = "yes" ?> 489 455 <?include VBoxMergeNetLwfSeq.wxi ?> 490 <?endif?>491 <?if $(env.VBOX_WITH_NETADP) = "yes" ?>492 <?if $(env.KBUILD_TARGET_ARCH) = amd64 ?> <!-- @todo bird: Remove this and use Adp6, we don't support XP any more. -->493 <?include VBoxMergeNetAdpSeq.wxi ?>494 <?endif?>495 456 <?include VBoxMergeNetAdp6Seq.wxi ?> 496 457 <?endif?> … … 558 519 <?endif?> 559 520 <Directory Id="dir_Network" Name="network"> 560 <?if $(env.VBOX_WITH_NETFLT) = "yes" And $(env.KBUILD_TARGET_ARCH) = "amd64" ?> <!-- @todo bird: Remove this and use Adp6, we don't support XP any more. --> 561 <Directory Id="dir_NetFlt" Name="netflt"> 562 <?if $(env.VBOX_WITH_MSM_INSTALL) = "yes" ?> 563 <Merge Id="msm_VBoxNetworkFlt" Language="0" SourceFile="$(var.Property_VBoxMergeNetworkFlt)" DiskId="1"> 564 <ConfigurationData Name="passedNetworkType" Value="[NETWORKTYPE]" /> 565 </Merge> 566 <?else?> 567 <Directory Id="msm_VBoxNetworkFltFolder" FileSource="."> 568 <?include VBoxMergeNetFlt.wxi ?> 569 </Directory> 570 <?endif?> 571 </Directory> 572 <?endif?> 573 <?if $(env.VBOX_WITH_NETADP) = "yes" and $(env.KBUILD_TARGET_ARCH) = "amd64" ?> <!-- @todo bird: Remove this and use Adp6, we don't support XP any more. --> 574 <Directory Id="dir_NetAdp" Name="netadp"> 575 <?if $(env.VBOX_WITH_MSM_INSTALL) = "yes" ?> 576 <Merge Id="msm_VBoxNetworkAdp" Language="!(loc.LANG)" SourceFile="$(var.Property_VBoxMergeNetworkAdp)" DiskId="1"> 577 <ConfigurationData Name="passedNetworkType" Value="[NETWORKTYPE]" /> 578 </Merge> 579 <?else?> 580 <Directory Id="msm_VBoxNetworkAdpFolder" FileSource="."> 581 <?include VBoxMergeNetAdp.wxi ?> 582 </Directory> 583 <?endif?> 584 </Directory> 585 <?endif?> 586 587 <?if $(env.VBOX_WITH_NETFLT) = "yes" ?> 521 <?if $(env.VBOX_WITH_NETADP) = "yes" ?> 588 522 <Directory Id="dir_NetLwf" Name="netlwf"> 589 523 <?if $(env.VBOX_WITH_MSM_INSTALL) = "yes" ?> … … 598 532 </Directory> 599 533 <?endif?> 600 601 534 <?if $(env.VBOX_WITH_NETADP) = "yes" ?> 602 535 <Directory Id="dir_NetAdp6" Name="netadp6">
Note:
See TracChangeset
for help on using the changeset viewer.
