[WinOF] Missed the fact that WinVerbs needs the WdfCoinstaller.

git-svn-id: svn://openib.tc.cornell.edu/gen1@1496 ad392aa1-c5ef-ae45-8dd8-e69d62a5ef86

diff --git a/branches/WinOF/WIX/wlh/ia64/wof.wxs b/branches/WinOF/WIX/wlh/ia64/wof.wxs
index 194c674699baa71bd73b4d30ec56641637afcd02..7d82173ead024975f09353ecf11cd8a2347fd1b7 100644 (file)
--- a/branches/WinOF/WIX/wlh/ia64/wof.wxs
+++ b/branches/WinOF/WIX/wlh/ia64/wof.wxs
@@ -438,6 +438,9 @@ End Remove -->
                <File Id="winverbsd.dll" Compressed="yes" DiskId="1"\r
                      LongName="winverbsd.dll" Name="winvrbsd.dll"\r
                      Source="..\bin\HCA\ia64\winverbsd.dll" />\r
+               <File Id="wvWdfCoinstaller" Compressed="yes" DiskId="1"\r
+                     LongName="WdfCoInstaller01007.dll" Name="WCO.dll"\r
+                     Source="..\bin\HCA\ia64\WdfCoInstaller01007.dll" />\r
              </Component>\r
 \r
              <Component Id="cWinVerbsUser"\r

diff --git a/branches/WinOF/WIX/wlh/x64/wof.wxs b/branches/WinOF/WIX/wlh/x64/wof.wxs
index 7de34129d2b7f250cf2201c3bfda61c4714835a6..cef3276fef02d5054a57151ff838b6f6847156ae 100644 (file)
--- a/branches/WinOF/WIX/wlh/x64/wof.wxs
+++ b/branches/WinOF/WIX/wlh/x64/wof.wxs
@@ -465,6 +465,9 @@
                <File Id="winverbsd.dll" Compressed="yes" DiskId="1"\r
                      LongName="winverbsd.dll" Name="winvrbsd.dll"\r
                      Source="..\bin\HCA\amd64\winverbsd.dll" />\r
+               <File Id="wvWdfCoinstaller" Compressed="yes" DiskId="1"\r
+                     LongName="WdfCoInstaller01007.dll" Name="WCO.dll"\r
+                     Source="..\bin\HCA\amd64\WdfCoInstaller01007.dll" />\r
              </Component>\r
 \r
              <Component Id="cWinVerbsUser"\r

diff --git a/branches/WinOF/WIX/wlh/x86/wof.wxs b/branches/WinOF/WIX/wlh/x86/wof.wxs
index 3fbda2c3da562d422a2494c5c56fdaa8e5491332..41811c3b7d56d420731bb6ccd20dd107bbc75e31 100644 (file)
--- a/branches/WinOF/WIX/wlh/x86/wof.wxs
+++ b/branches/WinOF/WIX/wlh/x86/wof.wxs
@@ -415,6 +415,9 @@
                      <File Id="winverbsd.dll" Compressed="yes" DiskId="1"\r
                            LongName="winverbsd.dll" Name="winvrbsd.dll"\r
                            Source="..\bin\HCA\x86\winverbsd.dll" />\r
+                     <File Id="wvWdfCoinstaller" Compressed="yes" DiskId="1"\r
+                           LongName="WdfCoInstaller01007.dll" Name="WCO.dll"\r
+                           Source="..\bin\hca\x86\WdfCoInstaller01007.dll" />\r
                    </Component>\r
 \r
                    <Component Id="cWinVerbsUser"\r

diff --git a/branches/WinOF/WIX/wnet/ia64/wof.wxs b/branches/WinOF/WIX/wnet/ia64/wof.wxs
index a7e2be5d2bab600ea80e0a02c13d9009969bb11d..bc792df1acbd624e5cf09391b6f48632935e986a 100644 (file)
--- a/branches/WinOF/WIX/wnet/ia64/wof.wxs
+++ b/branches/WinOF/WIX/wnet/ia64/wof.wxs
@@ -442,6 +442,9 @@ End Remove -->
                <File Id="winverbsd.dll" Compressed="yes" DiskId="1"\r
                      LongName="winverbsd.dll" Name="winvrbsd.dll"\r
                      Source="..\bin\HCA\ia64\winverbsd.dll" />\r
