[WinOF]
authorstansmith <stansmith@ad392aa1-c5ef-ae45-8dd8-e69d62a5ef86>
Tue, 31 Mar 2009 18:32:43 +0000 (18:32 +0000)
committerstansmith <stansmith@ad392aa1-c5ef-ae45-8dd8-e69d62a5ef86>
Tue, 31 Mar 2009 18:32:43 +0000 (18:32 +0000)
  Add SRP & QLGCVNIC to the common includes.
  Remove orphaned files on uninstall.

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

16 files changed:
WinOF/WIX/common/IBcore.inc
WinOF/WIX/common/arp.inc [new file with mode: 0644]
WinOF/WIX/common/ipoib.inc
WinOF/WIX/common/mlnx_drivers.inc
WinOF/WIX/common/qlgc_vnic.inc [new file with mode: 0644]
WinOF/WIX/common/srp.inc [new file with mode: 0644]
WinOF/WIX/win7/ia64/wof.wxs
WinOF/WIX/win7/x64/wof.wxs
WinOF/WIX/win7/x86/wof.wxs
WinOF/WIX/wlh/ia64/wof.wxs
WinOF/WIX/wlh/x64/wof.wxs
WinOF/WIX/wlh/x86/wof.wxs
WinOF/WIX/wnet/ia64/wof.wxs
WinOF/WIX/wnet/x64/wof.wxs
WinOF/WIX/wnet/x86/wof.wxs
WinOF/WIX/wxp/x86/wof.wxs

index fefd9a6..6a0da21 100644 (file)
           <File Id="ibal32d.dll" Compressed="yes" DiskId="1"\r
                  LongName="ibal32d.dll" Name="IBAL32D.DLL"\r
                  Source="..\bin\HCA\$(var.ARCH)\ibal32d.dll" />\r
+\r
+          <RemoveFile Id='rm64_ibal.dll' On='uninstall'\r
+                 Property="System64Folder"\r
+                 Name="ibal.dll" LongName='ibal.dll' />\r
+          <RemoveFile Id='rm64_ibald.dll' On='uninstall'\r
+                 Property="System64Folder"\r
+                 Name="ibald.dll" LongName='ibald.dll' />\r
+          <RemoveFile Id='rm64_complib.dll' On='uninstall'\r
+                 Property="System64Folder"\r
+                 Name="complib.dll" LongName='complib.dll' />\r
+          <RemoveFile Id='rm64_complibd.dll' On='uninstall'\r
+                 Property="System64Folder"\r
+                 Name="complibd.dll" LongName='complibd.dll' />\r
       <?endif?>\r
 \r
       <!--\r
          Orphaned install files - remove on uninstall\r
          x64 SystemFolder == SysWOW64, System64Folder == System32\r
       -->\r
-      <RemoveFile Id='o64_ibal.dll' On='uninstall'\r
+      <RemoveFile Id='rm_ibal.dll' On='uninstall'\r
              Property="SystemFolder"\r
              Name="ibal.dll" LongName='ibal.dll' />\r
-      <RemoveFile Id='o64_complib.dll' On='uninstall'\r
-             Property="SystemFolder"\r
-             Name="complib.dll" LongName='complib.dll' />\r
-      <RemoveFile Id='o64_complibd.dll' On='uninstall'\r
+      <RemoveFile Id='rm_ibald.dll' On='uninstall'\r
              Property="SystemFolder"\r
-             Name="complibd.dll" LongName='complibd.dll' />\r
-      <RemoveFile Id='o32_ibal.dll' On='uninstall'\r
-             Property="System64Folder"\r
-             Name="ibal.dll" LongName='ibal.dll' />\r
-      <RemoveFile Id='o32_ibald.dll' On='uninstall'\r
-             Property="System64Folder"\r
              Name="ibald.dll" LongName='ibald.dll' />\r
-      <RemoveFile Id='o32_complib.dll' On='uninstall'\r
-             Property="System64Folder"\r
+      <RemoveFile Id='rm_complib.dll' On='uninstall'\r
+             Property="SystemFolder"\r
              Name="complib.dll" LongName='complib.dll' />\r
-      <RemoveFile Id='o32_complibd.dll' On='uninstall'\r
-             Property="System64Folder"\r
+      <RemoveFile Id='rm_complibd.dll' On='uninstall'\r
+             Property="SystemFolder"\r
              Name="complibd.dll" LongName='complibd.dll' />\r
+\r
     </Component>\r
 </Include>\r
diff --git a/WinOF/WIX/common/arp.inc b/WinOF/WIX/common/arp.inc
new file mode 100644 (file)
index 0000000..3de2e99
--- /dev/null
@@ -0,0 +1,15 @@
+<Include>\r
+\r
+<!-- Add Remove Properties -->\r
+\r
+<!--\r
+    <Property Id='ARPNOMODIFY'>1</Property>\r
+    <Property Id='ARPNOREPAIR'>1</Property>\r
+-->\r
+    <Property Id='ARPCOMMENTS'>OpenFabrics Windows InfiniBand</Property>\r
+    <Property Id='ARPCONTACT'>Openfabrics Alliance [www.openfabrics.org]</Property>\r
+    <Property Id='ARPURLINFOABOUT'>https://wiki.openfabrics.org/tiki-index.php?page=OpenIB%20Windows</Property>\r
+    <Property Id='ARPHELPLINK'>https://wiki.openfabrics.org/tiki-index.php?page=Windows+FAQ</Property>\r
+    <Property Id='ARPURLUPDATEINFO'>http://www.openfabrics.org/downloads/WinOF/</Property>\r
+\r
+</Include>\r
index 59d9472..e1f0296 100644 (file)
           <File Id="ibndprov32.dll" Compressed="yes" DiskId="1"\r
                  LongName="ibndprov32.dll" Name="IBNDPR32.DLL"\r
                  Source="..\bin\net\$(var.ARCH)\ibndprov32.dll" />\r
+\r
+          <RemoveFile Id='rm64_ibwsd.dll' On='uninstall'\r
+                 Property="System64Folder"\r
+                 Name="ibwsd.dll" LongName='ibwsd.dll' />\r
+          <RemoveFile Id='rm64_ibndprov.dll' On='uninstall'\r
+                 Property="System64Folder"\r
+                 Name="ibndprov.dll" LongName='ibndprov.dll' />\r
+          <RemoveFile Id='rm64_ndinstall.exe' On='uninstall'\r
+                 Property="System64Folder"\r
+                 Name="ndinstal.exe" LongName='ndinstall.exe' />\r
       <?endif?>\r
 \r
       <!-- Orphaned install files - remove on uninstall -->\r
-      <RemoveFile Id='o32_ibwsd.dll' On='uninstall'\r
-             Property="System64Folder"\r
-             Name="ibwsd.dll" LongName='ibwsd.dll' />\r
       <RemoveFile Id='o64_ibwsd.dll' On='uninstall'\r
              Property="SystemFolder"\r
              Name="ibwsd.dll" LongName='ibwsd.dll' />\r
@@ -49,5 +56,6 @@
       <RemoveFile Id='o64_ndinstall.exe' On='uninstall'\r
              Property="SystemFolder"\r
              Name="ndinstal.exe" LongName='ndinstall.exe' />\r
+\r
     </Component>\r
 </Include>\r
index 10d811e..cd3b594 100644 (file)
              LongName="mthcaud.dll" Name="MTHCAUD.DLL"\r
              Source="..\bin\HCA\$(var.ARCH)\mthcaud.dll" />\r
 \r
+      <?if $(var.ARCHP) = "x64" Or $(var.ARCHP) = "ia64" ?>\r
+          <!-- Orphaned install files - remove on uninstall -->\r
+          <RemoveFile Id='rm64_mthcau.dll' On='uninstall'\r
+                 Property="System64Folder"\r
+                 Name="mthcau.dll" LongName='mthcau.dll' />\r
+          <RemoveFile Id='rm64_mthcaud.dll' On='uninstall'\r
+                 Property="System64Folder"\r
+                 Name="mthcaud.dll" LongName='mthcaud.dll' />\r
+      <?endif?>\r
+\r
       <!-- Orphaned install files - remove on uninstall -->\r
-      <RemoveFile Id='o32_mthcau.dll' On='uninstall'\r
-             Property="System64Folder"\r
+      <RemoveFile Id='rm32_mthcau.dll' On='uninstall'\r
+             Property="SystemFolder"\r
              Name="mthcau.dll" LongName='mthcau.dll' />\r
-      <RemoveFile Id='o32_mthcaud.dll' On='uninstall'\r
-             Property="System64Folder"\r
+      <RemoveFile Id='rm32_mthcaud.dll' On='uninstall'\r
+             Property="SystemFolder"\r
              Name="mthcaud.dll" LongName='mthcaud.dll' />\r
+\r
     </Component>\r
 \r
+\r
     <Component Id="cConnectXDriver"\r
                Guid="C1EFF4D6-CE55-432a-9D92-E46AB983D9E3">\r
       <File Id="mlx4_bus.inf" Compressed="yes" DiskId="1"\r
           <File Id="mlx4u32.dll" Compressed="yes" DiskId="1"\r
                  LongName="mlx4u32.dll" Name="mlx4u32.dll"\r
                  Source="..\bin\hca\$(var.ARCH)\mlx4u32.dll" />\r
+\r
+          <!-- Orphaned install files - remove on uninstall -->\r
+          <RemoveFile Id='rm64_mlx4u.dll' On='uninstall'\r
+                 Property="System64Folder"\r
+                 Name="mlx4u.dll" LongName='mlx4u.dll' />\r
       <?endif?>\r
 \r
+      <!-- Orphaned install files - remove on uninstall -->\r
+      <RemoveFile Id='rm32_mlx4u.dll' On='uninstall'\r
+             Property="SystemFolder"\r
+             Name="mlx4u.dll" LongName='mlx4u.dll' />\r
+\r
     </Component>\r
 </Include>\r
diff --git a/WinOF/WIX/common/qlgc_vnic.inc b/WinOF/WIX/common/qlgc_vnic.inc
new file mode 100644 (file)
index 0000000..d810dcd
--- /dev/null
@@ -0,0 +1,24 @@
+<Include>\r
+    <Component Id="cQLVNIC_driver_installed"\r
+               Guid="730C742E-73D9-4871-A523-6FB7963EA01E">\r
+    </Component>\r
+\r
+    <Directory Id="qlgcvnicDir" Name="qlgcvnic">\r
+      <Component Id="cQLVNIC_files"\r
+                 Guid="2AE69B67-C5FD-4CEE-9DF4-FB0A55619B4A">\r
+        <CreateFolder />\r
+        <File Id="qlgcvnic.sys" Compressed="yes" DiskId="1"\r
+              LongName="qlgcvnic.sys" Name="QLGCVNIC.SYS"\r
+              Source="..\bin\net\$(var.ARCH)\qlgcvnic.sys" />\r
+        <File Id="qlgcvnic.pdb" Compressed="yes" DiskId="1"\r
+              Name="qlgcvnic.pdb"\r
+              Source="..\bin\net\$(var.ARCH)\qlgcvnic.pdb" />\r
+        <File Id="netvnic.inf" Compressed="yes" DiskId="1"\r
+              LongName="netvnic.inf" Name="NETVNIC.INF"\r
+              Source="..\bin\net\$(var.ARCH)\netvnic.inf" />\r
+        <File Id="netvnic.cat" Compressed="yes" DiskId="1"\r
+              LongName="netvnic.cat" Name="NETVNIC.cat"\r
+              Source="..\bin\net\$(var.ARCH)\netvnic.cat" />\r
+      </Component>\r
+    </Directory>\r
+</Include>\r
diff --git a/WinOF/WIX/common/srp.inc b/WinOF/WIX/common/srp.inc
new file mode 100644 (file)
index 0000000..42c2aae
--- /dev/null
@@ -0,0 +1,26 @@
+<Include>\r
+\r
+    <Component Id="cSRP_driver_installed"\r
+               Guid="6945E66C-ADC0-4258-8858-AE7E7DF70495">\r
+    </Component>\r
+\r
+    <!-- RDMA SCSI over IB (aka SRP) -->\r
+    <Directory Id="srpDir" Name="SRP">\r
+      <Component Id="cSRP_files"\r
+                 Guid="BB58772F-061F-48B0-B6D5-0C0E38A301B2">\r
+        <File Id="ib_srp.inf" Compressed="yes" DiskId="1"\r
+              LongName="ib_srp.inf" Name="IB_SRP.INF"\r
+              Source="..\bin\storage\$(var.ARCH)\ib_srp.inf" />\r
+        <File Id="ibsrp.cat" Compressed="yes" DiskId="1"\r
+              LongName="ibsrp.cat" Name="IBSRP.CAT"\r
+              Source="..\bin\storage\$(var.ARCH)\ibsrp.cat" />\r
+        <File Id="ibsrp.sys" Compressed="yes" DiskId="1"\r
+              LongName="ibsrp.sys" Name="IBSRP.SYS"\r
+              Source="..\bin\storage\$(var.ARCH)\ibsrp.sys" />\r
+        <File Id="ibsrp.pdb" Compressed="yes" DiskId="1"\r
+              Name="ibsrp.pdb"\r
+              Source="..\bin\storage\$(var.ARCH)\ibsrp.pdb" />\r
+      </Component>\r
+    </Directory>\r
+\r
+</Include>\r
index 6672c8d..a6decfd 100644 (file)
           </Component>\r
 -->\r
           <?include ..\..\common\dapl_rt.inc ?>\r
+          <?include ..\..\common\qlgc_vnic.inc ?>\r
+          <?include ..\..\common\srp.inc ?>\r
 \r
