[prev in list] [next in list] [prev in thread] [next in thread]
List: win-pv-devel
Subject: [win-pv-devel] [PATCH] Conditionally package DPInst
From: Owen Smith <owen.smith () citrix ! com>
Date: 2018-08-14 9:06:04
Message-ID: 20180814090604.6944-1-owen.smith () citrix ! com
[Download RAW message or body]
Since DPInst.exe is not shipped with the Windows Driver Kit 10, an
environment variable must point to local copies. Make the inclusion of
DPInst conditional on DPINST_REDIST being defined and that path
existing. This simplifies building packages which do not require DPInst
for installation, and removes a required step to create a working build.
Signed-off-by: Owen Smith <owen.smith@citrix.com>
---
vs2015/package/package.vcxproj | 2 +-
vs2017/package/package.vcxproj | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/vs2015/package/package.vcxproj b/vs2015/package/package.vcxproj
index d2baa4c..db5c2e0 100644
--- a/vs2015/package/package.vcxproj
+++ b/vs2015/package/package.vcxproj
@@ -39,7 +39,7 @@
<Project>{2BFAC7E6-3420-47A5-A092-BDC5C9D78A44}</Project>
</ProjectReference>
</ItemGroup>
- <ItemGroup>
+ <ItemGroup Condition="Exists('$(DPINST_REDIST)')">
<FilesToPackage Include="$(DPINST_REDIST)\x86\dpinst.exe" Condition="'$(Platform)'=='Win32'" />
<FilesToPackage Include="$(DPINST_REDIST)\x64\dpinst.exe" Condition="'$(Platform)'=='x64'" />
</ItemGroup>
diff --git a/vs2017/package/package.vcxproj b/vs2017/package/package.vcxproj
index 3827ea4..f32de24 100644
--- a/vs2017/package/package.vcxproj
+++ b/vs2017/package/package.vcxproj
@@ -39,7 +39,7 @@
<Project>{2BFAC7E6-3420-47A5-A092-BDC5C9D78A44}</Project>
</ProjectReference>
</ItemGroup>
- <ItemGroup>
+ <ItemGroup Condition="Exists('$(DPINST_REDIST)')">
<FilesToPackage Include="$(DPINST_REDIST)\x86\dpinst.exe" Condition="'$(Platform)'=='Win32'" />
<FilesToPackage Include="$(DPINST_REDIST)\x64\dpinst.exe" Condition="'$(Platform)'=='x64'" />
</ItemGroup>
--
2.16.2.windows.1
_______________________________________________
win-pv-devel mailing list
win-pv-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/win-pv-devel
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic