| Message ID | 20161229002511.18480-1-aserdean@cloudbasesolutions.com |
|---|---|
| State | Superseded |
| Headers | show |
On 28 December 2016 at 16:25, Alin Serdean <aserdean@cloudbasesolutions.com> wrote: > This patch adds two more compiling targets: > - one for Windows 10 release > - one for Windows 10 Debug > > The new targets are flagged properly to use the new Windows 10 kernel mode > driver and its toolchain. > > Signed-off-by: Alin Gabriel Serdean <aserdean@cloudbasesolutions.com> > Acked-by: Sairam Venugopal <vsairam@vmware.com> > --- > v2: rebase, include version number for WDK 10, use localtime for WDK 10 > I still get rejects. > --- > datapath-windows/Package/package.VcxProj | 32 +++++++++++++ > datapath-windows/Package/package.VcxProj.user | 6 +++ > datapath-windows/ovsext.sln | 14 ++++++ > datapath-windows/ovsext/ovsext.vcxproj | 68 > +++++++++++++++++++++++++++ > datapath-windows/ovsext/ovsext.vcxproj.user | 6 +++ > 5 files changed, 126 insertions(+) > > diff --git a/datapath-windows/Package/package.VcxProj > b/datapath-windows/Package/package.VcxProj > index 0d48163..24bb914 100644 > --- a/datapath-windows/Package/package.VcxProj > +++ b/datapath-windows/Package/package.VcxProj > @@ -1,6 +1,14 @@ > <?xml version="1.0" encoding="utf-8"?> > <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas. > microsoft.com/developer/msbuild/2003"> > <ItemGroup Label="ProjectConfigurations"> > + <ProjectConfiguration Include="Win10 Debug|x64"> > + <Configuration>Win10 Debug</Configuration> > + <Platform>x64</Platform> > + </ProjectConfiguration> > + <ProjectConfiguration Include="Win10 Release|x64"> > + <Configuration>Win10 Release</Configuration> > + <Platform>x64</Platform> > + </ProjectConfiguration> > <ProjectConfiguration Include="Win8.1 Debug|x64"> > <Configuration>Win8.1 Debug</Configuration> > <Platform>x64</Platform> > @@ -38,11 +46,25 @@ > <UseDebugLibraries>true</UseDebugLibraries> > <PlatformToolset>WindowsKernelModeDriver8.1</PlatformToolset> > </PropertyGroup> > + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Win10 > Debug|x64'" Label="Configuration"> > + <TargetVersion> > + </TargetVersion> > + <UseDebugLibraries>true</UseDebugLibraries> > + <PlatformToolset>WindowsKernelModeDriver10.0</PlatformToolset> > + <DriverTargetPlatform>Desktop</DriverTargetPlatform> > + </PropertyGroup> > <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Win8 > Debug|x64'" Label="Configuration"> > <TargetVersion>Windows8</TargetVersion> > <UseDebugLibraries>true</UseDebugLibraries> > <PlatformToolset>WindowsKernelModeDriver8.1</PlatformToolset> > </PropertyGroup> > + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Win10 > Release|x64'" Label="Configuration"> > + <TargetVersion> > + </TargetVersion> > + <UseDebugLibraries>false</UseDebugLibraries> > + <PlatformToolset>WindowsKernelModeDriver10.0</PlatformToolset> > + <DriverTargetPlatform>Universal</DriverTargetPlatform> > + </PropertyGroup> > <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Win8.1 > Release|x64'"> > <TargetVersion>WindowsV6.3</TargetVersion> > <UseDebugLibraries>false</UseDebugLibraries> > @@ -83,6 +105,11 @@ > <UseLocalTime>true</UseLocalTime> > </Inf2Cat> > </ItemDefinitionGroup> > + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Win10 > Debug|x64'"> > + <Inf2Cat> > + <UseLocalTime>true</UseLocalTime> > + </Inf2Cat> > + </ItemDefinitionGroup> > <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Win8.1 > Debug|x64'"> > <Inf2Cat> > <UseLocalTime>true</UseLocalTime> > @@ -98,6 +125,11 @@ > <UseLocalTime>true</UseLocalTime> > </Inf2Cat> > </ItemDefinitionGroup> > + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Win10 > Release|x64'"> > + <Inf2Cat> > + <UseLocalTime>true</UseLocalTime> > + </Inf2Cat> > + </ItemDefinitionGroup> > <ItemGroup> > <!--Inf Include="DriverInf.inv" /--> > <FilesToPackage Include="@(Inf->'%(CopyOutput)')" > Condition="'@(Inf)'!=''" /> > diff --git a/datapath-windows/Package/package.VcxProj.user > b/datapath-windows/Package/package.VcxProj.user > index 7169f02..75ea9d7 100644 > --- a/datapath-windows/Package/package.VcxProj.user > +++ b/datapath-windows/Package/package.VcxProj.user > @@ -6,10 +6,16 @@ > <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Win8.1 > Debug|x64'"> > <SignMode>TestSign</SignMode> > </PropertyGroup> > + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Win10 > Debug|x64'"> > + <SignMode>TestSign</SignMode> > + </PropertyGroup> > <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Win8 > Release|x64'"> > <SignMode>TestSign</SignMode> > </PropertyGroup> > <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Win8.1 > Release|x64'"> > <SignMode>TestSign</SignMode> > </PropertyGroup> > + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Win10 > Release|x64'"> > + <SignMode>TestSign</SignMode> > + </PropertyGroup> > </Project> > diff --git a/datapath-windows/ovsext.sln b/datapath-windows/ovsext.sln > index 60e9318..6cf441b 100644 > --- a/datapath-windows/ovsext.sln > +++ b/datapath-windows/ovsext.sln > @@ -12,12 +12,20 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = > "ovsext", "ovsext\ovsext.vcx > EndProject > Global > GlobalSection(SolutionConfigurationPlatforms) = preSolution > + Win10Debug|x64 = Win10Debug|x64 > + Win10Release|x64 = Win10Release|x64 > Win8.1Debug|x64 = Win8.1Debug|x64 > Win8.1Release|x64 = Win8.1Release|x64 > Win8Debug|x64 = Win8Debug|x64 > Win8Release|x64 = Win8Release|x64 > EndGlobalSection > GlobalSection(ProjectConfigurationPlatforms) = postSolution > + {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 > + {911D7389-3E61-449F-B8F3-14AD7EE9A0F2}.Win10Release|x64.ActiveCfg > = Win10 Release|x64 > + {911D7389-3E61-449F-B8F3-14AD7EE9A0F2}.Win10Release|x64.Build.0 > = Win10 Release|x64 > + {911D7389-3E61-449F-B8F3-14AD7EE9A0F2}.Win10Release|x64.Deploy.0 > = Win10 Release|x64 > {911D7389-3E61-449F-B8F3-14AD7EE9A0F2}.Win8.1Debug|x64.ActiveCfg > = Win8.1 Debug|x64 > {911D7389-3E61-449F-B8F3-14AD7EE9A0F2}.Win8.1Debug|x64.Build.0 > = Win8.1 Debug|x64 > {911D7389-3E61-449F-B8F3-14AD7EE9A0F2}.Win8.1Release|x64.ActiveCfg > = Win8.1 Release|x64 > @@ -26,6 +34,12 @@ 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}.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 > + {63FE215D-98BE-4440-8081-C6160EFB80FA}.Win10Release|x64.ActiveCfg > = Win10 Release|x64 > + {63FE215D-98BE-4440-8081-C6160EFB80FA}.Win10Release|x64.Build.0 > = Win10 Release|x64 > + {63FE215D-98BE-4440-8081-C6160EFB80FA}.Win10Release|x64.Deploy.0 > = Win10 Release|x64 > {63FE215D-98BE-4440-8081-C6160EFB80FA}.Win8.1Debug|x64.ActiveCfg > = Win8.1 Debug|x64 > {63FE215D-98BE-4440-8081-C6160EFB80FA}.Win8.1Debug|x64.Build.0 > = Win8.1 Debug|x64 > {63FE215D-98BE-4440-8081-C6160EFB80FA}.Win8.1Debug|x64.Deploy.0 > = Win8.1 Debug|x64 > diff --git a/datapath-windows/ovsext/ovsext.vcxproj > b/datapath-windows/ovsext/ovsext.vcxproj > index 39b9f57..44aea19 100644 > --- a/datapath-windows/ovsext/ovsext.vcxproj > +++ b/datapath-windows/ovsext/ovsext.vcxproj > @@ -1,6 +1,14 @@ > <?xml version="1.0" encoding="utf-8"?> > <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas. > microsoft.com/developer/msbuild/2003"> > <ItemGroup Label="ProjectConfigurations"> > + <ProjectConfiguration Include="Win10 Debug|x64"> > + <Configuration>Win10 Debug</Configuration> > + <Platform>x64</Platform> > + </ProjectConfiguration> > + <ProjectConfiguration Include="Win10 Release|x64"> > + <Configuration>Win10 Release</Configuration> > + <Platform>x64</Platform> > + </ProjectConfiguration> > <ProjectConfiguration Include="Win8.1 Debug|x64"> > <Configuration>Win8.1 Debug</Configuration> > <Platform>x64</Platform> > @@ -38,6 +46,13 @@ > <UseDebugLibraries>True</UseDebugLibraries> > <PlatformToolset>WindowsKernelModeDriver8.1</PlatformToolset> > </PropertyGroup> > + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Win10 > Debug|x64'" Label="Configuration"> > + <TargetVersion> > + </TargetVersion> > + <UseDebugLibraries>True</UseDebugLibraries> > + <PlatformToolset>WindowsKernelModeDriver10.0</PlatformToolset> > + <DriverTargetPlatform>Desktop</DriverTargetPlatform> > + </PropertyGroup> > <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Win8 > Debug|x64'"> > <TargetVersion>Win8</TargetVersion> > <UseDebugLibraries>True</UseDebugLibraries> > @@ -48,6 +63,13 @@ > <UseDebugLibraries>False</UseDebugLibraries> > <PlatformToolset>WindowsKernelModeDriver8.1</PlatformToolset> > </PropertyGroup> > + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Win10 > Release|x64'" Label="Configuration"> > + <TargetVersion> > + </TargetVersion> > + <UseDebugLibraries>False</UseDebugLibraries> > + <PlatformToolset>WindowsKernelModeDriver10.0</PlatformToolset> > + <DriverTargetPlatform>Desktop</DriverTargetPlatform> > + </PropertyGroup> > <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Win8 > Release|x64'"> > <TargetVersion>Win8</TargetVersion> > <UseDebugLibraries>False</UseDebugLibraries> > @@ -60,6 +82,9 @@ > <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Win8 > Release|x64'"> > <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" > Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" > /> > </ImportGroup> > + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Win10 > Release|x64'" Label="PropertySheets"> > + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" > Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" > /> > + </ImportGroup> > <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Win8.1 > Release|x64'" Label="PropertySheets"> > <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" > Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" > /> > </ImportGroup> > @@ -69,6 +94,9 @@ > <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Win8.1 > 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)'=='Win10 > Debug|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" /> > @@ -112,6 +140,12 @@ > <PropertyGroup> > <TargetName>OVSExt</TargetName> > </PropertyGroup> > + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Win10 > Release|x64'"> > + <Inf2CatUseLocalTime>true</Inf2CatUseLocalTime> > + </PropertyGroup> > + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Win10 > Debug|x64'"> > + <Inf2CatUseLocalTime>true</Inf2CatUseLocalTime> > + </PropertyGroup> > <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Win8 > Release|x64'"> > <ClCompile> > <PreprocessorDefinitions>%(PreprocessorDefinitions);NDIS_ > WDM=1;NDIS630=1</PreprocessorDefinitions> > @@ -134,6 +168,17 @@ > <PreprocessorDefinitions>%(PreprocessorDefinitions);NDIS_ > WDM=1;NDIS640=1</PreprocessorDefinitions> > </ResourceCompile> > </ItemDefinitionGroup> > + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Win10 > Release|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 Condition="'$(Configuration)|$(Platform)'=='Win8 > Debug|x64'"> > <ClCompile> > <PreprocessorDefinitions>%(PreprocessorDefinitions);NDIS_ > WDM=1;NDIS630=1</PreprocessorDefinitions> > @@ -156,6 +201,17 @@ > <PreprocessorDefinitions>%(PreprocessorDefinitions);NDIS_ > WDM=1;NDIS640=1</PreprocessorDefinitions> > </ResourceCompile> > </ItemDefinitionGroup> > + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Win10 > Debug|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> > @@ -167,12 +223,16 @@ > </ExceptionHandling> > <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Win8 > Debug|x64'">$(IntDir);%(AdditionalIncludeDirectories);..\..</ > AdditionalIncludeDirectories> > <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Win8.1 > Debug|x64'">$(IntDir);%(AdditionalIncludeDirectories);..\..</ > AdditionalIncludeDirectories> > + <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Win10 > Debug|x64'">$(IntDir);%(AdditionalIncludeDirectories);..\..</ > 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);..\..</ > AdditionalIncludeDirectories> > <MultiProcessorCompilation Condition="'$(Configuration)|$(Platform)'=='Win8 > Release|x64'">true</MultiProcessorCompilation> > <MultiProcessorCompilation Condition="'$(Configuration)|$(Platform)'=='Win8 > Debug|x64'">true</MultiProcessorCompilation> > <MultiProcessorCompilation Condition="'$(Configuration)|$(Platform)'=='Win8.1 > Debug|x64'">true</MultiProcessorCompilation> > + <MultiProcessorCompilation Condition="'$(Configuration)|$(Platform)'=='Win10 > Debug|x64'">true</MultiProcessorCompilation> > <MultiProcessorCompilation Condition="'$(Configuration)|$(Platform)'=='Win8.1 > Release|x64'">true</MultiProcessorCompilation> > + <MultiProcessorCompilation Condition="'$(Configuration)|$(Platform)'=='Win10 > Release|x64'">true</MultiProcessorCompilation> > </ClCompile> > <Inf> > <TimeStamp Condition="'$(Configuration)|$(Platform)'=='Win8 > Debug|x64'">$(Version)</TimeStamp> > @@ -181,11 +241,17 @@ > <TimeStamp Condition="'$(Configuration)|$(Platform)'=='Win8.1 > Debug|x64'">$(Version)</TimeStamp> > </Inf> > <Inf> > + <TimeStamp Condition="'$(Configuration)|$(Platform)'=='Win10 > Debug|x64'">$(Version)</TimeStamp> > + </Inf> > + <Inf> > <TimeStamp Condition="'$(Configuration)|$(Platform)'=='Win8 > Release|x64'">$(Version)</TimeStamp> > </Inf> > <Inf> > <TimeStamp Condition="'$(Configuration)|$(Platform)'=='Win8.1 > Release|x64'">$(Version)</TimeStamp> > </Inf> > + <Inf> > + <TimeStamp Condition="'$(Configuration)|$(Platform)'=='Win10 > Release|x64'">$(Version)</TimeStamp> > + </Inf> > </ItemDefinitionGroup> > <ItemGroup> > <ClCompile Include="Actions.c" /> > @@ -231,6 +297,8 @@ > <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Win8 > Debug|x64'">%(PreprocessorDefinitions);NDIS_WDM=1;NDIS630=1; > VersionWithCommas=$(Version.Replace('.',','))</PreprocessorDefinitions> > <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Win8.1 > Release|x64'">%(PreprocessorDefinitions);NDIS_WDM=1;NDIS640=1; > VersionWithCommas=$(Version.Replace('.',','))</PreprocessorDefinitions> > <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Win8.1 > Debug|x64'">%(PreprocessorDefinitions);NDIS_WDM=1;NDIS640=1; > VersionWithCommas=$(Version.Replace('.',','))</PreprocessorDefinitions> > + <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Win10 > Release|x64'">%(PreprocessorDefinitions);NDIS_WDM=1;NDIS640=1; > VersionWithCommas=$(Version.Replace('.',','))</PreprocessorDefinitions> > + <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Win10 > Debug|x64'">%(PreprocessorDefinitions);NDIS_WDM=1;NDIS640=1; > VersionWithCommas=$(Version.Replace('.',','))</PreprocessorDefinitions> > </ResourceCompile> > </ItemGroup> > <ItemGroup> > diff --git a/datapath-windows/ovsext/ovsext.vcxproj.user > b/datapath-windows/ovsext/ovsext.vcxproj.user > index 7169f02..75ea9d7 100644 > --- a/datapath-windows/ovsext/ovsext.vcxproj.user > +++ b/datapath-windows/ovsext/ovsext.vcxproj.user > @@ -6,10 +6,16 @@ > <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Win8.1 > Debug|x64'"> > <SignMode>TestSign</SignMode> > </PropertyGroup> > + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Win10 > Debug|x64'"> > + <SignMode>TestSign</SignMode> > + </PropertyGroup> > <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Win8 > Release|x64'"> > <SignMode>TestSign</SignMode> > </PropertyGroup> > <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Win8.1 > Release|x64'"> > <SignMode>TestSign</SignMode> > </PropertyGroup> > + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Win10 > Release|x64'"> > + <SignMode>TestSign</SignMode> > + </PropertyGroup> > </Project> > -- > 2.10.2.windows.1 > _______________________________________________ > dev mailing list > dev@openvswitch.org > https://mail.openvswitch.org/mailman/listinfo/ovs-dev >
diff --git a/datapath-windows/Package/package.VcxProj b/datapath-windows/Package/package.VcxProj index 0d48163..24bb914 100644 --- a/datapath-windows/Package/package.VcxProj +++ b/datapath-windows/Package/package.VcxProj @@ -1,6 +1,14 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <ItemGroup Label="ProjectConfigurations"> + <ProjectConfiguration Include="Win10 Debug|x64"> + <Configuration>Win10 Debug</Configuration> + <Platform>x64</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Win10 Release|x64"> + <Configuration>Win10 Release</Configuration> + <Platform>x64</Platform> + </ProjectConfiguration> <ProjectConfiguration Include="Win8.1 Debug|x64"> <Configuration>Win8.1 Debug</Configuration> <Platform>x64</Platform> @@ -38,11 +46,25 @@ <UseDebugLibraries>true</UseDebugLibraries> <PlatformToolset>WindowsKernelModeDriver8.1</PlatformToolset> </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Win10 Debug|x64'" Label="Configuration"> + <TargetVersion> + </TargetVersion> + <UseDebugLibraries>true</UseDebugLibraries> + <PlatformToolset>WindowsKernelModeDriver10.0</PlatformToolset> + <DriverTargetPlatform>Desktop</DriverTargetPlatform> + </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Win8 Debug|x64'" Label="Configuration"> <TargetVersion>Windows8</TargetVersion> <UseDebugLibraries>true</UseDebugLibraries> <PlatformToolset>WindowsKernelModeDriver8.1</PlatformToolset> </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Win10 Release|x64'" Label="Configuration"> + <TargetVersion> + </TargetVersion> + <UseDebugLibraries>false</UseDebugLibraries> + <PlatformToolset>WindowsKernelModeDriver10.0</PlatformToolset> + <DriverTargetPlatform>Universal</DriverTargetPlatform> + </PropertyGroup> <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Win8.1 Release|x64'"> <TargetVersion>WindowsV6.3</TargetVersion> <UseDebugLibraries>false</UseDebugLibraries> @@ -83,6 +105,11 @@ <UseLocalTime>true</UseLocalTime> </Inf2Cat> </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Win10 Debug|x64'"> + <Inf2Cat> + <UseLocalTime>true</UseLocalTime> + </Inf2Cat> + </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Win8.1 Debug|x64'"> <Inf2Cat> <UseLocalTime>true</UseLocalTime> @@ -98,6 +125,11 @@ <UseLocalTime>true</UseLocalTime> </Inf2Cat> </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Win10 Release|x64'"> + <Inf2Cat> + <UseLocalTime>true</UseLocalTime> + </Inf2Cat> + </ItemDefinitionGroup> <ItemGroup> <!--Inf Include="DriverInf.inv" /--> <FilesToPackage Include="@(Inf->'%(CopyOutput)')" Condition="'@(Inf)'!=''" /> diff --git a/datapath-windows/Package/package.VcxProj.user b/datapath-windows/Package/package.VcxProj.user index 7169f02..75ea9d7 100644 --- a/datapath-windows/Package/package.VcxProj.user +++ b/datapath-windows/Package/package.VcxProj.user @@ -6,10 +6,16 @@ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Win8.1 Debug|x64'"> <SignMode>TestSign</SignMode> </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Win10 Debug|x64'"> + <SignMode>TestSign</SignMode> + </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Win8 Release|x64'"> <SignMode>TestSign</SignMode> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Win8.1 Release|x64'"> <SignMode>TestSign</SignMode> </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Win10 Release|x64'"> + <SignMode>TestSign</SignMode> + </PropertyGroup> </Project> diff --git a/datapath-windows/ovsext.sln b/datapath-windows/ovsext.sln index 60e9318..6cf441b 100644 --- a/datapath-windows/ovsext.sln +++ b/datapath-windows/ovsext.sln @@ -12,12 +12,20 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ovsext", "ovsext\ovsext.vcx EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution + Win10Debug|x64 = Win10Debug|x64 + Win10Release|x64 = Win10Release|x64 Win8.1Debug|x64 = Win8.1Debug|x64 Win8.1Release|x64 = Win8.1Release|x64 Win8Debug|x64 = Win8Debug|x64 Win8Release|x64 = Win8Release|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution + {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 + {911D7389-3E61-449F-B8F3-14AD7EE9A0F2}.Win10Release|x64.ActiveCfg = Win10 Release|x64 + {911D7389-3E61-449F-B8F3-14AD7EE9A0F2}.Win10Release|x64.Build.0 = Win10 Release|x64 + {911D7389-3E61-449F-B8F3-14AD7EE9A0F2}.Win10Release|x64.Deploy.0 = Win10 Release|x64 {911D7389-3E61-449F-B8F3-14AD7EE9A0F2}.Win8.1Debug|x64.ActiveCfg = Win8.1 Debug|x64 {911D7389-3E61-449F-B8F3-14AD7EE9A0F2}.Win8.1Debug|x64.Build.0 = Win8.1 Debug|x64 {911D7389-3E61-449F-B8F3-14AD7EE9A0F2}.Win8.1Release|x64.ActiveCfg = Win8.1 Release|x64 @@ -26,6 +34,12 @@ 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}.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 + {63FE215D-98BE-4440-8081-C6160EFB80FA}.Win10Release|x64.ActiveCfg = Win10 Release|x64 + {63FE215D-98BE-4440-8081-C6160EFB80FA}.Win10Release|x64.Build.0 = Win10 Release|x64 + {63FE215D-98BE-4440-8081-C6160EFB80FA}.Win10Release|x64.Deploy.0 = Win10 Release|x64 {63FE215D-98BE-4440-8081-C6160EFB80FA}.Win8.1Debug|x64.ActiveCfg = Win8.1 Debug|x64 {63FE215D-98BE-4440-8081-C6160EFB80FA}.Win8.1Debug|x64.Build.0 = Win8.1 Debug|x64 {63FE215D-98BE-4440-8081-C6160EFB80FA}.Win8.1Debug|x64.Deploy.0 = Win8.1 Debug|x64 diff --git a/datapath-windows/ovsext/ovsext.vcxproj b/datapath-windows/ovsext/ovsext.vcxproj index 39b9f57..44aea19 100644 --- a/datapath-windows/ovsext/ovsext.vcxproj +++ b/datapath-windows/ovsext/ovsext.vcxproj @@ -1,6 +1,14 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <ItemGroup Label="ProjectConfigurations"> + <ProjectConfiguration Include="Win10 Debug|x64"> + <Configuration>Win10 Debug</Configuration> + <Platform>x64</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Win10 Release|x64"> + <Configuration>Win10 Release</Configuration> + <Platform>x64</Platform> + </ProjectConfiguration> <ProjectConfiguration Include="Win8.1 Debug|x64"> <Configuration>Win8.1 Debug</Configuration> <Platform>x64</Platform> @@ -38,6 +46,13 @@ <UseDebugLibraries>True</UseDebugLibraries> <PlatformToolset>WindowsKernelModeDriver8.1</PlatformToolset> </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Win10 Debug|x64'" Label="Configuration"> + <TargetVersion> + </TargetVersion> + <UseDebugLibraries>True</UseDebugLibraries> + <PlatformToolset>WindowsKernelModeDriver10.0</PlatformToolset> + <DriverTargetPlatform>Desktop</DriverTargetPlatform> + </PropertyGroup> <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Win8 Debug|x64'"> <TargetVersion>Win8</TargetVersion> <UseDebugLibraries>True</UseDebugLibraries> @@ -48,6 +63,13 @@ <UseDebugLibraries>False</UseDebugLibraries> <PlatformToolset>WindowsKernelModeDriver8.1</PlatformToolset> </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Win10 Release|x64'" Label="Configuration"> + <TargetVersion> + </TargetVersion> + <UseDebugLibraries>False</UseDebugLibraries> + <PlatformToolset>WindowsKernelModeDriver10.0</PlatformToolset> + <DriverTargetPlatform>Desktop</DriverTargetPlatform> + </PropertyGroup> <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Win8 Release|x64'"> <TargetVersion>Win8</TargetVersion> <UseDebugLibraries>False</UseDebugLibraries> @@ -60,6 +82,9 @@ <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Win8 Release|x64'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" /> </ImportGroup> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Win10 Release|x64'" Label="PropertySheets"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" /> + </ImportGroup> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Win8.1 Release|x64'" Label="PropertySheets"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" /> </ImportGroup> @@ -69,6 +94,9 @@ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Win8.1 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)'=='Win10 Debug|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" /> @@ -112,6 +140,12 @@ <PropertyGroup> <TargetName>OVSExt</TargetName> </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Win10 Release|x64'"> + <Inf2CatUseLocalTime>true</Inf2CatUseLocalTime> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Win10 Debug|x64'"> + <Inf2CatUseLocalTime>true</Inf2CatUseLocalTime> + </PropertyGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Win8 Release|x64'"> <ClCompile> <PreprocessorDefinitions>%(PreprocessorDefinitions);NDIS_WDM=1;NDIS630=1</PreprocessorDefinitions> @@ -134,6 +168,17 @@ <PreprocessorDefinitions>%(PreprocessorDefinitions);NDIS_WDM=1;NDIS640=1</PreprocessorDefinitions> </ResourceCompile> </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Win10 Release|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 Condition="'$(Configuration)|$(Platform)'=='Win8 Debug|x64'"> <ClCompile> <PreprocessorDefinitions>%(PreprocessorDefinitions);NDIS_WDM=1;NDIS630=1</PreprocessorDefinitions> @@ -156,6 +201,17 @@ <PreprocessorDefinitions>%(PreprocessorDefinitions);NDIS_WDM=1;NDIS640=1</PreprocessorDefinitions> </ResourceCompile> </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Win10 Debug|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> @@ -167,12 +223,16 @@ </ExceptionHandling> <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Win8 Debug|x64'">$(IntDir);%(AdditionalIncludeDirectories);..\..</AdditionalIncludeDirectories> <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Win8.1 Debug|x64'">$(IntDir);%(AdditionalIncludeDirectories);..\..</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Win10 Debug|x64'">$(IntDir);%(AdditionalIncludeDirectories);..\..</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);..\..</AdditionalIncludeDirectories> <MultiProcessorCompilation Condition="'$(Configuration)|$(Platform)'=='Win8 Release|x64'">true</MultiProcessorCompilation> <MultiProcessorCompilation Condition="'$(Configuration)|$(Platform)'=='Win8 Debug|x64'">true</MultiProcessorCompilation> <MultiProcessorCompilation Condition="'$(Configuration)|$(Platform)'=='Win8.1 Debug|x64'">true</MultiProcessorCompilation> + <MultiProcessorCompilation Condition="'$(Configuration)|$(Platform)'=='Win10 Debug|x64'">true</MultiProcessorCompilation> <MultiProcessorCompilation Condition="'$(Configuration)|$(Platform)'=='Win8.1 Release|x64'">true</MultiProcessorCompilation> + <MultiProcessorCompilation Condition="'$(Configuration)|$(Platform)'=='Win10 Release|x64'">true</MultiProcessorCompilation> </ClCompile> <Inf> <TimeStamp Condition="'$(Configuration)|$(Platform)'=='Win8 Debug|x64'">$(Version)</TimeStamp> @@ -181,11 +241,17 @@ <TimeStamp Condition="'$(Configuration)|$(Platform)'=='Win8.1 Debug|x64'">$(Version)</TimeStamp> </Inf> <Inf> + <TimeStamp Condition="'$(Configuration)|$(Platform)'=='Win10 Debug|x64'">$(Version)</TimeStamp> + </Inf> + <Inf> <TimeStamp Condition="'$(Configuration)|$(Platform)'=='Win8 Release|x64'">$(Version)</TimeStamp> </Inf> <Inf> <TimeStamp Condition="'$(Configuration)|$(Platform)'=='Win8.1 Release|x64'">$(Version)</TimeStamp> </Inf> + <Inf> + <TimeStamp Condition="'$(Configuration)|$(Platform)'=='Win10 Release|x64'">$(Version)</TimeStamp> + </Inf> </ItemDefinitionGroup> <ItemGroup> <ClCompile Include="Actions.c" /> @@ -231,6 +297,8 @@ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Win8 Debug|x64'">%(PreprocessorDefinitions);NDIS_WDM=1;NDIS630=1;VersionWithCommas=$(Version.Replace('.',','))</PreprocessorDefinitions> <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Win8.1 Release|x64'">%(PreprocessorDefinitions);NDIS_WDM=1;NDIS640=1;VersionWithCommas=$(Version.Replace('.',','))</PreprocessorDefinitions> <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Win8.1 Debug|x64'">%(PreprocessorDefinitions);NDIS_WDM=1;NDIS640=1;VersionWithCommas=$(Version.Replace('.',','))</PreprocessorDefinitions> + <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Win10 Release|x64'">%(PreprocessorDefinitions);NDIS_WDM=1;NDIS640=1;VersionWithCommas=$(Version.Replace('.',','))</PreprocessorDefinitions> + <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Win10 Debug|x64'">%(PreprocessorDefinitions);NDIS_WDM=1;NDIS640=1;VersionWithCommas=$(Version.Replace('.',','))</PreprocessorDefinitions> </ResourceCompile> </ItemGroup> <ItemGroup> diff --git a/datapath-windows/ovsext/ovsext.vcxproj.user b/datapath-windows/ovsext/ovsext.vcxproj.user index 7169f02..75ea9d7 100644 --- a/datapath-windows/ovsext/ovsext.vcxproj.user +++ b/datapath-windows/ovsext/ovsext.vcxproj.user @@ -6,10 +6,16 @@ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Win8.1 Debug|x64'"> <SignMode>TestSign</SignMode> </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Win10 Debug|x64'"> + <SignMode>TestSign</SignMode> + </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Win8 Release|x64'"> <SignMode>TestSign</SignMode> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Win8.1 Release|x64'"> <SignMode>TestSign</SignMode> </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Win10 Release|x64'"> + <SignMode>TestSign</SignMode> + </PropertyGroup> </Project>