-          <Component Id="cQLVNIC_driver_installed"\r
-                     Guid="730C742E-73D9-4871-A523-6FB7963EA01E">\r
-          </Component>\r
-\r
-          <Directory Id="qlgcvnicDir" Name="qlgcvnic">\r
-            <Component Id="cQLVNIC_files"\r
-                       Guid="2AE69B67-C5FD-4CEE-9DF4-FB0A55619B4A">\r
-              <CreateFolder />\r
-              <File Id="qlgcvnic.sys" Compressed="yes" DiskId="1"\r
-                    LongName="qlgcvnic.sys" Name="QLGCVNIC.SYS"\r
-                    Source="..\bin\net\$(var.ARCH)\qlgcvnic.sys" />\r
-              <File Id="qlgcvnic.pdb" Compressed="yes" DiskId="1"\r
-                    Name="qlgcvnic.pdb"\r
-                    Source="..\bin\net\$(var.ARCH)\qlgcvnic.pdb" />\r
-              <File Id="netvnic.inf" Compressed="yes" DiskId="1"\r
-                    LongName="netvnic.inf" Name="NETVNIC.INF"\r
-                    Source="..\bin\net\$(var.ARCH)\netvnic.inf" />\r
-              <File Id="netvnic.cat" Compressed="yes" DiskId="1"\r
-                    LongName="netvnic.cat" Name="NETVNIC.cat"\r
-                    Source="..\bin\net\$(var.ARCH)\netvnic.cat" />\r
-            </Component>\r
-          </Directory>\r
-\r
-          <Component Id="cSRP_driver_installed"\r
-                     Guid="6945E66C-ADC0-4258-8858-AE7E7DF70495">\r
-          </Component>\r
-\r
-          <!-- RDMA SCSI over IB (aka SRP) -->\r
-          <Directory Id="srpDir" Name="SRP">\r
-            <Component Id="cSRP_files"\r
-                       Guid="BB58772F-061F-48B0-B6D5-0C0E38A301B2">\r
-              <File Id="ib_srp.inf" Compressed="yes" DiskId="1"\r
-                    LongName="ib_srp.inf" Name="IB_SRP.INF"\r
-                    Source="..\bin\storage\$(var.ARCH)\ib_srp.inf" />\r
-              <File Id="ibsrp.cat" Compressed="yes" DiskId="1"\r
-                    LongName="ibsrp.cat" Name="IBSRP.CAT"\r
-                    Source="..\bin\storage\$(var.ARCH)\ibsrp.cat" />\r
-              <File Id="ibsrp.sys" Compressed="yes" DiskId="1"\r
-                    LongName="ibsrp.sys" Name="IBSRP.SYS"\r
-                    Source="..\bin\storage\$(var.ARCH)\ibsrp.sys" />\r
-              <File Id="ibsrp.pdb" Compressed="yes" DiskId="1"\r
-                    Name="ibsrp.pdb"\r
-                    Source="..\bin\storage\$(var.ARCH)\ibsrp.pdb" />\r
-            </Component>\r
-          </Directory>\r
         </Directory>\r
       </Directory>\r
 \r
       </Directory>\r
     </Directory> <!-- End TARGETDIR -->\r
 \r
-<!--\r
-    <Property Id='ARPNOMODIFY'>1</Property>\r
-    <Property Id='ARPNOREPAIR'>1</Property>\r
--->\r
-    <Property Id='ARPCOMMENTS'>OpenFabrics Windows InfiniBand</Property>\r
-    <Property Id='ARPCONTACT'>Openfabrics Alliance [www.openfabrics.org]</Property>\r
-    <Property Id='ARPURLINFOABOUT'>https://wiki.openfabrics.org/tiki-index.php?page=OpenIB%20Windows</Property>\r
-    <Property Id='ARPHELPLINK'>https://wiki.openfabrics.org/tiki-index.php?page=Windows+FAQ</Property>\r
-    <Property Id='ARPURLUPDATEINFO'>http://www.openfabrics.org/downloads/WinOF/</Property>\r
+    <?include ..\..\common\arp.inc ?>\r
 \r
     <!--\r
        Features - Level=1 == Typical, no WSD on XP or SRP on 32-bit XP\r
index bcea0fb..f4a5116 100644 (file)
           </Component>\r
 \r
           <?include ..\..\common\dapl_rt.inc ?>\r
+          <?include ..\..\common\qlgc_vnic.inc ?>\r
+          <?include ..\..\common\srp.inc ?>\r
 \r
-          <Component Id="cQLVNIC_driver_installed"\r
-                     Guid="730C742E-73D9-4871-A523-6FB7963EA01E">\r
-          </Component>\r
-\r
-          <Directory Id="qlgcvnicDir" Name="qlgcvnic">\r
-            <Component Id="cQLVNIC_files"\r
-                       Guid="2AE69B67-C5FD-4CEE-9DF4-FB0A55619B4A">\r
-              <CreateFolder />\r
-              <File Id="qlgcvnic.sys" Compressed="yes" DiskId="1"\r
-                    LongName="qlgcvnic.sys" Name="QLGCVNIC.SYS"\r
-                    Source="..\bin\net\$(var.ARCH)\qlgcvnic.sys" />\r
-              <File Id="qlgcvnic.pdb" Compressed="yes" DiskId="1"\r
-                    Name="qlgcvnic.pdb"\r
-                    Source="..\bin\net\$(var.ARCH)\qlgcvnic.pdb" />\r
-              <File Id="netvnic.inf" Compressed="yes" DiskId="1"\r
-                    LongName="netvnic.inf" Name="NETVNIC.INF"\r
-                    Source="..\bin\net\$(var.ARCH)\netvnic.inf" />\r
-              <File Id="netvnic.cat" Compressed="yes" DiskId="1"\r
-                    LongName="netvnic.cat" Name="NETVNIC.cat"\r
-                    Source="..\bin\net\$(var.ARCH)\netvnic.cat" />\r
-            </Component>\r
-          </Directory>\r
-\r
-          <Component Id="cSRP_driver_installed"\r
-                     Guid="6945E66C-ADC0-4258-8858-AE7E7DF70495">\r
-          </Component>\r
-\r
-          <!-- RDMA SCSI over IB (aka SRP) -->\r
-          <Directory Id="srpDir" Name="SRP">\r
-            <Component Id="cSRP_files"\r
-                       Guid="BB58772F-061F-48B0-B6D5-0C0E38A301B2">\r
-              <File Id="ib_srp.inf" Compressed="yes" DiskId="1"\r
-                    LongName="ib_srp.inf" Name="IB_SRP.INF"\r
-                    Source="..\bin\storage\$(var.ARCH)\ib_srp.inf" />\r
-              <File Id="ibsrp.cat" Compressed="yes" DiskId="1"\r
-                    LongName="ibsrp.cat" Name="IBSRP.CAT"\r
-                    Source="..\bin\storage\$(var.ARCH)\ibsrp.cat" />\r
-              <File Id="ibsrp.sys" Compressed="yes" DiskId="1"\r
-                    LongName="ibsrp.sys" Name="IBSRP.SYS"\r
-                    Source="..\bin\storage\$(var.ARCH)\ibsrp.sys" />\r
-              <File Id="ibsrp.pdb" Compressed="yes" DiskId="1"\r
-                    Name="ibsrp.pdb"\r
-                    Source="..\bin\storage\$(var.ARCH)\ibsrp.pdb" />\r
-            </Component>\r
-          </Directory>\r
         </Directory>\r
       </Directory>\r
 \r
       </Directory>\r
     </Directory> <!-- End TARGETDIR -->\r
 \r
