From d8990d429bdd8756c3cc926cad607c63eab8e5b7 Mon Sep 17 00:00:00 2001
From: stansmith <stansmith@ad392aa1-c5ef-ae45-8dd8-e69d62a5ef86>
Date: Tue, 31 Mar 2009 18:32:43 +0000
Subject: [PATCH] [WinOF]   Add SRP & QLGCVNIC to the common includes.   Remove
 orphaned files on uninstall.

git-svn-id: svn://openib.tc.cornell.edu/gen1@2071 ad392aa1-c5ef-ae45-8dd8-e69d62a5ef86
---
 trunk/WinOF/WIX/common/IBcore.inc       | 35 ++++++++-------
 trunk/WinOF/WIX/common/arp.inc          | 15 +++++++
 trunk/WinOF/WIX/common/ipoib.inc        | 14 ++++--
 trunk/WinOF/WIX/common/mlnx_drivers.inc | 30 +++++++++++--
 trunk/WinOF/WIX/common/qlgc_vnic.inc    | 24 +++++++++++
 trunk/WinOF/WIX/common/srp.inc          | 26 +++++++++++
 trunk/WinOF/WIX/win7/ia64/wof.wxs       | 57 ++-----------------------
 trunk/WinOF/WIX/win7/x64/wof.wxs        | 57 ++-----------------------
 trunk/WinOF/WIX/win7/x86/wof.wxs        | 57 ++-----------------------
 trunk/WinOF/WIX/wlh/ia64/wof.wxs        | 57 ++-----------------------
 trunk/WinOF/WIX/wlh/x64/wof.wxs         | 57 ++-----------------------
 trunk/WinOF/WIX/wlh/x86/wof.wxs         | 57 ++-----------------------
 trunk/WinOF/WIX/wnet/ia64/wof.wxs       | 57 ++-----------------------
 trunk/WinOF/WIX/wnet/x64/wof.wxs        | 57 ++-----------------------
 trunk/WinOF/WIX/wnet/x86/wof.wxs        | 57 ++-----------------------
 trunk/WinOF/WIX/wxp/x86/wof.wxs         | 52 ++--------------------
 16 files changed, 152 insertions(+), 557 deletions(-)
 create mode 100644 trunk/WinOF/WIX/common/arp.inc
 create mode 100644 trunk/WinOF/WIX/common/qlgc_vnic.inc
 create mode 100644 trunk/WinOF/WIX/common/srp.inc

diff --git a/trunk/WinOF/WIX/common/IBcore.inc b/trunk/WinOF/WIX/common/IBcore.inc
index fefd9a6e..6a0da213 100644
--- a/trunk/WinOF/WIX/common/IBcore.inc
+++ b/trunk/WinOF/WIX/common/IBcore.inc
@@ -58,32 +58,37 @@
           <File Id="ibal32d.dll" Compressed="yes" DiskId="1"
                  LongName="ibal32d.dll" Name="IBAL32D.DLL"
                  Source="..\bin\HCA\$(var.ARCH)\ibal32d.dll" />
+
+          <RemoveFile Id='rm64_ibal.dll' On='uninstall'
+                 Property="System64Folder"
+                 Name="ibal.dll" LongName='ibal.dll' />
+          <RemoveFile Id='rm64_ibald.dll' On='uninstall'
+                 Property="System64Folder"
+                 Name="ibald.dll" LongName='ibald.dll' />
+          <RemoveFile Id='rm64_complib.dll' On='uninstall'
+                 Property="System64Folder"
+                 Name="complib.dll" LongName='complib.dll' />
+          <RemoveFile Id='rm64_complibd.dll' On='uninstall'
+                 Property="System64Folder"
+                 Name="complibd.dll" LongName='complibd.dll' />
       <?endif?>
 
       <!--
          Orphaned install files - remove on uninstall
          x64 SystemFolder == SysWOW64, System64Folder == System32
       -->
-      <RemoveFile Id='o64_ibal.dll' On='uninstall'
+      <RemoveFile Id='rm_ibal.dll' On='uninstall'
              Property="SystemFolder"
              Name="ibal.dll" LongName='ibal.dll' />
-      <RemoveFile Id='o64_complib.dll' On='uninstall'
-             Property="SystemFolder"
-             Name="complib.dll" LongName='complib.dll' />
-      <RemoveFile Id='o64_complibd.dll' On='uninstall'
+      <RemoveFile Id='rm_ibald.dll' On='uninstall'
              Property="SystemFolder"
-             Name="complibd.dll" LongName='complibd.dll' />
-      <RemoveFile Id='o32_ibal.dll' On='uninstall'
-             Property="System64Folder"
-             Name="ibal.dll" LongName='ibal.dll' />
-      <RemoveFile Id='o32_ibald.dll' On='uninstall'
-             Property="System64Folder"
              Name="ibald.dll" LongName='ibald.dll' />
-      <RemoveFile Id='o32_complib.dll' On='uninstall'
-             Property="System64Folder"
+      <RemoveFile Id='rm_complib.dll' On='uninstall'
+             Property="SystemFolder"
              Name="complib.dll" LongName='complib.dll' />
-      <RemoveFile Id='o32_complibd.dll' On='uninstall'
-             Property="System64Folder"
+      <RemoveFile Id='rm_complibd.dll' On='uninstall'
+             Property="SystemFolder"
              Name="complibd.dll" LongName='complibd.dll' />
+
     </Component>
 </Include>
diff --git a/trunk/WinOF/WIX/common/arp.inc b/trunk/WinOF/WIX/common/arp.inc
new file mode 100644
index 00000000..3de2e993
--- /dev/null
+++ b/trunk/WinOF/WIX/common/arp.inc
@@ -0,0 +1,15 @@
+<Include>
+
+<!-- Add Remove Properties -->
+
+<!--
+    <Property Id='ARPNOMODIFY'>1</Property>
+    <Property Id='ARPNOREPAIR'>1</Property>
+-->
+    <Property Id='ARPCOMMENTS'>OpenFabrics Windows InfiniBand</Property>
+    <Property Id='ARPCONTACT'>Openfabrics Alliance [www.openfabrics.org]</Property>
+    <Property Id='ARPURLINFOABOUT'>https://wiki.openfabrics.org/tiki-index.php?page=OpenIB%20Windows</Property>
+    <Property Id='ARPHELPLINK'>https://wiki.openfabrics.org/tiki-index.php?page=Windows+FAQ</Property>
+    <Property Id='ARPURLUPDATEINFO'>http://www.openfabrics.org/downloads/WinOF/</Property>
+
+</Include>
diff --git a/trunk/WinOF/WIX/common/ipoib.inc b/trunk/WinOF/WIX/common/ipoib.inc
index 59d94720..e1f02960 100644
--- a/trunk/WinOF/WIX/common/ipoib.inc
+++ b/trunk/WinOF/WIX/common/ipoib.inc
@@ -34,12 +34,19 @@
           <File Id="ibndprov32.dll" Compressed="yes" DiskId="1"
                  LongName="ibndprov32.dll" Name="IBNDPR32.DLL"
                  Source="..\bin\net\$(var.ARCH)\ibndprov32.dll" />
+
+          <RemoveFile Id='rm64_ibwsd.dll' On='uninstall'
+                 Property="System64Folder"
+                 Name="ibwsd.dll" LongName='ibwsd.dll' />
+          <RemoveFile Id='rm64_ibndprov.dll' On='uninstall'
+                 Property="System64Folder"
+                 Name="ibndprov.dll" LongName='ibndprov.dll' />
+          <RemoveFile Id='rm64_ndinstall.exe' On='uninstall'
+                 Property="System64Folder"
+                 Name="ndinstal.exe" LongName='ndinstall.exe' />
       <?endif?>
 
       <!-- Orphaned install files - remove on uninstall -->
-      <RemoveFile Id='o32_ibwsd.dll' On='uninstall'
-             Property="System64Folder"
-             Name="ibwsd.dll" LongName='ibwsd.dll' />
       <RemoveFile Id='o64_ibwsd.dll' On='uninstall'
              Property="SystemFolder"
              Name="ibwsd.dll" LongName='ibwsd.dll' />
@@ -49,5 +56,6 @@
       <RemoveFile Id='o64_ndinstall.exe' On='uninstall'
              Property="SystemFolder"
              Name="ndinstal.exe" LongName='ndinstall.exe' />
+
     </Component>
 </Include>
diff --git a/trunk/WinOF/WIX/common/mlnx_drivers.inc b/trunk/WinOF/WIX/common/mlnx_drivers.inc
index 10d811ea..cd3b5942 100644
--- a/trunk/WinOF/WIX/common/mlnx_drivers.inc
+++ b/trunk/WinOF/WIX/common/mlnx_drivers.inc
@@ -30,15 +30,27 @@
              LongName="mthcaud.dll" Name="MTHCAUD.DLL"
              Source="..\bin\HCA\$(var.ARCH)\mthcaud.dll" />
 
+      <?if $(var.ARCHP) = "x64" Or $(var.ARCHP) = "ia64" ?>
+          <!-- Orphaned install files - remove on uninstall -->
+          <RemoveFile Id='rm64_mthcau.dll' On='uninstall'
+                 Property="System64Folder"
+                 Name="mthcau.dll" LongName='mthcau.dll' />
+          <RemoveFile Id='rm64_mthcaud.dll' On='uninstall'
+                 Property="System64Folder"
+                 Name="mthcaud.dll" LongName='mthcaud.dll' />
+      <?endif?>
+
       <!-- Orphaned install files - remove on uninstall -->
-      <RemoveFile Id='o32_mthcau.dll' On='uninstall'
-             Property="System64Folder"
+      <RemoveFile Id='rm32_mthcau.dll' On='uninstall'
+             Property="SystemFolder"
              Name="mthcau.dll" LongName='mthcau.dll' />
-      <RemoveFile Id='o32_mthcaud.dll' On='uninstall'
-             Property="System64Folder"
+      <RemoveFile Id='rm32_mthcaud.dll' On='uninstall'
+             Property="SystemFolder"
              Name="mthcaud.dll" LongName='mthcaud.dll' />
+
     </Component>
 
+
     <Component Id="cConnectXDriver"
                Guid="C1EFF4D6-CE55-432a-9D92-E46AB983D9E3">
       <File Id="mlx4_bus.inf" Compressed="yes" DiskId="1"
@@ -80,7 +92,17 @@
           <File Id="mlx4u32.dll" Compressed="yes" DiskId="1"
                  LongName="mlx4u32.dll" Name="mlx4u32.dll"
                  Source="..\bin\hca\$(var.ARCH)\mlx4u32.dll" />
+
+          <!-- Orphaned install files - remove on uninstall -->
+          <RemoveFile Id='rm64_mlx4u.dll' On='uninstall'
+                 Property="System64Folder"
+                 Name="mlx4u.dll" LongName='mlx4u.dll' />
       <?endif?>
 
+      <!-- Orphaned install files - remove on uninstall -->
+      <RemoveFile Id='rm32_mlx4u.dll' On='uninstall'
+             Property="SystemFolder"
+             Name="mlx4u.dll" LongName='mlx4u.dll' />
+
     </Component>
 </Include>
diff --git a/trunk/WinOF/WIX/common/qlgc_vnic.inc b/trunk/WinOF/WIX/common/qlgc_vnic.inc
new file mode 100644
index 00000000..d810dcd2
--- /dev/null
+++ b/trunk/WinOF/WIX/common/qlgc_vnic.inc
@@ -0,0 +1,24 @@
+<Include>
+    <Component Id="cQLVNIC_driver_installed"
+               Guid="730C742E-73D9-4871-A523-6FB7963EA01E">
+    </Component>
+
+    <Directory Id="qlgcvnicDir" Name="qlgcvnic">
+      <Component Id="cQLVNIC_files"
+                 Guid="2AE69B67-C5FD-4CEE-9DF4-FB0A55619B4A">
+        <CreateFolder />
+        <File Id="qlgcvnic.sys" Compressed="yes" DiskId="1"
+              LongName="qlgcvnic.sys" Name="QLGCVNIC.SYS"
+              Source="..\bin\net\$(var.ARCH)\qlgcvnic.sys" />
+        <File Id="qlgcvnic.pdb" Compressed="yes" DiskId="1"
+              Name="qlgcvnic.pdb"
+              Source="..\bin\net\$(var.ARCH)\qlgcvnic.pdb" />
+        <File Id="netvnic.inf" Compressed="yes" DiskId="1"
+              LongName="netvnic.inf" Name="NETVNIC.INF"
+              Source="..\bin\net\$(var.ARCH)\netvnic.inf" />
+        <File Id="netvnic.cat" Compressed="yes" DiskId="1"
+              LongName="netvnic.cat" Name="NETVNIC.cat"
+              Source="..\bin\net\$(var.ARCH)\netvnic.cat" />
+      </Component>
+    </Directory>
+</Include>
diff --git a/trunk/WinOF/WIX/common/srp.inc b/trunk/WinOF/WIX/common/srp.inc
new file mode 100644
index 00000000..42c2aae3
--- /dev/null
+++ b/trunk/WinOF/WIX/common/srp.inc
@@ -0,0 +1,26 @@
+<Include>
+
+    <Component Id="cSRP_driver_installed"
+               Guid="6945E66C-ADC0-4258-8858-AE7E7DF70495">
+    </Component>
+
+    <!-- RDMA SCSI over IB (aka SRP) -->
+    <Directory Id="srpDir" Name="SRP">
+      <Component Id="cSRP_files"
+                 Guid="BB58772F-061F-48B0-B6D5-0C0E38A301B2">
+        <File Id="ib_srp.inf" Compressed="yes" DiskId="1"
+              LongName="ib_srp.inf" Name="IB_SRP.INF"
+              Source="..\bin\storage\$(var.ARCH)\ib_srp.inf" />
+        <File Id="ibsrp.cat" Compressed="yes" DiskId="1"
+              LongName="ibsrp.cat" Name="IBSRP.CAT"
+              Source="..\bin\storage\$(var.ARCH)\ibsrp.cat" />
+        <File Id="ibsrp.sys" Compressed="yes" DiskId="1"
+              LongName="ibsrp.sys" Name="IBSRP.SYS"
+              Source="..\bin\storage\$(var.ARCH)\ibsrp.sys" />
+        <File Id="ibsrp.pdb" Compressed="yes" DiskId="1"
+              Name="ibsrp.pdb"
+              Source="..\bin\storage\$(var.ARCH)\ibsrp.pdb" />
+      </Component>
+    </Directory>
+
+</Include>
diff --git a/trunk/WinOF/WIX/win7/ia64/wof.wxs b/trunk/WinOF/WIX/win7/ia64/wof.wxs
index 6672c8db..a6decfdb 100644
--- a/trunk/WinOF/WIX/win7/ia64/wof.wxs
+++ b/trunk/WinOF/WIX/win7/ia64/wof.wxs
@@ -81,52 +81,9 @@
           </Component>
 -->
           <?include ..\..\common\dapl_rt.inc ?>
