|
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [win-pv-devel] [PATCH 1/2] Fixes for VS2015/WDK10 build
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/xenagent/xenagent.vcxproj | 2 +- vs2015/xenagent/xenagent.vcxproj.user | 4 ++-- vs2015/xeniface/xeniface.vcxproj | 2 +- vs2015/xeniface/xeniface.vcxproj.user | 2 +- vs2015/xeniface_coinst/xeniface_coinst.vcxproj | 14 +------------- vs2015/xeniface_coinst/xeniface_coinst.vcxproj.user | 2 +- 8 files changed, 15 insertions(+), 27 deletions(-) diff --git a/vs2015/package/package.vcxproj b/vs2015/package/package.vcxproj index b795f62..d9b6ac3 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"> @@ -29,8 +30,7 @@ <VerifyDrivers /> <VerifyFlags>133563</VerifyFlags> <IntDir>..\$(ProjectName)\$(ConfigurationName)\$(Platform)\</IntDir> - <OutDir>..\$(ConfigurationName)\$(Platform)\</OutDir> - <PackageDir>..\..\xeniface\$(DDKPlatform)</PackageDir> + <OutDir>..\..\xeniface\$(DDKPlatform)</OutDir> </PropertyGroup> <ItemGroup> <ProjectReference Include="..\xeniface\xeniface.vcxproj"> @@ -44,8 +44,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 38b83e3..ec2b080 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="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\xeniface.pfx</TestCertificate> diff --git a/vs2015/xenagent/xenagent.vcxproj b/vs2015/xenagent/xenagent.vcxproj index c7fa387..5f87e6d 100644 --- a/vs2015/xenagent/xenagent.vcxproj +++ b/vs2015/xenagent/xenagent.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"> <CharacterSet>MultiByte</CharacterSet> diff --git a/vs2015/xenagent/xenagent.vcxproj.user b/vs2015/xenagent/xenagent.vcxproj.user index 50f3cbe..28b978d 100644 --- a/vs2015/xenagent/xenagent.vcxproj.user +++ b/vs2015/xenagent/xenagent.vcxproj.user @@ -1,4 +1,4 @@ <?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 /> -</Project> \ No newline at end of file +</Project> diff --git a/vs2015/xeniface/xeniface.vcxproj b/vs2015/xeniface/xeniface.vcxproj index 860630f..d1ed99a 100644 --- a/vs2015/xeniface/xeniface.vcxproj +++ b/vs2015/xeniface/xeniface.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/xeniface/xeniface.vcxproj.user b/vs2015/xeniface/xeniface.vcxproj.user index 38b83e3..ec2b080 100644 --- a/vs2015/xeniface/xeniface.vcxproj.user +++ b/vs2015/xeniface/xeniface.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\xeniface.pfx</TestCertificate> diff --git a/vs2015/xeniface_coinst/xeniface_coinst.vcxproj b/vs2015/xeniface_coinst/xeniface_coinst.vcxproj index 343d2eb..a05944c 100644 --- a/vs2015/xeniface_coinst/xeniface_coinst.vcxproj +++ b/vs2015/xeniface_coinst/xeniface_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> @@ -34,28 +34,16 @@ <ResourceCompile> <AdditionalIncludeDirectories>$(SolutionDir)..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ResourceCompile> - <Inf> - <SpecifyArchitecture>true</SpecifyArchitecture> - <SpecifyDriverVerDirectiveVersion>true</SpecifyDriverVerDirectiveVersion> - <TimeStamp>$(MAJOR_VERSION).$(MINOR_VERSION).$(MICRO_VERSION).$(BUILD_NUMBER)</TimeStamp> - <EnableVerbose>true</EnableVerbose> - </Inf> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Platform)'=='Win32'"> <ClCompile> <PreprocessorDefinitions>__i386__;%(PreprocessorDefinitions)</PreprocessorDefinitions> </ClCompile> - <Inf> - <Architecture>x86</Architecture> - </Inf> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Platform)'=='x64'"> <ClCompile> <PreprocessorDefinitions>__x86_64__;%(PreprocessorDefinitions)</PreprocessorDefinitions> </ClCompile> - <Inf> - <Architecture>amd64</Architecture> - </Inf> </ItemDefinitionGroup> <ItemGroup> <FilesToPackage Include="$(TargetPath)" /> diff --git a/vs2015/xeniface_coinst/xeniface_coinst.vcxproj.user b/vs2015/xeniface_coinst/xeniface_coinst.vcxproj.user index 38b83e3..ec2b080 100644 --- a/vs2015/xeniface_coinst/xeniface_coinst.vcxproj.user +++ b/vs2015/xeniface_coinst/xeniface_coinst.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\xeniface.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
|
 |
Lists.xenproject.org is hosted with RackSpace, monitoring our |