-<!--\r
-    <Property Id='ARPNOMODIFY'>1</Property>\r
-    <Property Id='ARPNOREPAIR'>1</Property>\r
--->\r
-    <Property Id='ARPCOMMENTS'>OpenFabrics Windows InfiniBand</Property>\r
-    <Property Id='ARPCONTACT'>Openfabrics Alliance [www.openfabrics.org]</Property>\r
-    <Property Id='ARPURLINFOABOUT'>https://wiki.openfabrics.org/tiki-index.php?page=OpenIB%20Windows</Property>\r
-    <Property Id='ARPHELPLINK'>https://wiki.openfabrics.org/tiki-index.php?page=Windows+FAQ</Property>\r
-    <Property Id='ARPURLUPDATEINFO'>http://www.openfabrics.org/downloads/WinOF/</Property>\r
+    <?include ..\..\common\arp.inc ?>\r
 \r
     <!--\r
        Features - Level=1 == Typical, no WSD on XP or SRP on 32-bit XP\r
index 176041d..a859b15 100644 (file)
           </Component>\r
 \r
           <?include ..\..\common\dapl_rt.inc ?>\r
+          <?include ..\..\common\qlgc_vnic.inc ?>\r
+          <?include ..\..\common\srp.inc ?>\r
 \r
-          <Component Id="cQLVNIC_driver_installed"\r
-                     Guid="730C742E-73D9-4871-A523-6FB7963EA01E">\r
-          </Component>\r
-\r
-          <Directory Id="qlgcvnicDir" Name="qlgcvnic">\r
-            <Component Id="cQLVNIC_files"\r
-                       Guid="2AE69B67-C5FD-4CEE-9DF4-FB0A55619B4A">\r
-              <CreateFolder />\r
-              <File Id="qlgcvnic.sys" Compressed="yes" DiskId="1"\r
-                    LongName="qlgcvnic.sys" Name="QLGCVNIC.SYS"\r
-                    Source="..\bin\net\$(var.ARCH)\qlgcvnic.sys" />\r
-              <File Id="qlgcvnic.pdb" Compressed="yes" DiskId="1"\r
-                    Name="qlgcvnic.pdb"\r
-                    Source="..\bin\net\$(var.ARCH)\qlgcvnic.pdb" />\r
-              <File Id="netvnic.inf" Compressed="yes" DiskId="1"\r
-                    LongName="netvnic.inf" Name="NETVNIC.INF"\r
-                    Source="..\bin\net\$(var.ARCH)\netvnic.inf" />\r
-              <File Id="netvnic.cat" Compressed="yes" DiskId="1"\r
-                    LongName="netvnic.cat" Name="NETVNIC.cat"\r
-                    Source="..\bin\net\$(var.ARCH)\netvnic.cat" />\r
-            </Component>\r
-          </Directory>\r
-\r
-          <Component Id="cSRP_driver_installed"\r
-                     Guid="6945E66C-ADC0-4258-8858-AE7E7DF70495">\r
-          </Component>\r
-\r
-          <!-- RDMA SCSI over IB (aka SRP) -->\r
-          <Directory Id="srpDir" Name="SRP">\r
-            <Component Id="cSRP_files"\r
-                       Guid="BB58772F-061F-48B0-B6D5-0C0E38A301B2">\r
-              <File Id="ib_srp.inf" Compressed="yes" DiskId="1"\r
-                    LongName="ib_srp.inf" Name="IB_SRP.INF"\r
-                    Source="..\bin\storage\$(var.ARCH)\ib_srp.inf" />\r
-              <File Id="ibsrp.cat" Compressed="yes" DiskId="1"\r
-                    LongName="ibsrp.cat" Name="IBSRP.CAT"\r
-                    Source="..\bin\storage\$(var.ARCH)\ibsrp.cat" />\r
-              <File Id="ibsrp.sys" Compressed="yes" DiskId="1"\r
-                    LongName="ibsrp.sys" Name="IBSRP.SYS"\r
-                    Source="..\bin\storage\$(var.ARCH)\ibsrp.sys" />\r
-              <File Id="ibsrp.pdb" Compressed="yes" DiskId="1"\r
-                    Name="ibsrp.pdb"\r
-                    Source="..\bin\storage\$(var.ARCH)\ibsrp.pdb" />\r
-            </Component>\r
-          </Directory>\r
         </Directory>\r
       </Directory>\r
 \r
       </Directory>\r
     </Directory> <!-- End TARGETDIR -->\r
 \r
-<!--\r
-    <Property Id='ARPNOMODIFY'>1</Property>\r
-    <Property Id='ARPNOREPAIR'>1</Property>\r
--->\r
-    <Property Id='ARPCOMMENTS'>OpenFabrics Windows InfiniBand</Property>\r
-    <Property Id='ARPCONTACT'>Openfabrics Alliance [www.openfabrics.org]</Property>\r
-    <Property Id='ARPURLINFOABOUT'>https://wiki.openfabrics.org/tiki-index.php?page=OpenIB%20Windows</Property>\r
-    <Property Id='ARPHELPLINK'>https://wiki.openfabrics.org/tiki-index.php?page=Windows+FAQ</Property>\r
-    <Property Id='ARPURLUPDATEINFO'>http://www.openfabrics.org/downloads/WinOF/</Property>\r
+    <?include ..\..\common\arp.inc ?>\r
 \r
     <!--\r
        Features - Level=1 == Typical, no WSD on XP or SRP on 32-bit XP\r
index 1bdf27b..e82dbc5 100644 (file)
           </Component>\r
 -->\r
           <?include ..\..\common\dapl_rt.inc ?>\r
+          <?include ..\..\common\qlgc_vnic.inc ?>\r
+          <?include ..\..\common\srp.inc ?>\r
 \r
-          <Component Id="cQLVNIC_driver_installed"\r
-                     Guid="730C742E-73D9-4871-A523-6FB7963EA01E">\r
-          </Component>\r
-\r
-          <Directory Id="qlgcvnicDir" Name="qlgcvnic">\r
-            <Component Id="cQLVNIC_files"\r
-                       Guid="2AE69B67-C5FD-4CEE-9DF4-FB0A55619B4A">\r
-              <CreateFolder />\r
-              <File Id="qlgcvnic.sys" Compressed="yes" DiskId="1"\r
-                    LongName="qlgcvnic.sys" Name="QLGCVNIC.SYS"\r
-                    Source="..\bin\net\$(var.ARCH)\qlgcvnic.sys" />\r
-              <File Id="qlgcvnic.pdb" Compressed="yes" DiskId="1"\r
-                    Name="qlgcvnic.pdb"\r
-                    Source="..\bin\net\$(var.ARCH)\qlgcvnic.pdb" />\r
-              <File Id="netvnic.inf" Compressed="yes" DiskId="1"\r
-                    LongName="netvnic.inf" Name="NETVNIC.INF"\r
-                    Source="..\bin\net\$(var.ARCH)\netvnic.inf" />\r
-              <File Id="netvnic.cat" Compressed="yes" DiskId="1"\r
-                    LongName="netvnic.cat" Name="NETVNIC.cat"\r
-                    Source="..\bin\net\$(var.ARCH)\netvnic.cat" />\r
-            </Component>\r
-          </Directory>\r
-\r
-          <Component Id="cSRP_driver_installed"\r
-                     Guid="6945E66C-ADC0-4258-8858-AE7E7DF70495">\r
-          </Component>\r
-\r
-          <!-- RDMA SCSI over IB (aka SRP) -->\r
-          <Directory Id="srpDir" Name="SRP">\r
-            <Component Id="cSRP_files"\r
-                       Guid="BB58772F-061F-48B0-B6D5-0C0E38A301B2">\r
-              <File Id="ib_srp.inf" Compressed="yes" DiskId="1"\r
-                    LongName="ib_srp.inf" Name="IB_SRP.INF"\r
-                    Source="..\bin\storage\$(var.ARCH)\ib_srp.inf" />\r
-              <File Id="ibsrp.cat" Compressed="yes" DiskId="1"\r
-                    LongName="ibsrp.cat" Name="IBSRP.CAT"\r
-                    Source="..\bin\storage\$(var.ARCH)\ibsrp.cat" />\r
-              <File Id="ibsrp.sys" Compressed="yes" DiskId="1"\r
-                    LongName="ibsrp.sys" Name="IBSRP.SYS"\r
-                    Source="..\bin\storage\$(var.ARCH)\ibsrp.sys" />\r
-              <File Id="ibsrp.pdb" Compressed="yes" DiskId="1"\r
-                    Name="ibsrp.pdb"\r
-                    Source="..\bin\storage\$(var.ARCH)\ibsrp.pdb" />\r
-            </Component>\r
-          </Directory>\r
         </Directory>\r
       </Directory>\r
 \r
       </Directory>\r
     </Directory> <!-- End TARGETDIR -->\r
 \r