+          <?include ..\..\common\qlgc_vnic.inc ?>
+          <?include ..\..\common\srp.inc ?>
 
-          <Component Id="cQLVNIC_driver_installed"
-                     Guid="730C742E-73D9-4871-A523-6FB7963EA01E">
-          </Component>
-
-          <Directory Id="qlgcvnicDir" Name="qlgcvnic">
-            <Component Id="cQLVNIC_files"
-                       Guid="2AE69B67-C5FD-4CEE-9DF4-FB0A55619B4A">
-              <CreateFolder />
-              <File Id="qlgcvnic.sys" Compressed="yes" DiskId="1"
-                    LongName="qlgcvnic.sys" Name="QLGCVNIC.SYS"
-                    Source="..\bin\net\$(var.ARCH)\qlgcvnic.sys" />
-              <File Id="qlgcvnic.pdb" Compressed="yes" DiskId="1"
-                    Name="qlgcvnic.pdb"
-                    Source="..\bin\net\$(var.ARCH)\qlgcvnic.pdb" />
-              <File Id="netvnic.inf" Compressed="yes" DiskId="1"
-                    LongName="netvnic.inf" Name="NETVNIC.INF"
-                    Source="..\bin\net\$(var.ARCH)\netvnic.inf" />
-              <File Id="netvnic.cat" Compressed="yes" DiskId="1"
-                    LongName="netvnic.cat" Name="NETVNIC.cat"
-                    Source="..\bin\net\$(var.ARCH)\netvnic.cat" />
-            </Component>
-          </Directory>
-
-          <Component Id="cSRP_driver_installed"
-                     Guid="6945E66C-ADC0-4258-8858-AE7E7DF70495">
-          </Component>
-
-          <!-- RDMA SCSI over IB (aka SRP) -->
-          <Directory Id="srpDir" Name="SRP">
-            <Component Id="cSRP_files"
-                       Guid="BB58772F-061F-48B0-B6D5-0C0E38A301B2">
-              <File Id="ib_srp.inf" Compressed="yes" DiskId="1"
-                    LongName="ib_srp.inf" Name="IB_SRP.INF"
-                    Source="..\bin\storage\$(var.ARCH)\ib_srp.inf" />
-              <File Id="ibsrp.cat" Compressed="yes" DiskId="1"
-                    LongName="ibsrp.cat" Name="IBSRP.CAT"
-                    Source="..\bin\storage\$(var.ARCH)\ibsrp.cat" />
-              <File Id="ibsrp.sys" Compressed="yes" DiskId="1"
-                    LongName="ibsrp.sys" Name="IBSRP.SYS"
-                    Source="..\bin\storage\$(var.ARCH)\ibsrp.sys" />
-              <File Id="ibsrp.pdb" Compressed="yes" DiskId="1"
-                    Name="ibsrp.pdb"
-                    Source="..\bin\storage\$(var.ARCH)\ibsrp.pdb" />
-            </Component>
-          </Directory>
         </Directory>
       </Directory>
 
@@ -148,15 +105,7 @@
       </Directory>
     </Directory> <!-- End TARGETDIR -->
 
-<!--
-    <Property Id='ARPNOMODIFY'>1</Property>
-    <Property Id='ARPNOREPAIR'>1</Property>
--->
-    <Property Id='ARPCOMMENTS'>OpenFabrics Windows InfiniBand</Property>
-    <Property Id='ARPCONTACT'>Openfabrics Alliance [www.openfabrics.org]</Property>
-    <Property Id='ARPURLINFOABOUT'>https://wiki.openfabrics.org/tiki-index.php?page=OpenIB%20Windows</Property>
-    <Property Id='ARPHELPLINK'>https://wiki.openfabrics.org/tiki-index.php?page=Windows+FAQ</Property>
-    <Property Id='ARPURLUPDATEINFO'>http://www.openfabrics.org/downloads/WinOF/</Property>
+    <?include ..\..\common\arp.inc ?>
 
     <!--
        Features - Level=1 == Typical, no WSD on XP or SRP on 32-bit XP
diff --git a/trunk/WinOF/WIX/win7/x64/wof.wxs b/trunk/WinOF/WIX/win7/x64/wof.wxs
index bcea0fb1..f4a51162 100644
--- a/trunk/WinOF/WIX/win7/x64/wof.wxs
+++ b/trunk/WinOF/WIX/win7/x64/wof.wxs
@@ -81,52 +81,9 @@
           </Component>
 
           <?include ..\..\common\dapl_rt.inc ?>
+          <?include ..\..\common\qlgc_vnic.inc ?>
+          <?include ..\..\common\srp.inc ?>
 
-          <Component Id="cQLVNIC_driver_installed"
-                     Guid="730C742E-73D9-4871-A523-6FB7963EA01E">
-          </Component>
-
-          <Directory Id="qlgcvnicDir" Name="qlgcvnic">
-            <Component Id="cQLVNIC_files"
-                       Guid="2AE69B67-C5FD-4CEE-9DF4-FB0A55619B4A">
-              <CreateFolder />
-              <File Id="qlgcvnic.sys" Compressed="yes" DiskId="1"
-                    LongName="qlgcvnic.sys" Name="QLGCVNIC.SYS"
-                    Source="..\bin\net\$(var.ARCH)\qlgcvnic.sys" />
-              <File Id="qlgcvnic.pdb" Compressed="yes" DiskId="1"
-                    Name="qlgcvnic.pdb"
-                    Source="..\bin\net\$(var.ARCH)\qlgcvnic.pdb" />
-              <File Id="netvnic.inf" Compressed="yes" DiskId="1"
-                    LongName="netvnic.inf" Name="NETVNIC.INF"
-                    Source="..\bin\net\$(var.ARCH)\netvnic.inf" />
-              <File Id="netvnic.cat" Compressed="yes" DiskId="1"
-                    LongName="netvnic.cat" Name="NETVNIC.cat"
-                    Source="..\bin\net\$(var.ARCH)\netvnic.cat" />
-            </Component>
-          </Directory>
-
-          <Component Id="cSRP_driver_installed"
-                     Guid="6945E66C-ADC0-4258-8858-AE7E7DF70495">
-          </Component>
-
-          <!-- RDMA SCSI over IB (aka SRP) -->
-          <Directory Id="srpDir" Name="SRP">
-            <Component Id="cSRP_files"
-                       Guid="BB58772F-061F-48B0-B6D5-0C0E38A301B2">
-              <File Id="ib_srp.inf" Compressed="yes" DiskId="1"
-                    LongName="ib_srp.inf" Name="IB_SRP.INF"
-                    Source="..\bin\storage\$(var.ARCH)\ib_srp.inf" />
-              <File Id="ibsrp.cat" Compressed="yes" DiskId="1"
-                    LongName="ibsrp.cat" Name="IBSRP.CAT"
-                    Source="..\bin\storage\$(var.ARCH)\ibsrp.cat" />
-              <File Id="ibsrp.sys" Compressed="yes" DiskId="1"
-                    LongName="ibsrp.sys" Name="IBSRP.SYS"
-                    Source="..\bin\storage\$(var.ARCH)\ibsrp.sys" />
-              <File Id="ibsrp.pdb" Compressed="yes" DiskId="1"
-                    Name="ibsrp.pdb"
-                    Source="..\bin\storage\$(var.ARCH)\ibsrp.pdb" />
-            </Component>
-          </Directory>
         </Directory>
       </Directory>
 
