This patch adds a new target called `Win10Analyze` to the driver solution.
It enables us to trigger static analysis over the Win10 target.
Signed-off-by: Alin Gabriel Serdean <aserd...@ovn.org>
---
datapath-windows/Package/package.VcxProj | 21 ++++++++++++++-
datapath-windows/Package/package.VcxProj.user | 5 +++-
datapath-windows/ovsext.sln | 5 ++++
datapath-windows/ovsext/ovsext.vcxproj | 37 ++++++++++++++++++++++++++-
datapath-windows/ovsext/ovsext.vcxproj.user | 5 +++-
5 files changed, 69 insertions(+), 4 deletions(-)
diff --git a/datapath-windows/Package/package.VcxProj
b/datapath-windows/Package/package.VcxProj
index de747eed2..5939a8816 100644
--- a/datapath-windows/Package/package.VcxProj
+++ b/datapath-windows/Package/package.VcxProj
@@ -9,6 +9,10 @@
<Configuration>Win10 Release</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
+ <ProjectConfiguration Include="Win10Analyze|x64">
+ <Configuration>Win10Analyze</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
<ProjectConfiguration Include="Win8.1 Debug|x64">
<Configuration>Win8.1 Debug</Configuration>
<Platform>x64</Platform>
@@ -71,6 +75,13 @@
<PlatformToolset>WindowsKernelModeDriver$(PlatformToolsetVer)</PlatformToolset>
<DriverTargetPlatform>Desktop</DriverTargetPlatform>
</PropertyGroup>
+ <PropertyGroup
Condition="'$(Configuration)|$(Platform)'=='Win10Analyze|x64'"
Label="Configuration">
+ <TargetVersion />
+ <UseDebugLibraries>true</UseDebugLibraries>
+ <PlatformToolsetVer Condition="'$(PlatformToolsetVer)' ==
''">10.0</PlatformToolsetVer>
+
<PlatformToolset>WindowsKernelModeDriver$(PlatformToolsetVer)</PlatformToolset>
+ <DriverTargetPlatform>Desktop</DriverTargetPlatform>
+ </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Win8 Debug|x64'"
Label="Configuration">
<TargetVersion>Windows8</TargetVersion>
<UseDebugLibraries>true</UseDebugLibraries>
@@ -113,6 +124,9 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Win10 Debug|x64'">
<Inf2CatUseLocalTime>true</Inf2CatUseLocalTime>
</PropertyGroup>
+ <PropertyGroup
Condition="'$(Configuration)|$(Platform)'=='Win10Analyze|x64'">
+ <Inf2CatUseLocalTime>true</Inf2CatUseLocalTime>
+ </PropertyGroup>
<PropertyGroup>
<DebuggerFlavor>DbgengKernelDebugger</DebuggerFlavor>
<EnableDeployment>False</EnableDeployment>
@@ -148,6 +162,11 @@
<UseLocalTime>true</UseLocalTime>
</Inf2Cat>
</ItemDefinitionGroup>
+ <ItemDefinitionGroup
Condition="'$(Configuration)|$(Platform)'=='Win10Analyze|x64'">
+ <Inf2Cat>
+ <UseLocalTime>true</UseLocalTime>
+ </Inf2Cat>
+ </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Win8.1
Debug|x64'">
<Inf2Cat>
<UseLocalTime>true</UseLocalTime>
@@ -185,4 +204,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/datapath-windows/Package/package.VcxProj.user
b/datapath-windows/Package/package.VcxProj.user
index 6231d93f7..5b0c53539 100644
--- a/datapath-windows/Package/package.VcxProj.user
+++ b/datapath-windows/Package/package.VcxProj.user
@@ -15,6 +15,9 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Win10 Debug|x64'">
<SignMode>TestSign</SignMode>
</PropertyGroup>
+ <PropertyGroup
Condition="'$(Configuration)|$(Platform)'=='Win10Analyze|x64'">
+ <SignMode>TestSign</SignMode>
+ </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Win8
Release|x64'">
<SignMode>TestSign</SignMode>
</PropertyGroup>
@@ -24,4 +27,4 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Win10
Release|x64'">
<SignMode>TestSign</SignMode>
</PropertyGroup>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/datapath-windows/ovsext.sln b/datapath-windows/ovsext.sln
index 1000104f1..ab006e84f 100644
--- a/datapath-windows/ovsext.sln
+++ b/datapath-windows/ovsext.sln
@@ -12,6 +12,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ovsext",
"ovsext\ovsext.vcx
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
+ Win10Analyze|x64 = Win10Analyze|x64
Win10Debug|x64 = Win10Debug|x64
Win10Release|x64 = Win10Release|x64
Win8.1Analyze|x64 = Win8.1Analyze|x64
@@ -22,6 +23,8 @@ Global
Win8Release|x64 = Win8Release|x64
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
+
{911D7389-3E61-449F-B8F3-14AD7EE9A0F2}.Win10Analyze|x64.ActiveCfg =
Win10Analyze|x64
+ {911D7389-3E61-449F-B8F3-14AD7EE9A0F2}.Win10Analyze|x64.Build.0
= Win10Analyze|x64
{911D7389-3E61-449F-B8F3-14AD7EE9A0F2}.Win10Debug|x64.ActiveCfg
= Win10 Debug|x64
{911D7389-3E61-449F-B8F3-14AD7EE9A0F2}.Win10Debug|x64.Build.0 =
Win10 Debug|x64
{911D7389-3E61-449F-B8F3-14AD7EE9A0F2}.Win10Debug|x64.Deploy.0
= Win10 Debug|x64
@@ -42,6 +45,8 @@ Global
{911D7389-3E61-449F-B8F3-14AD7EE9A0F2}.Win8Debug|x64.Build.0 =
Win8 Debug|x64
{911D7389-3E61-449F-B8F3-14AD7EE9A0F2}.Win8Release|x64.ActiveCfg = Win8
Release|x64
{911D7389-3E61-449F-B8F3-14AD7EE9A0F2}.Win8Release|x64.Build.0
= Win8 Release|x64
+
{63FE215D-98BE-4440-8081-C6160EFB80FA}.Win10Analyze|x64.ActiveCfg =
Win10Analyze|x64
+ {63FE215D-98BE-4440-8081-C6160EFB80FA}.Win10Analyze|x64.Build.0
= Win10Analyze|x64
{63FE215D-98BE-4440-8081-C6160EFB80FA}.Win10Debug|x64.ActiveCfg
= Win10 Debug|x64
{63FE215D-98BE-4440-8081-C6160EFB80FA}.Win10Debug|x64.Build.0 =
Win10 Debug|x64
{63FE215D-98BE-4440-8081-C6160EFB80FA}.Win10Debug|x64.Deploy.0
= Win10 Debug|x64
diff --git a/datapath-windows/ovsext/ovsext.vcxproj
b/datapath-windows/ovsext/ovsext.vcxproj
index 0509b765b..faec342dd 100644
--- a/datapath-windows/ovsext/ovsext.vcxproj
+++ b/datapath-windows/ovsext/ovsext.vcxproj
@@ -9,6 +9,10 @@
<Configuration>Win10 Release</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
+ <ProjectConfiguration Include="Win10Analyze|x64">
+ <Configuration>Win10Analyze</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
<ProjectConfiguration Include="Win8.1 Debug|x64">
<Configuration>Win8.1 Debug</Configuration>
<Platform>x64</Platform>
@@ -71,6 +75,13 @@
<PlatformToolset>WindowsKernelModeDriver$(PlatformToolsetVer)</PlatformToolset>
<DriverTargetPlatform>Desktop</DriverTargetPlatform>
</PropertyGroup>
+ <PropertyGroup
Condition="'$(Configuration)|$(Platform)'=='Win10Analyze|x64'"
Label="Configuration">
+ <TargetVersion />
+ <UseDebugLibraries>True</UseDebugLibraries>
+ <PlatformToolsetVer Condition="'$(PlatformToolsetVer)' ==
''">10.0</PlatformToolsetVer>
+
<PlatformToolset>WindowsKernelModeDriver$(PlatformToolsetVer)</PlatformToolset>
+ <DriverTargetPlatform>Desktop</DriverTargetPlatform>
+ </PropertyGroup>
<PropertyGroup Label="Configuration"
Condition="'$(Configuration)|$(Platform)'=='Win8 Debug|x64'">
<TargetVersion>Windows8</TargetVersion>
<UseDebugLibraries>True</UseDebugLibraries>
@@ -131,6 +142,9 @@
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Win10 Debug|x64'"
Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" />
</ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Win10Analyze|x64'"
Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" />
+ </ImportGroup>
<ItemGroup Label="WrappedTaskItems">
<ClInclude Include="..\include\OvsDpInterfaceCtExt.h" />
<ClInclude Include="..\include\OvsDpInterfaceExt.h" />
@@ -182,6 +196,11 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Win10 Debug|x64'">
<Inf2CatUseLocalTime>true</Inf2CatUseLocalTime>
</PropertyGroup>
+ <PropertyGroup
Condition="'$(Configuration)|$(Platform)'=='Win10Analyze|x64'">
+ <Inf2CatUseLocalTime>true</Inf2CatUseLocalTime>
+ <CodeAnalysisRuleSet>..\..\..\..\..\Program Files (x86)\Windows
Kits\10\CodeAnalysis\DriverMinimumRules.ruleset</CodeAnalysisRuleSet>
+ <RunCodeAnalysis>true</RunCodeAnalysis>
+ </PropertyGroup>
<PropertyGroup
Condition="'$(Configuration)|$(Platform)'=='Win8.1Analyze|x64'">
<RunCodeAnalysis>true</RunCodeAnalysis>
</PropertyGroup>
@@ -276,6 +295,17 @@
<PreprocessorDefinitions>%(PreprocessorDefinitions);NDIS_WDM=1;NDIS640=1</PreprocessorDefinitions>
</ResourceCompile>
</ItemDefinitionGroup>
+ <ItemDefinitionGroup
Condition="'$(Configuration)|$(Platform)'=='Win10Analyze|x64'">
+ <ClCompile>
+
<PreprocessorDefinitions>%(PreprocessorDefinitions);NDIS_WDM=1;NDIS640=1</PreprocessorDefinitions>
+ </ClCompile>
+ <Midl>
+
<PreprocessorDefinitions>%(PreprocessorDefinitions);NDIS_WDM=1;NDIS640=1</PreprocessorDefinitions>
+ </Midl>
+ <ResourceCompile>
+
<PreprocessorDefinitions>%(PreprocessorDefinitions);NDIS_WDM=1;NDIS640=1</PreprocessorDefinitions>
+ </ResourceCompile>
+ </ItemDefinitionGroup>
<ItemDefinitionGroup>
<Link>
<AdditionalDependencies>%(AdditionalDependencies);$(DDK_LIB_PATH)\ndis.lib;$(DDK_LIB_PATH)\fwpkclnt.lib;$(SDK_LIB_PATH)\uuid.lib;$(DDK_LIB_PATH)\netio.lib</AdditionalDependencies>
@@ -290,6 +320,7 @@
<AdditionalIncludeDirectories
Condition="'$(Configuration)|$(Platform)'=='Win8.1
Debug|x64'">.;$(IntDir);%(AdditionalIncludeDirectories);..\..</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories
Condition="'$(Configuration)|$(Platform)'=='Win8.1Analyze|x64'">.;$(IntDir);%(AdditionalIncludeDirectories);..\..</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories
Condition="'$(Configuration)|$(Platform)'=='Win10
Debug|x64'">.;$(IntDir);%(AdditionalIncludeDirectories);..\..;$(MSBuildProjectDirectory)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories
Condition="'$(Configuration)|$(Platform)'=='Win10Analyze|x64'">.;$(IntDir);%(AdditionalIncludeDirectories);..\..;$(MSBuildProjectDirectory)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories
Condition="'$(Configuration)|$(Platform)'=='Win8
Release|x64'">.;$(IntDir);%(AdditionalIncludeDirectories);..\..</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories
Condition="'$(Configuration)|$(Platform)'=='Win8.1
Release|x64'">.;$(IntDir);%(AdditionalIncludeDirectories);..\..</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories
Condition="'$(Configuration)|$(Platform)'=='Win10
Release|x64'">.;$(IntDir);%(AdditionalIncludeDirectories);..\..;$(MSBuildProjectDirectory)</AdditionalIncludeDirectories>
@@ -299,10 +330,12 @@
<MultiProcessorCompilation
Condition="'$(Configuration)|$(Platform)'=='Win8.1
Debug|x64'">true</MultiProcessorCompilation>
<MultiProcessorCompilation
Condition="'$(Configuration)|$(Platform)'=='Win8.1Analyze|x64'">true</MultiProcessorCompilation>
<MultiProcessorCompilation
Condition="'$(Configuration)|$(Platform)'=='Win10
Debug|x64'">true</MultiProcessorCompilation>
+ <MultiProcessorCompilation
Condition="'$(Configuration)|$(Platform)'=='Win10Analyze|x64'">true</MultiProcessorCompilation>
<MultiProcessorCompilation
Condition="'$(Configuration)|$(Platform)'=='Win8.1
Release|x64'">true</MultiProcessorCompilation>
<MultiProcessorCompilation
Condition="'$(Configuration)|$(Platform)'=='Win10
Release|x64'">true</MultiProcessorCompilation>
<EnablePREfast
Condition="'$(Configuration)|$(Platform)'=='Win8.1Analyze|x64'">true</EnablePREfast>
<EnablePREfast
Condition="'$(Configuration)|$(Platform)'=='Win8Analyze|x64'">true</EnablePREfast>
+ <EnablePREfast
Condition="'$(Configuration)|$(Platform)'=='Win10Analyze|x64'">true</EnablePREfast>
</ClCompile>
<Inf>
<TimeStamp Condition="'$(Configuration)|$(Platform)'=='Win8
Debug|x64'">$(Version)</TimeStamp>
@@ -314,6 +347,7 @@
</Inf>
<Inf>
<TimeStamp Condition="'$(Configuration)|$(Platform)'=='Win10
Debug|x64'">$(Version)</TimeStamp>
+ <TimeStamp
Condition="'$(Configuration)|$(Platform)'=='Win10Analyze|x64'">$(Version)</TimeStamp>
</Inf>
<Inf>
<TimeStamp Condition="'$(Configuration)|$(Platform)'=='Win8
Release|x64'">$(Version)</TimeStamp>
@@ -375,6 +409,7 @@
<PreprocessorDefinitions
Condition="'$(Configuration)|$(Platform)'=='Win8.1Analyze|x64'">%(PreprocessorDefinitions);NDIS_WDM=1;NDIS640=1;VersionWithDots=$(Version);VersionWithCommas=$(Version.Replace('.',','))</PreprocessorDefinitions>
<PreprocessorDefinitions
Condition="'$(Configuration)|$(Platform)'=='Win10
Release|x64'">%(PreprocessorDefinitions);NDIS_WDM=1;NDIS640=1;VersionWithDots=$(Version);VersionWithCommas=$(Version.Replace('.',','))</PreprocessorDefinitions>
<PreprocessorDefinitions
Condition="'$(Configuration)|$(Platform)'=='Win10
Debug|x64'">%(PreprocessorDefinitions);NDIS_WDM=1;NDIS640=1;VersionWithDots=$(Version);VersionWithCommas=$(Version.Replace('.',','))</PreprocessorDefinitions>
+ <PreprocessorDefinitions
Condition="'$(Configuration)|$(Platform)'=='Win10Analyze|x64'">%(PreprocessorDefinitions);NDIS_WDM=1;NDIS640=1;VersionWithDots=$(Version);VersionWithCommas=$(Version.Replace('.',','))</PreprocessorDefinitions>
</ResourceCompile>
</ItemGroup>
<ItemGroup>
@@ -387,4 +422,4 @@
<None Exclude="@(None)" Include="*.def;*.bat;*.hpj;*.asmx" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-</Project>
+</Project>
\ No newline at end of file
diff --git a/datapath-windows/ovsext/ovsext.vcxproj.user
b/datapath-windows/ovsext/ovsext.vcxproj.user
index 6231d93f7..5b0c53539 100644
--- a/datapath-windows/ovsext/ovsext.vcxproj.user
+++ b/datapath-windows/ovsext/ovsext.vcxproj.user
@@ -15,6 +15,9 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Win10 Debug|x64'">
<SignMode>TestSign</SignMode>
</PropertyGroup>
+ <PropertyGroup
Condition="'$(Configuration)|$(Platform)'=='Win10Analyze|x64'">
+ <SignMode>TestSign</SignMode>
+ </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Win8
Release|x64'">
<SignMode>TestSign</SignMode>
</PropertyGroup>
@@ -24,4 +27,4 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Win10
Release|x64'">
<SignMode>TestSign</SignMode>
</PropertyGroup>
-</Project>
+</Project>
\ No newline at end of file
--
2.16.1.windows.1
_______________________________________________
dev mailing list
d...@openvswitch.org
https://mail.openvswitch.org/mailman/listinfo/ovs-dev