-<!--\r
-    <Property Id='ARPNOMODIFY'>1</Property>\r
-    <Property Id='ARPNOREPAIR'>1</Property>\r
--->\r
-    <Property Id='ARPCOMMENTS'>OpenFabrics Windows InfiniBand</Property>\r
-    <Property Id='ARPCONTACT'>Openfabrics Alliance [www.openfabrics.org]</Property>\r
-    <Property Id='ARPURLINFOABOUT'>https://wiki.openfabrics.org/tiki-index.php?page=OpenIB%20Windows</Property>\r
-    <Property Id='ARPHELPLINK'>https://wiki.openfabrics.org/tiki-index.php?page=Windows+FAQ</Property>\r
-    <Property Id='ARPURLUPDATEINFO'>http://www.openfabrics.org/downloads/WinOF/</Property>\r
+    <?include ..\..\common\arp.inc ?>\r
 \r
     <!--\r
        Features - Level=1 == Typical, no WSD on XP or SRP on 32-bit XP\r
index 33b3e4d..562238d 100644 (file)
           </Component>\r
 \r
           <?include ..\..\common\dapl_rt.inc ?>\r
+          <?include ..\..\common\qlgc_vnic.inc ?>\r
+          <?include ..\..\common\srp.inc ?>\r
 \r
-          <Component Id="cQLVNIC_driver_installed"\r
-                     Guid="730C742E-73D9-4871-A523-6FB7963EA01E">\r
-          </Component>\r
-\r
-          <Directory Id="qlgcvnicDir" Name="qlgcvnic">\r
-            <Component Id="cQLVNIC_files"\r
-                       Guid="2AE69B67-C5FD-4CEE-9DF4-FB0A55619B4A">\r
-              <CreateFolder />\r
-              <File Id="qlgcvnic.sys" Compressed="yes" DiskId="1"\r
-                    LongName="qlgcvnic.sys" Name="QLGCVNIC.SYS"\r
-                    Source="..\bin\net\$(var.ARCH)\qlgcvnic.sys" />\r
-              <File Id="qlgcvnic.pdb" Compressed="yes" DiskId="1"\r
-                    Name="qlgcvnic.pdb"\r
-                    Source="..\bin\net\$(var.ARCH)\qlgcvnic.pdb" />\r
-              <File Id="netvnic.inf" Compressed="yes" DiskId="1"\r
-                    LongName="netvnic.inf" Name="NETVNIC.INF"\r
-                    Source="..\bin\net\$(var.ARCH)\netvnic.inf" />\r
-              <File Id="netvnic.cat" Compressed="yes" DiskId="1"\r
-                    LongName="netvnic.cat" Name="NETVNIC.cat"\r
-                    Source="..\bin\net\$(var.ARCH)\netvnic.cat" />\r
-            </Component>\r
-          </Directory>\r
-\r
-          <Component Id="cSRP_driver_installed"\r
-                     Guid="6945E66C-ADC0-4258-8858-AE7E7DF70495">\r
-          </Component>\r
-\r
-          <!-- RDMA SCSI over IB (aka SRP) -->\r
-          <Directory Id="srpDir" Name="SRP">\r
-            <Component Id="cSRP_files"\r
-                       Guid="BB58772F-061F-48B0-B6D5-0C0E38A301B2">\r
-              <File Id="ib_srp.inf" Compressed="yes" DiskId="1"\r
-                    LongName="ib_srp.inf" Name="IB_SRP.INF"\r
-                    Source="..\bin\storage\$(var.ARCH)\ib_srp.inf" />\r
-              <File Id="ibsrp.cat" Compressed="yes" DiskId="1"\r
-                    LongName="ibsrp.cat" Name="IBSRP.CAT"\r
-                    Source="..\bin\storage\$(var.ARCH)\ibsrp.cat" />\r
-              <File Id="ibsrp.sys" Compressed="yes" DiskId="1"\r
-                    LongName="ibsrp.sys" Name="IBSRP.SYS"\r
-                    Source="..\bin\storage\$(var.ARCH)\ibsrp.sys" />\r
-              <File Id="ibsrp.pdb" Compressed="yes" DiskId="1"\r
-                    Name="ibsrp.pdb"\r
-                    Source="..\bin\storage\$(var.ARCH)\ibsrp.pdb" />\r
-            </Component>\r
-          </Directory>\r
         </Directory>\r
       </Directory>\r
 \r
       </Directory>\r
     </Directory> <!-- End TARGETDIR -->\r
 \r
-<!--\r
-    <Property Id='ARPNOMODIFY'>1</Property>\r
-    <Property Id='ARPNOREPAIR'>1</Property>\r
--->\r
-    <Property Id='ARPCOMMENTS'>OpenFabrics Windows InfiniBand</Property>\r
-    <Property Id='ARPCONTACT'>Openfabrics Alliance [www.openfabrics.org]</Property>\r
-    <Property Id='ARPURLINFOABOUT'>https://wiki.openfabrics.org/tiki-index.php?page=OpenIB%20Windows</Property>\r
-    <Property Id='ARPHELPLINK'>https://wiki.openfabrics.org/tiki-index.php?page=Windows+FAQ</Property>\r
-    <Property Id='ARPURLUPDATEINFO'>http://www.openfabrics.org/downloads/WinOF/</Property>\r
+    <?include ..\..\common\arp.inc ?>\r
 \r
     <!--\r
        Features - Level=1 == Typical, no WSD on XP or SRP on 32-bit XP\r
index 2c142a0..e799017 100644 (file)
           </Component>\r
 \r
           <?include ..\..\common\dapl_rt.inc ?>\r
+          <?include ..\..\common\qlgc_vnic.inc ?>\r
+          <?include ..\..\common\srp.inc ?>\r
 \r