@@ -148,15 +105,7 @@
       </Directory>
     </Directory> <!-- End TARGETDIR -->
 
-<!--
-    <Property Id='ARPNOMODIFY'>1</Property>
-    <Property Id='ARPNOREPAIR'>1</Property>
--->
-    <Property Id='ARPCOMMENTS'>OpenFabrics Windows InfiniBand</Property>
-    <Property Id='ARPCONTACT'>Openfabrics Alliance [www.openfabrics.org]</Property>
-    <Property Id='ARPURLINFOABOUT'>https://wiki.openfabrics.org/tiki-index.php?page=OpenIB%20Windows</Property>
-    <Property Id='ARPHELPLINK'>https://wiki.openfabrics.org/tiki-index.php?page=Windows+FAQ</Property>
-    <Property Id='ARPURLUPDATEINFO'>http://www.openfabrics.org/downloads/WinOF/</Property>
+    <?include ..\..\common\arp.inc ?>
 
     <!--
        Features - Level=1 == Typical, no WSD on XP or SRP on 32-bit XP
diff --git a/trunk/WinOF/WIX/win7/x86/wof.wxs b/trunk/WinOF/WIX/win7/x86/wof.wxs
index 176041d3..a859b15f 100644
--- a/trunk/WinOF/WIX/win7/x86/wof.wxs
+++ b/trunk/WinOF/WIX/win7/x86/wof.wxs
@@ -75,52 +75,9 @@
           </Component>
 
           <?include ..\..\common\dapl_rt.inc ?>
+          <?include ..\..\common\qlgc_vnic.inc ?>
+          <?include ..\..\common\srp.inc ?>
 
-          <Component Id="cQLVNIC_driver_installed"
-                     Guid="730C742E-73D9-4871-A523-6FB7963EA01E">
-          </Component>
-
-          <Directory Id="qlgcvnicDir" Name="qlgcvnic">
-            <Component Id="cQLVNIC_files"
-                       Guid="2AE69B67-C5FD-4CEE-9DF4-FB0A55619B4A">
-              <CreateFolder />
-              <File Id="qlgcvnic.sys" Compressed="yes" DiskId="1"
-                    LongName="qlgcvnic.sys" Name="QLGCVNIC.SYS"
-                    Source="..\bin\net\$(var.ARCH)\qlgcvnic.sys" />
-              <File Id="qlgcvnic.pdb" Compressed="yes" DiskId="1"
-                    Name="qlgcvnic.pdb"
-                    Source="..\bin\net\$(var.ARCH)\qlgcvnic.pdb" />
-              <File Id="netvnic.inf" Compressed="yes" DiskId="1"
-                    LongName="netvnic.inf" Name="NETVNIC.INF"
-                    Source="..\bin\net\$(var.ARCH)\netvnic.inf" />
-              <File Id="netvnic.cat" Compressed="yes" DiskId="1"
-                    LongName="netvnic.cat" Name="NETVNIC.cat"
-                    Source="..\bin\net\$(var.ARCH)\netvnic.cat" />
-            </Component>
-          </Directory>
-
-          <Component Id="cSRP_driver_installed"
-                     Guid="6945E66C-ADC0-4258-8858-AE7E7DF70495">
-          </Component>
-
-          <!-- RDMA SCSI over IB (aka SRP) -->
-          <Directory Id="srpDir" Name="SRP">
-            <Component Id="cSRP_files"
-                       Guid="BB58772F-061F-48B0-B6D5-0C0E38A301B2">
-              <File Id="ib_srp.inf" Compressed="yes" DiskId="1"
-                    LongName="ib_srp.inf" Name="IB_SRP.INF"
-                    Source="..\bin\storage\$(var.ARCH)\ib_srp.inf" />
-              <File Id="ibsrp.cat" Compressed="yes" DiskId="1"
-                    LongName="ibsrp.cat" Name="IBSRP.CAT"
-                    Source="..\bin\storage\$(var.ARCH)\ibsrp.cat" />
-              <File Id="ibsrp.sys" Compressed="yes" DiskId="1"
-                    LongName="ibsrp.sys" Name="IBSRP.SYS"
-                    Source="..\bin\storage\$(var.ARCH)\ibsrp.sys" />
-              <File Id="ibsrp.pdb" Compressed="yes" DiskId="1"
-                    Name="ibsrp.pdb"
-                    Source="..\bin\storage\$(var.ARCH)\ibsrp.pdb" />
-            </Component>
-          </Directory>
         </Directory>
       </Directory>
 
@@ -142,15 +99,7 @@
       </Directory>
     </Directory> <!-- End TARGETDIR -->
 
-<!--
-    <Property Id='ARPNOMODIFY'>1</Property>
-    <Property Id='ARPNOREPAIR'>1</Property>
--->
-    <Property Id='ARPCOMMENTS'>OpenFabrics Windows InfiniBand</Property>
-    <Property Id='ARPCONTACT'>Openfabrics Alliance [www.openfabrics.org]</Property>
-    <Property Id='ARPURLINFOABOUT'>https://wiki.openfabrics.org/tiki-index.php?page=OpenIB%20Windows</Property>
-    <Property Id='ARPHELPLINK'>https://wiki.openfabrics.org/tiki-index.php?page=Windows+FAQ</Property>
-    <Property Id='ARPURLUPDATEINFO'>http://www.openfabrics.org/downloads/WinOF/</Property>
+    <?include ..\..\common\arp.inc ?>
 
     <!--
        Features - Level=1 == Typical, no WSD on XP or SRP on 32-bit XP
diff --git a/trunk/WinOF/WIX/wlh/ia64/wof.wxs b/trunk/WinOF/WIX/wlh/ia64/wof.wxs
index 1bdf27b3..e82dbc5c 100644
--- a/trunk/WinOF/WIX/wlh/ia64/wof.wxs
+++ b/trunk/WinOF/WIX/wlh/ia64/wof.wxs
@@ -81,52 +81,9 @@
           </Component>
 -->
           <?include ..\..\common\dapl_rt.inc ?>
+          <?include ..\..\common\qlgc_vnic.inc ?>
+          <?include ..\..\common\srp.inc ?>
 