+              <File Id="wvWdfcoinstaller" Compressed="yes" DiskId="1"\r
+                     LongName="WdfCoInstaller01007.dll" Name="WCO.dll"\r
+                     Source="..\bin\HCA\ia64\WdfCoInstaller01007.dll" />\r
              </Component>\r
 \r
              <Component Id="cWinVerbsUser"\r

diff --git a/branches/WinOF/WIX/wnet/x64/wof.wxs b/branches/WinOF/WIX/wnet/x64/wof.wxs
index de6b1cb739f4037f230331a61ce45402175b3171..96a3ddaff1534b56ffb9d65919ae8eb338602d5c 100644 (file)
--- a/branches/WinOF/WIX/wnet/x64/wof.wxs
+++ b/branches/WinOF/WIX/wnet/x64/wof.wxs
@@ -465,6 +465,9 @@
                <File Id="winverbsd.dll" Compressed="yes" DiskId="1"\r
                      LongName="winverbsd.dll" Name="winvrbsd.dll"\r
                      Source="..\bin\HCA\amd64\winverbsd.dll" />\r
+               <File Id="wvWdfCoinstaller" Compressed="yes" DiskId="1"\r
+                     LongName="WdfCoInstaller01007.dll" Name="WCO.dll"\r
+                     Source="..\bin\hca\amd64\WdfCoInstaller01007.dll" />\r
              </Component>\r
 \r
              <Component Id="cWinVerbsUser"\r

diff --git a/branches/WinOF/WIX/wnet/x86/wof.wxs b/branches/WinOF/WIX/wnet/x86/wof.wxs
index 17db41218756ecb443a01de9172e662a16d059e0..a227c39832ae764b11878f966e91243df70a3352 100644 (file)
--- a/branches/WinOF/WIX/wnet/x86/wof.wxs
+++ b/branches/WinOF/WIX/wnet/x86/wof.wxs
@@ -415,6 +415,9 @@
                      <File Id="winverbsd.dll" Compressed="yes" DiskId="1"\r
                            LongName="winverbsd.dll" Name="winvrbsd.dll"\r
                            Source="..\bin\HCA\x86\winverbsd.dll" />\r
+                     <File Id="wvWdfCoinstaller" Compressed="yes" DiskId="1"\r
+                           LongName="WdfCoInstaller01007.dll" Name="WCO.dll"\r
+                           Source="..\bin\HCA\x86\WdfCoInstaller01007.dll" />\r
                    </Component>\r
 \r
                    <Component Id="cWinVerbsUser"\r

diff --git a/branches/WinOF/WIX/wxp/x86/wof.wxs b/branches/WinOF/WIX/wxp/x86/wof.wxs
index a715f80fab288edcd4750ce7ac062e57773aabf0..f8a7b3052f3955c6b9597b13dd404101a8181dea 100644 (file)
--- a/branches/WinOF/WIX/wxp/x86/wof.wxs
+++ b/branches/WinOF/WIX/wxp/x86/wof.wxs
@@ -408,6 +408,9 @@
                      <File Id="winverbsd.dll" Compressed="yes" DiskId="1"\r
                            LongName="winverbsd.dll" Name="winvrbsd.dll"\r
                            Source="..\bin\HCA\x86\winverbsd.dll" />\r
+                     <File Id="wvWdfCoinstaller" Compressed="yes" DiskId="1"\r
+                           LongName="WdfCoInstaller01007.dll" Name="WCO.dll"\r
+                           Source="..\bin\hca\x86\WdfCoInstaller01007.dll" />\r
                    </Component>\r
 \r
                    <Component Id="cWinVerbsUser"\r