-          <Component Id="cQLVNIC_driver_installed"\r
-                     Guid="730C742E-73D9-4871-A523-6FB7963EA01E">\r
-          </Component>\r
-\r
-          <Directory Id="qlgcvnicDir" Name="qlgcvnic">\r
-            <Component Id="cQLVNIC_files"\r
-                       Guid="2AE69B67-C5FD-4CEE-9DF4-FB0A55619B4A">\r
-              <CreateFolder />\r
-              <File Id="qlgcvnic.sys" Compressed="yes" DiskId="1"\r
-                    LongName="qlgcvnic.sys" Name="QLGCVNIC.SYS"\r
-                    Source="..\bin\net\$(var.ARCH)\qlgcvnic.sys" />\r
-              <File Id="qlgcvnic.pdb" Compressed="yes" DiskId="1"\r
-                    Name="qlgcvnic.pdb"\r
-                    Source="..\bin\net\$(var.ARCH)\qlgcvnic.pdb" />\r
-              <File Id="netvnic.inf" Compressed="yes" DiskId="1"\r
-                    LongName="netvnic.inf" Name="NETVNIC.INF"\r
-                    Source="..\bin\net\$(var.ARCH)\netvnic.inf" />\r
-              <File Id="netvnic.cat" Compressed="yes" DiskId="1"\r
-                    LongName="netvnic.cat" Name="NETVNIC.cat"\r
-                    Source="..\bin\net\$(var.ARCH)\netvnic.cat" />\r
-            </Component>\r
-          </Directory>\r
-\r
-          <Component Id="cSRP_driver_installed"\r
-                     Guid="6945E66C-ADC0-4258-8858-AE7E7DF70495">\r
-          </Component>\r
-\r
-          <!-- RDMA SCSI over IB (aka SRP) -->\r
-          <Directory Id="srpDir" Name="SRP">\r
-            <Component Id="cSRP_files"\r
-                       Guid="BB58772F-061F-48B0-B6D5-0C0E38A301B2">\r
-              <File Id="ib_srp.inf" Compressed="yes" DiskId="1"\r
-                    LongName="ib_srp.inf" Name="IB_SRP.INF"\r
-                    Source="..\bin\storage\$(var.ARCH)\ib_srp.inf" />\r
-              <File Id="ibsrp.cat" Compressed="yes" DiskId="1"\r
-                    LongName="ibsrp.cat" Name="IBSRP.CAT"\r
-                    Source="..\bin\storage\$(var.ARCH)\ibsrp.cat" />\r
-              <File Id="ibsrp.sys" Compressed="yes" DiskId="1"\r
-                    LongName="ibsrp.sys" Name="IBSRP.SYS"\r
-                    Source="..\bin\storage\$(var.ARCH)\ibsrp.sys" />\r
-              <File Id="ibsrp.pdb" Compressed="yes" DiskId="1"\r
-                    Name="ibsrp.pdb"\r
-                    Source="..\bin\storage\$(var.ARCH)\ibsrp.pdb" />\r
-            </Component>\r
-          </Directory>\r
         </Directory>\r
       </Directory>\r
 \r
       </Directory>\r
     </Directory> <!-- End TARGETDIR -->\r
 \r
-<!--\r
-    <Property Id='ARPNOMODIFY'>1</Property>\r
-    <Property Id='ARPNOREPAIR'>1</Property>\r
--->\r
-    <Property Id='ARPCOMMENTS'>OpenFabrics Windows InfiniBand</Property>\r
-    <Property Id='ARPCONTACT'>Openfabrics Alliance [www.openfabrics.org]</Property>\r
-    <Property Id='ARPURLINFOABOUT'>https://wiki.openfabrics.org/tiki-index.php?page=OpenIB%20Windows</Property>\r
-    <Property Id='ARPHELPLINK'>https://wiki.openfabrics.org/tiki-index.php?page=Windows+FAQ</Property>\r
-    <Property Id='ARPURLUPDATEINFO'>http://www.openfabrics.org/downloads/WinOF/</Property>\r
+    <?include ..\..\common\arp.inc ?>\r
 \r
     <!--\r
        Features - Level=1 == Typical, no WSD on XP or SRP on 32-bit XP\r
index e5d3fbf..295a236 100644 (file)
           </Component>\r
 -->\r
           <?include ..\..\common\dapl_rt.inc ?>\r
+          <?include ..\..\common\qlgc_vnic.inc ?>\r
+          <?include ..\..\common\srp.inc ?>\r
 \r
-          <Component Id="cQLVNIC_driver_installed"\r
-                     Guid="730C742E-73D9-4871-A523-6FB7963EA01E">\r
-          </Component>\r
-\r
-          <Directory Id="qlgcvnicDir" Name="qlgcvnic">\r
-            <Component Id="cQLVNIC_files"\r
-                       Guid="2AE69B67-C5FD-4CEE-9DF4-FB0A55619B4A">\r
-              <CreateFolder />\r
-              <File Id="qlgcvnic.sys" Compressed="yes" DiskId="1"\r
-                    LongName="qlgcvnic.sys" Name="QLGCVNIC.SYS"\r
-                    Source="..\bin\net\$(var.ARCH)\qlgcvnic.sys" />\r
-              <File Id="qlgcvnic.pdb" Compressed="yes" DiskId="1"\r
-                    Name="qlgcvnic.pdb"\r
-                    Source="..\bin\net\$(var.ARCH)\qlgcvnic.pdb" />\r
-              <File Id="netvnic.inf" Compressed="yes" DiskId="1"\r
-                    LongName="netvnic.inf" Name="NETVNIC.INF"\r
-                    Source="..\bin\net\$(var.ARCH)\netvnic.inf" />\r
-              <File Id="netvnic.cat" Compressed="yes" DiskId="1"\r
-                    LongName="netvnic.cat" Name="NETVNIC.cat"\r
-                    Source="..\bin\net\$(var.ARCH)\netvnic.cat" />\r
-            </Component>\r
-          </Directory>\r
-\r
-          <Component Id="cSRP_driver_installed"\r
-                     Guid="6945E66C-ADC0-4258-8858-AE7E7DF70495">\r
-          </Component>\r
-\r
-          <!-- RDMA SCSI over IB (aka SRP) -->\r
-          <Directory Id="srpDir" Name="SRP">\r
-            <Component Id="cSRP_files"\r
-                       Guid="BB58772F-061F-48B0-B6D5-0C0E38A301B2">\r
-              <File Id="ib_srp.inf" Compressed="yes" DiskId="1"\r
-                    LongName="ib_srp.inf" Name="IB_SRP.INF"\r
-                    Source="..\bin\storage\$(var.ARCH)\ib_srp.inf" />\r
-              <File Id="ibsrp.cat" Compressed="yes" DiskId="1"\r
-                    LongName="ibsrp.cat" Name="IBSRP.CAT"\r
-                    Source="..\bin\storage\$(var.ARCH)\ibsrp.cat" />\r
-              <File Id="ibsrp.sys" Compressed="yes" DiskId="1"\r
-                    LongName="ibsrp.sys" Name="IBSRP.SYS"\r
-                    Source="..\bin\storage\$(var.ARCH)\ibsrp.sys" />\r
-              <File Id="ibsrp.pdb" Compressed="yes" DiskId="1"\r
-                    Name="ibsrp.pdb"\r
-                    Source="..\bin\storage\$(var.ARCH)\ibsrp.pdb" />\r
-            </Component>\r
-          </Directory>\r
         </Directory>\r
       </Directory>\r
 \r
       </Directory>\r
     </Directory> <!-- End TARGETDIR -->\r
 \r