-          <Component Id="cQLVNIC_driver_installed"
-                     Guid="730C742E-73D9-4871-A523-6FB7963EA01E">
-          </Component>
-
-          <Directory Id="qlgcvnicDir" Name="qlgcvnic">
-            <Component Id="cQLVNIC_files"
-                       Guid="2AE69B67-C5FD-4CEE-9DF4-FB0A55619B4A">
-              <CreateFolder />
-              <File Id="qlgcvnic.sys" Compressed="yes" DiskId="1"
-                    LongName="qlgcvnic.sys" Name="QLGCVNIC.SYS"
-                    Source="..\bin\net\$(var.ARCH)\qlgcvnic.sys" />
-              <File Id="qlgcvnic.pdb" Compressed="yes" DiskId="1"
-                    Name="qlgcvnic.pdb"
-                    Source="..\bin\net\$(var.ARCH)\qlgcvnic.pdb" />
-              <File Id="netvnic.inf" Compressed="yes" DiskId="1"
-                    LongName="netvnic.inf" Name="NETVNIC.INF"
-                    Source="..\bin\net\$(var.ARCH)\netvnic.inf" />
-              <File Id="netvnic.cat" Compressed="yes" DiskId="1"
-                    LongName="netvnic.cat" Name="NETVNIC.cat"
-                    Source="..\bin\net\$(var.ARCH)\netvnic.cat" />
-            </Component>
-          </Directory>
-
-          <Component Id="cSRP_driver_installed"
-                     Guid="6945E66C-ADC0-4258-8858-AE7E7DF70495">
-          </Component>
-
-          <!-- RDMA SCSI over IB (aka SRP) -->
-          <Directory Id="srpDir" Name="SRP">
-            <Component Id="cSRP_files"
-                       Guid="BB58772F-061F-48B0-B6D5-0C0E38A301B2">
-              <File Id="ib_srp.inf" Compressed="yes" DiskId="1"
-                    LongName="ib_srp.inf" Name="IB_SRP.INF"
-                    Source="..\bin\storage\$(var.ARCH)\ib_srp.inf" />
-              <File Id="ibsrp.cat" Compressed="yes" DiskId="1"
-                    LongName="ibsrp.cat" Name="IBSRP.CAT"
-                    Source="..\bin\storage\$(var.ARCH)\ibsrp.cat" />
-              <File Id="ibsrp.sys" Compressed="yes" DiskId="1"
-                    LongName="ibsrp.sys" Name="IBSRP.SYS"
-                    Source="..\bin\storage\$(var.ARCH)\ibsrp.sys" />
-              <File Id="ibsrp.pdb" Compressed="yes" DiskId="1"
-                    Name="ibsrp.pdb"
-                    Source="..\bin\storage\$(var.ARCH)\ibsrp.pdb" />
-            </Component>
-          </Directory>
         </Directory>
       </Directory>
 
@@ -148,15 +105,7 @@
       </Directory>
     </Directory> <!-- End TARGETDIR -->
 
-<!--
-    <Property Id='ARPNOMODIFY'>1</Property>
-    <Property Id='ARPNOREPAIR'>1</Property>
--->
-    <Property Id='ARPCOMMENTS'>OpenFabrics Windows InfiniBand</Property>
-    <Property Id='ARPCONTACT'>Openfabrics Alliance [www.openfabrics.org]</Property>
-    <Property Id='ARPURLINFOABOUT'>https://wiki.openfabrics.org/tiki-index.php?page=OpenIB%20Windows</Property>
-    <Property Id='ARPHELPLINK'>https://wiki.openfabrics.org/tiki-index.php?page=Windows+FAQ</Property>
-    <Property Id='ARPURLUPDATEINFO'>http://www.openfabrics.org/downloads/WinOF/</Property>
+    <?include ..\..\common\arp.inc ?>
 
     <!--
        Features - Level=1 == Typical, no WSD on XP or SRP on 32-bit XP
diff --git a/trunk/WinOF/WIX/wlh/x64/wof.wxs b/trunk/WinOF/WIX/wlh/x64/wof.wxs
index 33b3e4d1..562238d7 100644
--- a/trunk/WinOF/WIX/wlh/x64/wof.wxs
+++ b/trunk/WinOF/WIX/wlh/x64/wof.wxs
@@ -81,52 +81,9 @@
           </Component>
 
           <?include ..\..\common\dapl_rt.inc ?>
+          <?include ..\..\common\qlgc_vnic.inc ?>
+          <?include ..\..\common\srp.inc ?>
 
-          <Component Id="cQLVNIC_driver_installed"
-                     Guid="730C742E-73D9-4871-A523-6FB7963EA01E">
-          </Component>
-
-          <Directory Id="qlgcvnicDir" Name="qlgcvnic">
-            <Component Id="cQLVNIC_files"
-                       Guid="2AE69B67-C5FD-4CEE-9DF4-FB0A55619B4A">
-              <CreateFolder />
-              <File Id="qlgcvnic.sys" Compressed="yes" DiskId="1"
-                    LongName="qlgcvnic.sys" Name="QLGCVNIC.SYS"
-                    Source="..\bin\net\$(var.ARCH)\qlgcvnic.sys" />
-              <File Id="qlgcvnic.pdb" Compressed="yes" DiskId="1"
-                    Name="qlgcvnic.pdb"
-                    Source="..\bin\net\$(var.ARCH)\qlgcvnic.pdb" />
-              <File Id="netvnic.inf" Compressed="yes" DiskId="1"
-                    LongName="netvnic.inf" Name="NETVNIC.INF"
-                    Source="..\bin\net\$(var.ARCH)\netvnic.inf" />
-              <File Id="netvnic.cat" Compressed="yes" DiskId="1"
-                    LongName="netvnic.cat" Name="NETVNIC.cat"
-                    Source="..\bin\net\$(var.ARCH)\netvnic.cat" />
-            </Component>
-          </Directory>
-
-          <Component Id="cSRP_driver_installed"
-                     Guid="6945E66C-ADC0-4258-8858-AE7E7DF70495">
-          </Component>
-
-          <!-- RDMA SCSI over IB (aka SRP) -->
-          <Directory Id="srpDir" Name="SRP">
-            <Component Id="cSRP_files"
-                       Guid="BB58772F-061F-48B0-B6D5-0C0E38A301B2">
-              <File Id="ib_srp.inf" Compressed="yes" DiskId="1"
-                    LongName="ib_srp.inf" Name="IB_SRP.INF"
-                    Source="..\bin\storage\$(var.ARCH)\ib_srp.inf" />
-              <File Id="ibsrp.cat" Compressed="yes" DiskId="1"
-                    LongName="ibsrp.cat" Name="IBSRP.CAT"
-                    Source="..\bin\storage\$(var.ARCH)\ibsrp.cat" />
-              <File Id="ibsrp.sys" Compressed="yes" DiskId="1"
-                    LongName="ibsrp.sys" Name="IBSRP.SYS"
-                    Source="..\bin\storage\$(var.ARCH)\ibsrp.sys" />
-              <File Id="ibsrp.pdb" Compressed="yes" DiskId="1"
-                    Name="ibsrp.pdb"
-                    Source="..\bin\storage\$(var.ARCH)\ibsrp.pdb" />
-            </Component>
-          </Directory>
         </Directory>
       </Directory>
 
@@ -148,15 +105,7 @@
       </Directory>
     </Directory> <!-- End TARGETDIR -->
 
-<!--
-    <Property Id='ARPNOMODIFY'>1</Property>
-    <Property Id='ARPNOREPAIR'>1</Property>
--->
-    <Property Id='ARPCOMMENTS'>OpenFabrics Windows InfiniBand</Property>
-    <Property Id='ARPCONTACT'>Openfabrics Alliance [www.openfabrics.org]</Property>
-    <Property Id='ARPURLINFOABOUT'>https://wiki.openfabrics.org/tiki-index.php?page=OpenIB%20Windows</Property>
-    <Property Id='ARPHELPLINK'>https://wiki.openfabrics.org/tiki-index.php?page=Windows+FAQ</Property>
-    <Property Id='ARPURLUPDATEINFO'>http://www.openfabrics.org/downloads/WinOF/</Property>
+    <?include ..\..\common\arp.inc ?>
 
     <!--
        Features - Level=1 == Typical, no WSD on XP or SRP on 32-bit XP
