[win-pv-devel] [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 ad6b84f..7251baa 100644
--- a/vs2015/package/package.vcxproj
+++ b/vs2015/package/package.vcxproj
@@ -49,7 +49,7 @@
<Project>{2E61D2CC-865E-442C-8C83-B8DAFD7BBD3B}</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 ad6b84f..7251baa 100644
--- a/vs2017/package/package.vcxproj
+++ b/vs2017/package/package.vcxproj
@@ -49,7 +49,7 @@
<Project>{2E61D2CC-865E-442C-8C83-B8DAFD7BBD3B}</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>

[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 34b07aa..9dd5617 100644
--- a/vs2015/package/package.vcxproj
+++ b/vs2015/package/package.vcxproj
@@ -46,7 +46,7 @@
<Project>{D386D8E9-D015-4AD2-A5C2-4F845A803FA2}</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 f9fd507..7060312 100644
--- a/vs2017/package/package.vcxproj
+++ b/vs2017/package/package.vcxproj
@@ -46,7 +46,7 @@
<Project>{D386D8E9-D015-4AD2-A5C2-4F845A803FA2}</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>

[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 a8c0727..d83629d 100644
--- a/vs2015/package/package.vcxproj
+++ b/vs2015/package/package.vcxproj
@@ -46,7 +46,7 @@
<Project>{79D98F83-5A2F-4DE6-B62C-530D70B88C3F}</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 6d2ee3d..e6ffc1f 100644
--- a/vs2017/package/package.vcxproj
+++ b/vs2017/package/package.vcxproj
@@ -46,7 +46,7 @@
<Project>{79D98F83-5A2F-4DE6-B62C-530D70B88C3F}</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>

[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 7d4a7dd..09bb33e 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 d8af279..060affc 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>

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

[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 af2928c..49a5ec2 100644
--- a/vs2015/package/package.vcxproj
+++ b/vs2015/package/package.vcxproj
@@ -45,7 +45,7 @@
<Project>{d7411b2c-2c43-434d-9f56-e10a3d2f5bad}</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 6b5930e..f4577f9 100644
--- a/vs2017/package/package.vcxproj
+++ b/vs2017/package/package.vcxproj
@@ -45,7 +45,7 @@
<Project>{d7411b2c-2c43-434d-9f56-e10a3d2f5bad}</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>

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

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