-<!--\r
-    <Property Id='ARPNOMODIFY'>1</Property>\r
-    <Property Id='ARPNOREPAIR'>1</Property>\r
--->\r
-    <Property Id='ARPCOMMENTS'>OpenFabrics Windows InfiniBand</Property>\r
-    <Property Id='ARPCONTACT'>Openfabrics Alliance [www.openfabrics.org]</Property>\r
-    <Property Id='ARPURLINFOABOUT'>https://wiki.openfabrics.org/tiki-index.php?page=OpenIB%20Windows</Property>\r
-    <Property Id='ARPHELPLINK'>https://wiki.openfabrics.org/tiki-index.php?page=Windows+FAQ</Property>\r
-    <Property Id='ARPURLUPDATEINFO'>http://www.openfabrics.org/downloads/WinOF/</Property>\r
+    <?include ..\..\common\arp.inc ?>\r
 \r
     <!--\r
        Features - Level=1 == Typical, no WSD on XP\r
index e643dee..2d39ee4 100644 (file)
           </Component>\r
 \r
           <?include ..\..\common\dapl_rt.inc ?>\r
+          <?include ..\..\common\qlgc_vnic.inc ?>\r
+          <?include ..\..\common\srp.inc ?>\r
 \r
-          <Component Id="cQLVNIC_driver_installed"\r
-                     Guid="730C742E-73D9-4871-A523-6FB7963EA01E">\r
-          </Component>\r
-\r
-          <Directory Id="qlgcvnicDir" Name="qlgcvnic">\r
-            <Component Id="cQLVNIC_files"\r
-                       Guid="2AE69B67-C5FD-4CEE-9DF4-FB0A55619B4A">\r
-              <CreateFolder />\r
-              <File Id="qlgcvnic.sys" Compressed="yes" DiskId="1"\r
-                    LongName="qlgcvnic.sys" Name="QLGCVNIC.SYS"\r
-                    Source="..\bin\net\$(var.ARCH)\qlgcvnic.sys" />\r
-              <File Id="qlgcvnic.pdb" Compressed="yes" DiskId="1"\r
-                    Name="qlgcvnic.pdb"\r
-                    Source="..\bin\net\$(var.ARCH)\qlgcvnic.pdb" />\r
-              <File Id="netvnic.inf" Compressed="yes" DiskId="1"\r
-                    LongName="netvnic.inf" Name="NETVNIC.INF"\r
-                    Source="..\bin\net\$(var.ARCH)\netvnic.inf" />\r
-              <File Id="netvnic.cat" Compressed="yes" DiskId="1"\r
-                    LongName="netvnic.cat" Name="NETVNIC.cat"\r
-                    Source="..\bin\net\$(var.ARCH)\netvnic.cat" />\r
-            </Component>\r
-          </Directory>\r
-\r
-          <Component Id="cSRP_driver_installed"\r
-                     Guid="6945E66C-ADC0-4258-8858-AE7E7DF70495">\r
-          </Component>\r
-\r
-          <!-- RDMA SCSI over IB (aka SRP) -->\r
-          <Directory Id="srpDir" Name="SRP">\r
-            <Component Id="cSRP_files"\r
-                       Guid="BB58772F-061F-48B0-B6D5-0C0E38A301B2">\r
-              <File Id="ib_srp.inf" Compressed="yes" DiskId="1"\r
-                    LongName="ib_srp.inf" Name="IB_SRP.INF"\r
-                    Source="..\bin\storage\$(var.ARCH)\ib_srp.inf" />\r
-              <File Id="ibsrp.cat" Compressed="yes" DiskId="1"\r
-                    LongName="ibsrp.cat" Name="IBSRP.CAT"\r
-                    Source="..\bin\storage\$(var.ARCH)\ibsrp.cat" />\r
-              <File Id="ibsrp.sys" Compressed="yes" DiskId="1"\r
-                    LongName="ibsrp.sys" Name="IBSRP.SYS"\r
-                    Source="..\bin\storage\$(var.ARCH)\ibsrp.sys" />\r
-              <File Id="ibsrp.pdb" Compressed="yes" DiskId="1"\r
-                    Name="ibsrp.pdb"\r
-                    Source="..\bin\storage\$(var.ARCH)\ibsrp.pdb" />\r
-            </Component>\r
-          </Directory>\r
         </Directory>\r
       </Directory>\r
 \r
       </Directory>\r
     </Directory> <!-- End TARGETDIR -->\r
 \r
-<!--\r
-    <Property Id='ARPNOMODIFY'>1</Property>\r
-    <Property Id='ARPNOREPAIR'>1</Property>\r
--->\r
-    <Property Id='ARPCOMMENTS'>OpenFabrics Windows InfiniBand</Property>\r
-    <Property Id='ARPCONTACT'>Openfabrics Alliance [www.openfabrics.org]</Property>\r
-    <Property Id='ARPURLINFOABOUT'>https://wiki.openfabrics.org/tiki-index.php?page=OpenIB%20Windows</Property>\r
-    <Property Id='ARPHELPLINK'>https://wiki.openfabrics.org/tiki-index.php?page=Windows+FAQ</Property>\r
-    <Property Id='ARPURLUPDATEINFO'>http://www.openfabrics.org/downloads/WinOF/</Property>\r
+    <?include ..\..\common\arp.inc ?>\r
 \r
     <!--\r
        Features - Level=1 == Typical, no WSD on XP or SRP on 32-bit XP\r
index b1f4604..eb64183 100644 (file)
           </Component>\r
 \r
           <?include ..\..\common\dapl_rt.inc ?>\r
+          <?include ..\..\common\qlgc_vnic.inc ?>\r
+          <?include ..\..\common\srp.inc ?>\r
 \r
