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 a380aa7db0dc63495806236ba2dfab3d576d0817..a32e91230851c69b3f2b0f21abef37b4c787060b 100644 (file)
--- 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 39e234765cadf6d7057f9df3914b3109befcf5cc..0324fd4f20b1409a11c0379509e0db4227e2bc26 100644 (file)
--- 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>