diff --git a/trunk/WinOF/WIX/wlh/x86/wof.wxs b/trunk/WinOF/WIX/wlh/x86/wof.wxs
index 2c142a06..e7990176 100644
--- a/trunk/WinOF/WIX/wlh/x86/wof.wxs
+++ b/trunk/WinOF/WIX/wlh/x86/wof.wxs
@@ -75,52 +75,9 @@
           </Component>
 
           <?include ..\..\common\dapl_rt.inc ?>
+          <?include ..\..\common\qlgc_vnic.inc ?>
+          <?include ..\..\common\srp.inc ?>
 
-          <Component Id="cQLVNIC_driver_installed"
-                     Guid="730C742E-73D9-4871-A523-6FB7963EA01E">
-          </Component>
-
-          <Directory Id="qlgcvnicDir" Name="qlgcvnic">
-            <Component Id="cQLVNIC_files"
-                       Guid="2AE69B67-C5FD-4CEE-9DF4-FB0A55619B4A">
-              <CreateFolder />
-              <File Id="qlgcvnic.sys" Compressed="yes" DiskId="1"
-                    LongName="qlgcvnic.sys" Name="QLGCVNIC.SYS"
-                    Source="..\bin\net\$(var.ARCH)\qlgcvnic.sys" />
-              <File Id="qlgcvnic.pdb" Compressed="yes" DiskId="1"
-                    Name="qlgcvnic.pdb"
-                    Source="..\bin\net\$(var.ARCH)\qlgcvnic.pdb" />
-              <File Id="netvnic.inf" Compressed="yes" DiskId="1"
-                    LongName="netvnic.inf" Name="NETVNIC.INF"
-                    Source="..\bin\net\$(var.ARCH)\netvnic.inf" />
-              <File Id="netvnic.cat" Compressed="yes" DiskId="1"
-                    LongName="netvnic.cat" Name="NETVNIC.cat"
-                    Source="..\bin\net\$(var.ARCH)\netvnic.cat" />
-            </Component>
-          </Directory>
-
-          <Component Id="cSRP_driver_installed"
-                     Guid="6945E66C-ADC0-4258-8858-AE7E7DF70495">
-          </Component>
-
-          <!-- RDMA SCSI over IB (aka SRP) -->
-          <Directory Id="srpDir" Name="SRP">
-            <Component Id="cSRP_files"
-                       Guid="BB58772F-061F-48B0-B6D5-0C0E38A301B2">
-              <File Id="ib_srp.inf" Compressed="yes" DiskId="1"
-                    LongName="ib_srp.inf" Name="IB_SRP.INF"
-                    Source="..\bin\storage\$(var.ARCH)\ib_srp.inf" />
-              <File Id="ibsrp.cat" Compressed="yes" DiskId="1"
-                    LongName="ibsrp.cat" Name="IBSRP.CAT"
-                    Source="..\bin\storage\$(var.ARCH)\ibsrp.cat" />
-              <File Id="ibsrp.sys" Compressed="yes" DiskId="1"
-                    LongName="ibsrp.sys" Name="IBSRP.SYS"
-                    Source="..\bin\storage\$(var.ARCH)\ibsrp.sys" />
-              <File Id="ibsrp.pdb" Compressed="yes" DiskId="1"
-                    Name="ibsrp.pdb"
-                    Source="..\bin\storage\$(var.ARCH)\ibsrp.pdb" />
-            </Component>
-          </Directory>
         </Directory>
       </Directory>
 
@@ -142,15 +99,7 @@
       </Directory>
     </Directory> <!-- End TARGETDIR -->
 
-<!--
-    <Property Id='ARPNOMODIFY'>1</Property>
-    <Property Id='ARPNOREPAIR'>1</Property>
--->
-    <Property Id='ARPCOMMENTS'>OpenFabrics Windows InfiniBand</Property>
-    <Property Id='ARPCONTACT'>Openfabrics Alliance [www.openfabrics.org]</Property>
-    <Property Id='ARPURLINFOABOUT'>https://wiki.openfabrics.org/tiki-index.php?page=OpenIB%20Windows</Property>
-    <Property Id='ARPHELPLINK'>https://wiki.openfabrics.org/tiki-index.php?page=Windows+FAQ</Property>
-    <Property Id='ARPURLUPDATEINFO'>http://www.openfabrics.org/downloads/WinOF/</Property>
+    <?include ..\..\common\arp.inc ?>
 
     <!--
        Features - Level=1 == Typical, no WSD on XP or SRP on 32-bit XP
diff --git a/trunk/WinOF/WIX/wnet/ia64/wof.wxs b/trunk/WinOF/WIX/wnet/ia64/wof.wxs
index e5d3fbf3..295a2361 100644
--- a/trunk/WinOF/WIX/wnet/ia64/wof.wxs
+++ b/trunk/WinOF/WIX/wnet/ia64/wof.wxs
@@ -81,52 +81,9 @@
           </Component>
 -->
           <?include ..\..\common\dapl_rt.inc ?>
+          <?include ..\..\common\qlgc_vnic.inc ?>
+          <?include ..\..\common\srp.inc ?>
 
-          <Component Id="cQLVNIC_driver_installed"
-                     Guid="730C742E-73D9-4871-A523-6FB7963EA01E">
-          </Component>
-
-          <Directory Id="qlgcvnicDir" Name="qlgcvnic">
-            <Component Id="cQLVNIC_files"
-                       Guid="2AE69B67-C5FD-4CEE-9DF4-FB0A55619B4A">
-              <CreateFolder />
-              <File Id="qlgcvnic.sys" Compressed="yes" DiskId="1"
-                    LongName="qlgcvnic.sys" Name="QLGCVNIC.SYS"
-                    Source="..\bin\net\$(var.ARCH)\qlgcvnic.sys" />
-              <File Id="qlgcvnic.pdb" Compressed="yes" DiskId="1"
-                    Name="qlgcvnic.pdb"
-                    Source="..\bin\net\$(var.ARCH)\qlgcvnic.pdb" />
-              <File Id="netvnic.inf" Compressed="yes" DiskId="1"
-                    LongName="netvnic.inf" Name="NETVNIC.INF"
-                    Source="..\bin\net\$(var.ARCH)\netvnic.inf" />
-              <File Id="netvnic.cat" Compressed="yes" DiskId="1"
-                    LongName="netvnic.cat" Name="NETVNIC.cat"
-                    Source="..\bin\net\$(var.ARCH)\netvnic.cat" />
-            </Component>
-          </Directory>
-
-          <Component Id="cSRP_driver_installed"
-                     Guid="6945E66C-ADC0-4258-8858-AE7E7DF70495">
-          </Component>
-
-          <!-- RDMA SCSI over IB (aka SRP) -->
-          <Directory Id="srpDir" Name="SRP">
-            <Component Id="cSRP_files"
-                       Guid="BB58772F-061F-48B0-B6D5-0C0E38A301B2">
-              <File Id="ib_srp.inf" Compressed="yes" DiskId="1"
-                    LongName="ib_srp.inf" Name="IB_SRP.INF"
-                    Source="..\bin\storage\$(var.ARCH)\ib_srp.inf" />
-              <File Id="ibsrp.cat" Compressed="yes" DiskId="1"
-                    LongName="ibsrp.cat" Name="IBSRP.CAT"
-                    Source="..\bin\storage\$(var.ARCH)\ibsrp.cat" />
-              <File Id="ibsrp.sys" Compressed="yes" DiskId="1"
-                    LongName="ibsrp.sys" Name="IBSRP.SYS"
-                    Source="..\bin\storage\$(var.ARCH)\ibsrp.sys" />
-              <File Id="ibsrp.pdb" Compressed="yes" DiskId="1"
-                    Name="ibsrp.pdb"
-                    Source="..\bin\storage\$(var.ARCH)\ibsrp.pdb" />
-            </Component>
-          </Directory>
         </Directory>
       </Directory>
 
