[win-pv-devel] [xenvif PATCH] Conditionally package DPInst

[Owen Smith]

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 <***@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 ed28bea..11899e2 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 20127b5..8c62989 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>

[Paul Durrant]

-----Original Message-----
Behalf Of Owen Smith
Sent: 14 August 2018 14:09
Subject: [win-pv-devel] [xenvif PATCH] 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.

This, and all similar patches for other drivers...

---
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 ed28bea..11899e2 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 20127b5..8c62989 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
https://lists.xenproject.org/mailman/listinfo/win-pv-devel