[win-pv-devel] [PATCH 1/2] Fixes for VS2015/WDK10 build

[Paul Durrant <paul.durrant@xxxxxxxxxx>]

The package build was not working correctly and caused the overall build
to fail.
At least part of the reason for this is that Microsoft, in their infinite
wisdom, have removed the DIFx redist from WDK10. This patch makes use of
a new environment variable 'DPINST_REDIST' to find the copy of dpinst.exe
to package such that this can be pointed at an older WDK or alternative
location where dpinst.exe can be found.

Signed-off-by: Paul Durrant <paul.durrant@xxxxxxxxxx>
---
 vs2015/package/package.vcxproj                  | 14 +++++++-------
 vs2015/package/package.vcxproj.user             |  2 +-
 vs2015/xennet/xennet.vcxproj                    |  2 +-
 vs2015/xennet/xennet.vcxproj.user               |  2 +-
 vs2015/xennet_coinst/xennet_coinst.vcxproj      |  2 +-
 vs2015/xennet_coinst/xennet_coinst.vcxproj.user |  2 +-
 6 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/vs2015/package/package.vcxproj b/vs2015/package/package.vcxproj
index 9357e87..907764f 100644
--- a/vs2015/package/package.vcxproj
+++ b/vs2015/package/package.vcxproj
@@ -1,12 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" 
xmlns="http://schemas.microsoft.com/developer/msbuild/2003";>
+<Project DefaultTargets="Build" ToolsVersion="14.0" 
xmlns="http://schemas.microsoft.com/developer/msbuild/2003";>
   <Import Project="..\configs.props" />
   <PropertyGroup Label="PropertySheets">
-    <DriverType>WDM</DriverType>
-    <PlatformToolset>WindowsApplicationForDrivers10.0</PlatformToolset>
+    <PlatformToolset>WindowsKernelModeDriver10.0</PlatformToolset>
     <ConfigurationType>Utility</ConfigurationType>
     <DriverType>Package</DriverType>
     <DisableFastUpToDateCheck>true</DisableFastUpToDateCheck>
+    <SupportsPackaging>true</SupportsPackaging>
+    <DriverTargetPlatform>Desktop</DriverTargetPlatform>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Globals">
@@ -28,8 +29,7 @@
     <VerifyProjectOutput>True</VerifyProjectOutput>
     <VerifyFlags>133563</VerifyFlags>
     <IntDir>..\$(ProjectName)\$(ConfigurationName)\$(Platform)\</IntDir>
-    <OutDir>..\$(ConfigurationName)\$(Platform)\</OutDir>
-    <PackageDir>..\..\xennet\$(DDKPlatform)</PackageDir>
+    <OutDir>..\..\xennet\$(DDKPlatform)</OutDir>
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\xennet\xennet.vcxproj">
@@ -40,8 +40,8 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <FilesToPackage Include="$(KIT)\Redist\DIFx\dpinst\EngMui\x86\dpinst.exe" 
Condition="'$(Platform)'=='Win32'" />
-    <FilesToPackage Include="$(KIT)\Redist\DIFx\dpinst\EngMui\x64\dpinst.exe" 
Condition="'$(Platform)'=='x64'" />
+    <FilesToPackage Include="$(DPINST_REDIST)\x86\dpinst.exe" 
Condition="'$(Platform)'=='Win32'" />
+    <FilesToPackage Include="$(DPINST_REDIST)\x64\dpinst.exe" 
Condition="'$(Platform)'=='x64'" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/vs2015/package/package.vcxproj.user 
b/vs2015/package/package.vcxproj.user
index a5433e9..8b034c4 100644
--- a/vs2015/package/package.vcxproj.user
+++ b/vs2015/package/package.vcxproj.user
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" 
xmlns="http://schemas.microsoft.com/developer/msbuild/2003";>
+<Project ToolsVersion="14.0" 
xmlns="http://schemas.microsoft.com/developer/msbuild/2003";>
   <PropertyGroup>
     <SignMode>TestSign</SignMode>
     <TestCertificate>..\..\src\xennet.pfx</TestCertificate>
diff --git a/vs2015/xennet/xennet.vcxproj b/vs2015/xennet/xennet.vcxproj
index 7dfddb2..d3b6e9a 100644
--- a/vs2015/xennet/xennet.vcxproj
+++ b/vs2015/xennet/xennet.vcxproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" 
xmlns="http://schemas.microsoft.com/developer/msbuild/2003";>
+<Project DefaultTargets="Build" ToolsVersion="14.0" 
xmlns="http://schemas.microsoft.com/developer/msbuild/2003";>
   <Import Project="..\configs.props" />
   <PropertyGroup Label="PropertySheets">
     <ConfigurationType>Driver</ConfigurationType>
diff --git a/vs2015/xennet/xennet.vcxproj.user 
b/vs2015/xennet/xennet.vcxproj.user
index 770fdca..8b034c4 100644
--- a/vs2015/xennet/xennet.vcxproj.user
+++ b/vs2015/xennet/xennet.vcxproj.user
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" 
xmlns="http://schemas.microsoft.com/developer/msbuild/2003";>
+<Project ToolsVersion="14.0" 
xmlns="http://schemas.microsoft.com/developer/msbuild/2003";>
   <PropertyGroup>
     <SignMode>TestSign</SignMode>
     <TestCertificate>..\..\src\xennet.pfx</TestCertificate>
diff --git a/vs2015/xennet_coinst/xennet_coinst.vcxproj 
b/vs2015/xennet_coinst/xennet_coinst.vcxproj
index a3097a6..3feda2d 100644
--- a/vs2015/xennet_coinst/xennet_coinst.vcxproj
+++ b/vs2015/xennet_coinst/xennet_coinst.vcxproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" 
xmlns="http://schemas.microsoft.com/developer/msbuild/2003";>
+<Project DefaultTargets="Build" ToolsVersion="14.0" 
xmlns="http://schemas.microsoft.com/developer/msbuild/2003";>
   <Import Project="..\configs.props" />
   <PropertyGroup Label="PropertySheets">
     <DriverType>WDM</DriverType>
diff --git a/vs2015/xennet_coinst/xennet_coinst.vcxproj.user 
b/vs2015/xennet_coinst/xennet_coinst.vcxproj.user
index a5433e9..8b034c4 100644
--- a/vs2015/xennet_coinst/xennet_coinst.vcxproj.user
+++ b/vs2015/xennet_coinst/xennet_coinst.vcxproj.user
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" 
xmlns="http://schemas.microsoft.com/developer/msbuild/2003";>
+<Project ToolsVersion="14.0" 
xmlns="http://schemas.microsoft.com/developer/msbuild/2003";>
   <PropertyGroup>
     <SignMode>TestSign</SignMode>
     <TestCertificate>..\..\src\xennet.pfx</TestCertificate>
-- 
2.5.3


_______________________________________________
win-pv-devel mailing list
win-pv-devel@xxxxxxxxxxxxxxxxxxxx
https://lists.xenproject.org/cgi-bin/mailman/listinfo/win-pv-devel