@@ -148,15 +105,7 @@
       </Directory>
     </Directory> <!-- End TARGETDIR -->
 
-<!--
-    <Property Id='ARPNOMODIFY'>1</Property>
-    <Property Id='ARPNOREPAIR'>1</Property>
--->
-    <Property Id='ARPCOMMENTS'>OpenFabrics Windows InfiniBand</Property>
-    <Property Id='ARPCONTACT'>Openfabrics Alliance [www.openfabrics.org]</Property>
-    <Property Id='ARPURLINFOABOUT'>https://wiki.openfabrics.org/tiki-index.php?page=OpenIB%20Windows</Property>
-    <Property Id='ARPHELPLINK'>https://wiki.openfabrics.org/tiki-index.php?page=Windows+FAQ</Property>
-    <Property Id='ARPURLUPDATEINFO'>http://www.openfabrics.org/downloads/WinOF/</Property>
+    <?include ..\..\common\arp.inc ?>
 
     <!--
        Features - Level=1 == Typical, no WSD on XP
diff --git a/trunk/WinOF/WIX/wnet/x64/wof.wxs b/trunk/WinOF/WIX/wnet/x64/wof.wxs
index e643deeb..2d39ee4b 100644
--- a/trunk/WinOF/WIX/wnet/x64/wof.wxs
+++ b/trunk/WinOF/WIX/wnet/x64/wof.wxs
@@ -81,52 +81,9 @@
           </Component>
 
           <?include ..\..\common\dapl_rt.inc ?>
+          <?include ..\..\common\qlgc_vnic.inc ?>
+          <?include ..\..\common\srp.inc ?>
 
-          <Component Id="cQLVNIC_driver_installed"
-                     Guid="730C742E-73D9-4871-A523-6FB7963EA01E">
-          </Component>
-
-          <Directory Id="qlgcvnicDir" Name="qlgcvnic">
-            <Component Id="cQLVNIC_files"
-                       Guid="2AE69B67-C5FD-4CEE-9DF4-FB0A55619B4A">
-              <CreateFolder />
-              <File Id="qlgcvnic.sys" Compressed="yes" DiskId="1"
-                    LongName="qlgcvnic.sys" Name="QLGCVNIC.SYS"
-                    Source="..\bin\net\$(var.ARCH)\qlgcvnic.sys" />
-              <File Id="qlgcvnic.pdb" Compressed="yes" DiskId="1"
-                    Name="qlgcvnic.pdb"
-                    Source="..\bin\net\$(var.ARCH)\qlgcvnic.pdb" />
-              <File Id="netvnic.inf" Compressed="yes" DiskId="1"
-                    LongName="netvnic.inf" Name="NETVNIC.INF"
-                    Source="..\bin\net\$(var.ARCH)\netvnic.inf" />
-              <File Id="netvnic.cat" Compressed="yes" DiskId="1"
-                    LongName="netvnic.cat" Name="NETVNIC.cat"
-                    Source="..\bin\net\$(var.ARCH)\netvnic.cat" />
-            </Component>
-          </Directory>
-
-          <Component Id="cSRP_driver_installed"
-                     Guid="6945E66C-ADC0-4258-8858-AE7E7DF70495">
-          </Component>
-
-          <!-- RDMA SCSI over IB (aka SRP) -->
-          <Directory Id="srpDir" Name="SRP">
-            <Component Id="cSRP_files"
-                       Guid="BB58772F-061F-48B0-B6D5-0C0E38A301B2">
-              <File Id="ib_srp.inf" Compressed="yes" DiskId="1"
-                    LongName="ib_srp.inf" Name="IB_SRP.INF"
-                    Source="..\bin\storage\$(var.ARCH)\ib_srp.inf" />
-              <File Id="ibsrp.cat" Compressed="yes" DiskId="1"
-                    LongName="ibsrp.cat" Name="IBSRP.CAT"
-                    Source="..\bin\storage\$(var.ARCH)\ibsrp.cat" />
-              <File Id="ibsrp.sys" Compressed="yes" DiskId="1"
-                    LongName="ibsrp.sys" Name="IBSRP.SYS"
-                    Source="..\bin\storage\$(var.ARCH)\ibsrp.sys" />
-              <File Id="ibsrp.pdb" Compressed="yes" DiskId="1"
-                    Name="ibsrp.pdb"
-                    Source="..\bin\storage\$(var.ARCH)\ibsrp.pdb" />
-            </Component>
-          </Directory>
         </Directory>
       </Directory>
 
@@ -148,15 +105,7 @@
       </Directory>
     </Directory> <!-- End TARGETDIR -->
 
-<!--
-    <Property Id='ARPNOMODIFY'>1</Property>
-    <Property Id='ARPNOREPAIR'>1</Property>
--->
-    <Property Id='ARPCOMMENTS'>OpenFabrics Windows InfiniBand</Property>
-    <Property Id='ARPCONTACT'>Openfabrics Alliance [www.openfabrics.org]</Property>
-    <Property Id='ARPURLINFOABOUT'>https://wiki.openfabrics.org/tiki-index.php?page=OpenIB%20Windows</Property>
-    <Property Id='ARPHELPLINK'>https://wiki.openfabrics.org/tiki-index.php?page=Windows+FAQ</Property>
-    <Property Id='ARPURLUPDATEINFO'>http://www.openfabrics.org/downloads/WinOF/</Property>
+    <?include ..\..\common\arp.inc ?>
 
     <!--
        Features - Level=1 == Typical, no WSD on XP or SRP on 32-bit XP
diff --git a/trunk/WinOF/WIX/wnet/x86/wof.wxs b/trunk/WinOF/WIX/wnet/x86/wof.wxs
index b1f4604d..eb64183d 100644
--- a/trunk/WinOF/WIX/wnet/x86/wof.wxs
+++ b/trunk/WinOF/WIX/wnet/x86/wof.wxs
@@ -75,52 +75,9 @@
           </Component>
 
           <?include ..\..\common\dapl_rt.inc ?>
+          <?include ..\..\common\qlgc_vnic.inc ?>
+          <?include ..\..\common\srp.inc ?>
 
