On 5 December 2016 at 07:39, Alin Serdean <[email protected]> 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 <[email protected]> > Would you mind reposting this patch. It gives me rejects. > --- > datapath-windows/Package/package.VcxProj | 32 ++++++++++++++++ > datapath-windows/Package/package.VcxProj.user | 8 +++- > datapath-windows/ovsext.sln | 18 ++++++++- > datapath-windows/ovsext/ovsext.vcxproj | 54 > +++++++++++++++++++++++++++ > datapath-windows/ovsext/ovsext.vcxproj.user | 8 +++- > 5 files changed, 116 insertions(+), 4 deletions(-) > > diff --git a/datapath-windows/Package/package.VcxProj > b/datapath-windows/Package/package.VcxProj > index 0d48163..1a0da97 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,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 Condition="'$(Configuration)|$(Platform)'=='Win8 > Debug|x64'" Label="Configuration"> > <TargetVersion>Windows8</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>Universal</DriverTargetPlatform> > + </PropertyGroup> > <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Win8 > Release|x64'" Label="Configuration"> > <TargetVersion>Windows8</TargetVersion> > <UseDebugLibraries>false</UseDebugLibraries> > @@ -88,6 +110,11 @@ > <UseLocalTime>true</UseLocalTime> > </Inf2Cat> > </ItemDefinitionGroup> > + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Win10 > Debug|x64'"> > + <Inf2Cat> > + <UseLocalTime>true</UseLocalTime> > + </Inf2Cat> > + </ItemDefinitionGroup> > <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Win8 > Release|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..891fbc0 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> > -</Project> > + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Win10 > Release|x64'"> > + <SignMode>TestSign</SignMode> > + </PropertyGroup> > +</Project> > \ No newline at end of file > diff --git a/datapath-windows/ovsext.sln b/datapath-windows/ovsext.sln > index 60e9318..831db89 100644 > --- a/datapath-windows/ovsext.sln > +++ b/datapath-windows/ovsext.sln > @@ -1,6 +1,6 @@ > Microsoft Visual Studio Solution File, Format Version 12.00 > -# Visual Studio 2013 > -VisualStudioVersion = 12.0.31101.0 > +# Visual Studio 14 > +VisualStudioVersion = 14.0.25420.1 > MinimumVisualStudioVersion = 10.0.40219.1 > Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Package", > "Package", "{6BA8554E-AE50-49B0-9C98-4592447FEF8D}" > EndProject > @@ -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 77530fd..fdb998a 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> > @@ -63,12 +85,18 @@ > <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> > + <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 Label="PropertySheets" > Condition="'$(Configuration)|$(Platform)'=='Win8 > Debug|x64'"> > <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" > Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" > /> > </ImportGroup> > <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" /> > @@ -134,6 +162,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 +195,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 +217,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> > </ItemDefinitionGroup> > <ItemGroup> > diff --git a/datapath-windows/ovsext/ovsext.vcxproj.user > b/datapath-windows/ovsext/ovsext.vcxproj.user > index 7169f02..891fbc0 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> > -</Project> > + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Win10 > Release|x64'"> > + <SignMode>TestSign</SignMode> > + </PropertyGroup> > +</Project> > \ No newline at end of file > -- > 2.10.2.windows.1 > _______________________________________________ > dev mailing list > [email protected] > https://mail.openvswitch.org/mailman/listinfo/ovs-dev > _______________________________________________ dev mailing list [email protected] https://mail.openvswitch.org/mailman/listinfo/ovs-dev
