Add JIT option for MSI Release bits and CI/CD. (#1986)
This commit is contained in:
Родитель
44602dcb1d
Коммит
64e6812784
|
@ -42,6 +42,7 @@ jobs:
|
||||||
build_artifact: Build-x64
|
build_artifact: Build-x64
|
||||||
generate_release_package: true
|
generate_release_package: true
|
||||||
build_nuget: true
|
build_nuget: true
|
||||||
|
build_options: /p:ReleaseJIT='True'
|
||||||
|
|
||||||
cmake:
|
cmake:
|
||||||
# Always run this job.
|
# Always run this job.
|
||||||
|
|
|
@ -34,11 +34,18 @@ SPDX-License-Identifier: MIT
|
||||||
<ComponentGroupRef Id="eBPF_Runtime_Components" />
|
<ComponentGroupRef Id="eBPF_Runtime_Components" />
|
||||||
<ComponentGroupRef Id="eBPFCore_Driver" />
|
<ComponentGroupRef Id="eBPFCore_Driver" />
|
||||||
<ComponentGroupRef Id="NetEbpfExt_Driver" />
|
<ComponentGroupRef Id="NetEbpfExt_Driver" />
|
||||||
|
<?if $(var.IncludeJIT) = True ?>
|
||||||
<?if $(var.Configuration) = Debug ?>
|
<?if $(var.Configuration) = Debug ?>
|
||||||
<Feature Id="eBPF_Runtime_Components_JIT" Level="1" Title="JIT" Absent="allow">
|
<Feature Id="eBPF_Runtime_Components_JIT" Level="1" Title="JIT" Absent="allow">
|
||||||
<ComponentGroupRef Id="eBPF_Service" />
|
<ComponentGroupRef Id="eBPF_Service" />
|
||||||
</Feature>
|
</Feature>
|
||||||
<?endif?>
|
<?endif?>
|
||||||
|
<?if $(var.Configuration) = Release ?>
|
||||||
|
<Feature Id="eBPF_Runtime_Components_JIT" Level="11" Title="JIT" Absent="allow" >
|
||||||
|
<ComponentGroupRef Id="eBPF_Service" />
|
||||||
|
</Feature>
|
||||||
|
<?endif?>
|
||||||
|
<?endif?>
|
||||||
</Feature>
|
</Feature>
|
||||||
<Feature Id="eBPF_Development" Level="2" Title="Development components">
|
<Feature Id="eBPF_Development" Level="2" Title="Development components">
|
||||||
<ComponentGroupRef Id="eBPF_Development_include" />
|
<ComponentGroupRef Id="eBPF_Development_include" />
|
||||||
|
@ -119,7 +126,7 @@ SPDX-License-Identifier: MIT
|
||||||
<Directory Id="TARGETDIR" Name="SourceDir">
|
<Directory Id="TARGETDIR" Name="SourceDir">
|
||||||
<Directory Id="ProgramFiles64Folder">
|
<Directory Id="ProgramFiles64Folder">
|
||||||
<Directory Id="INSTALLFOLDER" Name="ebpf-for-windows">
|
<Directory Id="INSTALLFOLDER" Name="ebpf-for-windows">
|
||||||
<?if $(var.Configuration) = Debug ?>
|
<?if $(var.IncludeJIT) = True ?>
|
||||||
<Directory Id="dir_JIT" Name="JIT" />
|
<Directory Id="dir_JIT" Name="JIT" />
|
||||||
<?endif?>
|
<?endif?>
|
||||||
<Directory Id="dir_drivers" Name="drivers"/>
|
<Directory Id="dir_drivers" Name="drivers"/>
|
||||||
|
@ -209,7 +216,7 @@ SPDX-License-Identifier: MIT
|
||||||
<CustomAction Id="eBPF_netsh_helper_uninstall_rollback" BinaryKey="WixCA" DllEntry="WixQuietExec64" Execute="deferred" Return="ignore" Impersonate="no"/>
|
<CustomAction Id="eBPF_netsh_helper_uninstall_rollback" BinaryKey="WixCA" DllEntry="WixQuietExec64" Execute="deferred" Return="ignore" Impersonate="no"/>
|
||||||
|
|
||||||
<!--Install/Uninstall the eBPF Service -->
|
<!--Install/Uninstall the eBPF Service -->
|
||||||
<?if $(var.Configuration) = Debug ?>
|
<?if $(var.IncludeJIT) = True ?>
|
||||||
<ComponentGroup Id="eBPF_Service" Directory="dir_JIT">
|
<ComponentGroup Id="eBPF_Service" Directory="dir_JIT">
|
||||||
<Component Id="EBPFSVC.PDB" DiskId="1" Guid="{D1935DF0-2FC7-42F5-81E5-19AF88D6244B}">
|
<Component Id="EBPFSVC.PDB" DiskId="1" Guid="{D1935DF0-2FC7-42F5-81E5-19AF88D6244B}">
|
||||||
<File Id="EBPFSVC.PDB" Name="EbpfSvc.pdb" Source="$(var.ebpfsvc.TargetDir)ebpfsvc.pdb" />
|
<File Id="EBPFSVC.PDB" Name="EbpfSvc.pdb" Source="$(var.ebpfsvc.TargetDir)ebpfsvc.pdb" />
|
||||||
|
|
|
@ -17,13 +17,15 @@ SPDX-License-Identifier: MIT
|
||||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
|
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
|
||||||
<OutputPath>$(SolutionDir)$(Platform)\$(Configuration)\</OutputPath>
|
<OutputPath>$(SolutionDir)$(Platform)\$(Configuration)\</OutputPath>
|
||||||
<IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
|
<IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
|
||||||
<DefineConstants>Debug</DefineConstants>
|
<DefineConstants>Debug;IncludeJIT=True</DefineConstants>
|
||||||
|
<SuppressValidation>True</SuppressValidation>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
|
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
|
||||||
<OutputPath>$(SolutionDir)$(Platform)\$(Configuration)\</OutputPath>
|
<OutputPath>$(SolutionDir)$(Platform)\$(Configuration)\</OutputPath>
|
||||||
<IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
|
<IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
|
||||||
<DefineConstants>
|
<DefineConstants Condition=" '$(ReleaseJIT)' == 'True' ">IncludeJIT=True</DefineConstants>
|
||||||
</DefineConstants>
|
<DefineConstants Condition=" '$(ReleaseJIT)' == 'False' OR '$(ReleaseJIT)' == '' ">IncludeJIT=False</DefineConstants>
|
||||||
|
<SuppressValidation>True</SuppressValidation>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<!-- In accordance to what defined in sample.vcxproj, the MSI build is disabled for the 'Analysis' CI/CD build, as it does not generate the *.o artifacts. -->
|
<!-- In accordance to what defined in sample.vcxproj, the MSI build is disabled for the 'Analysis' CI/CD build, as it does not generate the *.o artifacts. -->
|
||||||
<ItemGroup Condition="'$(Analysis)'==''">
|
<ItemGroup Condition="'$(Analysis)'==''">
|
||||||
|
|
Загрузка…
Ссылка в новой задаче