-          <Component Id="cQLVNIC_driver_installed"
-                     Guid="730C742E-73D9-4871-A523-6FB7963EA01E">
-          </Component>
-
-          <Directory Id="qlgcvnicDir" Name="qlgcvnic">
-            <Component Id="cQLVNIC_files"
-                       Guid="2AE69B67-C5FD-4CEE-9DF4-FB0A55619B4A">
-              <CreateFolder />
-              <File Id="qlgcvnic.sys" Compressed="yes" DiskId="1"
-                    LongName="qlgcvnic.sys" Name="QLGCVNIC.SYS"
-                    Source="..\bin\net\$(var.ARCH)\qlgcvnic.sys" />
-              <File Id="qlgcvnic.pdb" Compressed="yes" DiskId="1"
-                    Name="qlgcvnic.pdb"
-                    Source="..\bin\net\$(var.ARCH)\qlgcvnic.pdb" />
-              <File Id="netvnic.inf" Compressed="yes" DiskId="1"
-                    LongName="netvnic.inf" Name="NETVNIC.INF"
-                    Source="..\bin\net\$(var.ARCH)\netvnic.inf" />
-              <File Id="netvnic.cat" Compressed="yes" DiskId="1"
-                    LongName="netvnic.cat" Name="NETVNIC.cat"
-                    Source="..\bin\net\$(var.ARCH)\netvnic.cat" />
-            </Component>
-          </Directory>
-
-          <Component Id="cSRP_driver_installed"
-                     Guid="6945E66C-ADC0-4258-8858-AE7E7DF70495">
-          </Component>
-
-          <!-- RDMA SCSI over IB (aka SRP) -->
-          <Directory Id="srpDir" Name="SRP">
-            <Component Id="cSRP_files"
-                       Guid="BB58772F-061F-48B0-B6D5-0C0E38A301B2">
-              <File Id="ib_srp.inf" Compressed="yes" DiskId="1"
-                    LongName="ib_srp.inf" Name="IB_SRP.INF"
-                    Source="..\bin\storage\$(var.ARCH)\ib_srp.inf" />
-              <File Id="ibsrp.cat" Compressed="yes" DiskId="1"
-                    LongName="ibsrp.cat" Name="IBSRP.CAT"
-                    Source="..\bin\storage\$(var.ARCH)\ibsrp.cat" />
-              <File Id="ibsrp.sys" Compressed="yes" DiskId="1"
-                    LongName="ibsrp.sys" Name="IBSRP.SYS"
-                    Source="..\bin\storage\$(var.ARCH)\ibsrp.sys" />
-              <File Id="ibsrp.pdb" Compressed="yes" DiskId="1"
-                    Name="ibsrp.pdb"
-                    Source="..\bin\storage\$(var.ARCH)\ibsrp.pdb" />
-            </Component>
-          </Directory>
         </Directory>
       </Directory>
 
@@ -142,15 +99,7 @@
       </Directory>
     </Directory> <!-- End TARGETDIR -->
 
-<!--
-    <Property Id='ARPNOMODIFY'>1</Property>
-    <Property Id='ARPNOREPAIR'>1</Property>
--->
-    <Property Id='ARPCOMMENTS'>OpenFabrics Windows InfiniBand</Property>
-    <Property Id='ARPCONTACT'>Openfabrics Alliance [www.openfabrics.org]</Property>
-    <Property Id='ARPURLINFOABOUT'>https://wiki.openfabrics.org/tiki-index.php?page=OpenIB%20Windows</Property>
-    <Property Id='ARPHELPLINK'>https://wiki.openfabrics.org/tiki-index.php?page=Windows+FAQ</Property>
-    <Property Id='ARPURLUPDATEINFO'>http://www.openfabrics.org/downloads/WinOF/</Property>
+    <?include ..\..\common\arp.inc ?>
 
     <!--
        Features - Level=1 == Typical, no WSD on XP or SRP on 32-bit XP
diff --git a/trunk/WinOF/WIX/wxp/x86/wof.wxs b/trunk/WinOF/WIX/wxp/x86/wof.wxs
index c320dad9..2d6d2730 100644
--- a/trunk/WinOF/WIX/wxp/x86/wof.wxs
+++ b/trunk/WinOF/WIX/wxp/x86/wof.wxs
@@ -76,48 +76,10 @@
             </Component>
 
             <?include ..\..\common\dapl_rt.inc ?>
-
-            <Component Id="cQLVNIC_driver_installed"
-                       Guid="730C742E-73D9-4871-A523-6FB7963EA01E">
-            </Component>
-
-            <Directory Id="qlgcvnicDir" Name="qlgcvnic">
-              <Component Id="cQLVNIC_files"
-                         Guid="2AE69B67-C5FD-4CEE-9DF4-FB0A55619B4A">
-                  <CreateFolder />
-                  <File Id="qlgcvnic.sys" Compressed="yes" DiskId="1"
-                        LongName="qlgcvnic.sys" Name="QLGCVNIC.SYS"
-                        Source="..\bin\net\$(var.ARCH)\qlgcvnic.sys" />
-                  <File Id="qlgcvnic.pdb" Compressed="yes" DiskId="1"
-                        Name="qlgcvnic.pdb"
-                        Source="..\bin\net\$(var.ARCH)\qlgcvnic.pdb" />
-                  <File Id="netvnic.inf" Compressed="yes" DiskId="1"
-                        LongName="netvnic.inf" Name="NETVNIC.INF"
-                        Source="..\bin\net\$(var.ARCH)\netvnic.inf" />
-                  <File Id="netvnic.cat" Compressed="yes" DiskId="1"
-                        LongName="netvnic.cat" Name="NETVNIC.cat"
-                        Source="..\bin\net\$(var.ARCH)\netvnic.cat" />
-              </Component>
-            </Directory>
+            <?include ..\..\common\qlgc_vnic.inc ?>
 
 <!-- Skip SRP on XP/32
-            <Directory Id="srpDir" Name="SRP">
-              <Component Id="cSRP_driver"
-                         Guid="BB58772F-061F-48B0-B6D5-0C0E38A301B2">
-                  <File Id="ib_srp.inf" Compressed="yes" DiskId="1"
-                        LongName="ib_srp.inf" Name="IB_SRP.INF"
-                        Source="..\bin\storage\$(var.ARCH)\ib_srp.inf" />
-                  <File Id="ibsrp.cat" Compressed="yes" DiskId="1"
-                        LongName="ibsrp.cat" Name="IBSRP.CAT"
-                        Source="..\bin\storage\$(var.ARCH)\ibsrp.cat" />
-                  <File Id="ibsrp.sys" Compressed="yes" DiskId="1"
-                        LongName="ibsrp.sys" Name="IBSRP.SYS"
-                        Source="..\bin\storage\$(var.ARCH)\ibsrp.sys" />
-                  <File Id="ibsrp.pdb" Compressed="yes" DiskId="1"
-                        Name="ibsrp.pdb"
-                        Source="..\bin\storage\$(var.ARCH)\ibsrp.pdb" />
-              </Component>
-            </Directory>
+            <?include ..\..\common\srp.inc ?>
 -->
         </Directory>
       </Directory>
@@ -140,15 +102,7 @@
       </Directory>
     </Directory> <!-- End TARGETDIR -->
 
-<!--
-    <Property Id='ARPNOMODIFY'>1</Property>
-    <Property Id='ARPNOREPAIR'>1</Property>
--->
-    <Property Id='ARPCOMMENTS'>OpenFabrics Windows InfiniBand</Property>
-    <Property Id='ARPCONTACT'>Openfabrics Alliance [www.openfabrics.org]</Property>
-    <Property Id='ARPURLINFOABOUT'>https://wiki.openfabrics.org/tiki-index.php?page=OpenIB%20Windows</Property>
-    <Property Id='ARPHELPLINK'>https://wiki.openfabrics.org/tiki-index.php?page=Windows+FAQ</Property>
-    <Property Id='ARPURLUPDATEINFO'>http://www.openfabrics.org/downloads/WinOF/</Property>
+    <?include ..\..\common\arp.inc ?>
 
     <!--
        Features - Level=1 == Typical, no WSD on XP or SRP on 32-bit XP
-- 
2.46.0