-          <Component Id="cQLVNIC_driver_installed"\r
-                     Guid="730C742E-73D9-4871-A523-6FB7963EA01E">\r
-          </Component>\r
-\r
-          <Directory Id="qlgcvnicDir" Name="qlgcvnic">\r
-            <Component Id="cQLVNIC_files"\r
-                       Guid="2AE69B67-C5FD-4CEE-9DF4-FB0A55619B4A">\r
-              <CreateFolder />\r
-              <File Id="qlgcvnic.sys" Compressed="yes" DiskId="1"\r
-                    LongName="qlgcvnic.sys" Name="QLGCVNIC.SYS"\r
-                    Source="..\bin\net\$(var.ARCH)\qlgcvnic.sys" />\r
-              <File Id="qlgcvnic.pdb" Compressed="yes" DiskId="1"\r
-                    Name="qlgcvnic.pdb"\r
-                    Source="..\bin\net\$(var.ARCH)\qlgcvnic.pdb" />\r
-              <File Id="netvnic.inf" Compressed="yes" DiskId="1"\r
-                    LongName="netvnic.inf" Name="NETVNIC.INF"\r
-                    Source="..\bin\net\$(var.ARCH)\netvnic.inf" />\r
-              <File Id="netvnic.cat" Compressed="yes" DiskId="1"\r
-                    LongName="netvnic.cat" Name="NETVNIC.cat"\r
-                    Source="..\bin\net\$(var.ARCH)\netvnic.cat" />\r
-            </Component>\r
-          </Directory>\r
-\r
-          <Component Id="cSRP_driver_installed"\r
-                     Guid="6945E66C-ADC0-4258-8858-AE7E7DF70495">\r
-          </Component>\r
-\r
-          <!-- RDMA SCSI over IB (aka SRP) -->\r
-          <Directory Id="srpDir" Name="SRP">\r
-            <Component Id="cSRP_files"\r
-                       Guid="BB58772F-061F-48B0-B6D5-0C0E38A301B2">\r
-              <File Id="ib_srp.inf" Compressed="yes" DiskId="1"\r
-                    LongName="ib_srp.inf" Name="IB_SRP.INF"\r
-                    Source="..\bin\storage\$(var.ARCH)\ib_srp.inf" />\r
-              <File Id="ibsrp.cat" Compressed="yes" DiskId="1"\r
-                    LongName="ibsrp.cat" Name="IBSRP.CAT"\r
-                    Source="..\bin\storage\$(var.ARCH)\ibsrp.cat" />\r
-              <File Id="ibsrp.sys" Compressed="yes" DiskId="1"\r
-                    LongName="ibsrp.sys" Name="IBSRP.SYS"\r
-                    Source="..\bin\storage\$(var.ARCH)\ibsrp.sys" />\r
-              <File Id="ibsrp.pdb" Compressed="yes" DiskId="1"\r
-                    Name="ibsrp.pdb"\r
-                    Source="..\bin\storage\$(var.ARCH)\ibsrp.pdb" />\r
-            </Component>\r
-          </Directory>\r
         </Directory>\r
       </Directory>\r
 \r
       </Directory>\r
     </Directory> <!-- End TARGETDIR -->\r
 \r
-<!--\r
-    <Property Id='ARPNOMODIFY'>1</Property>\r
-    <Property Id='ARPNOREPAIR'>1</Property>\r
--->\r
-    <Property Id='ARPCOMMENTS'>OpenFabrics Windows InfiniBand</Property>\r
-    <Property Id='ARPCONTACT'>Openfabrics Alliance [www.openfabrics.org]</Property>\r
-    <Property Id='ARPURLINFOABOUT'>https://wiki.openfabrics.org/tiki-index.php?page=OpenIB%20Windows</Property>\r
-    <Property Id='ARPHELPLINK'>https://wiki.openfabrics.org/tiki-index.php?page=Windows+FAQ</Property>\r
-    <Property Id='ARPURLUPDATEINFO'>http://www.openfabrics.org/downloads/WinOF/</Property>\r
+    <?include ..\..\common\arp.inc ?>\r
 \r
     <!--\r
        Features - Level=1 == Typical, no WSD on XP or SRP on 32-bit XP\r
index c320dad..2d6d273 100644 (file)
             </Component>\r
 \r
             <?include ..\..\common\dapl_rt.inc ?>\r
-\r
-            <Component Id="cQLVNIC_driver_installed"\r
-                       Guid="730C742E-73D9-4871-A523-6FB7963EA01E">\r
-            </Component>\r
-\r
-            <Directory Id="qlgcvnicDir" Name="qlgcvnic">\r
-              <Component Id="cQLVNIC_files"\r
-                         Guid="2AE69B67-C5FD-4CEE-9DF4-FB0A55619B4A">\r
-                  <CreateFolder />\r
-                  <File Id="qlgcvnic.sys" Compressed="yes" DiskId="1"\r
-                        LongName="qlgcvnic.sys" Name="QLGCVNIC.SYS"\r
-                        Source="..\bin\net\$(var.ARCH)\qlgcvnic.sys" />\r
-                  <File Id="qlgcvnic.pdb" Compressed="yes" DiskId="1"\r
-                        Name="qlgcvnic.pdb"\r
-                        Source="..\bin\net\$(var.ARCH)\qlgcvnic.pdb" />\r
-                  <File Id="netvnic.inf" Compressed="yes" DiskId="1"\r
-                        LongName="netvnic.inf" Name="NETVNIC.INF"\r
-                        Source="..\bin\net\$(var.ARCH)\netvnic.inf" />\r
-                  <File Id="netvnic.cat" Compressed="yes" DiskId="1"\r
-                        LongName="netvnic.cat" Name="NETVNIC.cat"\r
-                        Source="..\bin\net\$(var.ARCH)\netvnic.cat" />\r
-              </Component>\r
-            </Directory>\r
+            <?include ..\..\common\qlgc_vnic.inc ?>\r
 \r
 <!-- Skip SRP on XP/32\r
-            <Directory Id="srpDir" Name="SRP">\r
-              <Component Id="cSRP_driver"\r
-                         Guid="BB58772F-061F-48B0-B6D5-0C0E38A301B2">\r
-                  <File Id="ib_srp.inf" Compressed="yes" DiskId="1"\r
-                        LongName="ib_srp.inf" Name="IB_SRP.INF"\r
-                        Source="..\bin\storage\$(var.ARCH)\ib_srp.inf" />\r
-                  <File Id="ibsrp.cat" Compressed="yes" DiskId="1"\r
-                        LongName="ibsrp.cat" Name="IBSRP.CAT"\r
-                        Source="..\bin\storage\$(var.ARCH)\ibsrp.cat" />\r
-                  <File Id="ibsrp.sys" Compressed="yes" DiskId="1"\r
-                        LongName="ibsrp.sys" Name="IBSRP.SYS"\r
-                        Source="..\bin\storage\$(var.ARCH)\ibsrp.sys" />\r
-                  <File Id="ibsrp.pdb" Compressed="yes" DiskId="1"\r
-                        Name="ibsrp.pdb"\r
-                        Source="..\bin\storage\$(var.ARCH)\ibsrp.pdb" />\r
-              </Component>\r
-            </Directory>\r
+            <?include ..\..\common\srp.inc ?>\r
 -->\r
         </Directory>\r
       </Directory>\r
       </Directory>\r
     </Directory> <!-- End TARGETDIR -->\r
 \r
-<!--\r
-    <Property Id='ARPNOMODIFY'>1</Property>\r
-    <Property Id='ARPNOREPAIR'>1</Property>\r
--->\r
-    <Property Id='ARPCOMMENTS'>OpenFabrics Windows InfiniBand</Property>\r
-    <Property Id='ARPCONTACT'>Openfabrics Alliance [www.openfabrics.org]</Property>\r
-    <Property Id='ARPURLINFOABOUT'>https://wiki.openfabrics.org/tiki-index.php?page=OpenIB%20Windows</Property>\r
-    <Property Id='ARPHELPLINK'>https://wiki.openfabrics.org/tiki-index.php?page=Windows+FAQ</Property>\r
-    <Property Id='ARPURLUPDATEINFO'>http://www.openfabrics.org/downloads/WinOF/</Property>\r
+    <?include ..\..\common\arp.inc ?>\r
 \r
     <!--\r
        Features - Level=1 == Typical, no WSD on XP or SRP on 32-bit XP\r