From: Owen Smith <owen.smith@citrix.com>
Date: Fri, 24 Aug 2018 16:46:43 +0000 (+0100)
Subject: Conditionally package DPInst
X-Git-Tag: 9.0.0-rc1~8
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=f4312863c87fe0785451389967c897f01da20e9d;p=pvdrivers%2Fwin%2Fxennet.git

Conditionally package DPInst

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>
---

diff --git a/vs2015/package/package.vcxproj b/vs2015/package/package.vcxproj
index a380aa7..a32e912 100644
--- a/vs2015/package/package.vcxproj
+++ b/vs2015/package/package.vcxproj
@@ -39,7 +39,7 @@
       <Project>{3EDD837A-C1BE-47D4-9603-16B61353670B}</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 39e2347..0324fd4 100644
--- a/vs2017/package/package.vcxproj
+++ b/vs2017/package/package.vcxproj
@@ -39,7 +39,7 @@
       <Project>{3EDD837A-C1BE-47D4-9603-16B61353670B}</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>