[WinOF] Using the WIX preprocessor OS*\arch*\wof.wxs files (all 10 of them) have...
authorstansmith <stansmith@ad392aa1-c5ef-ae45-8dd8-e69d62a5ef86>
Mon, 30 Mar 2009 22:49:25 +0000 (22:49 +0000)
committerstansmith <stansmith@ad392aa1-c5ef-ae45-8dd8-e69d62a5ef86>
Mon, 30 Mar 2009 22:49:25 +0000 (22:49 +0000)
git-svn-id: svn://openib.tc.cornell.edu/gen1/trunk@2067 ad392aa1-c5ef-ae45-8dd8-e69d62a5ef86

25 files changed:
WinOF/WIX/common/DAT_config.inc [new file with mode: 0644]
WinOF/WIX/common/Docs.inc [new file with mode: 0644]
WinOF/WIX/common/IBcore.inc [new file with mode: 0644]
WinOF/WIX/common/InstallExecuteSeq.inc [new file with mode: 0644]
WinOF/WIX/common/OpenSM_service.inc [new file with mode: 0644]
WinOF/WIX/common/WinOF_cfg.inc [new file with mode: 0644]
WinOF/WIX/common/checked.inc [new file with mode: 0644]
WinOF/WIX/common/dapl_rt.inc [new file with mode: 0644]
WinOF/WIX/common/ib_sdk.inc [new file with mode: 0644]
WinOF/WIX/common/ipoib.inc [new file with mode: 0644]
WinOF/WIX/common/mlnx_drivers.inc [new file with mode: 0644]
WinOF/WIX/common/requirements.inc [new file with mode: 0644]
WinOF/WIX/common/tools.inc [new file with mode: 0644]
WinOF/WIX/common/winverbs_OFED.inc [new file with mode: 0644]
WinOF/WIX/common/winverbs_drivers.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

diff --git a/WinOF/WIX/common/DAT_config.inc b/WinOF/WIX/common/DAT_config.inc
new file mode 100644 (file)
index 0000000..a80eeff
--- /dev/null
@@ -0,0 +1,149 @@
+<Include>\r
+    <Component Id="cDatCfg"\r
+               Guid="54A4F997-AC33-45D8-9899-6332E40B62A8" >\r
+      <CreateFolder />\r
+      <File Id="_dat.conf" Compressed="yes" DiskId="1" KeyPath="yes"\r
+             LongName="dat.conf" Name="dat.conf"\r
+             Source="..\..\dat.conf" />\r
+    </Component>\r
+\r
+    <Directory Id="v1_1" Name="v1-1">\r
+      <Component Id="cDATV1"\r
+                 Guid="D8EB75CB-8DE0-41B1-904B-CED87C893049">\r
+        <CreateFolder />\r
+      </Component>\r
+\r
+      <Directory Id="DDID" Name="DAT">    \r
+        <Component Id="cDatBldV1Hdrs"\r
+                  Guid="AA6BB350-5146-452F-B5F0-80BB9E3B0F55">    \r
+          <CreateFolder />    \r
+          <File Id="dat.h" Compressed="yes" DiskId="1"    \r
+                LongName="dat.h" Name="dat.h"    \r
+                Source="..\bin\DAPL\dat.h" />    \r
+\r
+          <File Id="dat_error.h" Compressed="yes" DiskId="1"    \r
+                LongName="dat_error.h" Name="dat.h"    \r
+                Source="..\bin\DAPL\dat_error.h" />    \r
+  \r
+          <File Id="dat_platform_specific.h" Compressed="yes"    \r
+                DiskId="1" LongName="dat_platform_specific.h"    \r
+                Name="dat_plat.h"    \r
+               Source="..\bin\DAPL\dat_platform_specific.h" />    \r
+  \r
+          <File Id="dat_redirection.h" Compressed="yes"    \r
+                DiskId="1" LongName="dat_redirection.h"    \r
+                Name="dat_redi.h"    \r
+                Source="..\bin\DAPL\dat_redirection.h" />    \r
+  \r
+          <File Id="dat_registry.h" Compressed="yes"    \r
+                DiskId="1" LongName="dat_registry.h"    \r
+                Name="dat_reg.h"    \r
+                Source="..\bin\DAPL\dat_registry.h" />    \r
+  \r
+          <File Id="dat_vendor_specific.h" Compressed="yes"    \r
+                DiskId="1" LongName="dat_vendor_specific.h"    \r
+                Name="dat_vend.h"    \r
+                Source="..\bin\DAPL\dat_vendor_specific.h" />    \r
+  \r
+          <File Id="udat.h" Compressed="yes" DiskId="1"    \r
+                LongName="udat.h" Name="udat.h"    \r
+                Source="..\bin\DAPL\udat.h" />    \r
+  \r
+          <File Id="udat_config.h" Compressed="yes" DiskId="1"    \r
+                LongName="udat_config.h" Name="udat_cfg.h"    \r
+                Source="..\bin\DAPL\udat_config.h" />    \r
+  \r
+          <File Id="udat_redirection.h" Compressed="yes"    \r
+                DiskId="1" LongName="udat_redirection.h"    \r
+                Name="udat_red.h"    \r
+                Source="..\bin\DAPL\udat_redirection.h" />    \r
+  \r
+          <File Id="udat_vendor_specific.h" Compressed="yes"    \r
+                DiskId="1" LongName="udat_vendor_specific.h"    \r
+                Name="udat_ven.h"    \r
+                Source="..\bin\DAPL\udat_vendor_specific.h" />    \r
+        </Component>\r
+      </Directory>\r
+\r
+      <Component Id="cDatBldV1Libs"\r
+                  Guid="1BB9291E-79F5-4EC5-9400-4175BA1E5A91">    \r
+\r
+          <File Id="_dat.lib" Compressed="yes" DiskId="1"\r
+                LongName="dat.lib" Name="dat.lib"\r
+                Source="..\bin\DAPL\$(var.ARCH)\dat.lib" />\r
+          <File Id="_datd.lib" Compressed="yes" DiskId="1"\r
+                LongName="datd.lib" Name="datd.lib"\r
+                Source="..\bin\DAPL\$(var.ARCH)\datd.lib" />\r
+      </Component>\r
+    </Directory>\r
+\r
+    <Directory Id="v2_0" Name="v2-0">\r
+      <Component Id="cDATV2" Guid="A3CD6CA7-309B-48D2-B375-C9A91B37A876"\r
+                 KeyPath="yes" SharedDllRefCount="yes">\r
+        <CreateFolder />\r
+      </Component>\r
+\r
+      <Directory Id="DDID2" Name="DAT">    \r
+        <Component Id="cDatBldV2Hdrs"\r
+                  Guid="4D688030-53AC-4351-8999-E3AFEB38A92C" >    \r
+          <CreateFolder />    \r
+          <File Id="_dat.h" Compressed="yes" DiskId="1"    \r
+                LongName="dat.h" Name="dat.h"    \r
+                Source="..\bin\DAPL2\dat.h" />    \r
+\r
+          <File Id="_dat_error.h" Compressed="yes" DiskId="1"    \r
+                LongName="dat_error.h" Name="dat.h"    \r
+                Source="..\bin\DAPL2\dat_error.h" />    \r
+  \r
+          <File Id="_dat_platform_specific.h" Compressed="yes"    \r
+                DiskId="1" LongName="dat_platform_specific.h"    \r
+                Name="dat_plat.h"    \r
+               Source="..\bin\DAPL2\dat_platform_specific.h" />    \r
+  \r
+          <File Id="_dat_redirection.h" Compressed="yes"    \r
+                DiskId="1" LongName="dat_redirection.h"    \r
+                Name="dat_redi.h"    \r
+                Source="..\bin\DAPL2\dat_redirection.h" />    \r
+  \r
+          <File Id="_dat_registry.h" Compressed="yes"    \r
+                DiskId="1" LongName="dat_registry.h"    \r
+                Name="dat_reg.h"    \r
+                Source="..\bin\DAPL2\dat_registry.h" />    \r
+  \r
+          <File Id="_dat_vendor_specific.h" Compressed="yes"    \r
+                DiskId="1" LongName="dat_vendor_specific.h"    \r
+                Name="dat_vend.h"    \r
+                Source="..\bin\DAPL2\dat_vendor_specific.h" />    \r
+  \r
+          <File Id="_udat.h" Compressed="yes" DiskId="1"    \r
+                LongName="udat.h" Name="udat.h"    \r
+                Source="..\bin\DAPL2\udat.h" />    \r
+  \r
+          <File Id="_udat_config.h" Compressed="yes" DiskId="1"    \r
+                LongName="udat_config.h" Name="udat_cfg.h"    \r
+                Source="..\bin\DAPL2\udat_config.h" />    \r
+  \r
+          <File Id="_udat_redirection.h" Compressed="yes"    \r
+                DiskId="1" LongName="udat_redirection.h"    \r
+                Name="udat_red.h"    \r
+                Source="..\bin\DAPL2\udat_redirection.h" />    \r
+  \r
+          <File Id="_udat_vendor_specific.h" Compressed="yes"    \r
+                DiskId="1" LongName="udat_vendor_specific.h"    \r
+                Name="udat_ven.h"    \r
+                Source="..\bin\DAPL2\udat_vendor_specific.h" />    \r
+        </Component>\r
+      </Directory>\r
+\r
+      <Component Id="cDatBldV2Libs"\r
+                  Guid="4DCE2855-1F42-4A7D-957A-44A47715C051" >    \r
+\r
+          <File Id="_dat2.lib" Compressed="yes" DiskId="1"\r
+                LongName="dat2.lib" Name="dat2.lib"\r
+                Source="..\bin\DAPL2\$(var.ARCH)\dat2.lib" />\r
+          <File Id="_dat2d.lib" Compressed="yes" DiskId="1"\r
+                LongName="dat2d.lib" Name="dat2d.lib"\r
+                Source="..\bin\DAPL2\$(var.ARCH)\dat2d.lib" />\r
+      </Component>\r
+    </Directory>\r
+</Include>\r
diff --git a/WinOF/WIX/common/Docs.inc b/WinOF/WIX/common/Docs.inc
new file mode 100644 (file)
index 0000000..b741ee6
--- /dev/null
@@ -0,0 +1,57 @@
+<Include>\r
+    <Component Id="Docs"\r
+               Guid="931C58EF-3759-4cf4-89CC-276C017305BB">\r
+\r
+      <File Id="OFAlogo" Compressed="yes" DiskId="1"\r
+              LongName="openfabrics.gif" Name="ofa.gif"\r
+              Source="..\..\openfabrics.gif" />\r
+\r
+      <!-- implies WIX build only from an svn structured tree.  -->\r
+      <File Id="manual.htm" Compressed="yes" DiskId="1"\r
+              Name="Manual.htm" LongName="Manual.htm"\r
+              Source="..\bin\Misc\Manual.htm" Vital="yes" />\r
+\r
+      <Shortcut Id="Manual.htm" Directory="ProgramMenuDir"\r
+              Name="Manual.htm" LongName="Manual"\r
+              Target="[INSTALLDIR]\Manual.htm" Show="normal"\r
+              WorkingDirectory="INSTALLDIR" Icon="openfabrics"\r
+              IconIndex="0" />\r
+\r
+      <File Id="dRelnotes" Compressed="yes" DiskId="1"\r
+              LongName="Release_notes.htm" Name="RELEASE_.HTM"\r
+              Source="..\..\Release_notes.htm" />\r
+\r
+      <Shortcut Id="RelNotes" Directory="ProgramMenuDir"\r
+              Name="RelNotes" LongName="Release Notes"\r
+              Target="[INSTALLDIR]\Release_notes.htm" Show="normal"\r
+              WorkingDirectory="INSTALLDIR" Icon="openfabrics"\r
+              IconIndex="0" />\r
+\r
+      <File Id="command_window" Name="COMMAND.LNK"\r
+              LongName="Command Window.lnk" Compressed="yes" DiskId="1"\r
+              Source="..\..\$(var.ARCHP)\Command Window.lnk" Vital="yes" />\r
+\r
+      <Shortcut Id="Command_Window.lnk" Directory="ProgramMenuDir"\r
+              Name="COMMAND.LNK" LongName="Command Window.lnk"\r
+              Target="[INSTALLDIR]\Command Window.lnk" Icon="openfabrics"\r
+              IconIndex="0" Show="normal" WorkingDirectory="INSTALLDIR" />\r
+\r
+<?if $(var.ARCHP) = "x64" Or $(var.ARCHP) = "ia64" ?>\r
+      <Shortcut Id="UninstallProduct" Name="UnMyApp"\r
+          Directory="ProgramMenuDir"\r
+          LongName="Uninstall WinOF"\r
+                 Target="[System64Folder]msiexec.exe"\r
+          Arguments="/X [ProductCode]"\r
+          Description="Uninstalls Windows OpenFabrics InfiniBand" />\r
+<?else?>\r
+      <Shortcut Id="UninstallProduct" Name="UnMyApp"\r
+          Directory="ProgramMenuDir"\r
+          LongName="Uninstall WinOF"\r
+                 Target="[SystemFolder]msiexec.exe"\r
+          Arguments="/X [ProductCode]"\r
+          Description="Uninstalls Windows OpenFabrics InfiniBand" />\r
+<?endif?>\r
+\r
+      <RemoveFolder Id="RemoveShorcutFolder" On="uninstall" />\r
+    </Component>\r
+</Include>\r
diff --git a/WinOF/WIX/common/IBcore.inc b/WinOF/WIX/common/IBcore.inc
new file mode 100644 (file)
index 0000000..fefd9a6
--- /dev/null
@@ -0,0 +1,89 @@
+<Include>\r
+    <Component Id="cIBcore"\r
+               Guid="4B4EA649-65ED-4B0D-8717-D60481412211">\r
+      <CreateFolder />\r
+      <File Id="dpinst.exe" Compressed="yes" DiskId="1"\r
+             LongName="dpinst.exe" Name="dpinst.exe"\r
+             Source="..\..\$(var.ARCHP)\dpinst.exe" />\r
+      <File Id="dpinst.xml" Compressed="yes" DiskId="1"\r
+             LongName="dpinst.xml" Name="dpinst.xml"\r
+             Source="..\..\dpinst.xml" />\r
+      <File Id="devman.exe" Compressed="yes" DiskId="1"\r
+             LongName="devman.exe" Name="devman.exe"\r
+             Source="..\..\$(var.ARCHP)\devman.exe" />\r
+      <File Id="wdfcoinstaller" Compressed="yes" DiskId="1"\r
+             LongName="WdfCoInstaller$(var.WDFVER).dll" Name="WCO.dll"\r
+             Source="..\bin\hca\$(var.ARCH)\WdfCoInstaller$(var.WDFVER).dll" />\r
+      <File Id="complib.dll" Compressed="yes" DiskId="1"\r
+             LongName="complib.dll" Name="COMPLIB.DLL"\r
+             Source="..\bin\HCA\$(var.ARCH)\complib.dll" />\r
+      <File Id="complibd.dll" Compressed="yes" DiskId="1"\r
+             LongName="complibd.dll" Name="COMPLIB1.DLL"\r
+             Source="..\bin\HCA\$(var.ARCH)\complibd.dll" />\r
+      <File Id="ibal.dll" Compressed="yes" DiskId="1"\r
+             LongName="ibal.dll" Name="IBAL.DLL"\r
+             Source="..\bin\HCA\$(var.ARCH)\ibal.dll" />\r
+      <File Id="ibald.dll" Compressed="yes" DiskId="1"\r
+             LongName="ibald.dll" Name="IBALD.DLL"\r
+             Source="..\bin\HCA\$(var.ARCH)\ibald.dll" />\r
+      <File Id="ibbus.sys" Compressed="yes" DiskId="1"\r
+             LongName="ibbus.sys" Name="IBBUS.SYS"\r
+             Source="..\bin\HCA\$(var.ARCH)\ibbus.sys" />\r
+      <File Id="ibbus.pdb" Name="ibbus.pdb" DiskId="1" Compressed="yes"\r
+             Source="..\bin\HCA\$(var.ARCH)\ibbus.pdb" />\r
+\r
+      <File Id="ibiou.sys" Compressed="yes" DiskId="1"\r
+             LongName="ibiou.sys" Name="IBIOU.SYS"\r
+             Source="..\bin\HCA\$(var.ARCH)\ibiou.sys" />\r
+      <File Id="ibiou.pdb" Compressed="yes" DiskId="1"\r
+             Name="ibiou.pdb"\r
+             Source="..\bin\HCA\$(var.ARCH)\ibiou.pdb" />\r
+      <File Id="ib_iou.cat" Compressed="yes" DiskId="1"\r
+             LongName="ib_iou.cat" Name="IB_IOU.cat"\r
+             Source="..\bin\HCA\$(var.ARCH)\ib_iou.cat" />\r
+      <File Id="ib_iou.inf" Compressed="yes" DiskId="1"\r
+             LongName="ib_iou.inf" Name="IB_IOU.inf"\r
+             Source="..\bin\HCA\$(var.ARCH)\ib_iou.inf" />\r
+\r
+      <?if $(var.ARCHP) = "x64" Or $(var.ARCHP) = "ia64" ?>\r
+          <File Id="cl32.dll" Compressed="yes" DiskId="1"\r
+                 LongName="cl32.dll" Name="CL32.DLL"\r
+                 Source="..\bin\HCA\$(var.ARCH)\cl32.dll" />\r
+          <File Id="cl32d.dll" Compressed="yes" DiskId="1"\r
+                 LongName="cl32d.dll" Name="CL32D.DLL"\r
+                 Source="..\bin\HCA\$(var.ARCH)\cl32d.dll" />\r
+          <File Id="ibal32.dll" Compressed="yes" DiskId="1"\r
+                 LongName="ibal32.dll" Name="IBAL32.DLL"\r
+                 Source="..\bin\HCA\$(var.ARCH)\ibal32.dll" />\r
+          <File Id="ibal32d.dll" Compressed="yes" DiskId="1"\r
+                 LongName="ibal32d.dll" Name="IBAL32D.DLL"\r
+                 Source="..\bin\HCA\$(var.ARCH)\ibal32d.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
+             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
+             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
+             Name="complib.dll" LongName='complib.dll' />\r
+      <RemoveFile Id='o32_complibd.dll' On='uninstall'\r
+             Property="System64Folder"\r
+             Name="complibd.dll" LongName='complibd.dll' />\r
+    </Component>\r
+</Include>\r
diff --git a/WinOF/WIX/common/InstallExecuteSeq.inc b/WinOF/WIX/common/InstallExecuteSeq.inc
new file mode 100644 (file)
index 0000000..5e32503
--- /dev/null
@@ -0,0 +1,69 @@
+<Include>\r
+\r
+    <!--> File where Custom Actions are defined -->\r
+    <Binary Id="CA" src="..\..\CustomActions.vbs" />\r
+\r
+    <CustomAction Id="WinOF_setup" BinaryKey="CA"\r
+         VBScriptCall="WinOF_setup" Return="check" />\r
+\r
+    <CustomAction Id="ChkPreviousInstall" BinaryKey="CA"\r
+         VBScriptCall="ChkInstallAndReboot" Return="check" />\r
+\r
+    <CustomAction Id="DriverInstall" BinaryKey="CA"\r
+         VBScriptCall="DriverInstall" Return="check" Execute="deferred" />\r
+\r
+    <CustomAction Id="DriverUninstall" BinaryKey="CA"\r
+         VBScriptCall="DriverUninstall" Return="check" />\r
+\r
+    <CustomAction Id="WSDStart" BinaryKey="CA"\r
+         VBScriptCall="WSDEnable" Return="check" />\r
+\r
+    <CustomAction Id="ND_start" BinaryKey="CA"\r
+         VBScriptCall="ND_StartMeUp" Return="check" />\r
+\r
+    <CustomAction Id="HammerTime" BinaryKey="CA"\r
+         VBScriptCall="HammerTime" Return="check" />\r
+\r
+    <CustomAction Id="BcastRegChanged" BinaryKey="CA"\r
+         VBScriptCall="BcastRegChanged" Return="check" />\r
+\r
+    <CustomAction Id="InstallChanged" BinaryKey="CA"\r
+         VBScriptCall="InstallChanged" Return="check" />\r
+\r
+\r
+    <InstallExecuteSequence>\r
+       <!-- Always executed (Install or uninstall) -->\r
+       <Custom Action="WinOF_setup" After="InstallInitialize" />\r
+\r
+       <!--> Install ONLY </!-->\r
+       <Custom Action="ChkPreviousInstall" After='WinOF_setup'>\r
+               NOT Installed</Custom>\r
+\r
+       <ScheduleReboot After='ChkPreviousInstall'>\r
+               REBOOT="FORCE"</ScheduleReboot>\r
+\r
+       <Custom Action="DriverInstall" After='InstallServices'>\r
+               Not Installed AND Not NODRV </Custom>\r
+\r
+       <Custom Action="WSDStart" After="InstallFinalize">\r
+               Not Installed AND Not NODRV </Custom>\r
+\r
+       <Custom Action="ND_start" After="WSDStart">\r
+          ($cNetworkDirect = 3) AND Not Installed AND Not NODRV </Custom>\r
+\r
+       <Custom Action="BcastRegChanged" After="ND_start">\r
+               Not Installed</Custom>\r
+\r
+       <!--> CHANGE ONLY </!-->\r
+       <Custom Action="InstallChanged" After="InstallFinalize">\r
+           Installed </Custom>\r
+\r
+       <!--> REMOVE ONLY </!-->\r
+       <Custom Action="DriverUninstall" After="PublishProduct">\r
+               REMOVE="ALL" </Custom>\r
+\r
+       <Custom Action="HammerTime" After="InstallFinalize">REMOVE="ALL"</Custom>\r
+\r
+    </InstallExecuteSequence>\r
+\r
+</Include>\r
diff --git a/WinOF/WIX/common/OpenSM_service.inc b/WinOF/WIX/common/OpenSM_service.inc
new file mode 100644 (file)
index 0000000..d7087ef
--- /dev/null
@@ -0,0 +1,33 @@
+<Include>\r
+    <Component Id='OpenSMservice'\r
+               Guid='90042B4F-51B5-4720-8E54-6D366253634B'\r
+               SharedDllRefCount='no' KeyPath='no'\r
+               NeverOverwrite='no'\r
+               Permanent='no' Transitive='no' Win64='no'\r
+               Location='either'>\r
+\r
+        <File Id="opensm.exe" Compressed="yes" DiskId="1"\r
+              LongName="opensm.exe" Name="OPENSM.EXE"\r
+              Source="..\bin\tools\$(var.ARCH)\release\opensm.exe"\r
+              Vital='yes' KeyPath='yes' Hidden='no' System='no' \r
+              Checksum='no' ReadOnly='no' />\r
+\r
+        <ServiceInstall Id='osmSvcInstall' Vital='yes' Name='OpenSM'\r
+            Description='InfiniBand Subnet Configuration and Management'\r
+            DisplayName='InfiniBand Subnet Manager'\r
+            Arguments='-e --service'\r
+            ErrorControl='normal'\r
+            Start='disabled'\r
+            Interactive='no'\r
+            Type='ownProcess' />\r
+\r
+        <ServiceControl Id='osmSvcControl' Name='OpenSM'\r
+                        Stop='uninstall'\r
+                        Wait='no'\r
+                        Remove='uninstall' />\r
+    </Component>\r
+\r
+    <Component Id="OpenSM_Service_enabled"\r
+               Guid="3A148CF8-129D-4AE0-A769-5FC0E0828B5E">\r
+    </Component>\r
+</Include>\r
diff --git a/WinOF/WIX/common/WinOF_cfg.inc b/WinOF/WIX/common/WinOF_cfg.inc
new file mode 100644 (file)
index 0000000..eff7df1
--- /dev/null
@@ -0,0 +1,11 @@
+\r
+<Include>\r
+\r
+       <?define WOFREL="v2.1 (RC0)" ?>\r
+\r
+       <?define WOFRELNUM=2.1.0 ?>\r
+\r
+       <?define WDFVER=01007 ?>\r
+\r
+</Include>\r
+\r
diff --git a/WinOF/WIX/common/checked.inc b/WinOF/WIX/common/checked.inc
new file mode 100644 (file)
index 0000000..50309bf
--- /dev/null
@@ -0,0 +1,176 @@
+<Include>\r
+    <Directory Id="dir_0" Name="Checked">\r
+      <Directory Id="dir_1" Name="kernel">\r
+\r
+        <Component Id="cCHK_kernel"\r
+                   Guid="D96F299E-EEAA-44a5-BBC4-A862A158BA6B">\r
+          <CreateFolder />\r
+\r
+          <File Id="chk0" DiskId="1" Compressed="yes"\r
+                Name="README.txt"\r
+                Source="..\..\README_checked.txt" />\r
+          <File Id="chk1" DiskId="1" Compressed="yes"\r
+                Name="mthca.sys"\r
+                Source="..\bin\Chk\HCA\$(var.ARCH)\mthca.sys" />\r
+          <File Id="cat1" DiskId="1" Compressed="yes"\r
+                Name="mthca.cat"\r
+                Source="..\bin\Chk\HCA\$(var.ARCH)\mthca.cat" />\r
+          <File Id="sym1" DiskId="1" Compressed="yes"\r
+                Name="mthca.pdb"\r
+                Source="..\bin\Chk\HCA\$(var.ARCH)\mthca.pdb" />\r
+\r
+          <File Id="chk2" DiskId="1" Compressed="yes"\r
+                Name="ibbus.sys"\r
+                Source="..\bin\Chk\HCA\$(var.ARCH)\ibbus.sys" />\r
+          <File Id="sym2" DiskId="1" Compressed="yes"\r
+                Name="ibbus.pdb"\r
+                Source="..\bin\Chk\HCA\$(var.ARCH)\ibbus.pdb" />\r
+\r
+          <File Id="chk3" DiskId="1" Compressed="yes"\r
+                Name="ibiou.sys"\r
+                Source="..\bin\Chk\HCA\$(var.ARCH)\ibiou.sys" />\r
+          <File Id="cat3" DiskId="1" Compressed="yes"\r
+                Name="ib_iou.cat"\r
+                Source="..\bin\Chk\HCA\$(var.ARCH)\ib_iou.cat" />\r
+          <File Id="sym3" DiskId="1" Compressed="yes"\r
+                Name="ibiou.pdb"\r
+                Source="..\bin\Chk\HCA\$(var.ARCH)\ibiou.pdb" />\r
+\r
+          <File Id="chk4" DiskId="1" Compressed="yes"\r
+                Name="ipoib.sys"\r
+                Source="..\bin\Chk\net\$(var.ARCH)\ipoib.sys" />\r
+          <File Id="cat4" DiskId="1" Compressed="yes"\r
+                Name="ipoib.cat"\r
+                Source="..\bin\Chk\net\$(var.ARCH)\ipoib.cat" />\r
+          <File Id="sym4" DiskId="1" Compressed="yes"\r
+                Name="ipoib.pdb"\r
+                Source="..\bin\Chk\net\$(var.ARCH)\ipoib.pdb" />\r
+\r
+          <File Id="chk5" DiskId="1" Compressed="yes"\r
+                Name="qlgcvnic.sys"\r
+                Source="..\bin\Chk\net\$(var.ARCH)\qlgcvnic.sys" />\r
+          <File Id="cat5" DiskId="1" Compressed="yes"\r
+                Name="netvnic.cat"\r
+                Source="..\bin\Chk\net\$(var.ARCH)\netvnic.cat" />\r
+          <File Id="sym5" DiskId="1" Compressed="yes"\r
+                Name="qlgcvnic.pdb"\r
+                Source="..\bin\Chk\net\$(var.ARCH)\qlgcvnic.pdb" />\r
+\r
+          <File Id="chk6" DiskId="1" Compressed="yes"\r
+                Name="ibsrp.sys"\r
+                Source="..\bin\Chk\storage\$(var.ARCH)\ibsrp.sys" />\r
+          <File Id="cat6" DiskId="1" Compressed="yes"\r
+                Name="ibsrp.cat"\r
+                Source="..\bin\Chk\storage\$(var.ARCH)\ibsrp.cat" />\r
+          <File Id="sym6" DiskId="1" Compressed="yes"\r
+                Name="ibsrp.pdb"\r
+                Source="..\bin\Chk\storage\$(var.ARCH)\ibsrp.pdb" />\r
+          <File Id="chk7" DiskId="1" Compressed="yes"\r
+                Name="mlx4_bus.sys"\r
+                Source="..\bin\Chk\HCA\$(var.ARCH)\mlx4_bus.sys" />\r
+          <File Id="cat7" DiskId="1" Compressed="yes"\r
+                Name="mlx4_bus.cat"\r
+                Source="..\bin\Chk\HCA\$(var.ARCH)\mlx4_bus.cat" />\r
+          <File Id="sym7" DiskId="1" Compressed="yes"\r
+                Name="mlx4_bus.pdb"\r
+                Source="..\bin\Chk\HCA\$(var.ARCH)\mlx4_bus.pdb" />\r
+\r
+          <File Id="chk8" DiskId="1" Compressed="yes"\r
+                Name="mlx4_hca.sys"\r
+                Source="..\bin\Chk\HCA\$(var.ARCH)\mlx4_hca.sys" />\r
+          <File Id="cat8" DiskId="1" Compressed="yes"\r
+                Name="mlx4_hca.cat"\r
+                Source="..\bin\Chk\HCA\$(var.ARCH)\mlx4_hca.cat" />\r
+          <File Id="sym8" DiskId="1" Compressed="yes"\r
+                Name="mlx4_hca.pdb"\r
+                Source="..\bin\Chk\HCA\$(var.ARCH)\mlx4_hca.pdb" />\r
+          <File Id="chk9" DiskId="1" Compressed="yes"\r
+                Name="winverbs.sys"\r
+                Source="..\bin\Chk\HCA\$(var.ARCH)\winverbs.sys" />\r
+          <File Id="sym9" DiskId="1" Compressed="yes"\r
+                Name="winverbs.pdb"\r
+                Source="..\bin\Chk\HCA\$(var.ARCH)\winverbs.pdb" />\r
+          <File Id="dll9" DiskId="1" Compressed="yes"\r
+                Name="winverbs.dll"\r
+                Source="..\bin\Chk\HCA\$(var.ARCH)\winverbs.dll" />\r
+          <File Id="dlld9" DiskId="1" Compressed="yes"\r
+                Name="winverbd.dll"\r
+                LongName="winverbsd.dll"\r
+                Source="..\bin\Chk\HCA\$(var.ARCH)\winverbsd.dll" />\r
+        </Component>\r
+      </Directory>\r
+\r
+      <Directory Id="dir_14" Name="user">\r
+        <Component Id="cCHK_user"\r
+                   Guid="A4AC788B-6517-47b2-A898-0493ADC794D5">\r
+          <CreateFolder />\r
+          <File Id="file83" Name="DAPL2-_1.DLL"\r
+            LongName="dapl2-scmd.dll"\r
+            DiskId="1" Compressed="yes"\r
+            Source="..\bin\DAPL2\$(var.ARCH)\dapl2-scmd.dll" />\r
+          <File Id="file84" Name="dapl2d.dll"\r
+            DiskId="1" Compressed="yes"\r
+            Source="..\bin\DAPL2\$(var.ARCH)\dapl2d.dll" />\r
+          <File Id="file85" Name="DAPL2T_1.EXE"\r
+            LongName="dapl2testd.exe"\r
+            DiskId="1" Compressed="yes"\r
+            Source="..\bin\tools\$(var.ARCH)\debug\dapl2testd.exe" />\r
+          <File Id="file86" Name="dapld.dll"\r
+            DiskId="1" Compressed="yes"\r
+            Source="..\bin\DAPL\$(var.ARCH)\dapld.dll" />\r
+          <File Id="file87" Name="DAPLTE_1.EXE"\r
+            LongName="dapltestd.exe"\r
+            DiskId="1" Compressed="yes"\r
+            Source="..\bin\tools\$(var.ARCH)\debug\dapltestd.exe" />\r
+          <File Id="file88" Name="dat2d.dll"\r
+            DiskId="1" Compressed="yes"\r
+            Source="..\bin\DAPL2\$(var.ARCH)\dat2d.dll" />\r
+          <File Id="file89" Name="datd.dll"\r
+            DiskId="1" Compressed="yes"\r
+            Source="..\bin\DAPL\$(var.ARCH)\datd.dll" />\r
+          <File Id="file90" Name="dtest2d.exe"\r
+            DiskId="1" Compressed="yes"\r
+            Source="..\bin\tools\$(var.ARCH)\debug\dtest2d.exe" />\r
+          <File Id="file91" Name="dtestxd.exe"\r
+            DiskId="1" Compressed="yes"\r
+            Source="..\bin\tools\$(var.ARCH)\debug\dtestxd.exe" />\r
+          <File Id="file45" Name="complibd.dll"\r
+            DiskId="1" Compressed="yes"\r
+            Source="..\bin\Chk\HCA\$(var.ARCH)\complibd.dll" />\r
+          <File Id="file94" Name="ibald.dll"\r
+            DiskId="1" Compressed="yes"\r
+            Source="..\bin\Chk\HCA\$(var.ARCH)\ibald.dll" />\r
+\r
+          <?if $(var.OS) != "XP" ?>\r
+            <File Id="file97" Name="ibwsd.dll"\r
+              DiskId="1" Compressed="yes"\r
+              Source="..\bin\Chk\net\$(var.ARCH)\ibwsd.dll" />\r
+            <File Id="file105" Name="INSTAL_1.EXE"\r
+              LongName="installsp.exe"\r
+              DiskId="1" Compressed="yes"\r
+              Source="..\bin\Chk\net\$(var.ARCH)\installsp.exe" />\r
+          <?endif?>\r
+\r
+          <File Id="file69" Name="mlx4ud.dll"\r
+            DiskId="1" Compressed="yes"\r
+            Source="..\bin\Chk\HCA\$(var.ARCH)\mlx4ud.dll" />\r
+          <File Id="file108" Name="mthcaud.dll"\r
+            DiskId="1" Compressed="yes"\r
+            Source="..\bin\Chk\HCA\$(var.ARCH)\mthcaud.dll" />\r
+          <File Id="file110" Name="opensm.exe"\r
+            DiskId="1" Compressed="yes"\r
+            Source="..\bin\tools\$(var.ARCH)\debug\opensm.exe" />\r
+          <File Id="file115" Name="vstat.exe"\r
+            DiskId="1" Compressed="yes"\r
+            Source="..\bin\tools\$(var.ARCH)\debug\vstat.exe" />\r
+          <File Id="file116" Name="part_man.exe"\r
+            DiskId="1" Compressed="yes"\r
+            Source="..\bin\tools\$(var.ARCH)\debug\part_man.exe" />\r
+          <File Id="file117" Name="vnic_cfg.exe"\r
+            LongName="qlgcvnic_config.exe"\r
+            DiskId="1" Compressed="yes"\r
+            Source="..\bin\tools\$(var.ARCH)\debug\qlgcvnic_config.exe" />\r
+        </Component>\r
+      </Directory>\r
+    </Directory>\r
+</Include>\r
diff --git a/WinOF/WIX/common/dapl_rt.inc b/WinOF/WIX/common/dapl_rt.inc
new file mode 100644 (file)
index 0000000..e8e63d9
--- /dev/null
@@ -0,0 +1,157 @@
+<Include>\r
+      <Component Id="cDAPL1RT"\r
+                 Guid="A49F1ECC-14E4-4310-9F37-BEB7B00243A9">\r
+\r
+        <?if $(var.ARCHP) = "ia64" Or $(var.ARCHP) = "x64" ?>\r
+            <File Id="dapl32.dll" Compressed="yes" DiskId="1"\r
+                   LongName="dapl32.dll" Name="DAPL32.DLL"\r
+                   Source="..\bin\DAPL\$(var.ARCH)\dapl32.dll" />\r
+            <File Id="dapl32d.dll" Compressed="yes" DiskId="1"\r
+                   LongName="dapl32d.dll" Name="DAPL32D.DLL"\r
+                   Source="..\bin\DAPL\$(var.ARCH)\dapl32d.dll" />\r
+            <File Id="dat32.dll" Compressed="yes" DiskId="1"\r
+                   LongName="dat32.dll" Name="DAT32.DLL"\r
+                   Source="..\bin\DAPL\$(var.ARCH)\dat32.dll" />\r
+            <File Id="dat32d.dll" Compressed="yes" DiskId="1"\r
+                   LongName="dat32d.dll" Name="DAT32D.DLL"\r
+                   Source="..\bin\DAPL\$(var.ARCH)\dat32d.dll" />\r
+        <?endif?>\r
+\r
+        <File Id="dapl.dll" Compressed="yes" DiskId="1"\r
+               LongName="dapl.dll" Name="DAPL.DLL"\r
+               Source="..\bin\DAPL\$(var.ARCH)\dapl.dll" />\r
+          <CopyFile Id="dupDAPL" FileId="dapl.dll"\r
+                  DestinationName="dapl.dll"\r
+                  DestinationProperty="WindowsFolder" />\r
+        <File Id="dapld.dll" Compressed="yes" DiskId="1"\r
+               LongName="dapld.dll" Name="DAPLD.DLL"\r
+               Source="..\bin\DAPL\$(var.ARCH)\dapld.dll" />\r
+        <File Id="dat.dll" Compressed="yes" DiskId="1"\r
+               LongName="dat.dll" Name="DAT.DLL"\r
+               Source="..\bin\DAPL\$(var.ARCH)\dat.dll" />\r
+        <CopyFile Id="dupDAT" FileId="dat.dll"\r
+                  DestinationName="dat.dll"\r
+                  DestinationProperty="WindowsFolder" />\r
+        <File Id="datd.dll" Compressed="yes" DiskId="1"\r
+               LongName="datd.dll" Name="DATD.DLL"\r
+               Source="..\bin\DAPL\$(var.ARCH)\datd.dll" />\r
+        <File Id="dat.conf" Compressed="yes" DiskId="1"\r
+               LongName="dat.conf" Name="dat.conf"\r
+               Source="..\..\dat.conf" />\r
+        <File Id="dapltest.exe" Compressed="yes" DiskId="1"\r
+               LongName="dapltest.exe" Name="dapltest.exe"\r
+               Source="..\bin\tools\$(var.ARCH)\release\dapltest.exe" />\r
+        <File Id="dapltestd.exe" Compressed="yes" DiskId="1"\r
+               LongName="dapltestd.exe" Name="dapltesd.exe"\r
+               Source="..\bin\tools\$(var.ARCH)\debug\dapltestd.exe" />\r
+\r
+        <File Id="dapl.pdb" Compressed="yes" DiskId="1"\r
+              LongName="dapl.pdb" Name="dapl.pdb"\r
+              Source="..\bin\DAPL\$(var.ARCH)\dapl.pdb" />\r
+        <File Id="dapld.pdb" Compressed="yes" DiskId="1"\r
+              LongName="dapld.pdb" Name="dapld.pdb"\r
+              Source="..\bin\DAPL\$(var.ARCH)\dapld.pdb" />\r
+        <File Id="dat.lib" Compressed="yes" DiskId="1"\r
+              LongName="dat.lib" Name="dat.lib"\r
+              Source="..\bin\DAPL\$(var.ARCH)\dat.lib" />\r
+        <File Id="datd.lib" Compressed="yes" DiskId="1"\r
+              LongName="datd.lib" Name="datd.lib"\r
+              Source="..\bin\DAPL\$(var.ARCH)\datd.lib" />\r
+        <File Id="dat.pdb" Compressed="yes" DiskId="1"\r
+              LongName="dat.pdb" Name="dat.pdb"\r
+              Source="..\bin\DAPL\$(var.ARCH)\dat.pdb" />\r
+        <File Id="datd.pdb" Compressed="yes" DiskId="1"\r
+              LongName="datd.pdb" Name="datd.pdb"\r
+              Source="..\bin\DAPL\$(var.ARCH)\datd.pdb" />\r
+        <File Id="dt_svr.bat" Compressed="yes" DiskId="1"\r
+              LongName="dt-svr.bat" Name="dt-svr.bat"\r
+              Source="..\bin\DAPL2\dt-svr.bat" />\r
+        <CopyFile Id="dup_dt_svr" FileId="dt_svr.bat"\r
+                  DestinationName="dt1-svr.bat"\r
+                  DestinationProperty="INSTALLDIR" />\r
+        <File Id="dt_cli.bat" Compressed="yes" DiskId="1"\r
+              LongName="dt-cli.bat" Name="dt-cli.bat"\r
+              Source="..\bin\DAPL2\dt-cli.bat" />\r
+        <CopyFile Id="dup_dt_cli" FileId="dt_cli.bat"\r
+                  DestinationName="dt1-cli.bat"\r
+                  DestinationProperty="INSTALLDIR" />\r
+      </Component>\r
+\r
+      <Component Id="cDAPL2RT" Guid="02C3490D-EF11-40C9-9E8D-0BEE97082A6A">\r
+\r
+          <?if $(var.ARCHP) = "ia64" Or $(var.ARCHP) = "x64" ?>\r
+              <File Id="_dapl32.dll" Compressed="yes" DiskId="1"\r
+                     LongName="dapl232.dll" Name="DAPL232.DLL"\r
+                     Source="..\bin\DAPL2\$(var.ARCH)\dapl232.dll" />\r
+              <File Id="_dapl32d.dll" Compressed="yes" DiskId="1"\r
+                     LongName="dapl232d.dll" Name="DAPL232D.DLL"\r
+                     Source="..\bin\DAPL2\$(var.ARCH)\dapl232d.dll" />\r
+              <File Id="_dat32.dll" Compressed="yes" DiskId="1"\r
+                     LongName="dat232.dll" Name="DAT232.DLL"\r
+                     Source="..\bin\DAPL2\$(var.ARCH)\dat232.dll" />\r
+              <File Id="_dat32d.dll" Compressed="yes" DiskId="1"\r
+                     LongName="dat232d.dll" Name="DAT232D.DLL"\r
+                     Source="..\bin\DAPL2\$(var.ARCH)\dat232d.dll" />\r
+          <?endif?>\r
+\r
+          <File Id="_dapl2.dll" Compressed="yes" DiskId="1"\r
+                 LongName="dapl2.dll" Name="DAPL2.DLL"\r
+                 Source="..\bin\DAPL2\$(var.ARCH)\dapl2.dll" />\r
+          <CopyFile Id="dupDAPL2" FileId="_dapl2.dll"\r
+                    DestinationName="dapl2.dll"\r
+                    DestinationProperty="WindowsFolder" />\r
+          <File Id="_dapl2d.dll" Compressed="yes" DiskId="1"\r
+                 LongName="dapl2d.dll" Name="DAPL2D.DLL"\r
+                 Source="..\bin\DAPL2\$(var.ARCH)\dapl2d.dll" />\r
+          <File Id="_dapl2_scm.dll" Compressed="yes" DiskId="1"\r
+                 LongName="dapl2-scm.dll" Name="D2-scm.DLL"\r
+                 Source="..\bin\DAPL2\$(var.ARCH)\dapl2-scm.dll" />\r
+          <CopyFile Id="dupDAPL2_scm" FileId="_dapl2_scm.dll"\r
+                    DestinationName="d2-scm.dll"\r
+                    DestinationLongName="dapl2-scm.dll"\r
+                    DestinationProperty="WindowsFolder" />\r
+          <File Id="_dapl2_scmd.dll" Compressed="yes" DiskId="1"\r
+                 LongName="dapl2-scmd.dll" Name="D2-scmd.DLL"\r
+                 Source="..\bin\DAPL2\$(var.ARCH)\dapl2-scmd.dll" />\r
+          <File Id="_dat2.dll" Compressed="yes" DiskId="1"\r
+                 LongName="dat2.dll" Name="DAT2.DLL"\r
+                 Source="..\bin\DAPL2\$(var.ARCH)\dat2.dll" />\r
+          <CopyFile Id="dupDAT2" FileId="_dat2.dll"\r
+                    DestinationName="dat2.dll"\r
+                    DestinationProperty="WindowsFolder" />\r
+          <File Id="_dat2d.dll" Compressed="yes" DiskId="1"\r
+                 LongName="dat2d.dll" Name="DAT2D.DLL"\r
+                 Source="..\bin\DAPL2\$(var.ARCH)\dat2d.dll" />\r
+          <File Id="dapl2test.exe" Compressed="yes" DiskId="1"\r
+                 LongName="dapl2test.exe" Name="dapl2tes.exe"\r
+                 Source="..\bin\tools\$(var.ARCH)\release\dapl2test.exe" />\r
+          <File Id="dapl2testd.exe" Compressed="yes" DiskId="1"\r
+                 LongName="dapl2testd.exe" Name="dapl2tes.exe"\r
+                 Source="..\bin\tools\$(var.ARCH)\debug\dapl2testd.exe" />\r
+          <File Id="dtest2.exe" Compressed="yes" DiskId="1"\r
+                 LongName="dtest2.exe" Name="dtest2.exe"\r
+                 Source="..\bin\tools\$(var.ARCH)\release\dtest2.exe" />\r
+          <File Id="dtestx.exe" Compressed="yes" DiskId="1"\r
+                 LongName="dtestx.exe" Name="dtestx.exe"\r
+                 Source="..\bin\tools\$(var.ARCH)\release\dtestx.exe" />\r
+\r
+          <File Id="dapl2.pdb" Compressed="yes" DiskId="1"\r
+                LongName="dapl2.pdb" Name="dapl2.pdb"\r
+                Source="..\bin\DAPL2\$(var.ARCH)\dapl2.pdb" />\r
+          <File Id="dapl2d.pdb" Compressed="yes" DiskId="1"\r
+                LongName="dapl2d.pdb" Name="dapl2d.pdb"\r
+                Source="..\bin\DAPL2\$(var.ARCH)\dapl2d.pdb" />\r
+          <File Id="dat2.pdb" Compressed="yes" DiskId="1"\r
+                LongName="dat2.pdb" Name="dat2.pdb"\r
+                Source="..\bin\DAPL2\$(var.ARCH)\dat2.pdb" />\r
+          <File Id="dat2d.pdb" Compressed="yes" DiskId="1"\r
+                LongName="dat2d.pdb" Name="dat2d.pdb"\r
+                Source="..\bin\DAPL2\$(var.ARCH)\dat2d.pdb" />\r
+          <File Id="dat2.lib" Compressed="yes" DiskId="1"\r
+                LongName="dat2.lib" Name="dat2.lib"\r
+                Source="..\bin\DAPL2\$(var.ARCH)\dat2.lib" />\r
+          <File Id="dat2d.lib" Compressed="yes" DiskId="1"\r
+                LongName="dat2d.lib" Name="dat2d.lib"\r
+                Source="..\bin\DAPL2\$(var.ARCH)\dat2d.lib" />\r
+      </Component>\r
+</Include>\r
diff --git a/WinOF/WIX/common/ib_sdk.inc b/WinOF/WIX/common/ib_sdk.inc
new file mode 100644 (file)
index 0000000..ec855ed
--- /dev/null
@@ -0,0 +1,354 @@
+<Include>\r
+    <Directory Id="IB_libs" Name="lib">\r
+      <Component Id="cIBAL_Libs"\r
+                 Guid="12E15947-F84E-49d0-B5DF-FFC505C3F5C9">\r
+        <CreateFolder />\r
+        <File Id="ibal.lib" Compressed="yes" DiskId="1"\r
+              LongName="ibal.lib" Name="ibal.lib"\r
+              Source="..\bin\HCA\$(var.ARCH)\ibal.lib" />\r
+        <File Id="ibal.pdb" Compressed="yes" DiskId="1"\r
+              LongName="ibal.pdb" Name="ibal.pdb"\r
+              Source="..\bin\HCA\$(var.ARCH)\ibal.pdb" />\r
+        <File Id="complib.lib" Compressed="yes" DiskId="1"\r
+              LongName="complib.lib" Name="complib.lib"\r
+              Source="..\bin\HCA\$(var.ARCH)\complib.lib" />\r
+        <File Id="complib.pdb" Compressed="yes" DiskId="1"\r
+              LongName="complib.pdb" Name="complib.pdb"\r
+              Source="..\bin\HCA\$(var.ARCH)\complib.pdb" />\r
+        <File Id="ibald.lib" Compressed="yes" DiskId="1"\r
+              LongName="ibald.lib" Name="ibald.lib"\r
+              Source="..\bin\HCA\$(var.ARCH)\ibald.lib" />\r
+        <File Id="ibald.pdb" Compressed="yes" DiskId="1"\r
+              LongName="ibald.pdb" Name="ibald.pdb"\r
+              Source="..\bin\HCA\$(var.ARCH)\ibald.pdb" />\r
+        <File Id="complibd.lib" Compressed="yes" DiskId="1"\r
+              LongName="complibd.lib" Name="complibd.lib"\r
+              Source="..\bin\HCA\$(var.ARCH)\complibd.lib" />\r
+        <File Id="complibd.pdb" Compressed="yes" DiskId="1"\r
+              LongName="complibd.pdb" Name="complibd.pdb"\r
+              Source="..\bin\HCA\$(var.ARCH)\complibd.pdb" />\r
+\r
+         <?if $(var.ARCHP) = "x64" Or $(var.ARCHP) = "ia64" ?>\r
+             <!-- SysWOW64\ 32-bit libs -->\r
+            <File Id="cl32.lib" Compressed="yes" DiskId="1"\r
+                  LongName="complib32.lib" Name="cl32.lib"\r
+                  Source="..\bin\HCA\$(var.ARCH)\cl32.lib" />\r
+            <File Id="cl32.pdb" Compressed="yes" DiskId="1"\r
+                  LongName="complib32.pdb" Name="cl32.pdb"\r
+                  Source="..\bin\HCA\$(var.ARCH)\cl32.pdb" />\r
+            <File Id="cl32d.lib" Compressed="yes" DiskId="1"\r
+                  LongName="complib32d.lib" Name="cl32d.lib"\r
+                  Source="..\bin\HCA\$(var.ARCH)\cl32d.lib" />\r
+            <File Id="cl32d.pdb" Compressed="yes" DiskId="1"\r
+                  LongName="complib32d.pdb" Name="cl32d.pdb"\r
+                  Source="..\bin\HCA\$(var.ARCH)\cl32d.pdb" />\r
+            <File Id="ibal32.lib" Compressed="yes" DiskId="1"\r
+                  LongName="ibal32.lib" Name="ibal32.lib"\r
+                  Source="..\bin\HCA\$(var.ARCH)\ibal32.lib" />\r
+            <File Id="ibal32.pdb" Compressed="yes" DiskId="1"\r
+                  LongName="ibal32.pdb" Name="ibal32.pdb"\r
+                  Source="..\bin\HCA\$(var.ARCH)\ibal32.pdb" />\r
+            <File Id="ibal32d.lib" Compressed="yes" DiskId="1"\r
+                  LongName="ibal32d.lib" Name="ibal32d.lib"\r
+                  Source="..\bin\HCA\$(var.ARCH)\ibal32d.lib" />\r
+            <File Id="ibal32d.pdb" Compressed="yes" DiskId="1"\r
+                  LongName="ibal32d.pdb" Name="ibal32d.pdb"\r
+                  Source="..\bin\HCA\$(var.ARCH)\ibal32d.pdb" />\r
+        <?endif?>\r
+\r
+        <File Id="winverbs.lib" Compressed="yes" DiskId="1"\r
+              LongName="winverbs.lib" Name="winverbs.lib"\r
+              Source="..\bin\HCA\$(var.ARCH)\winverbs.lib" />\r
+        <File Id="winverbsd.lib" Compressed="yes" DiskId="1"\r
+              LongName="winverbsd.lib" Name="winvrbsd.lib"\r
+              Source="..\bin\HCA\$(var.ARCH)\winverbsd.lib" />\r
+\r
+        <File Id="libibverbs.lib" Compressed="yes" DiskId="1"\r
+              LongName="libibverbs.lib" Name="ibverbs.lib"\r
+              Source="..\bin\HCA\$(var.ARCH)\libibverbs.lib" />\r
+        <File Id="libibverbs2.pdb" Compressed="yes" DiskId="1"\r
+              LongName="libibverbs.pdb" Name="ibverbs.pdb"\r
+              Source="..\bin\HCA\$(var.ARCH)\libibverbs.pdb" />\r
+        <File Id="libibverbsd.lib" Compressed="yes" DiskId="1"\r
+              LongName="libibverbsd.lib" Name="ibverbsd.lib"\r
+              Source="..\bin\HCA\$(var.ARCH)\libibverbsd.lib" />\r
+        <File Id="libibverbsd2.pdb" Compressed="yes" DiskId="1"\r
+              LongName="libibverbsd.pdb" Name="ibverbsd.pdb"\r
+              Source="..\bin\HCA\$(var.ARCH)\libibverbsd.pdb" />\r
+\r
+        <File Id="libibmad.lib" Compressed="yes" DiskId="1"\r
+              LongName="libibmad.lib" Name="ibmad.lib"\r
+              Source="..\bin\HCA\$(var.ARCH)\libibmad.lib" />\r
+        <File Id="libibmad2.pdb" Compressed="yes" DiskId="1"\r
+              LongName="libibmad.pdb" Name="ibmad.pdb"\r
+              Source="..\bin\HCA\$(var.ARCH)\libibmad.pdb" />\r
+        <File Id="libibmadd.lib" Compressed="yes" DiskId="1"\r
+              LongName="libibmadd.lib" Name="ibmadd.lib"\r
+              Source="..\bin\HCA\$(var.ARCH)\libibmadd.lib" />\r
+        <File Id="libibmadd2.pdb" Compressed="yes" DiskId="1"\r
+              LongName="libibmadd.pdb" Name="ibmadd.pdb"\r
+              Source="..\bin\HCA\$(var.ARCH)\libibmadd.pdb" />\r
+\r
+        <File Id="libibumad.lib" Compressed="yes" DiskId="1"\r
+              LongName="libibumad.lib" Name="ibumad.lib"\r
+              Source="..\bin\HCA\$(var.ARCH)\libibumad.lib" />\r
+        <File Id="libibumad2.pdb" Compressed="yes" DiskId="1"\r
+              LongName="libibumad.pdb" Name="ibumad.pdb"\r
+              Source="..\bin\HCA\$(var.ARCH)\libibumad.pdb" />\r
+        <File Id="libibumadd.lib" Compressed="yes" DiskId="1"\r
+              LongName="libibumadd.lib" Name="ibumadd.lib"\r
+              Source="..\bin\HCA\$(var.ARCH)\libibumadd.lib" />\r
+        <File Id="libibumadd2.pdb" Compressed="yes" DiskId="1"\r
+              LongName="libibumadd.pdb" Name="ibumadd.pdb"\r
+              Source="..\bin\HCA\$(var.ARCH)\libibumadd.pdb" />\r
+      </Component>\r
+    </Directory>\r
+\r
+    <Directory Id="IB_inc" Name="Inc">\r
+      <Component Id="cIBAL_Incs"\r
+                 Guid="54C2903E-65DF-4c62-B31D-21DB1AFB5819">\r
+        <CreateFolder />\r
+\r
+        <File Id="oib_ver.h" Compressed="yes" DiskId="1"\r
+               LongName="oib_ver.h" Name="oib_ver.h"\r
+               Source="..\bin\Inc\oib_ver.h" />\r
+        <File Id="openib.def" Compressed="yes" DiskId="1"\r
+               LongName="openib.def" Name="openib.def"\r
+               Source="..\bin\Inc\openib.def" />\r
+      </Component>\r
+\r
+      <Directory Id="IB_complib" Name="complib">\r
+        <Component Id="cIBAL_Complib"\r
+                   Guid="9F9EE1F2-5ACE-47c7-89F8-B0EA1D4363AF">\r
+          <CreateFolder />\r
+          <File Id="cl_async_proc.h" Compressed="yes" DiskId="1"\r
+                LongName="cl_async_proc.h" Name="CL_ASYN.H" \r
+                Source="..\bin\Inc\complib\cl_async_proc.h" />\r
+          <File Id="cl_atomic.h" Compressed="yes" DiskId="1"\r
+                LongName="cl_atomic.h" Name="CL_ATOM.H" \r
+                Source="..\bin\Inc\complib\cl_atomic.h" />\r
+          <File Id="cl_atomic_osd.h" Compressed="yes" DiskId="1"\r
+                LongName="cl_atomic_osd.h" Name="CL_ATOM1.H" \r
+                Source="..\bin\Inc\complib\cl_atomic_osd.h" />\r
+          <File Id="cl_byteswap.h" Compressed="yes" DiskId="1"\r
+                LongName="cl_byteswap.h" Name="CL_BYTE.H" \r
+                Source="..\bin\Inc\complib\cl_byteswap.h" />\r
+          <File Id="cl_byteswap_osd.h" Compressed="yes" DiskId="1"\r
+                LongName="cl_byteswap_osd.h" Name="CL_BYTE1.H" \r
+                Source="..\bin\Inc\complib\cl_byteswap_osd.h" />\r
+          <File Id="cl_comppool.h" Compressed="yes" DiskId="1"\r
+                LongName="cl_comppool.h" Name="CL_COMP.H" \r
+                Source="..\bin\Inc\complib\cl_comppool.h" />\r
+          <File Id="cl_debug.h" Compressed="yes" DiskId="1"\r
+                LongName="cl_debug.h" Name="CL_DEBU.H" \r
+                Source="..\bin\Inc\complib\cl_debug.h" />\r
+          <File Id="cl_debug_osd.h" Compressed="yes" DiskId="1"\r
+                LongName="cl_debug_osd.h" Name="CL_DEBU1.H" \r
+                Source="..\bin\Inc\complib\cl_debug_osd.h" />\r
+          <File Id="cl_event.h" Compressed="yes" DiskId="1"\r
+                LongName="cl_event.h" Name="CL_EVEN.H" \r
+                Source="..\bin\Inc\complib\cl_event.h" />\r
+          <File Id="cl_event_osd.h" Compressed="yes" DiskId="1"\r
+                LongName="cl_event_osd.h" Name="CL_EVEN1.H" \r
+                Source="..\bin\Inc\complib\cl_event_osd.h" />\r
+          <File Id="cl_fleximap.h" Compressed="yes" DiskId="1"\r
+                LongName="cl_fleximap.h" Name="CL_FLEX.H" \r
+                Source="..\bin\Inc\complib\cl_fleximap.h" />\r
+          <File Id="cl_ioctl.h" Compressed="yes" DiskId="1"\r
+                LongName="cl_ioctl.h" Name="CL_IOCT.H" \r
+                Source="..\bin\Inc\complib\cl_ioctl.h" />\r
+          <File Id="cl_ioctl_osd.h" Compressed="yes" DiskId="1"\r
+                LongName="cl_ioctl_osd.h" Name="CL_IOCT1.H" \r
+                Source="..\bin\Inc\complib\cl_ioctl_osd.h" />\r
+          <File Id="cl_irqlock.h" Compressed="yes" DiskId="1"\r
+                LongName="cl_irqlock.h" Name="CL_IRQL.H" \r
+                Source="..\bin\Inc\complib\cl_irqlock.h" />\r
+          <File Id="cl_list.h" Compressed="yes" DiskId="1"\r
+                LongName="cl_list.h" Name="CL_LIST.H" \r
+                Source="..\bin\Inc\complib\cl_list.h" />\r
+          <File Id="cl_log.h" Compressed="yes" DiskId="1"\r
+                LongName="cl_log.h" Name="CL_LOG.H" \r
+                Source="..\bin\Inc\complib\cl_log.h" />\r
+          <File Id="cl_map.h" Compressed="yes" DiskId="1"\r
+                LongName="cl_map.h" Name="CL_MAP.H" \r
+                Source="..\bin\Inc\complib\cl_map.h" />\r
+          <File Id="cl_math.h" Compressed="yes" DiskId="1"\r
+                LongName="cl_math.h" Name="CL_MATH.H" \r
+                Source="..\bin\Inc\complib\cl_math.h" />\r
+          <File Id="cl_memory.h" Compressed="yes" DiskId="1"\r
+                LongName="cl_memory.h" Name="CL_MEMO.H" \r
+                Source="..\bin\Inc\complib\cl_memory.h" />\r
+          <File Id="cl_memory_osd.h" Compressed="yes" DiskId="1"\r
+                LongName="cl_memory_osd.h" Name="CL_MEMO1.H" \r
+                Source="..\bin\Inc\complib\cl_memory_osd.h" />\r
+          <File Id="cl_mutex.h" Compressed="yes" DiskId="1"\r
+                LongName="cl_mutex.h" Name="CL_MUTE.H" \r
+                Source="..\bin\Inc\complib\cl_mutex.h" />\r
+          <File Id="cl_mutex_osd.h" Compressed="yes" DiskId="1"\r
+                LongName="cl_mutex_osd.h" Name="CL_MUTE1.H" \r
+                Source="..\bin\Inc\complib\cl_mutex_osd.h" />\r
+          <File Id="cl_obj.h" Compressed="yes" DiskId="1"\r
+                LongName="cl_obj.h" Name="CL_OBJ.H" \r
+                Source="..\bin\Inc\complib\cl_obj.h" />\r
+          <File Id="cl_packoff.h" Compressed="yes" DiskId="1"\r
+                LongName="cl_packoff.h" Name="CL_PACK.H" \r
+                Source="..\bin\Inc\complib\cl_packoff.h" />\r
+          <File Id="cl_packon.h" Compressed="yes" DiskId="1"\r
+                LongName="cl_packon.h" Name="CL_PACK1.H" \r
+                Source="..\bin\Inc\complib\cl_packon.h" />\r
+          <File Id="cl_passivelock.h" Compressed="yes" DiskId="1"\r
+                LongName="cl_passivelock.h" Name="CL_PASS.H" \r
+                Source="..\bin\Inc\complib\cl_passivelock.h" />\r
+          <File Id="cl_perf.h" Compressed="yes" DiskId="1"\r
+                LongName="cl_perf.h" Name="CL_PERF.H" \r
+                Source="..\bin\Inc\complib\cl_perf.h" />\r
+          <File Id="cl_pool.h" Compressed="yes" DiskId="1"\r
+                LongName="cl_pool.h" Name="CL_POOL.H" \r
+                Source="..\bin\Inc\complib\cl_pool.h" />\r
+          <File Id="cl_ptr_vector.h" Compressed="yes" DiskId="1"\r
+                LongName="cl_ptr_vector.h" Name="CL_PTR_.H" \r
+                Source="..\bin\Inc\complib\cl_ptr_vector.h" />\r
+          <File Id="cl_qcomppool.h" Compressed="yes" DiskId="1"\r
+                LongName="cl_qcomppool.h" Name="CL_QCOM.H" \r
+                Source="..\bin\Inc\complib\cl_qcomppool.h" />\r
+          <File Id="cl_qlist.h" Compressed="yes" DiskId="1"\r
+                LongName="cl_qlist.h" Name="CL_QLIS.H" \r
+                Source="..\bin\Inc\complib\cl_qlist.h" />\r
+          <File Id="cl_qlockpool.h" Compressed="yes" DiskId="1"\r
+                LongName="cl_qlockpool.h" Name="CL_QLOC.H" \r
+                Source="..\bin\Inc\complib\cl_qlockpool.h" />\r
+          <File Id="cl_qmap.h" Compressed="yes" DiskId="1"\r
+                LongName="cl_qmap.h" Name="CL_QMAP.H" \r
+                Source="..\bin\Inc\complib\cl_qmap.h" />\r
+          <File Id="cl_qpool.h" Compressed="yes" DiskId="1"\r
+                LongName="cl_qpool.h" Name="CL_QPOO.H" \r
+                Source="..\bin\Inc\complib\cl_qpool.h" />\r
+          <File Id="cl_rbmap.h" Compressed="yes" DiskId="1"\r
+                LongName="cl_rbmap.h" Name="CL_RBMA.H" \r
+                Source="..\bin\Inc\complib\cl_rbmap.h" />\r
+          <File Id="cl_reqmgr.h" Compressed="yes" DiskId="1"\r
+                LongName="cl_reqmgr.h" Name="CL_REQM.H" \r
+                Source="..\bin\Inc\complib\cl_reqmgr.h" />\r
+          <File Id="cl_spinlock.h" Compressed="yes" DiskId="1"\r
+                LongName="cl_spinlock.h" Name="CL_SPIN.H" \r
+                Source="..\bin\Inc\complib\cl_spinlock.h" />\r
+          <File Id="cl_spinlock_osd.h" Compressed="yes" DiskId="1"\r
+                LongName="cl_spinlock_osd.h" Name="CL_SPIN1.H" \r
+                Source="..\bin\Inc\complib\cl_spinlock_osd.h" />\r
+          <File Id="cl_syscallback.h" Compressed="yes" DiskId="1"\r
+                LongName="cl_syscallback.h" Name="CL_SYSC.H" \r
+                Source="..\bin\Inc\complib\cl_syscallback.h" />\r
+          <File Id="cl_syscallback_osd.h" Compressed="yes" DiskId="1"\r
+                LongName="cl_syscallback_osd.h" Name="CL_SYSC1.H" \r
+                Source="..\bin\Inc\complib\cl_syscallback_osd.h" />\r
+          <File Id="cl_thread.h" Compressed="yes" DiskId="1"\r
+                LongName="cl_thread.h" Name="CL_THRE.H" \r
+                Source="..\bin\Inc\complib\cl_thread.h" />\r
+          <File Id="cl_thread_osd.h" Compressed="yes" DiskId="1"\r
+                LongName="cl_thread_osd.h" Name="CL_THRE1.H" \r
+                Source="..\bin\Inc\complib\cl_thread_osd.h" />\r
+          <File Id="cl_threadpool.h" Compressed="yes" DiskId="1"\r
+                LongName="cl_threadpool.h" Name="CL_THRE2.H" \r
+                Source="..\bin\Inc\complib\cl_threadpool.h" />\r
+          <File Id="cl_timer.h" Compressed="yes" DiskId="1"\r
+                LongName="cl_timer.h" Name="CL_TIME.H" \r
+                Source="..\bin\Inc\complib\cl_timer.h" />\r
+          <File Id="cl_timer_osd.h" Compressed="yes" DiskId="1"\r
+                LongName="cl_timer_osd.h" Name="CL_TIME1.H" \r
+                Source="..\bin\Inc\complib\cl_timer_osd.h" />\r
+          <File Id="cl_types.h" Compressed="yes" DiskId="1"\r
+                LongName="cl_types.h" Name="CL_TYPE.H" \r
+                Source="..\bin\Inc\complib\cl_types.h" />\r
+          <File Id="cl_types_osd.h" Compressed="yes" DiskId="1"\r
+                LongName="cl_types_osd.h" Name="CL_TYPE1.H" \r
+                Source="..\bin\Inc\complib\cl_types_osd.h" />\r
+          <File Id="cl_vector.h" Compressed="yes" DiskId="1"\r
+                LongName="cl_vector.h" Name="CL_VECT.H" \r
+                Source="..\bin\Inc\complib\cl_vector.h" />\r
+          <File Id="cl_waitobj.h" Compressed="yes" DiskId="1"\r
+                LongName="cl_waitobj.h" Name="CL_WAIT.H" \r
+                Source="..\bin\Inc\complib\cl_waitobj.h" />\r
+          <File Id="cl_waitobj_osd.h" Compressed="yes" DiskId="1"\r
+                LongName="cl_waitobj_osd.h" Name="CL_WAIT1.H" \r
+                Source="..\bin\Inc\complib\cl_waitobj_osd.h" />\r
+          <File Id="comp_lib.h" Compressed="yes" DiskId="1"\r
+                LongName="comp_lib.h" Name="COMP_LI.H" \r
+                Source="..\bin\Inc\complib\comp_lib.h" />\r
+        </Component>\r
+      </Directory>\r
+\r
+      <Directory Id="IB_iba" Name="iba">\r
+        <Component Id="cIBAL_IBA"\r
+                   Guid="2EC5C324-734D-4a06-AE35-D7B80D76B77A">\r
+          <CreateFolder />\r
+          <File Id="ib_al.h" Compressed="yes" DiskId="1"\r
+                LongName="ib_al.h" Name="ib_al.h"\r
+                Source="..\bin\Inc\iba\ib_al.h" />\r
+          <File Id="ib_al_ioctl.h" Compressed="yes" DiskId="1"\r
+                LongName="ib_al_ioctl.h" Name="ib_ioctl.h"\r
+                Source="..\bin\Inc\iba\ib_al_ioctl.h" />\r
+          <File Id="ib_at_ioctl.h" Compressed="yes" DiskId="1"\r
+                LongName="ib_at_ioctl.h" Name="ib_iocat.h"\r
+                Source="..\bin\Inc\iba\ib_at_ioctl.h" />\r
+          <File Id="ib_ci.h" Compressed="yes" DiskId="1"\r
+                LongName="ib_ci.h" Name="ib_ci.h"\r
+                Source="..\bin\Inc\iba\ib_ci.h" />\r
+          <File Id="ib_types.h" Compressed="yes" DiskId="1"\r
+                LongName="ib_types.h" Name="ib_types.h"\r
+                Source="..\bin\Inc\iba\ib_types.h" />\r
+          <File Id="ib_uvp.h" Compressed="yes" DiskId="1"\r
+                LongName="ib_uvp.h" Name="ib_uvp.h"\r
+                Source="..\bin\Inc\iba\ib_uvp.h" />\r
+        </Component>\r
+      </Directory>\r
+    </Directory>\r
+\r
+    <Directory Id="IB_samples" Name="Samples">\r
+      <Directory Id="sample_DDK" Name="DDK">\r
+        <Component Id="cDDK_example"\r
+                   Guid="8C27B926-FCFE-4f46-83B4-A27482A5EB3B">\r
+          <CreateFolder />\r
+              <File Id="cmtest.c" Compressed="yes" DiskId="1"\r
+                    LongName="cmtest.c" Name="cmtest.c"\r
+                    Source="..\bin\misc\cmtest.c" />\r
+              <File Id="cmtest.rc" Compressed="yes" DiskId="1"\r
+                    LongName="cmtest.rc" Name="cmtest.rc"\r
+                    Source="..\..\SDK_Samples\DDK\cmtest.rc" />\r
+              <File Id="makefile" Compressed="yes" DiskId="1"\r
+                    LongName="makefile" Name="makefile"\r
+                    Source="..\..\SDK_Samples\DDK\makefile" />\r
+              <File Id="SOURCES" Compressed="yes" DiskId="1"\r
+                    LongName="SOURCES" Name="SOURCES"\r
+                    Source="..\..\SDK_Samples\DDK\SOURCES" />\r
+              <File Id="README.txt" Compressed="yes" DiskId="1"\r
+                    LongName="README.txt" Name="README.txt"\r
+                    Source="..\..\SDK_Samples\DDK\README.txt" />\r
+        </Component>\r
+      </Directory>    <!-- End DDK -->\r
+\r
+      <Directory Id="sample_VS" Name="VS">\r
+        <Component Id="cVS_example"\r
+                   Guid="35E03D7E-E943-4346-8F63-7E991AF68F53">\r
+          <CreateFolder />\r
+              <File Id="vs_cmtest.c" Compressed="yes" DiskId="1"\r
+                    LongName="cmtest.c" Name="cmtest.c"\r
+                    Source="..\bin\misc\cmtest.c" />\r
+              <File Id="vs_cmtest.rc" Compressed="yes" DiskId="1"\r
+                    LongName="cmtest.rc" Name="cmtest.rc"\r
+                    Source="..\..\SDK_Samples\VS\cmtest.rc" />\r
+              <File Id="vsREADME.txt" Compressed="yes" DiskId="1"\r
+                    LongName="README.txt" Name="README.txt"\r
+                    Source="..\..\SDK_Samples\VS\README.txt" />\r
+              <?if $(var.ARCHP) = "x64" Or $(var.ARCHP) = "ia64" ?>\r
+                  <File Id="Makefile.x64" Compressed="yes" DiskId="1"\r
+                        LongName="Makefile.x64" Name="Makefile.x64"\r
+                        Source="..\..\SDK_Samples\VS\Makefile.x64" />\r
+              <?else?>\r
+                  <File Id="Makefile.x64" Compressed="yes" DiskId="1"\r
+                        LongName="Makefile.x64" Name="Makefile.x86"\r
+                        Source="..\..\SDK_Samples\VS\Makefile.x86" />\r
+              <?endif?>\r
+        </Component>\r
+      </Directory>   <!-- End VS -->\r
+    </Directory>   <!-- End Samples -->\r
+</Include>\r
diff --git a/WinOF/WIX/common/ipoib.inc b/WinOF/WIX/common/ipoib.inc
new file mode 100644 (file)
index 0000000..59d9472
--- /dev/null
@@ -0,0 +1,53 @@
+<Include>\r
+    <Component Id="IPoIB" Guid="18CC13CC-0D29-4B88-8F03-854CE0C6AF94">\r
+      <CreateFolder />\r
+      <File Id="netipoib_inf" Compressed="yes" DiskId="1"\r
+             LongName="netipoib.inf" Name="NETIPOI.INF"\r
+             Source="..\bin\net\$(var.ARCH)\netipoib.inf" />\r
+      <File Id="ipoib_cat" Compressed="yes" DiskId="1"\r
+             LongName="ipoib.cat" Name="IPOI.cat"\r
+             Source="..\bin\net\$(var.ARCH)\ipoib.cat" />\r
+      <File Id="ipoib.sys" Compressed="yes" DiskId="1"\r
+             LongName="ipoib.sys" Name="IPOIB.SYS"\r
+             Source="..\bin\net\$(var.ARCH)\ipoib.sys" />\r
+      <File Id="ipoib.pdb" Compressed="yes" DiskId="1"\r
+             Name="ipoib.pdb"\r
+             Source="..\bin\net\$(var.ARCH)\ipoib.pdb" />\r
+\r
+      <?if $(var.OS) != "XP" ?>\r
+        <File Id="ibwsd.dll" Compressed="yes" DiskId="1"\r
+               LongName="ibwsd.dll" Name="IBWSD.DLL"\r
+               Source="..\bin\net\$(var.ARCH)\ibwsd.dll" />\r
+      <?endif?>\r
+\r
+      <File Id="ibndprov.dll" Compressed="yes" DiskId="1"\r
+             LongName="ibndprov.dll" Name="IBNDPROV.DLL"\r
+             Source="..\bin\net\$(var.ARCH)\ibndprov.dll" />\r
+      <File Id="ndinstall.exe" Compressed="yes" DiskId="1"\r
+             LongName="ndinstall.exe" Name="NDINSTAL.EXE"\r
+             Source="..\bin\net\$(var.ARCH)\ndinstall.exe" />\r
+\r
+      <?if $(var.ARCHP) = "x64" Or $(var.ARCHP) = "ia64" ?>\r
+          <File Id="ibwsd32.dll" Compressed="yes" DiskId="1"\r
+                 LongName="ibwsd32.dll" Name="IBWSD32.DLL"\r
+                 Source="..\bin\net\$(var.ARCH)\ibwsd32.dll" />\r
+          <File Id="ibndprov32.dll" Compressed="yes" DiskId="1"\r
+                 LongName="ibndprov32.dll" Name="IBNDPR32.DLL"\r
+                 Source="..\bin\net\$(var.ARCH)\ibndprov32.dll" />\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
+      <RemoveFile Id='o64_ibndprov.dll' On='uninstall'\r
+             Property="SystemFolder"\r
+             Name="ibndprov.dll" LongName='ibndprov.dll' />\r
+      <RemoveFile Id='o64_ndinstall.exe' On='uninstall'\r
+             Property="SystemFolder"\r
+             Name="ndinstal.exe" LongName='ndinstall.exe' />\r
+    </Component>\r
+</Include>\r
diff --git a/WinOF/WIX/common/mlnx_drivers.inc b/WinOF/WIX/common/mlnx_drivers.inc
new file mode 100644 (file)
index 0000000..10d811e
--- /dev/null
@@ -0,0 +1,86 @@
+<Include>\r
+    <Component Id="cMthcaDriver"\r
+               Guid="BE4ED061-C852-40a2-A240-F06DBBE1159F">\r
+\r
+      <?if $(var.ARCHP) = "x64" Or $(var.ARCH) = "ia64" ?>\r
+          <File Id="mthca32.dll" Compressed="yes" DiskId="1"\r
+                 LongName="mthca32.dll" Name="MTHCA32.DLL"\r
+                 Source="..\bin\HCA\$(var.ARCH)\mthca32.dll" />\r
+          <File Id="mthca32d.dll" Compressed="yes" DiskId="1"\r
+                 LongName="mthca32d.dll" Name="MTHCA321.DLL"\r
+                 Source="..\bin\HCA\$(var.ARCH)\mthca32d.dll" />\r
+      <?endif?>\r
+\r
+      <File Id="mthca.inf" Compressed="yes" DiskId="1"\r
+             LongName="mthca.inf" Name="MTHCA.INF"\r
+             Source="..\bin\HCA\$(var.ARCH)\mthca.inf" />\r
+      <File Id="mthca.cat" Compressed="yes" DiskId="1"\r
+             LongName="mthca.cat" Name="MTHCA.cat"\r
+             Source="..\bin\HCA\$(var.ARCH)\mthca.cat" />\r
+      <File Id="mthca.sys" Compressed="yes" DiskId="1"\r
+             LongName="mthca.sys" Name="MTHCA.SYS"\r
+             Source="..\bin\HCA\$(var.ARCH)\mthca.sys" />\r
+      <File Id="mthca.pdb" Compressed="yes" DiskId="1"\r
+             Name="mthca.pdb"\r
+             Source="..\bin\HCA\$(var.ARCH)\mthca.pdb" />\r
+      <File Id="mthcau.dll" Compressed="yes" DiskId="1"\r
+             LongName="mthcau.dll" Name="MTHCAU.DLL"\r
+             Source="..\bin\HCA\$(var.ARCH)\mthcau.dll" />\r
+      <File Id="mthcaud.dll" Compressed="yes" DiskId="1"\r
+             LongName="mthcaud.dll" Name="MTHCAUD.DLL"\r
+             Source="..\bin\HCA\$(var.ARCH)\mthcaud.dll" />\r
+\r
+      <!-- Orphaned install files - remove on uninstall -->\r
+      <RemoveFile Id='o32_mthcau.dll' On='uninstall'\r
+             Property="System64Folder"\r
+             Name="mthcau.dll" LongName='mthcau.dll' />\r
+      <RemoveFile Id='o32_mthcaud.dll' On='uninstall'\r
+             Property="System64Folder"\r
+             Name="mthcaud.dll" LongName='mthcaud.dll' />\r
+    </Component>\r
+\r
+    <Component Id="cConnectXDriver"\r
+               Guid="C1EFF4D6-CE55-432a-9D92-E46AB983D9E3">\r
+      <File Id="mlx4_bus.inf" Compressed="yes" DiskId="1"\r
+             LongName="mlx4_bus.inf" Name="mlx4_bus.INF"\r
+             Source="..\bin\hca\$(var.ARCH)\mlx4_bus.inf" />\r
+      <File Id="mlx4_bus.cat" Compressed="yes" DiskId="1"\r
+             LongName="mlx4_bus.cat" Name="mlx4_bus.cat"\r
+             Source="..\bin\hca\$(var.ARCH)\mlx4_bus.cat" />\r
+      <File Id="mlx4_bus.sys" Compressed="yes" DiskId="1"\r
+             LongName="mlx4_bus.sys" Name="mlx4_bus.sys"\r
+             Source="..\bin\hca\$(var.ARCH)\mlx4_bus.sys" />\r
+      <File Id="mlx4_bus.pdb" Compressed="yes" DiskId="1"\r
+             Name="mlx4_bus.pdb"\r
+             Source="..\bin\hca\$(var.ARCH)\mlx4_bus.pdb" />\r
+      <File Id="mlx4_hca.inf" Compressed="yes" DiskId="1"\r
+             LongName="mlx4_hca.inf" Name="mlx4_hca.INF"\r
+             Source="..\bin\hca\$(var.ARCH)\mlx4_hca.inf" />\r
+      <File Id="mlx4_hca.cat" Compressed="yes" DiskId="1"\r
+             LongName="mlx4_hca.cat" Name="mlx4_hca.cat"\r
+             Source="..\bin\hca\$(var.ARCH)\mlx4_hca.cat" />\r
+      <File Id="mlx4_hca.sys" Compressed="yes" DiskId="1"\r
+             LongName="mlx4_hca.sys" Name="mlx4_hca.sys"\r
+             Source="..\bin\hca\$(var.ARCH)\mlx4_hca.sys" />\r
+      <File Id="mlx4_hca.pdb" Compressed="yes" DiskId="1"\r
+             Name="mlx4_hca.pdb"\r
+             Source="..\bin\hca\$(var.ARCH)\mlx4_hca.pdb" />\r
+      <File Id="mlx4u.dll" Compressed="yes" DiskId="1"\r
+             LongName="mlx4u.dll" Name="mlx4u.dll"\r
+             Source="..\bin\hca\$(var.ARCH)\mlx4u.dll" />\r
+      <File Id="mlx4ud.dll" Compressed="yes" DiskId="1"\r
+             LongName="mlx4ud.dll" Name="mlx4ud.dll"\r
+             Source="..\bin\hca\$(var.ARCH)\mlx4ud.dll" />\r
+\r
+      <?if $(var.ARCHP) = "x64" Or $(var.ARCHP) = "ia64" ?>\r
+          <!-- copy 32-bit binaries for 32b in x64 -->\r
+          <File Id="mlx4u32d.dll" Compressed="yes" DiskId="1"\r
+                 LongName="mlx4u32d.dll" Name="mlx4u32.dll"\r
+                 Source="..\bin\hca\$(var.ARCH)\mlx4u32d.dll" />\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
+      <?endif?>\r
+\r
+    </Component>\r
+</Include>\r
diff --git a/WinOF/WIX/common/requirements.inc b/WinOF/WIX/common/requirements.inc
new file mode 100644 (file)
index 0000000..3b40e47
--- /dev/null
@@ -0,0 +1,57 @@
+<Include>\r
+\r
+    <!--\r
+        System/Machine-wide install, otherwise per-user (Administrator) only.\r
+        All users see OpenFabrics WinOF Release Notes & Manual in Programs.\r
+     -->\r
+    <Property Id="ALLUSERS"> Value="1" </Property>\r
+\r
+    <!-- Requires files sc.exe & reg.exe -->\r
+    <Property Id="REG_EXISTS">\r
+      <DirectorySearch Id="RegFileDir" Path="[WindowsFolder]" Depth="1">\r
+        <FileSearch Id="RegFile" Name="reg.exe" />\r
+      </DirectorySearch>\r
+    </Property>\r
+\r
+    <Property Id="SC_EXISTS">\r
+      <DirectorySearch Id="ScFileDir" Path="[WindowsFolder]" Depth="1">\r
+        <FileSearch Id="ScFile" Name="sc.exe" />\r
+      </DirectorySearch>\r
+    </Property>\r
+\r
+    <Property Id="IPOIB_EXISTS">\r
+      <DirectorySearch Id="ipoibFileDir" Path="[INSTALLDIR]\net" Depth="0">\r
+        <FileSearch Id="ipoibFile" Name="netipoib.inf" />\r
+      </DirectorySearch>\r
+    </Property>\r
+\r
+    <Property Id="DAT_CONF_EXISTS">\r
+      <DirectorySearch Id="DCscan" Path="[WindowsVolume]\DAT" Depth="0">\r
+        <FileSearch Id="DCFile" Name="dat.conf" />\r
+      </DirectorySearch>\r
+    </Property>\r
+\r
+    <Property Id="DAT1_INSTALLED">\r
+      <DirectorySearch Id="Dat1DS" Path="[INSTALLDIR]" Depth="0">\r
+        <FileSearch Id="daplFS" Name="dapl.dll" />\r
+      </DirectorySearch>\r
+    </Property>\r
+\r
+    <Property Id="DAT2_INSTALLED">\r
+      <DirectorySearch Id="Dat2DS" Path="[INSTALLDIR]" Depth="0">\r
+        <FileSearch Id="dapl2FS" Name="dapl2.dll" />\r
+      </DirectorySearch>\r
+    </Property>\r
+\r
+    <Condition Message="[ProductName] requires system file reg.exe">\r
+       REG_EXISTS\r
+    </Condition>\r
+\r
+    <Condition Message="[ProductName] requires system file sc.exe">\r
+       SC_EXISTS\r
+    </Condition>\r
+\r
+    <Media Id="1" Cabinet="Data1.cab" EmbedCab="yes" DiskPrompt="CD-ROM #1" />\r
+    <Property Id="DiskPrompt" Value="WinOF Installation [1]" />\r
+\r
+</Include>\r
diff --git a/WinOF/WIX/common/tools.inc b/WinOF/WIX/common/tools.inc
new file mode 100644 (file)
index 0000000..cb1a8e0
--- /dev/null
@@ -0,0 +1,54 @@
+<Include>\r
+     <Component Id="Tools" Guid="1B89230E-5D8D-41a5-BD1F-A3E308FEE026">\r
+      <Environment Id='UpdatePath' Name='PATH' Action='create'\r
+                   System='yes' Part='last' Value='[INSTALLDIR]' /> \r
+\r
+       <File Id="qlgcvnic_config" Compressed="yes" DiskId="1" Vital="yes"\r
+             Name="vnic_cfg.exe" LongName="qlgcvnic_config.exe"\r
+             Source="..\bin\tools\$(var.ARCH)\release\qlgcvnic_config.exe" />\r
+       <File Id="part_man" Name="part_man.exe"\r
+             Compressed="yes" DiskId="1" Vital="yes"\r
+             Source="..\bin\tools\$(var.ARCH)\release\part_man.exe" />\r
+       <File Id="vstat" Name="vstat.exe"\r
+             Compressed="yes" DiskId="1" Vital="yes"\r
+             Source="..\bin\tools\$(var.ARCH)\release\vstat.exe" />\r
+       <File Id="ttcp.exe" LongName="ttcp.exe" Compressed="yes"\r
+             DiskId="1" Name="TTCP.EXE"\r
+             Source="..\bin\tools\$(var.ARCH)\release\ttcp.exe" />\r
+       <File Id="cmtest.exe" LongName="cmtest.exe" Compressed="yes"\r
+             DiskId="1" Name="CMTEST.EXE"\r
+             Source="..\bin\tools\$(var.ARCH)\release\cmtest.exe" />\r
+       <File Id="ib_limits.exe" Compressed="yes" DiskId="1"\r
+             LongName="ib_limits.exe" Name="IB_LIMI.EXE"\r
+             Source="..\bin\tools\$(var.ARCH)\release\ib_limits.exe" />\r
+       <File Id="ib_read_bw.exe" Compressed="yes" DiskId="1"\r
+             LongName="ib_read_bw.exe" Name="IB_READ.EXE"\r
+             Source="..\bin\tools\$(var.ARCH)\release\ib_read_bw.exe" />\r
+       <File Id="ib_read_lat.exe" Compressed="yes" DiskId="1"\r
+             LongName="ib_read_lat.exe" Name="IB_READ1.EXE"\r
+             Source="..\bin\tools\$(var.ARCH)\release\ib_read_lat.exe" />\r
+       <File Id="ib_send_bw.exe" Compressed="yes" DiskId="1"\r
+             LongName="ib_send_bw.exe" Name="IB_SEND.EXE"\r
+             Source="..\bin\tools\$(var.ARCH)\release\ib_send_bw.exe" />\r
+       <File Id="ib_send_lat.exe" Compressed="yes" DiskId="1"\r
+             LongName="ib_send_lat.exe" Name="IB_SEND1.EXE"\r
+             Source="..\bin\tools\$(var.ARCH)\release\ib_send_lat.exe" />\r
+       <File Id="ib_write_bw.exe" Compressed="yes" DiskId="1"\r
+             LongName="ib_write_bw.exe" Name="IB_WRIT.EXE"\r
+             Source="..\bin\tools\$(var.ARCH)\release\ib_write_bw.exe" />\r
+       <File Id="ib_write_lat.exe" Compressed="yes" DiskId="1"\r
+             LongName="ib_write_lat.exe" Name="IB_WRIT1.EXE"\r
+             Source="..\bin\tools\$(var.ARCH)\release\ib_write_lat.exe" />\r
+       <File Id="ibtrapgen.exe" Compressed="yes" DiskId="1"\r
+             LongName="ibtrapgen.exe" Name="IBTRAPG.EXE"\r
+             Source="..\bin\tools\$(var.ARCH)\release\ibtrapgen.exe" />\r
+       <File Id="osmtest.exe" Compressed="yes" DiskId="1"\r
+             LongName="osmtest.exe" Name="OSMTEST.EXE"\r
+             Source="..\bin\tools\$(var.ARCH)\release\osmtest.exe" />\r
+       <File Id="PrintIP.exe" Compressed="yes" DiskId="1"\r
+             LongName="PrintIP.exe" Name="PRINTIP.EXE"\r
+             Source="..\bin\tools\$(var.ARCH)\release\PrintIP.exe" />\r
+       <File Id="nsc" Name="nsc.exe" Compressed="yes" DiskId="1"\r
+                Vital="yes" Source="..\bin\tools\$(var.ARCH)\release\nsc.exe" />\r
+     </Component>\r
+</Include>\r
diff --git a/WinOF/WIX/common/winverbs_OFED.inc b/WinOF/WIX/common/winverbs_OFED.inc
new file mode 100644 (file)
index 0000000..3fbcd1b
--- /dev/null
@@ -0,0 +1,223 @@
+<Include>\r
+    <Component Id="cWinVerbsOFED"\r
+               Guid="20916BB0-5E16-49bb-BE9F-3A202D760E72">\r
+\r
+      <File Id="libibverbs.dll" Compressed="yes" DiskId="1"\r
+            LongName="libibverbs.dll" Name="ibverbs.dll"\r
+            Source="..\bin\HCA\$(var.ARCH)\libibverbs.dll" />\r
+        <CopyFile Id="dupLibibverbs.dll" FileId="libibverbs.dll"\r
+               DestinationName="ibverbs.dll"\r
+               DestinationLongName="libibverbs.dll"\r
+               DestinationProperty="WindowsFolder" />\r
+      <File Id="libibverbs.pdb" Compressed="yes" DiskId="1"\r
+            LongName="libibverbs.pdb" Name="ibverbs.pdb"\r
+            Source="..\bin\HCA\$(var.ARCH)\libibverbs.pdb" />\r
+\r
+      <File Id="libibverbsd.dll" Compressed="yes" DiskId="1"\r
+            LongName="libibverbsd.dll" Name="ibverbsd.dll"\r
+            Source="..\bin\HCA\$(var.ARCH)\libibverbsd.dll" />\r
+        <CopyFile Id="dupLibibverbsd.dll" FileId="libibverbsd.dll"\r
+               DestinationName="ibverbsd.dll"\r
+               DestinationLongName="libibverbsd.dll"\r
+               DestinationProperty="WindowsFolder" />\r
+      <File Id="libibverbsd.pdb" Compressed="yes" DiskId="1"\r
+            LongName="libibverbsd.pdb" Name="ibverbsd.pdb"\r
+            Source="..\bin\HCA\$(var.ARCH)\libibverbsd.pdb" />\r
+\r
+      <File Id="libibmad.dll" Compressed="yes" DiskId="1"\r
+            LongName="libibmad.dll" Name="ibmad.dll"\r
+            Source="..\bin\HCA\$(var.ARCH)\libibmad.dll" />\r
+        <CopyFile Id="dupLibibmad.dll" FileId="libibmad.dll"\r
+               DestinationName="ibmad.dll"\r
+               DestinationLongName="libibmad.dll"\r
+               DestinationProperty="WindowsFolder" />\r
+      <File Id="libibmad.pdb" Compressed="yes" DiskId="1"\r
+            LongName="libibmad.pdb" Name="ibmad.pdb"\r
+            Source="..\bin\HCA\$(var.ARCH)\libibmad.pdb" />\r
+\r
+      <File Id="libibmadd.dll" Compressed="yes" DiskId="1"\r
+            LongName="libibmadd.dll" Name="ibmadd.dll"\r
+            Source="..\bin\HCA\$(var.ARCH)\libibmadd.dll" />\r
+        <CopyFile Id="dupLibibmadd.dll" FileId="libibmadd.dll"\r
+               DestinationName="ibmadd.dll"\r
+               DestinationLongName="libibmadd.dll"\r
+               DestinationProperty="WindowsFolder" />\r
+      <File Id="libibmadd.pdb" Compressed="yes" DiskId="1"\r
+            LongName="libibmadd.pdb" Name="ibmadd.pdb"\r
+            Source="..\bin\HCA\$(var.ARCH)\libibmadd.pdb" />\r
+\r
+      <File Id="libibumad.dll" Compressed="yes" DiskId="1"\r
+            LongName="libibumad.dll" Name="ibumad.dll"\r
+            Source="..\bin\HCA\$(var.ARCH)\libibumad.dll" />\r
+        <CopyFile Id="dupLibibumad.dll" FileId="libibumad.dll"\r
+               DestinationName="ibumad.dll"\r
+               DestinationLongName="libibumad.dll"\r
+               DestinationProperty="WindowsFolder" />\r
+      <File Id="libibumad.pdb" Compressed="yes" DiskId="1"\r
+            LongName="libibumad.pdb" Name="ibumad.pdb"\r
+            Source="..\bin\HCA\$(var.ARCH)\libibumad.pdb" />\r
+\r
+      <File Id="libibumadd.dll" Compressed="yes" DiskId="1"\r
+            LongName="libibumadd.dll" Name="ibumadd.dll"\r
+            Source="..\bin\HCA\$(var.ARCH)\libibumadd.dll" />\r
+        <CopyFile Id="dupLibibumadd.dll" FileId="libibumadd.dll"\r
+               DestinationName="ibumadd.dll"\r
+               DestinationLongName="libibumadd.dll"\r
+               DestinationProperty="WindowsFolder" />\r
+      <File Id="libibumadd.pdb" Compressed="yes" DiskId="1"\r
+            LongName="libibumadd.pdb" Name="ibumadd.pdb"\r
+            Source="..\bin\HCA\$(var.ARCH)\libibumadd.pdb" />\r
+      <File Id="librdmacm.dll" Compressed="yes" DiskId="1"\r
+            LongName="librdmacm.dll" Name="rdmacm.dll"\r
+            Source="..\bin\HCA\$(var.ARCH)\librdmacm.dll" />\r
+        <CopyFile Id="dupLibrdmacm.dll" FileId="librdmacm.dll"\r
+               DestinationName="rdmacm.dll"\r
+               DestinationLongName="librdmacm.dll"\r
+               DestinationProperty="SystemFolder" />\r
+      <File Id="librdmacm.pdb" Compressed="yes" DiskId="1"\r
+            LongName="librdmacm.pdb" Name="rdmacm.pdb"\r
+            Source="..\bin\HCA\$(var.ARCH)\librdmacm.pdb" />\r
+\r
+      <File Id="librdmacmd.dll" Compressed="yes" DiskId="1"\r
+            LongName="librdmacmd.dll" Name="rdmacmd.dll"\r
+            Source="..\bin\HCA\$(var.ARCH)\librdmacmd.dll" />\r
+        <CopyFile Id="dupLibrdmacmd.dll" FileId="librdmacmd.dll"\r
+               DestinationName="rdmacmd.dll"\r
+               DestinationLongName="librdmacmd.dll"\r
+               DestinationProperty="SystemFolder" />\r
+      <File Id="librdmacmd.pdb" Compressed="yes" DiskId="1"\r
+            LongName="librdmacmd.pdb" Name="rdmacmd.pdb"\r
+            Source="..\bin\HCA\$(var.ARCH)\librdmacmd.pdb" />\r
+    </Component>\r
+\r
+    <Component Id="cWinVerbsUApps"\r
+              Guid="ECAB2829-AE65-4ef8-8214-9A89E5BBDB9A">\r
+\r
+      <File Id="ibv_asyncwatch.exe" Compressed="yes" DiskId="1"\r
+            LongName="ibv_asyncwatch.exe" Name="asyncwat.exe"\r
+            Source="..\bin\tools\$(var.ARCH)\release\ibv_asyncwatch.exe" />\r
+      <File Id="ibv_asyncwatch.pdb" Compressed="yes" DiskId="1"\r
+            LongName="ibv_asyncwatch.pdb" Name="asyncwat.pdb"\r
+            Source="..\bin\tools\$(var.ARCH)\release\ibv_asyncwatch.pdb" />\r
+      <File Id="ibv_devinfo.exe" Compressed="yes" DiskId="1"\r
+            LongName="ibv_devinfo.exe" Name="devinfo.exe"\r
+            Source="..\bin\tools\$(var.ARCH)\release\ibv_devinfo.exe" />\r
+      <File Id="ibv_devinfo.pdb" Compressed="yes" DiskId="1"\r
+            LongName="ibv_devinfo.pdb" Name="devinfo.pdb"\r
+            Source="..\bin\tools\$(var.ARCH)\release\ibv_devinfo.pdb" />\r
+      <File Id="ibv_rc_pingpong.exe" Compressed="yes" DiskId="1"\r
+            LongName="ibv_rc_pingpong.exe" Name="ibv_rc_p.exe"\r
+            Source="..\bin\tools\$(var.ARCH)\release\ibv_rc_pingpong.exe" />\r
+      <File Id="ibv_rc_pingpong.pdb" Compressed="yes" DiskId="1"\r
+            LongName="ibv_rc_pingpong.pdb" Name="ibv_rc_p.pdb"\r
+            Source="..\bin\tools\$(var.ARCH)\release\ibv_rc_pingpong.pdb" />\r
+      <File Id="ibv_read_bw.exe" Compressed="yes" DiskId="1"\r
+            LongName="ibv_read_bw.exe" Name="readbw.exe"\r
+            Source="..\bin\tools\$(var.ARCH)\release\ibv_read_bw.exe" />\r
+      <File Id="ibv_read_bw.pdb" Compressed="yes" DiskId="1"\r
+            LongName="ibv_read_bw.pdb" Name="readbw.pdb"\r
+            Source="..\bin\tools\$(var.ARCH)\release\ibv_read_bw.pdb" />\r
+      <File Id="ibv_read_lat.exe" Compressed="yes" DiskId="1"\r
+            LongName="ibv_read_lat.exe" Name="readlat.exe"\r
+            Source="..\bin\tools\$(var.ARCH)\release\ibv_read_lat.exe" />\r
+      <File Id="ibv_read_lat.pdb" Compressed="yes" DiskId="1"\r
+            LongName="ibv_read_lat.pdb" Name="readlat.pdb"\r
+            Source="..\bin\tools\$(var.ARCH)\release\ibv_read_lat.pdb" />\r
+      <File Id="ibv_send_bw.exe" Compressed="yes" DiskId="1"\r
+            LongName="ibv_send_bw.exe" Name="send_bw.exe"\r
+            Source="..\bin\tools\$(var.ARCH)\release\ibv_send_bw.exe" />\r
+      <File Id="ibv_send_bw.pdb" Compressed="yes" DiskId="1"\r
+            LongName="ibv_send_bw.pdb" Name="send_bw.pdb"\r
+            Source="..\bin\tools\$(var.ARCH)\release\ibv_send_bw.pdb" />\r
+      <File Id="ibv_send_lat.exe" Compressed="yes" DiskId="1"\r
+            LongName="ibv_send_lat.exe" Name="send_lat.exe"\r
+            Source="..\bin\tools\$(var.ARCH)\release\ibv_send_lat.exe" />\r
+      <File Id="ibv_send_lat.pdb" Compressed="yes" DiskId="1"\r
+            LongName="ibv_send_lat.pdb" Name="send_lat.pdb"\r
+            Source="..\bin\tools\$(var.ARCH)\release\ibv_send_lat.pdb" />\r
+      <File Id="ibv_uc_pingpong.exe" Compressed="yes" DiskId="1"\r
+            LongName="ibv_uc_pingpong.exe" Name="uc_ping.exe"\r
+            Source="..\bin\tools\$(var.ARCH)\release\ibv_uc_pingpong.exe" />\r
+      <File Id="ibv_uc_pingpong.pdb" Compressed="yes" DiskId="1"\r
+            LongName="ibv_uc_pingpong.pdb" Name="uc_ping.pdb"\r
+            Source="..\bin\tools\$(var.ARCH)\release\ibv_uc_pingpong.pdb" />\r
+      <File Id="ibv_ud_pingpong.exe" Compressed="yes" DiskId="1"\r
+            LongName="ibv_ud_pingpong.exe" Name="ud_ping.exe"\r
+            Source="..\bin\tools\$(var.ARCH)\release\ibv_ud_pingpong.exe" />\r
+      <File Id="ibv_ud_pingpong.pdb" Compressed="yes" DiskId="1"\r
+            LongName="ibv_ud_pingpong.pdb" Name="ud_ping.pdb"\r
+            Source="..\bin\tools\$(var.ARCH)\release\ibv_ud_pingpong.pdb" />\r
+      <File Id="ibv_write_bw.exe" Compressed="yes" DiskId="1"\r
+            LongName="ibv_write_bw.exe" Name="write_bw.exe"\r
+            Source="..\bin\tools\$(var.ARCH)\release\ibv_write_bw.exe" />\r
+      <File Id="ibv_write_bw.pdb" Compressed="yes" DiskId="1"\r
+            LongName="ibv_write_bw.pdb" Name="write_bw.pdb"\r
+            Source="..\bin\tools\$(var.ARCH)\release\ibv_write_bw.pdb" />\r
+      <File Id="ibv_write_lat.exe" Compressed="yes" DiskId="1"\r
+            LongName="ibv_write_lat.exe" Name="writelat.exe"\r
+            Source="..\bin\tools\$(var.ARCH)\release\ibv_write_lat.exe" />\r
+      <File Id="ibv_write_lat.pdb" Compressed="yes" DiskId="1"\r
+            LongName="ibv_write_lat.pdb" Name="writelat.pdb"\r
+            Source="..\bin\tools\$(var.ARCH)\release\ibv_write_lat.pdb" />\r
+      <File Id="sminfo.exe" Compressed="yes" DiskId="1"\r
+            LongName="sminfo.exe" Name="sminfo.exe"\r
+            Source="..\bin\tools\$(var.ARCH)\release\sminfo.exe" />\r
+      <File Id="sminfo.pdb" Compressed="yes" DiskId="1"\r
+            LongName="sminfo.pdb" Name="sminfo.pdb"\r
+            Source="..\bin\tools\$(var.ARCH)\release\sminfo.pdb" />\r
+      <File Id="ibstat.exe" Compressed="yes" DiskId="1"\r
+            LongName="ibstat.exe" Name="ibstat.exe"\r
+            Source="..\bin\tools\$(var.ARCH)\release\ibstat.exe" />\r
+      <File Id="ibstat.pdb" Compressed="yes" DiskId="1"\r
+            LongName="ibstat.pdb" Name="ibstat.pdb"\r
+            Source="..\bin\tools\$(var.ARCH)\release\ibstat.pdb" />\r
+      <File Id="perfquery.exe" Compressed="yes" DiskId="1"\r
+            LongName="perfquery.exe" Name="perfquer.exe"\r
+            Source="..\bin\tools\$(var.ARCH)\release\perfquery.exe" />\r
+      <File Id="perfquery.pdb" Compressed="yes" DiskId="1"\r
+            LongName="perfquery.pdb" Name="perfquer.pdb"\r
+            Source="..\bin\tools\$(var.ARCH)\release\perfquery.pdb" />\r
+      <File Id="ibaddr.exe" Compressed="yes" DiskId="1"\r
+            LongName="ibaddr.exe" Name="ibaddr.exe"\r
+            Source="..\bin\tools\$(var.ARCH)\release\ibaddr.exe" />\r
+      <File Id="ibaddr.pdb" Compressed="yes" DiskId="1"\r
+            LongName="ibaddr.pdb" Name="ibaddr.pdb"\r
+            Source="..\bin\tools\$(var.ARCH)\release\ibaddr.pdb" />\r
+      <File Id="ibnetdiscover.exe" Compressed="yes" DiskId="1"\r
+            LongName="ibnetdiscover.exe" Name="ibnetdis.exe"\r
+            Source="..\bin\tools\$(var.ARCH)\release\ibnetdiscover.exe" />\r
+      <File Id="ibnetdiscover.pdb" Compressed="yes" DiskId="1"\r
+            LongName="ibnetdiscover.pdb" Name="ibnetdis.pdb"\r
+            Source="..\bin\tools\$(var.ARCH)\release\ibnetdiscover.pdb" />\r
+      <File Id="rdma_cmatose.exe" Compressed="yes" DiskId="1"\r
+            LongName="rdma_cmatose.exe" Name="rcmatose.exe"\r
+            Source="..\bin\tools\$(var.ARCH)\release\rdma_cmatose.exe" />\r
+      <File Id="rdma_cmatose.pdb" Compressed="yes" DiskId="1"\r
+            LongName="rdma_cmatose.pdb" Name="rcmatose.pdb"\r
+            Source="..\bin\tools\$(var.ARCH)\release\rdma_cmatose.pdb" />\r
+      <File Id="ibv_rdma_lat.exe" Compressed="yes" DiskId="1"\r
+            LongName="ibv_rdma_lat.exe" Name="wrdmalat.exe"\r
+            Source="..\bin\tools\$(var.ARCH)\release\ibv_rdma_lat.exe" />\r
+      <File Id="ibv_rdma_lat.pdb" Compressed="yes" DiskId="1"\r
+            LongName="ibv_rdma_lat.pdb" Name="wrdmalat.pdb"\r
+            Source="..\bin\tools\$(var.ARCH)\release\ibv_rdma_lat.pdb" />\r
+      <File Id="ibv_rdma_bw.exe" Compressed="yes" DiskId="1"\r
+            LongName="ibv_rdma_bw.exe" Name="wrdma_bw.exe"\r
+            Source="..\bin\tools\$(var.ARCH)\release\ibv_rdma_bw.exe" />\r
+      <File Id="ibv_rdma_bw.pdb" Compressed="yes" DiskId="1"\r
+            LongName="ibv_rdma_bw.pdb" Name="wrdma_bw.pdb"\r
+            Source="..\bin\tools\$(var.ARCH)\release\ibv_rdma_bw.pdb" />\r
+      <File Id="ibroute.exe" Compressed="yes" DiskId="1"\r
+            LongName="ibroute.exe" Name="ibroute.exe"\r
+            Source="..\bin\tools\$(var.ARCH)\release\ibroute.exe" />\r
+      <File Id="ibroute.pdb" Compressed="yes" DiskId="1"\r
+            LongName="ibroute.pdb" Name="ibroute.pdb"\r
+            Source="..\bin\tools\$(var.ARCH)\release\ibroute.pdb" />\r
+      <File Id="ibtracert.exe" Compressed="yes" DiskId="1"\r
+            LongName="ibtracert.exe" Name="ibtrt.exe"\r
+            Source="..\bin\tools\$(var.ARCH)\release\ibtracert.exe" />\r
+      <File Id="ibtracert.pdb" Compressed="yes" DiskId="1"\r
+            LongName="ibtracert.pdb" Name="ibtrt.pdb"\r
+            Source="..\bin\tools\$(var.ARCH)\release\ibtracert.pdb" />\r
+    </Component>\r
+</Include>\r
diff --git a/WinOF/WIX/common/winverbs_drivers.inc b/WinOF/WIX/common/winverbs_drivers.inc
new file mode 100644 (file)
index 0000000..1b147a7
--- /dev/null
@@ -0,0 +1,30 @@
+<Include>\r
+    <Component Id="cWinVerbsDrivers"\r
+               Guid="F5FA1491-E2D2-4f22-9549-07C61F86BFEB">\r
+\r
+      <File Id="winverbs.sys" Compressed="yes" DiskId="1"\r
+            LongName="winverbs.sys" Name="winverbs.sys"\r
+            Source="..\bin\HCA\$(var.ARCH)\winverbs.sys" />\r
+      <File Id="winverbs.pdb" Compressed="yes" DiskId="1"\r
+            LongName="winverbs.pdb" Name="winverbs.pdb"\r
+            Source="..\bin\HCA\$(var.ARCH)\winverbs.pdb" />\r
+      <File Id="winverbs.dll" Compressed="yes" DiskId="1"\r
+            LongName="winverbs.dll" Name="winvrbs.dll"\r
+            Source="..\bin\HCA\$(var.ARCH)\winverbs.dll" />\r
+      <File Id="winverbsd.dll" Compressed="yes" DiskId="1"\r
+            LongName="winverbsd.dll" Name="winvrbsd.dll"\r
+            Source="..\bin\HCA\$(var.ARCH)\winverbsd.dll" />\r
+      <File Id="winmad.sys" Compressed="yes" DiskId="1"\r
+            LongName="winmad.sys" Name="winmad.sys"\r
+            Source="..\bin\HCA\$(var.ARCH)\winmad.sys" />\r
+      <File Id="winmad.pdb" Compressed="yes" DiskId="1"\r
+            LongName="winmad.pdb" Name="winmad.pdb"\r
+            Source="..\bin\HCA\$(var.ARCH)\winmad.pdb" />\r
+      <File Id="winmad.dll" Compressed="yes" DiskId="1"\r
+            LongName="winmad.dll" Name="winmad.dll"\r
+            Source="..\bin\HCA\$(var.ARCH)\winmad.dll" />\r
+      <File Id="winmadd.dll" Compressed="yes" DiskId="1"\r
+            LongName="winmadd.dll" Name="winmaddd.dll"\r
+            Source="..\bin\HCA\$(var.ARCH)\winmadd.dll" />\r
+    </Component>\r
+</Include>\r
index 619fadf..6672c8d 100644 (file)
@@ -2,23 +2,31 @@
 <!--\r
    WinOF (Windows OpenFabrics) for IA64/IPF Itanium on Windows 7\r
 -->\r
+\r
+<?define ARCH=ia64 ?>\r
+<?define ARCHP=ia64 ?>\r
+<?define OS=win7 ?>\r
+<?include ..\..\common\WinOF_cfg.inc ?>\r
+\r
 <Wix xmlns="http://schemas.microsoft.com/wix/2003/01/wi">\r
-  <Product Name="Windows Open Fabrics InfiniBand v2.1 (RC0) ia64"\r
-    Version="2.1.0"\r
+  <Product\r
+    Name="Windows OpenFabrics InfiniBand $(var.WOFREL) $(var.ARCHP)"\r
+    Version="$(var.WOFRELNUM)"\r
     Id="3A6A276E-A636-48e8-8624-9A0DE3F2A15E"\r
-    UpgradeCode='E38964D6-359D-4E38-9BBF-8C79D84DF6CF' \r
+    UpgradeCode='E38964D6-359D-4E38-9BBF-8C79D84DF6CF'\r
     Language="1033" Codepage="1252"\r
     Manufacturer="Open Fabrics Alliance Windows">\r
 \r
     <Package Id="????????-????-????-????-????????????"\r
-     Keywords="Installer, InfiniBand" Description="WinOF Installer"\r
+     Keywords="Installer, InfiniBand, WinOF, OpenFabrics"\r
      InstallPrivileges='elevated'\r
-     Comments="Windows Open Fabrics Alliance InfiniBand stack"\r
-     Manufacturer="Open Fabrics Alliance Windows" InstallerVersion="200"\r
+     Description="WinOF Installer"\r
+     Comments="Windows OpenFabrics Alliance InfiniBand stack"\r
+     Manufacturer="OpenFabrics Alliance" InstallerVersion="200"\r
      Languages="1033" Compressed="yes" SummaryCodepage="1252" />\r
 \r
     <Condition Message="Administrator required to install [ProductName].">\r
-     Privileged\r
+     AdminUser\r
     </Condition>\r
 \r
     <Condition Message="This package can be installed on IA64 systems only">\r
          <![CDATA[(VersionNT=600)]]>\r
     </Condition>\r
 \r
-    <!--\r
-        System/Machine-wide install, otherwise per-user (Administrator) only.\r
-        All users see OpenFabrics WinOF Release Notes & Manual in Programs.\r
-     -->\r
-    <Property Id="ALLUSERS"> Value="1" </Property>\r
-\r
-    <!-- Requires files sc.exe & reg.exe -->\r
-    <Property Id="REG_EXISTS">\r
-      <DirectorySearch Id="RegFileDir" Path="[WindowsFolder]" Depth="1">\r
-        <FileSearch Id="RegFile" Name="reg.exe" />\r
-      </DirectorySearch>\r
-    </Property>\r
-\r
-    <Property Id="SC_EXISTS">\r
-      <DirectorySearch Id="ScFileDir" Path="[WindowsFolder]" Depth="1">\r
-        <FileSearch Id="ScFile" Name="sc.exe" />\r
-      </DirectorySearch>\r
-    </Property>\r
-\r
-    <Property Id="IPOIB_EXISTS">\r
-      <DirectorySearch Id="ipoibFileDir" Path="[INSTALLDIR]\net" Depth="0">\r
-        <FileSearch Id="ipoibFile" Name="netipoib.inf" />\r
-      </DirectorySearch>\r
-    </Property>\r
-\r
-    <Property Id="DAT_CONF_EXISTS">\r
-      <DirectorySearch Id="DCscan" Path="[WindowsVolume]\DAT" Depth="0">\r
-        <FileSearch Id="DCFile" Name="dat.conf" />\r
-      </DirectorySearch>\r
-    </Property>\r
-\r
-    <Property Id="DAT1_INSTALLED">\r
-      <DirectorySearch Id="Dat1File" Path="[INSTALLDIR]" Depth="0">\r
-        <FileSearch Id="daplFile" Name="dapl.dll" />\r
-      </DirectorySearch>\r
-    </Property>\r
-\r
-    <Property Id="DAT2_INSTALLED">\r
-      <DirectorySearch Id="Dat2File" Path="[INSTALLDIR]" Depth="0">\r
-        <FileSearch Id="dapl2File" Name="dapl2.dll" />\r
-      </DirectorySearch>\r
-    </Property>\r
-\r
-    <Condition Message="[ProductName] requires system file reg.exe">\r
-       REG_EXISTS\r
-    </Condition>\r
-\r
-    <Condition Message="[ProductName] requires system file sc.exe">\r
-       SC_EXISTS\r
-    </Condition>\r
-\r
-    <Media Id="1" Cabinet="Sample.cab" EmbedCab="yes" DiskPrompt="CD-ROM #1" />\r
-    <Property Id="DiskPrompt" Value="WinOF 1.1 Installation [1]" />\r
+    <?include ..\..\common\requirements.inc ?>\r
 \r
     <Directory Id="TARGETDIR" Name="SourceDir">\r
       <Directory Id="ProgramMenuFolder" Name="PMenu" LongName="Programs">\r
       <Directory Id="DesktopFolder" Name="Desktop" />\r
       <Directory Id="ProgramFilesFolder" Name="PFiles">\r
         <Directory Id="INSTALLDIR" Name="WinOF">\r
-          <Component Id="Docs" Guid="931C58EF-3759-4cf4-89CC-276C017305BB">\r
-\r
-            <File Id="OFAlogo" Compressed="yes" DiskId="1"\r
-                    LongName="openfabrics.gif" Name="ofa.gif"\r
-                    Source="..\..\openfabrics.gif" />\r
-\r
-            <!-- implies WIX build only from an svn structured tree.  -->\r
-            <File Id="manual.htm" Compressed="yes" DiskId="1" Name="Manual.htm"\r
-                    LongName="Manual.htm"\r
-                    Source="..\bin\Misc\Manual.htm" Vital="yes" />\r
-\r
-            <Shortcut Id="Manual.htm" Directory="ProgramMenuDir"\r
-                    Name="Manual.htm" LongName="Manual"\r
-                    Target="[INSTALLDIR]\Manual.htm" Show="normal"\r
-                    WorkingDirectory="INSTALLDIR" Icon="openfabrics"\r
-                    IconIndex="0" />\r
-\r
-            <File Id="dRelnotes" Compressed="yes" DiskId="1"\r
-                    LongName="Release_notes.htm" Name="RELEASE_.HTM"\r
-                    Source="..\..\Release_notes.htm" />\r
-\r
-            <Shortcut Id="RelNotes" Directory="ProgramMenuDir" Name="RelNotes"\r
-                    LongName="Release Notes"\r
-                    Target="[INSTALLDIR]\Release_notes.htm" Show="normal"\r
-                    WorkingDirectory="INSTALLDIR" Icon="openfabrics"\r
-                    IconIndex="0" />\r
-\r
-            <File Id="command_window" Name="COMMAND.LNK"\r
-                    LongName="Command Window.lnk" Compressed="yes" DiskId="1"\r
-                    Source="..\..\ia64\Command Window.lnk" Vital="yes" />\r
-\r
-            <Shortcut Id="Command_Window.lnk" Directory="ProgramMenuDir"\r
-                    Name="COMMAND.LNK" LongName="Command Window.lnk"\r
-                    Target="[INSTALLDIR]\Command Window.lnk" Icon="openfabrics"\r
-                    IconIndex="0" Show="normal" WorkingDirectory="INSTALLDIR" />\r
-\r
-            <Shortcut Id="UninstallProduct" Name="UnMyApp"\r
-                LongName="Uninstall WinOF"\r
-                               Target="[System64Folder]msiexec.exe"\r
-                Arguments="/X [ProductCode]"\r
-                Directory="ProgramMenuDir"\r
-                Description="Uninstalls OpenFabrics InfiniBand" />\r
-            <RemoveFolder Id="RemoveShorcutFolder" On="uninstall" />\r
-          </Component>\r
-\r
-          <Component Id="Tools" Guid="1B89230E-5D8D-41a5-BD1F-A3E308FEE026">\r
-           <Environment Id='UpdatePath' Name='PATH' Action='create'\r
-                        System='yes' Part='last' Value='[INSTALLDIR]' /> \r
-\r
-            <File Id="qlgcvnic_config" Compressed="yes" DiskId="1" Vital="yes"\r
-                  Name="vnic_cfg.exe" LongName="qlgcvnic_config.exe"\r
-                  Source="..\bin\tools\ia64\release\qlgcvnic_config.exe" />\r
-            <File Id="part_man" Name="part_man.exe"\r
-                  Compressed="yes" DiskId="1" Vital="yes"\r
-                  Source="..\bin\tools\ia64\release\part_man.exe" />\r
-            <File Id="vstat" Name="vstat.exe"\r
-                  Compressed="yes" DiskId="1" Vital="yes"\r
-                  Source="..\bin\tools\ia64\release\vstat.exe" />\r
-            <File Id="ttcp.exe" LongName="ttcp.exe" Compressed="yes"\r
-                  DiskId="1" Name="TTCP.EXE"\r
-                  Source="..\bin\tools\ia64\release\ttcp.exe" />\r
-            <File Id="cmtest.exe" LongName="cmtest.exe" Compressed="yes"\r
-                  DiskId="1" Name="CMTEST.EXE"\r
-                  Source="..\bin\tools\ia64\release\cmtest.exe" />\r
-            <File Id="ib_limits.exe" Compressed="yes" DiskId="1"\r
-                  LongName="ib_limits.exe" Name="IB_LIMI.EXE"\r
-                  Source="..\bin\tools\ia64\release\ib_limits.exe" />\r
-            <File Id="ib_read_bw.exe" Compressed="yes" DiskId="1"\r
-                  LongName="ib_read_bw.exe" Name="IB_READ.EXE"\r
-                  Source="..\bin\tools\ia64\release\ib_read_bw.exe" />\r
-            <File Id="ib_read_lat.exe" Compressed="yes" DiskId="1"\r
-                  LongName="ib_read_lat.exe" Name="IB_READ1.EXE"\r
-                  Source="..\bin\tools\ia64\release\ib_read_lat.exe" />\r
-            <File Id="ib_send_bw.exe" Compressed="yes" DiskId="1"\r
-                  LongName="ib_send_bw.exe" Name="IB_SEND.EXE"\r
-                  Source="..\bin\tools\ia64\release\ib_send_bw.exe" />\r
-            <File Id="ib_send_lat.exe" Compressed="yes" DiskId="1"\r
-                  LongName="ib_send_lat.exe" Name="IB_SEND1.EXE"\r
-                  Source="..\bin\tools\ia64\release\ib_send_lat.exe" />\r
-            <File Id="ib_write_bw.exe" Compressed="yes" DiskId="1"\r
-                  LongName="ib_write_bw.exe" Name="IB_WRIT.EXE"\r
-                  Source="..\bin\tools\ia64\release\ib_write_bw.exe" />\r
-            <File Id="ib_write_lat.exe" Compressed="yes" DiskId="1"\r
-                  LongName="ib_write_lat.exe" Name="IB_WRIT1.EXE"\r
-                  Source="..\bin\tools\ia64\release\ib_write_lat.exe" />\r
-            <File Id="ibtrapgen.exe" Compressed="yes" DiskId="1"\r
-                  LongName="ibtrapgen.exe" Name="IBTRAPG.EXE"\r
-                  Source="..\bin\tools\ia64\release\ibtrapgen.exe" />\r
-            <File Id="osmtest.exe" Compressed="yes" DiskId="1"\r
-                  LongName="osmtest.exe" Name="OSMTEST.EXE"\r
-                  Source="..\bin\tools\ia64\release\osmtest.exe" />\r
-            <File Id="PrintIP.exe" Compressed="yes" DiskId="1"\r
-                  LongName="PrintIP.exe" Name="PRINTIP.EXE"\r
-                  Source="..\bin\tools\ia64\release\PrintIP.exe" />\r
-            <File Id="nsc" Name="nsc.exe" Compressed="yes" DiskId="1"\r
-                     Vital="yes" Source="..\bin\tools\ia64\release\nsc.exe" />\r
-          </Component>\r
-\r
-          <Component Id='OpenSMservice'\r
-                     Guid='90042B4F-51B5-4720-8E54-6D366253634B'\r
-                     SharedDllRefCount='no' KeyPath='no'\r
-                     NeverOverwrite='no'\r
-                     Permanent='no' Transitive='no' Win64='no'\r
-                     Location='either'>\r
-\r
-              <File Id="opensm.exe" Compressed="yes" DiskId="1"\r
-                    LongName="opensm.exe" Name="OPENSM.EXE"\r
-                    Source="..\bin\tools\ia64\release\opensm.exe"\r
-                    Vital='yes' KeyPath='yes' Hidden='no' System='no' \r
-                    Checksum='no' ReadOnly='no' />\r
-\r
-              <ServiceInstall Id='osmSvcInstall' Vital='yes' Name='OpenSM'\r
-                  Description='InfiniBand Subnet Configuration and Management'\r
-                  DisplayName='InfiniBand Subnet Manager'\r
-                  Arguments='-e --service'\r
-                  ErrorControl='normal'\r
-                  Start='disabled'\r
-                  Interactive='no'\r
-                  Type='ownProcess' />\r
-\r
-              <ServiceControl Id='osmSvcControl' Name='OpenSM'\r
-                              Stop='uninstall'\r
-                              Wait='no'\r
-                              Remove='uninstall' />\r
-          </Component>\r
-\r
-          <Directory Id="hcaDir" Name="IBcore">\r
-            <Component Id="cIBcore"\r
-                       Guid="4B4EA649-65ED-4B0D-8717-D60481412211">\r
-              <CreateFolder />\r
-              <File Id="dpinst.exe" Compressed="yes" DiskId="1"\r
-                     LongName="dpinst.exe" Name="dpinst.exe"\r
-                     Source="..\..\ia64\dpinst.exe" />\r
-              <File Id="dpinst.xml" Compressed="yes" DiskId="1"\r
-                     LongName="dpinst.xml" Name="dpinst.xml"\r
-                     Source="..\..\dpinst.xml" />\r
-              <File Id="devman.exe" Compressed="yes" DiskId="1"\r
-                     LongName="devman.exe" Name="devman.exe"\r
-                     Source="..\..\ia64\devman.exe" />\r
-              <File Id="wdfcoinstaller" Compressed="yes" DiskId="1"\r
-                     LongName="WdfCoInstaller01009.dll" Name="WCO.dll"\r
-                     Source="..\bin\hca\ia64\WdfCoInstaller01009.dll" />\r
-              <File Id="cl32.dll" Compressed="yes" DiskId="1"\r
-                     LongName="cl32.dll" Name="CL32.DLL"\r
-                     Source="..\bin\HCA\ia64\cl32.dll" />\r
-              <File Id="cl32d.dll" Compressed="yes" DiskId="1"\r
-                     LongName="cl32d.dll" Name="CL32D.DLL"\r
-                     Source="..\bin\HCA\ia64\cl32d.dll" />\r
-              <File Id="complib.dll" Compressed="yes" DiskId="1"\r
-                     LongName="complib.dll" Name="COMPLIB.DLL"\r
-                     Source="..\bin\HCA\ia64\complib.dll" />\r
-              <File Id="complibd.dll" Compressed="yes" DiskId="1"\r
-                     LongName="complibd.dll" Name="COMPLIB1.DLL"\r
-                     Source="..\bin\HCA\ia64\complibd.dll" />\r
-              <File Id="ibal32.dll" Compressed="yes" DiskId="1"\r
-                     LongName="ibal32.dll" Name="IBAL32.DLL"\r
-                     Source="..\bin\HCA\ia64\ibal32.dll" />\r
-              <File Id="ibal32d.dll" Compressed="yes" DiskId="1"\r
-                     LongName="ibal32d.dll" Name="IBAL32D.DLL"\r
-                     Source="..\bin\HCA\ia64\ibal32d.dll" />\r
-              <File Id="ibal.dll" Compressed="yes" DiskId="1"\r
-                     LongName="ibal.dll" Name="IBAL.DLL"\r
-                     Source="..\bin\HCA\ia64\ibal.dll" />\r
-              <File Id="ibald.dll" Compressed="yes" DiskId="1"\r
-                     LongName="ibald.dll" Name="IBALD.DLL"\r
-                     Source="..\bin\HCA\ia64\ibald.dll" />\r
-              <File Id="ibbus.sys" Compressed="yes" DiskId="1"\r
-                     LongName="ibbus.sys" Name="IBBUS.SYS"\r
-                     Source="..\bin\HCA\ia64\ibbus.sys" />\r
-              <File Id="ibbus.pdb" Name="ibbus.pdb" DiskId="1" Compressed="yes"\r
-                     Source="..\bin\HCA\ia64\ibbus.pdb" />\r
 \r
-              <File Id="ibiou.sys" Compressed="yes" DiskId="1"\r
-                     LongName="ibiou.sys" Name="IBIOU.SYS"\r
-                     Source="..\bin\HCA\ia64\ibiou.sys" />\r
-              <File Id="ibiou.pdb" Compressed="yes" DiskId="1"\r
-                     Name="ibiou.pdb" Source="..\bin\HCA\ia64\ibiou.pdb" />\r
-              <File Id="ib_iou.cat" Compressed="yes" DiskId="1"\r
-                     LongName="ib_iou.cat" Name="IB_IOU.cat"\r
-                     Source="..\bin\HCA\ia64\ib_iou.cat" />\r
-              <File Id="ib_iou.inf" Compressed="yes" DiskId="1"\r
-                     LongName="ib_iou.inf" Name="IB_IOU.inf"\r
-                     Source="..\bin\HCA\ia64\ib_iou.inf" />\r
-            </Component>\r
-\r
-            <Component Id="cMthcaDriver"\r
-                       Guid="BE4ED061-C852-40a2-A240-F06DBBE1159F">\r
-              <File Id="mthca32.dll" Compressed="yes" DiskId="1"\r
-                     LongName="mthca32.dll" Name="MTHCA32.DLL"\r
-                     Source="..\bin\HCA\ia64\mthca32.dll" />\r
-              <File Id="mthca32d.dll" Compressed="yes" DiskId="1"\r
-                     LongName="mthca32d.dll" Name="MTHCA321.DLL"\r
-                     Source="..\bin\HCA\ia64\mthca32d.dll" />\r
-              <File Id="mthca.inf" Compressed="yes" DiskId="1"\r
-                     LongName="mthca.inf" Name="MTHCA.INF"\r
-                     Source="..\bin\HCA\ia64\mthca.inf" />\r
-              <File Id="mthca.cat" Compressed="yes" DiskId="1"\r
-                     LongName="mthca.cat" Name="MTHCA.cat"\r
-                     Source="..\bin\HCA\ia64\mthca.cat" />\r
-              <File Id="mthca.sys" Compressed="yes" DiskId="1"\r
-                     LongName="mthca.sys" Name="MTHCA.SYS"\r
-                     Source="..\bin\HCA\ia64\mthca.sys" />\r
-              <File Id="mthca.pdb" Name="mthca.pdb" DiskId="1"\r
-                     Compressed="yes" Source="..\bin\HCA\ia64\mthca.pdb" />\r
-              <File Id="mthcau.dll" Compressed="yes" DiskId="1"\r
-                     LongName="mthcau.dll" Name="MTHCAU.DLL"\r
-                     Source="..\bin\HCA\ia64\mthcau.dll" />\r
-              <File Id="mthcaud.dll" Compressed="yes" DiskId="1"\r
-                     LongName="mthcaud.dll" Name="MTHCAUD.DLL"\r
-                     Source="..\bin\HCA\ia64\mthcaud.dll" />\r
-            </Component>\r
-\r
-            <Component Id="cConnectXDriver"\r
-                       Guid="C1EFF4D6-CE55-432a-9D92-E46AB983D9E3">\r
-              <File Id="mlx4_bus.inf" Compressed="yes" DiskId="1"\r
-                     LongName="mlx4_bus.inf" Name="mlx4_bus.INF"\r
-                     Source="..\bin\hca\ia64\mlx4_bus.inf" />\r
-              <File Id="mlx4_bus.cat" Compressed="yes" DiskId="1"\r
-                     LongName="mlx4_bus.cat" Name="mlx4_bus.cat"\r
-                     Source="..\bin\hca\ia64\mlx4_bus.cat" />\r
-              <File Id="mlx4_bus.sys" Compressed="yes" DiskId="1"\r
-                     LongName="mlx4_bus.sys" Name="mlx4_bus.sys"\r
-                     Source="..\bin\hca\ia64\mlx4_bus.sys" />\r
-              <File Id="mlx4_bus.pdb" Compressed="yes" DiskId="1"\r
-                     Name="mlx4_bus.pdb"\r
-                     Source="..\bin\hca\ia64\mlx4_bus.pdb" />\r
-              <File Id="mlx4_hca.inf" Compressed="yes" DiskId="1"\r
-                     LongName="mlx4_hca.inf" Name="mlx4_hca.INF"\r
-                     Source="..\bin\hca\ia64\mlx4_hca.inf" />\r
-              <File Id="mlx4_hca.cat" Compressed="yes" DiskId="1"\r
-                     LongName="mlx4_hca.cat" Name="mlx4_hca.cat"\r
-                     Source="..\bin\hca\ia64\mlx4_hca.cat" />\r
-              <File Id="mlx4_hca.sys" Compressed="yes" DiskId="1"\r
-                     LongName="mlx4_hca.sys" Name="mlx4_hca.sys"\r
-                     Source="..\bin\hca\ia64\mlx4_hca.sys" />\r
-              <File Id="mlx4_hca.pdb" Compressed="yes" DiskId="1"\r
-                     LongName="mlx4_hca.pdb" Name="mlx4_hca.pdb"\r
-                     Source="..\bin\hca\ia64\mlx4_hca.pdb" />\r
-              <File Id="mlx4u.dll" Compressed="yes" DiskId="1"\r
-                     LongName="mlx4u.dll" Name="mlx4u.dll"\r
-                     Source="..\bin\hca\ia64\mlx4u.dll" />\r
-              <File Id="mlx4ud.dll" Compressed="yes" DiskId="1"\r
-                     LongName="mlx4ud.dll" Name="mlx4ud.dll"\r
-                     Source="..\bin\hca\ia64\mlx4ud.dll" />\r
-\r
-                         <!-- copy 32-bit binaries --> \r
-              <File Id="mlx4u32d.dll" Compressed="yes" DiskId="1"\r
-                     LongName="mlx4u32d.dll" Name="mlx4u32.dll"\r
-                     Source="..\bin\hca\ia64\mlx4u32d.dll" />\r
-              <File Id="mlx4u32.dll" Compressed="yes" DiskId="1"\r
-                     LongName="mlx4u32.dll" Name="mlx4u32.dll"\r
-                     Source="..\bin\hca\ia64\mlx4u32.dll" />\r
-            </Component>\r
-\r
-            <Component Id="cWinVerbsDrivers"\r
-                       Guid="F5FA1491-E2D2-4f22-9549-07C61F86BFEB">\r
-\r
-              <File Id="winverbs.sys" Compressed="yes" DiskId="1"\r
-                    LongName="winverbs.sys" Name="winverbs.sys"\r
-                    Source="..\bin\HCA\ia64\winverbs.sys" />\r
-              <File Id="winverbs.pdb" Compressed="yes" DiskId="1"\r
-                    LongName="winverbs.pdb" Name="winverbs.pdb"\r
-                    Source="..\bin\HCA\ia64\winverbs.pdb" />\r
-              <File Id="winverbs.dll" Compressed="yes" DiskId="1"\r
-                    LongName="winverbs.dll" Name="winvrbs.dll"\r
-                    Source="..\bin\HCA\ia64\winverbs.dll" />\r
-              <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="winmad.sys" Compressed="yes" DiskId="1"\r
-                    LongName="winmad.sys" Name="winmad.sys"\r
-                    Source="..\bin\HCA\ia64\winmad.sys" />\r
-              <File Id="winmad.pdb" Compressed="yes" DiskId="1"\r
-                    LongName="winmad.pdb" Name="winmad.pdb"\r
-                    Source="..\bin\HCA\ia64\winmad.pdb" />\r
-              <File Id="winmad.dll" Compressed="yes" DiskId="1"\r
-                    LongName="winmad.dll" Name="winmad.dll"\r
-                    Source="..\bin\HCA\ia64\winmad.dll" />\r
-              <File Id="winmadd.dll" Compressed="yes" DiskId="1"\r
-                    LongName="winmadd.dll" Name="winmaddd.dll"\r
-                    Source="..\bin\HCA\ia64\winmadd.dll" />\r
-            </Component>\r
-          </Directory>\r
-\r
-          <Directory Id="dir_0" Name="Checked">\r
-            <Directory Id="dir_1" Name="kernel">\r
-              <Component Id="cCHK_kernel"\r
-                         Guid="D96F299E-EEAA-44a5-BBC4-A862A158BA6B">\r
-                <CreateFolder />\r
-\r
-                <File Id="chk0" DiskId="1" Compressed="yes"\r
-                      Name="README.txt"\r
-                      Source="..\..\README_checked.txt" />\r
-                <File Id="chk1" DiskId="1" Compressed="yes"\r
-                      Name="mthca.sys"\r
-                      Source="..\bin\Chk\HCA\ia64\mthca.sys" />\r
-                <File Id="cat1" DiskId="1" Compressed="yes"\r
-                      Name="mthca.cat"\r
-                      Source="..\bin\Chk\HCA\ia64\mthca.cat" />\r
-                <File Id="sym1" DiskId="1" Compressed="yes"\r
-                      Name="mthca.pdb"\r
-                      Source="..\bin\Chk\HCA\ia64\mthca.pdb" />\r
-\r
-                <File Id="chk2" DiskId="1" Compressed="yes"\r
-                      Name="ibbus.sys"\r
-                      Source="..\bin\Chk\HCA\ia64\ibbus.sys" />\r
-                <File Id="sym2" DiskId="1" Compressed="yes"\r
-                      Name="ibbus.pdb"\r
-                      Source="..\bin\Chk\HCA\ia64\ibbus.pdb" />\r
-\r
-                <File Id="chk3" DiskId="1" Compressed="yes"\r
-                      Name="ibiou.sys"\r
-                      Source="..\bin\Chk\HCA\ia64\ibiou.sys" />\r
-                <File Id="cat3" DiskId="1" Compressed="yes"\r
-                      Name="ib_iou.cat"\r
-                      Source="..\bin\Chk\HCA\ia64\ib_iou.cat" />\r
-                <File Id="sym3" DiskId="1" Compressed="yes"\r
-                      Name="ibiou.pdb"\r
-                      Source="..\bin\Chk\HCA\ia64\ibiou.pdb" />\r
-\r
-                <File Id="chk4" DiskId="1" Compressed="yes"\r
-                      Name="ipoib.sys"\r
-                      Source="..\bin\Chk\net\ia64\ipoib.sys" />\r
-                <File Id="cat4" DiskId="1" Compressed="yes"\r
-                      Name="ipoib.cat"\r
-                      Source="..\bin\Chk\net\ia64\ipoib.cat" />\r
-                <File Id="sym4" DiskId="1" Compressed="yes"\r
-                      Name="ipoib.pdb"\r
-                      Source="..\bin\Chk\net\ia64\ipoib.pdb" />\r
-\r
-                <File Id="chk5" DiskId="1" Compressed="yes"\r
-                      Name="qlgcvnic.sys"\r
-                      Source="..\bin\Chk\net\ia64\qlgcvnic.sys" />\r
-                <File Id="cat5" DiskId="1" Compressed="yes"\r
-                      Name="netvnic.cat"\r
-                      Source="..\bin\Chk\net\ia64\netvnic.cat" />\r
-                <File Id="sym5" DiskId="1" Compressed="yes"\r
-                      Name="qlgcvnic.pdb"\r
-                      Source="..\bin\Chk\net\ia64\qlgcvnic.pdb" />\r
-\r
-                <File Id="chk6" DiskId="1" Compressed="yes"\r
-                      Name="ibsrp.sys"\r
-                      Source="..\bin\Chk\storage\ia64\ibsrp.sys" />\r
-                <File Id="cat6" DiskId="1" Compressed="yes"\r
-                      Name="ibsrp.cat"\r
-                      Source="..\bin\Chk\storage\ia64\ibsrp.cat" />\r
-                <File Id="sym6" DiskId="1" Compressed="yes"\r
-                      Name="ibsrp.pdb"\r
-                      Source="..\bin\Chk\storage\ia64\ibsrp.pdb" />\r
+          <?include ..\..\common\Docs.inc ?>\r
+          <?include ..\..\common\Tools.inc ?>\r
+          <?include ..\..\common\OpenSM_service.inc ?>\r
 \r
-                <File Id="chk9" DiskId="1" Compressed="yes"\r
-                      Name="winverbs.sys"\r
-                      Source="..\bin\Chk\HCA\ia64\winverbs.sys" />\r
-                <File Id="sym9" DiskId="1" Compressed="yes"\r
-                      Name="winverbs.pdb"\r
-                      Source="..\bin\Chk\HCA\ia64\winverbs.pdb" />\r
-                <File Id="dll9" DiskId="1" Compressed="yes"\r
-                      Name="winverbs.dll"\r
-                      Source="..\bin\Chk\HCA\ia64\winverbs.dll" />\r
-                <File Id="dlld9" DiskId="1" Compressed="yes"\r
-                      Name="winverbd.dll"\r
-                      LongName="winverbsd.dll"\r
-                      Source="..\bin\Chk\HCA\ia64\winverbsd.dll" />\r
-              </Component>\r
-            </Directory>\r
-      \r
-            <Directory Id="dir_14" Name="user">\r
-              <Component Id="cCHK_user" \r
-                         Guid="A4AC788B-6517-47b2-A898-0493ADC794D5">\r
-                <CreateFolder />\r
-                <File Id="file83" Name="DAPL2-_1.DLL"\r
-                  LongName="dapl2-scmd.dll" DiskId="1" Compressed="yes"\r
-                  Source="..\bin\bin\user\objchk_win7_ia64\ia64\dapl2-scmd.dll" />\r
-                <File Id="file84" Name="dapl2d.dll" DiskId="1" Compressed="yes"\r
-                  Source="..\bin\bin\user\objchk_win7_ia64\ia64\dapl2d.dll" />\r
-                <File Id="file85" Name="DAPL2T_1.EXE"\r
-                  LongName="dapl2testd.exe" DiskId="1" Compressed="yes"\r
-                  Source="..\bin\bin\user\objchk_win7_ia64\ia64\dapl2testd.exe" />\r
-                <File Id="file86" Name="dapld.dll" DiskId="1" Compressed="yes"\r
-                  Source="..\bin\bin\user\objchk_win7_ia64\ia64\dapld.dll" />\r
-                <File Id="file87" Name="DAPLTE_1.EXE"\r
-                  LongName="dapltestd.exe" DiskId="1" Compressed="yes"\r
-                  Source="..\bin\bin\user\objchk_win7_ia64\ia64\dapltestd.exe" />\r
-                <File Id="file88" Name="dat2d.dll" DiskId="1" Compressed="yes"\r
-                  Source="..\bin\bin\user\objchk_win7_ia64\ia64\dat2d.dll" />\r
-                <File Id="file89" Name="datd.dll" DiskId="1" Compressed="yes"\r
-                  Source="..\bin\bin\user\objchk_win7_ia64\ia64\datd.dll" />\r
-                <File Id="file90" Name="dtest2d.exe" DiskId="1" Compressed="yes"\r
-                  Source="..\bin\bin\user\objchk_win7_ia64\ia64\dtest2d.exe" />\r
-                <File Id="file91" Name="dtestxd.exe" DiskId="1" Compressed="yes"\r
-                  Source="..\bin\bin\user\objchk_win7_ia64\ia64\dtestxd.exe" />\r
-                <File Id="file94" Name="ibald.dll" DiskId="1" Compressed="yes"\r
-                  Source="..\bin\bin\user\objchk_win7_ia64\ia64\ibald.dll" />\r
-                <File Id="file97" Name="ibwsd.dll" DiskId="1" Compressed="yes"\r
-                  Source="..\bin\bin\user\objchk_win7_ia64\ia64\ibwsd.dll" />\r
-                <File Id="file105" Name="INSTAL_1.EXE"\r
-                  LongName="installsp.exe" DiskId="1" Compressed="yes"\r
-                  Source="..\bin\bin\user\objchk_win7_ia64\ia64\installsp.exe" />\r
-                <File Id="file108" Name="mthcaud.dll" DiskId="1" Compressed="yes"\r
-                  Source="..\bin\bin\user\objchk_win7_ia64\ia64\mthcaud.dll" />\r
-                <File Id="file110" Name="opensm.exe" DiskId="1" Compressed="yes"\r
-                  Source="..\bin\bin\user\objchk_win7_ia64\ia64\opensm.exe" />\r
-                <File Id="file115" Name="vstat.exe" DiskId="1" Compressed="yes"\r
-                  Source="..\bin\bin\user\objchk_win7_ia64\ia64\vstat.exe" />\r
-                <File Id="file116" Name="part_man.exe"\r
-                  DiskId="1" Compressed="yes"\r
-                  Source="..\bin\bin\user\objchk_win7_ia64\ia64\part_man.exe" />\r
-              </Component>\r
-            </Directory>\r
+          <Directory Id="IBcoreDir" Name="IBcore">\r
+            <?include ..\..\common\IBcore.inc ?>\r
+            <?include ..\..\common\mlnx_drivers.inc ?>\r
+            <?include ..\..\common\winverbs_drivers.inc ?>\r
           </Directory>\r
 \r
-          <Component Id="cWinVerbsOFED"\r
-                     Guid="20916BB0-5E16-49bb-BE9F-3A202D760E72">\r
-\r
-            <File Id="libibverbs.dll" Compressed="yes" DiskId="1"\r
-                  LongName="libibverbs.dll" Name="ibverbs.dll"\r
-                  Source="..\bin\HCA\ia64\libibverbs.dll" />\r
-              <CopyFile Id="dupLibibverbs.dll" FileId="libibverbs.dll"\r
-                     DestinationName="ibverbs.dll"\r
-                     DestinationLongName="libibverbs.dll"\r
-                     DestinationProperty="WindowsFolder" />\r
-            <File Id="libibverbs.pdb" Compressed="yes" DiskId="1"\r
-                  LongName="libibverbs.pdb" Name="ibverbs.pdb"\r
-                  Source="..\bin\HCA\ia64\libibverbs.pdb" />\r
-\r
-            <File Id="libibverbsd.dll" Compressed="yes" DiskId="1"\r
-                  LongName="libibverbsd.dll" Name="ibverbsd.dll"\r
-                  Source="..\bin\HCA\ia64\libibverbsd.dll" />\r
-              <CopyFile Id="dupLibibverbsd.dll" FileId="libibverbsd.dll"\r
-                     DestinationName="ibverbsd.dll"\r
-                     DestinationLongName="libibverbsd.dll"\r
-                     DestinationProperty="WindowsFolder" />\r
-            <File Id="libibverbsd.pdb" Compressed="yes" DiskId="1"\r
-                  LongName="libibverbsd.pdb" Name="ibverbsd.pdb"\r
-                  Source="..\bin\HCA\ia64\libibverbsd.pdb" />\r
-\r
-            <File Id="libibmad.dll" Compressed="yes" DiskId="1"\r
-                  LongName="libibmad.dll" Name="ibmad.dll"\r
-                  Source="..\bin\HCA\ia64\libibmad.dll" />\r
-              <CopyFile Id="dupLibibmad.dll" FileId="libibmad.dll"\r
-                     DestinationName="ibmad.dll"\r
-                     DestinationLongName="libibmad.dll"\r
-                     DestinationProperty="WindowsFolder" />\r
-            <File Id="libibmad.pdb" Compressed="yes" DiskId="1"\r
-                  LongName="libibmad.pdb" Name="ibmad.pdb"\r
-                  Source="..\bin\HCA\ia64\libibmad.pdb" />\r
-\r
-            <File Id="libibmadd.dll" Compressed="yes" DiskId="1"\r
-                  LongName="libibmadd.dll" Name="ibmadd.dll"\r
-                  Source="..\bin\HCA\ia64\libibmadd.dll" />\r
-              <CopyFile Id="dupLibibmadd.dll" FileId="libibmadd.dll"\r
-                     DestinationName="ibmadd.dll"\r
-                     DestinationLongName="libibmadd.dll"\r
-                     DestinationProperty="WindowsFolder" />\r
-            <File Id="libibmadd.pdb" Compressed="yes" DiskId="1"\r
-                  LongName="libibmadd.pdb" Name="ibmadd.pdb"\r
-                  Source="..\bin\HCA\ia64\libibmadd.pdb" />\r
-\r
-            <File Id="libibumad.dll" Compressed="yes" DiskId="1"\r
-                  LongName="libibumad.dll" Name="ibumad.dll"\r
-                  Source="..\bin\HCA\ia64\libibumad.dll" />\r
-              <CopyFile Id="dupLibibumad.dll" FileId="libibumad.dll"\r
-                     DestinationName="ibumad.dll"\r
-                     DestinationLongName="libibumad.dll"\r
-                     DestinationProperty="WindowsFolder" />\r
-            <File Id="libibumad.pdb" Compressed="yes" DiskId="1"\r
-                  LongName="libibumad.pdb" Name="ibumad.pdb"\r
-                  Source="..\bin\HCA\ia64\libibumad.pdb" />\r
-\r
-            <File Id="libibumadd.dll" Compressed="yes" DiskId="1"\r
-                  LongName="libibumadd.dll" Name="ibumadd.dll"\r
-                  Source="..\bin\HCA\ia64\libibumadd.dll" />\r
-              <CopyFile Id="dupLibibumadd.dll" FileId="libibumadd.dll"\r
-                     DestinationName="ibumadd.dll"\r
-                     DestinationLongName="libibumadd.dll"\r
-                     DestinationProperty="WindowsFolder" />\r
-            <File Id="libibumadd.pdb" Compressed="yes" DiskId="1"\r
-                  LongName="libibumadd.pdb" Name="ibumadd.pdb"\r
-                  Source="..\bin\HCA\ia64\libibumadd.pdb" />\r
-\r
-            <File Id="librdmacm.dll" Compressed="yes" DiskId="1"\r
-                  LongName="librdmacm.dll" Name="rdmacm.dll"\r
-                  Source="..\bin\HCA\ia64\librdmacm.dll" />\r
-              <CopyFile Id="dupLibrdmacm.dll" FileId="librdmacm.dll"\r
-                     DestinationName="rdmacm.dll"\r
-                     DestinationLongName="librdmacm.dll"\r
-                     DestinationProperty="SystemFolder" />\r
-            <File Id="librdmacm.pdb" Compressed="yes" DiskId="1"\r
-                  LongName="librdmacm.pdb" Name="rdmacm.pdb"\r
-                  Source="..\bin\HCA\ia64\librdmacm.pdb" />\r
-\r
-            <File Id="librdmacmd.dll" Compressed="yes" DiskId="1"\r
-                  LongName="librdmacmd.dll" Name="rdmacmd.dll"\r
-                  Source="..\bin\HCA\ia64\librdmacmd.dll" />\r
-              <CopyFile Id="dupLibrdmacmd.dll" FileId="librdmacmd.dll"\r
-                     DestinationName="rdmacmd.dll"\r
-                     DestinationLongName="librdmacmd.dll"\r
-                     DestinationProperty="SystemFolder" />\r
-            <File Id="librdmacmd.pdb" Compressed="yes" DiskId="1"\r
-                  LongName="librdmacmd.pdb" Name="rdmacmd.pdb"\r
-                  Source="..\bin\HCA\ia64\librdmacmd.pdb" />\r
-\r
-          </Component>\r
-\r
-          <Component Id="cWinVerbsUApps"\r
-                    Guid="ECAB2829-AE65-4ef8-8214-9A89E5BBDB9A">\r
-\r
-            <File Id="ibv_asyncwatch.exe" Compressed="yes" DiskId="1"\r
-                  LongName="ibv_asyncwatch.exe" Name="asyncwat.exe"\r
-                  Source="..\bin\tools\ia64\release\ibv_asyncwatch.exe" />\r
-            <File Id="ibv_asyncwatch.pdb" Compressed="yes" DiskId="1"\r
-                  LongName="ibv_asyncwatch.pdb" Name="asyncwat.pdb"\r
-                  Source="..\bin\tools\ia64\release\ibv_asyncwatch.pdb" />\r
-            <File Id="ibv_devinfo.exe" Compressed="yes" DiskId="1"\r
-                  LongName="ibv_devinfo.exe" Name="devinfo.exe"\r
-                  Source="..\bin\tools\ia64\release\ibv_devinfo.exe" />\r
-            <File Id="ibv_devinfo.pdb" Compressed="yes" DiskId="1"\r
-                  LongName="ibv_devinfo.pdb" Name="devinfo.pdb"\r
-                  Source="..\bin\tools\ia64\release\ibv_devinfo.pdb" />\r
-            <File Id="ibv_rc_pingpong.exe" Compressed="yes" DiskId="1"\r
-                  LongName="ibv_rc_pingpong.exe" Name="ibv_rc_p.exe"\r
-                  Source="..\bin\tools\ia64\release\ibv_rc_pingpong.exe" />\r
-            <File Id="ibv_rc_pingpong.pdb" Compressed="yes" DiskId="1"\r
-                  LongName="ibv_rc_pingpong.pdb" Name="ibv_rc_p.pdb"\r
-                  Source="..\bin\tools\ia64\release\ibv_rc_pingpong.pdb" />\r
-            <File Id="ibv_read_bw.exe" Compressed="yes" DiskId="1"\r
-                  LongName="ibv_read_bw.exe" Name="readbw.exe"\r
-                  Source="..\bin\tools\ia64\release\ibv_read_bw.exe" />\r
-            <File Id="ibv_read_bw.pdb" Compressed="yes" DiskId="1"\r
-                  LongName="ibv_read_bw.pdb" Name="readbw.pdb"\r
-                  Source="..\bin\tools\ia64\release\ibv_read_bw.pdb" />\r
-            <File Id="ibv_read_lat.exe" Compressed="yes" DiskId="1"\r
-                  LongName="ibv_read_lat.exe" Name="readlat.exe"\r
-                  Source="..\bin\tools\ia64\release\ibv_read_lat.exe" />\r
-            <File Id="ibv_read_lat.pdb" Compressed="yes" DiskId="1"\r
-                  LongName="ibv_read_lat.pdb" Name="readlat.pdb"\r
-                  Source="..\bin\tools\ia64\release\ibv_read_lat.pdb" />\r
-            <File Id="ibv_send_bw.exe" Compressed="yes" DiskId="1"\r
-                  LongName="ibv_send_bw.exe" Name="send_bw.exe"\r
-                  Source="..\bin\tools\ia64\release\ibv_send_bw.exe" />\r
-            <File Id="ibv_send_bw.pdb" Compressed="yes" DiskId="1"\r
-                  LongName="ibv_send_bw.pdb" Name="send_bw.pdb"\r
-                  Source="..\bin\tools\ia64\release\ibv_send_bw.pdb" />\r
-            <File Id="ibv_send_lat.exe" Compressed="yes" DiskId="1"\r
-                  LongName="ibv_send_lat.exe" Name="send_lat.exe"\r
-                  Source="..\bin\tools\ia64\release\ibv_send_lat.exe" />\r
-            <File Id="ibv_send_lat.pdb" Compressed="yes" DiskId="1"\r
-                  LongName="ibv_send_lat.pdb" Name="send_lat.pdb"\r
-                  Source="..\bin\tools\ia64\release\ibv_send_lat.pdb" />\r
-            <File Id="ibv_uc_pingpong.exe" Compressed="yes" DiskId="1"\r
-                  LongName="ibv_uc_pingpong.exe" Name="uc_ping.exe"\r
-                  Source="..\bin\tools\ia64\release\ibv_uc_pingpong.exe" />\r
-            <File Id="ibv_uc_pingpong.pdb" Compressed="yes" DiskId="1"\r
-                  LongName="ibv_uc_pingpong.pdb" Name="uc_ping.pdb"\r
-                  Source="..\bin\tools\ia64\release\ibv_uc_pingpong.pdb" />\r
-            <File Id="ibv_ud_pingpong.exe" Compressed="yes" DiskId="1"\r
-                  LongName="ibv_ud_pingpong.exe" Name="ud_ping.exe"\r
-                  Source="..\bin\tools\ia64\release\ibv_ud_pingpong.exe" />\r
-            <File Id="ibv_ud_pingpong.pdb" Compressed="yes" DiskId="1"\r
-                  LongName="ibv_ud_pingpong.pdb" Name="ud_ping.pdb"\r
-                  Source="..\bin\tools\ia64\release\ibv_ud_pingpong.pdb" />\r
-            <File Id="ibv_write_bw.exe" Compressed="yes" DiskId="1"\r
-                  LongName="ibv_write_bw.exe" Name="write_bw.exe"\r
-                  Source="..\bin\tools\ia64\release\ibv_write_bw.exe" />\r
-            <File Id="ibv_write_bw.pdb" Compressed="yes" DiskId="1"\r
-                  LongName="ibv_write_bw.pdb" Name="write_bw.pdb"\r
-                  Source="..\bin\tools\ia64\release\ibv_write_bw.pdb" />\r
-            <File Id="ibv_write_lat.exe" Compressed="yes" DiskId="1"\r
-                  LongName="ibv_write_lat.exe" Name="writelat.exe"\r
-                  Source="..\bin\tools\ia64\release\ibv_write_lat.exe" />\r
-            <File Id="ibv_write_lat.pdb" Compressed="yes" DiskId="1"\r
-                  LongName="ibv_write_lat.pdb" Name="writelat.pdb"\r
-                  Source="..\bin\tools\ia64\release\ibv_write_lat.pdb" />\r
-            <File Id="sminfo.exe" Compressed="yes" DiskId="1"\r
-                  LongName="sminfo.exe" Name="sminfo.exe"\r
-                  Source="..\bin\tools\ia64\release\sminfo.exe" />\r
-            <File Id="sminfo.pdb" Compressed="yes" DiskId="1"\r
-                  LongName="sminfo.pdb" Name="sminfo.pdb"\r
-                  Source="..\bin\tools\ia64\release\sminfo.pdb" />\r
-            <File Id="ibstat.exe" Compressed="yes" DiskId="1"\r
-                  LongName="ibstat.exe" Name="ibstat.exe"\r
-                  Source="..\bin\tools\ia64\release\ibstat.exe" />\r
-            <File Id="ibstat.pdb" Compressed="yes" DiskId="1"\r
-                  LongName="ibstat.pdb" Name="ibstat.pdb"\r
-                  Source="..\bin\tools\ia64\release\ibstat.pdb" />\r
-            <File Id="perfquery.exe" Compressed="yes" DiskId="1"\r
-                  LongName="perfquery.exe" Name="perfquer.exe"\r
-                  Source="..\bin\tools\ia64\release\perfquery.exe" />\r
-            <File Id="perfquery.pdb" Compressed="yes" DiskId="1"\r
-                  LongName="perfquery.pdb" Name="perfquer.pdb"\r
-                  Source="..\bin\tools\ia64\release\perfquery.pdb" />\r
-            <File Id="ibaddr.exe" Compressed="yes" DiskId="1"\r
-                  LongName="ibaddr.exe" Name="ibaddr.exe"\r
-                  Source="..\bin\tools\ia64\release\ibaddr.exe" />\r
-            <File Id="ibaddr.pdb" Compressed="yes" DiskId="1"\r
-                  LongName="ibaddr.pdb" Name="ibaddr.pdb"\r
-                  Source="..\bin\tools\ia64\release\ibaddr.pdb" />\r
-            <File Id="ibnetdiscover.exe" Compressed="yes" DiskId="1"\r
-                  LongName="ibnetdiscover.exe" Name="ibnetdis.exe"\r
-                  Source="..\bin\tools\ia64\release\ibnetdiscover.exe" />\r
-            <File Id="ibnetdiscover.pdb" Compressed="yes" DiskId="1"\r
-                  LongName="ibnetdiscover.pdb" Name="ibnetdis.pdb"\r
-                  Source="..\bin\tools\ia64\release\ibnetdiscover.pdb" />\r
-            <File Id="rdma_cmatose.exe" Compressed="yes" DiskId="1"\r
-                  LongName="rdma_cmatose.exe" Name="rcmatose.exe"\r
-                  Source="..\bin\tools\ia64\release\rdma_cmatose.exe" />\r
-            <File Id="rdma_cmatose.pdb" Compressed="yes" DiskId="1"\r
-                  LongName="rdma_cmatose.pdb" Name="rcmatose.pdb"\r
-                  Source="..\bin\tools\ia64\release\rdma_cmatose.pdb" />\r
-            <File Id="ibv_rdma_lat.exe" Compressed="yes" DiskId="1"\r
-                  LongName="ibv_rdma_lat.exe" Name="wrdmalat.exe"\r
-                  Source="..\bin\tools\ia64\release\ibv_rdma_lat.exe" />\r
-            <File Id="ibv_rdma_lat.pdb" Compressed="yes" DiskId="1"\r
-                  LongName="ibv_rdma_lat.pdb" Name="wrdmalat.pdb"\r
-                  Source="..\bin\tools\ia64\release\ibv_rdma_lat.pdb" />\r
-            <File Id="ibv_rdma_bw.exe" Compressed="yes" DiskId="1"\r
-                  LongName="ibv_rdma_bw.exe" Name="wrdma_bw.exe"\r
-                  Source="..\bin\tools\ia64\release\ibv_rdma_bw.exe" />\r
-            <File Id="ibv_rdma_bw.pdb" Compressed="yes" DiskId="1"\r
-                  LongName="ibv_rdma_bw.pdb" Name="wrdma_bw.pdb"\r
-                  Source="..\bin\tools\ia64\release\ibv_rdma_bw.pdb" />\r
-            <File Id="ibroute.exe" Compressed="yes" DiskId="1"\r
-                  LongName="ibroute.exe" Name="ibroute.exe"\r
-                  Source="..\bin\tools\ia64\release\ibroute.exe" />\r
-            <File Id="ibroute.pdb" Compressed="yes" DiskId="1"\r
-                  LongName="ibroute.pdb" Name="ibroute.pdb"\r
-                  Source="..\bin\tools\ia64\release\ibroute.pdb" />\r
-            <File Id="ibtracert.exe" Compressed="yes" DiskId="1"\r
-                  LongName="ibtracert.exe" Name="ibtrt.exe"\r
-                  Source="..\bin\tools\ia64\release\ibtracert.exe" />\r
-            <File Id="ibtracert.pdb" Compressed="yes" DiskId="1"\r
-                  LongName="ibtracert.pdb" Name="ibtrt.pdb"\r
-                  Source="..\bin\tools\ia64\release\ibtracert.pdb" />\r
-          </Component>\r
+          <?include ..\..\common\checked.inc ?>\r
+          <?include ..\..\common\winverbs_OFED.inc ?>\r
 \r
           <Directory Id="ipoibDir" Name="net">\r
-            <Component Id="IPoIB" Guid="18CC13CC-0D29-4B88-8F03-854CE0C6AF94">\r
-              <CreateFolder />\r
-              <File Id="netipoib_inf" Compressed="yes" DiskId="1"\r
-                     LongName="netipoib.inf" Name="NETIPOI.INF"\r
-                     Source="..\bin\net\ia64\netipoib.inf" />\r
-              <File Id="ipoib_cat" Compressed="yes" DiskId="1"\r
-                     LongName="ipoib.cat" Name="IPOI.cat"\r
-                     Source="..\bin\net\ia64\ipoib.cat" />\r
-              <File Id="ipoib.sys" Compressed="yes" DiskId="1"\r
-                     LongName="ipoib.sys" Name="IPOIB.SYS"\r
-                     Source="..\bin\net\ia64\ipoib.sys" />\r
-              <File Id="ipoib.pdb" Compressed="yes" DiskId="1"\r
-                     Name="ipoib.pdb"\r
-                     Source="..\bin\net\ia64\ipoib.pdb" />\r
-              <File Id="ibwsd32.dll" Compressed="yes" DiskId="1"\r
-                     LongName="ibwsd32.dll" Name="IBWSD32.DLL"\r
-                     Source="..\bin\net\ia64\ibwsd32.dll" />\r
-              <File Id="ibwsd.dll" Compressed="yes" DiskId="1"\r
-                     LongName="ibwsd.dll" Name="IBWSD.DLL"\r
-                     Source="..\bin\net\ia64\ibwsd.dll" />\r
-              <File Id="ibndprov.dll" Compressed="yes" DiskId="1"\r
-                     LongName="ibndprov.dll" Name="IBNDPROV.DLL"\r
-                     Source="..\bin\net\ia64\ibndprov.dll" />\r
-              <File Id="ibndprov32.dll" Compressed="yes" DiskId="1"\r
-                     LongName="ibndprov32.dll" Name="IBNDPR32.DLL"\r
-                     Source="..\bin\net\ia64\ibndprov32.dll" />\r
-              <File Id="ndinstall.exe" Compressed="yes" DiskId="1"\r
-                     LongName="ndinstall.exe" Name="NDINSTAL.EXE"\r
-                     Source="..\bin\net\ia64\ndinstall.exe" />\r
-            </Component>\r
+            <?include ..\..\common\ipoib.inc ?>\r
           </Directory>\r
 \r
           <Component Id="WinsockDirect"\r
                      Guid="516A61B4-EBC2-41CE-8D18-81BADA4649D4">\r
             <File Id="installsp.exe" Compressed="yes" DiskId="1"\r
                      LongName="installsp.exe" Name="INSTALL.EXE"\r
-                     Source="..\bin\net\ia64\installsp.exe" />\r
+                     Source="..\bin\net\$(var.ARCH)\installsp.exe" />\r
           </Component>\r
 <!-- when ND works for ia64\r
           <Component Id="cNetworkDirect"\r
                      Guid="F3BA9E15-E532-4b8c-BB0C-E8C1CC0EEF3F">\r
           </Component>\r
 -->\r
-\r
-          <Component Id="cDAPL1RT" Guid="A49F1ECC-14E4-4310-9F37-BEB7B00243A9">\r
-              <File Id="dapl32.dll" Compressed="yes" DiskId="1"\r
-                     LongName="dapl32.dll" Name="DAPL32.DLL"\r
-                     Source="..\bin\DAPL\ia64\dapl32.dll" />\r
-              <File Id="dapl32d.dll" Compressed="yes" DiskId="1"\r
-                     LongName="dapl32d.dll" Name="DAPL32D.DLL"\r
-                     Source="..\bin\DAPL\ia64\dapl32d.dll" />\r
-              <File Id="dapl.dll" Compressed="yes" DiskId="1"\r
-                     LongName="dapl.dll" Name="DAPL.DLL"\r
-                     Source="..\bin\DAPL\ia64\dapl.dll" />\r
-                <CopyFile Id="dupDAPL" FileId="dapl.dll"\r
-                        DestinationName="dapl.dll"\r
-                        DestinationProperty="WindowsFolder" />\r
-              <File Id="dapld.dll" Compressed="yes" DiskId="1"\r
-                     LongName="dapld.dll" Name="DAPLD.DLL"\r
-                     Source="..\bin\DAPL\ia64\dapld.dll" />\r
-              <File Id="dat32.dll" Compressed="yes" DiskId="1"\r
-                     LongName="dat32.dll" Name="DAT32.DLL"\r
-                     Source="..\bin\DAPL\ia64\dat32.dll" />\r
-              <File Id="dat32d.dll" Compressed="yes" DiskId="1"\r
-                     LongName="dat32d.dll" Name="DAT32D.DLL"\r
-                     Source="..\bin\DAPL\ia64\dat32d.dll" />\r
-              <File Id="dat.dll" Compressed="yes" DiskId="1"\r
-                     LongName="dat.dll" Name="DAT.DLL"\r
-                     Source="..\bin\DAPL\ia64\dat.dll" />\r
-              <CopyFile Id="dupDAT" FileId="dat.dll"\r
-                        DestinationName="dat.dll"\r
-                        DestinationProperty="WindowsFolder" />\r
-              <File Id="datd.dll" Compressed="yes" DiskId="1"\r
-                     LongName="datd.dll" Name="DATD.DLL"\r
-                     Source="..\bin\DAPL\ia64\datd.dll" />\r
-\r
-              <File Id="dat.conf" Compressed="yes" DiskId="1"\r
-                     LongName="dat.conf" Name="dat.conf"\r
-                     Source="..\..\dat.conf" />\r
-              <File Id="dapltest.exe" Compressed="yes" DiskId="1"\r
-                     LongName="dapltest.exe" Name="dapltest.exe"\r
-                     Source="..\bin\tools\ia64\release\dapltest.exe" />\r
-              <File Id="dapltestd.exe" Compressed="yes" DiskId="1"\r
-                     LongName="dapltestd.exe" Name="dapltesd.exe"\r
-                     Source="..\bin\tools\ia64\debug\dapltestd.exe" />\r
-\r
-              <File Id="dapl.pdb" Compressed="yes" DiskId="1"\r
-                    LongName="dapl.pdb" Name="dapl.pdb"\r
-                    Source="..\bin\DAPL\ia64\dapl.pdb" />\r
-              <File Id="dapld.pdb" Compressed="yes" DiskId="1"\r
-                    LongName="dapld.pdb" Name="dapld.pdb"\r
-                    Source="..\bin\DAPL\ia64\dapld.pdb" />\r
-              <File Id="dat.lib" Compressed="yes" DiskId="1"\r
-                    LongName="dat.lib" Name="dat.lib"\r
-                    Source="..\bin\DAPL\ia64\dat.lib" />\r
-              <File Id="datd.lib" Compressed="yes" DiskId="1"\r
-                    LongName="datd.lib" Name="datd.lib"\r
-                    Source="..\bin\DAPL\ia64\datd.lib" />\r
-              <File Id="dat.pdb" Compressed="yes" DiskId="1"\r
-                    LongName="dat.pdb" Name="dat.pdb"\r
-                    Source="..\bin\DAPL\ia64\dat.pdb" />\r
-              <File Id="datd.pdb" Compressed="yes" DiskId="1"\r
-                    LongName="datd.pdb" Name="datd.pdb"\r
-                    Source="..\bin\DAPL\ia64\datd.pdb" />\r
-              <File Id="dt_svr.bat" Compressed="yes" DiskId="1"\r
-                    LongName="dt-svr.bat" Name="dt-svr.bat"\r
-                    Source="..\bin\DAPL2\dt-svr.bat" />\r
-              <CopyFile Id="dup_dt_svr" FileId="dt_svr.bat"\r
-                        DestinationName="dt1-svr.bat"\r
-                        DestinationProperty="INSTALLDIR" />\r
-              <File Id="dt_cli.bat" Compressed="yes" DiskId="1"\r
-                    LongName="dt-cli.bat" Name="dt-cli.bat"\r
-                    Source="..\bin\DAPL2\dt-cli.bat" />\r
-              <CopyFile Id="dup_dt_cli" FileId="dt_cli.bat"\r
-                        DestinationName="dt1-cli.bat"\r
-                        DestinationProperty="INSTALLDIR" />\r
-          </Component>\r
-\r
-          <Component Id="cDAPL2RT" Guid="02C3490D-EF11-40C9-9E8D-0BEE97082A6A">\r
-              <File Id="_dapl32.dll" Compressed="yes" DiskId="1"\r
-                     LongName="dapl232.dll" Name="DAPL232.DLL"\r
-                     Source="..\bin\DAPL2\ia64\dapl232.dll" />\r
-              <File Id="_dapl32d.dll" Compressed="yes" DiskId="1"\r
-                     LongName="dapl232d.dll" Name="DAPL232D.DLL"\r
-                     Source="..\bin\DAPL2\ia64\dapl232d.dll" />\r
-              <File Id="_dapl2.dll" Compressed="yes" DiskId="1"\r
-                     LongName="dapl2.dll" Name="DAPL2.DLL"\r
-                     Source="..\bin\DAPL2\ia64\dapl2.dll" />\r
-                <CopyFile Id="dupDAPL2" FileId="_dapl2.dll"\r
-                        DestinationName="dapl2.dll"\r
-                        DestinationProperty="WindowsFolder" />\r
-              <File Id="_dapl2d.dll" Compressed="yes" DiskId="1"\r
-                     LongName="dapl2d.dll" Name="DAPL2D.DLL"\r
-                     Source="..\bin\DAPL2\ia64\dapl2d.dll" />\r
-              <File Id="_dapl2_scm.dll" Compressed="yes" DiskId="1"\r
-                          LongName="dapl2-scm.dll" Name="D2-scm.DLL"\r
-                          Source="..\bin\DAPL2\ia64\dapl2-scm.dll" />\r
-              <CopyFile Id="dupDAPL2_scm" FileId="_dapl2_scm.dll"\r
-                              DestinationName="d2-scm.dll"\r
-                              DestinationLongName="dapl2-scm.dll"\r
-                              DestinationProperty="WindowsFolder" />\r
-              <File Id="_dapl2_scmd.dll" Compressed="yes" DiskId="1"\r
-                          LongName="dapl2-scmd.dll" Name="D2-scmd.DLL"\r
-                          Source="..\bin\DAPL2\ia64\dapl2-scmd.dll" />\r
-              <File Id="_dat32.dll" Compressed="yes" DiskId="1"\r
-                     LongName="dat232.dll" Name="DAT232.DLL"\r
-                     Source="..\bin\DAPL2\ia64\dat232.dll" />\r
-              <File Id="_dat32d.dll" Compressed="yes" DiskId="1"\r
-                     LongName="dat232d.dll" Name="DAT232D.DLL"\r
-                     Source="..\bin\DAPL2\ia64\dat232d.dll" />\r
-              <File Id="_dat2.dll" Compressed="yes" DiskId="1"\r
-                     LongName="dat2.dll" Name="DAT2.DLL"\r
-                     Source="..\bin\DAPL2\ia64\dat2.dll" />\r
-              <CopyFile Id="dupDAT2" FileId="_dat2.dll"\r
-                        DestinationName="dat2.dll"\r
-                        DestinationProperty="WindowsFolder" />\r
-              <File Id="_dat2d.dll" Compressed="yes" DiskId="1"\r
-                     LongName="dat2d.dll" Name="DAT2D.DLL"\r
-                     Source="..\bin\DAPL2\ia64\dat2d.dll" />\r
-              <File Id="dapl2test.exe" Compressed="yes" DiskId="1"\r
-                     LongName="dapl2test.exe" Name="dapl2tes.exe"\r
-                     Source="..\bin\tools\ia64\release\dapl2test.exe" />\r
-              <File Id="dapl2testd.exe" Compressed="yes" DiskId="1"\r
-                     LongName="dapl2testd.exe" Name="dapl2tes.exe"\r
-                     Source="..\bin\tools\ia64\debug\dapl2testd.exe" />\r
-              <File Id="dtest2.exe" Compressed="yes" DiskId="1"\r
-                     LongName="dtest2.exe" Name="dtest2.exe"\r
-                     Source="..\bin\tools\ia64\release\dtest2.exe" />\r
-              <File Id="dtestx.exe" Compressed="yes" DiskId="1"\r
-                     LongName="dtestx.exe" Name="dtestx.exe"\r
-                     Source="..\bin\tools\ia64\release\dtestx.exe" />\r
-\r
-              <File Id="dapl2.pdb" Compressed="yes" DiskId="1"\r
-                    LongName="dapl2.pdb" Name="dapl2.pdb"\r
-                    Source="..\bin\DAPL2\ia64\dapl2.pdb" />\r
-              <File Id="dapl2d.pdb" Compressed="yes" DiskId="1"\r
-                    LongName="dapl2d.pdb" Name="dapl2d.pdb"\r
-                    Source="..\bin\DAPL2\ia64\dapl2d.pdb" />\r
-              <File Id="dat2.pdb" Compressed="yes" DiskId="1"\r
-                    LongName="dat2.pdb" Name="dat2.pdb"\r
-                    Source="..\bin\DAPL2\ia64\dat2.pdb" />\r
-              <File Id="dat2d.pdb" Compressed="yes" DiskId="1"\r
-                    LongName="dat2d.pdb" Name="dat2d.pdb"\r
-                    Source="..\bin\DAPL2\ia64\dat2d.pdb" />\r
-              <File Id="dat2.lib" Compressed="yes" DiskId="1"\r
-                    LongName="dat2.lib" Name="dat2.lib"\r
-                    Source="..\bin\DAPL2\ia64\dat2.lib" />\r
-              <File Id="dat2d.lib" Compressed="yes" DiskId="1"\r
-                    LongName="dat2d.lib" Name="dat2d.lib"\r
-                    Source="..\bin\DAPL2\ia64\dat2d.lib" />\r
-          </Component>\r
+          <?include ..\..\common\dapl_rt.inc ?>\r
 \r
           <Component Id="cQLVNIC_driver_installed"\r
                      Guid="730C742E-73D9-4871-A523-6FB7963EA01E">\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\ia64\qlgcvnic.sys" />\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\ia64\qlgcvnic.pdb" />\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\ia64\netvnic.inf" />\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\ia64\netvnic.cat" />\r
+                    LongName="netvnic.cat" Name="NETVNIC.cat"\r
+                    Source="..\bin\net\$(var.ARCH)\netvnic.cat" />\r
             </Component>\r
           </Directory>\r
 \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\ia64\ib_srp.inf" />\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\ia64\ibsrp.cat" />\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\ia64\ibsrp.sys" />\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\ia64\ibsrp.pdb" />\r
-             </Component>\r
+                    Name="ibsrp.pdb"\r
+                    Source="..\bin\storage\$(var.ARCH)\ibsrp.pdb" />\r
+            </Component>\r
           </Directory>\r
-\r
-          <Component Id="OpenSM_Service_enabled"\r
-                     Guid="3A148CF8-129D-4AE0-A769-5FC0E0828B5E">\r
-          </Component>\r
-        </Directory>\r
         </Directory>\r
+      </Directory>\r
 \r
-      <!-- copy DAT header files -->\r
-\r
-      <Directory Id="WindowsVolume" Name="Root" SourceName="WinRoot">    \r
-\r
-          <Directory Id="dDATD" Name="DAT">\r
-            <Component Id="cDatCfg" Guid="54A4F997-AC33-45D8-9899-6332E40B62A8">\r
-              <CreateFolder />\r
-              <File Id="_dat.conf" Compressed="yes" DiskId="1" KeyPath="yes"\r
-                     LongName="dat.conf" Name="dat.conf"\r
-                     Source="..\..\dat.conf" />\r
-            </Component>\r
-\r
-            <Directory Id="v1_1" Name="v1-1">\r
-              <Component Id="cDATV1" Guid="D8EB75CB-8DE0-41B1-904B-CED87C893049"\r
-                         KeyPath="yes" SharedDllRefCount="yes">\r
-                <CreateFolder />\r
-              </Component>\r
-\r
-              <Directory Id="DDID" Name="DAT">    \r
-                <Component Id="cDatBldV1Hdrs"\r
-                          Guid="AA6BB350-5146-452F-B5F0-80BB9E3B0F55">    \r
-                  <CreateFolder />    \r
-                  <File Id="dat.h" Compressed="yes" DiskId="1"    \r
-                        LongName="dat.h" Name="dat.h"    \r
-                        Source="..\bin\DAPL\dat.h" />    \r
-\r
-                  <File Id="dat_error.h" Compressed="yes" DiskId="1"    \r
-                        LongName="dat_error.h" Name="dat.h"    \r
-                        Source="..\bin\DAPL\dat_error.h" />    \r
-    \r
-                  <File Id="dat_platform_specific.h" Compressed="yes"    \r
-                        DiskId="1" LongName="dat_platform_specific.h"    \r
-                        Name="dat_plat.h"    \r
-                       Source="..\bin\DAPL\dat_platform_specific.h" />    \r
-    \r
-                  <File Id="dat_redirection.h" Compressed="yes"    \r
-                        DiskId="1" LongName="dat_redirection.h"    \r
-                        Name="dat_redi.h"    \r
-                        Source="..\bin\DAPL\dat_redirection.h" />    \r
-    \r
-                  <File Id="dat_registry.h" Compressed="yes"    \r
-                        DiskId="1" LongName="dat_registry.h"    \r
-                        Name="dat_reg.h"    \r
-                        Source="..\bin\DAPL\dat_registry.h" />    \r
-    \r
-                  <File Id="dat_vendor_specific.h" Compressed="yes"    \r
-                        DiskId="1" LongName="dat_vendor_specific.h"    \r
-                        Name="dat_vend.h"    \r
-                        Source="..\bin\DAPL\dat_vendor_specific.h" />    \r
-    \r
-                  <File Id="udat.h" Compressed="yes" DiskId="1"    \r
-                        LongName="udat.h" Name="udat.h"    \r
-                        Source="..\bin\DAPL\udat.h" />    \r
-    \r
-                  <File Id="udat_config.h" Compressed="yes" DiskId="1"    \r
-                        LongName="udat_config.h" Name="udat_cfg.h"    \r
-                        Source="..\bin\DAPL\udat_config.h" />    \r
-    \r
-                  <File Id="udat_redirection.h" Compressed="yes"    \r
-                        DiskId="1" LongName="udat_redirection.h"    \r
-                        Name="udat_red.h"    \r
-                        Source="..\bin\DAPL\udat_redirection.h" />    \r
-    \r
-                  <File Id="udat_vendor_specific.h" Compressed="yes"    \r
-                        DiskId="1" LongName="udat_vendor_specific.h"    \r
-                        Name="udat_ven.h"    \r
-                        Source="..\bin\DAPL\udat_vendor_specific.h" />    \r
-                </Component>\r
-              </Directory>\r
-\r
-              <Component Id="cDatBldV1Libs"\r
-                          Guid="1BB9291E-79F5-4EC5-9400-4175BA1E5A91">    \r
-\r
-                  <File Id="_dat.lib" Compressed="yes" DiskId="1"\r
-                        LongName="dat.lib" Name="dat.lib"\r
-                        Source="..\bin\DAPL\ia64\dat.lib" />\r
-                  <File Id="_datd.lib" Compressed="yes" DiskId="1"\r
-                        LongName="datd.lib" Name="datd.lib"\r
-                        Source="..\bin\DAPL\ia64\datd.lib" />\r
-              </Component>\r
-            </Directory>\r
-\r
-            <Directory Id="v2_0" Name="v2-0">\r
-              <Component Id="cDATV2" Guid="A3CD6CA7-309B-48D2-B375-C9A91B37A876"\r
-                         KeyPath="yes" SharedDllRefCount="yes">\r
-                <CreateFolder />\r
-              </Component>\r
-\r
-              <Directory Id="DDID2" Name="DAT">    \r
-                <Component Id="cDatBldV2Hdrs"\r
-                          Guid="4D688030-53AC-4351-8999-E3AFEB38A92C" >    \r
-                  <CreateFolder />    \r
-                  <File Id="_dat.h" Compressed="yes" DiskId="1"    \r
-                        LongName="dat.h" Name="dat.h"    \r
-                        Source="..\bin\DAPL2\dat.h" />    \r
-\r
-                  <File Id="_dat_error.h" Compressed="yes" DiskId="1"    \r
-                        LongName="dat_error.h" Name="dat.h"    \r
-                        Source="..\bin\DAPL2\dat_error.h" />    \r
-    \r
-                  <File Id="_dat_platform_specific.h" Compressed="yes"    \r
-                        DiskId="1" LongName="dat_platform_specific.h"    \r
-                        Name="dat_plat.h"    \r
-                       Source="..\bin\DAPL2\dat_platform_specific.h" />    \r
-    \r
-                  <File Id="_dat_redirection.h" Compressed="yes"    \r
-                        DiskId="1" LongName="dat_redirection.h"    \r
-                        Name="dat_redi.h"    \r
-                        Source="..\bin\DAPL2\dat_redirection.h" />    \r
-    \r
-                  <File Id="_dat_registry.h" Compressed="yes"    \r
-                        DiskId="1" LongName="dat_registry.h"    \r
-                        Name="dat_reg.h"    \r
-                        Source="..\bin\DAPL2\dat_registry.h" />    \r
-    \r
-                  <File Id="_dat_vendor_specific.h" Compressed="yes"    \r
-                        DiskId="1" LongName="dat_vendor_specific.h"    \r
-                        Name="dat_vend.h"    \r
-                        Source="..\bin\DAPL2\dat_vendor_specific.h" />    \r
-    \r
-                  <File Id="_udat.h" Compressed="yes" DiskId="1"    \r
-                        LongName="udat.h" Name="udat.h"    \r
-                        Source="..\bin\DAPL2\udat.h" />    \r
-    \r
-                  <File Id="_udat_config.h" Compressed="yes" DiskId="1"    \r
-                        LongName="udat_config.h" Name="udat_cfg.h"    \r
-                        Source="..\bin\DAPL2\udat_config.h" />    \r
-    \r
-                  <File Id="_udat_redirection.h" Compressed="yes"    \r
-                        DiskId="1" LongName="udat_redirection.h"    \r
-                        Name="udat_red.h"    \r
-                        Source="..\bin\DAPL2\udat_redirection.h" />    \r
-    \r
-                  <File Id="_udat_vendor_specific.h" Compressed="yes"    \r
-                        DiskId="1" LongName="udat_vendor_specific.h"    \r
-                        Name="udat_ven.h"    \r
-                        Source="..\bin\DAPL2\udat_vendor_specific.h" />    \r
-                </Component>\r
-              </Directory>\r
-\r
-              <Component Id="cDatBldV2Libs"\r
-                          Guid="4DCE2855-1F42-4A7D-957A-44A47715C051" >    \r
-\r
-                  <File Id="_dat2.lib" Compressed="yes" DiskId="1"\r
-                        LongName="dat2.lib" Name="dat2.lib"\r
-                        Source="..\bin\DAPL2\ia64\dat2.lib" />\r
-                  <File Id="_dat2d.lib" Compressed="yes" DiskId="1"\r
-                        LongName="dat2d.lib" Name="dat2d.lib"\r
-                        Source="..\bin\DAPL2\ia64\dat2d.lib" />\r
-              </Component>    \r
-            </Directory>    \r
-\r
-          </Directory> <!-- DAT -->   \r
-\r
-          <Directory Id="IBSDK" Name="IBSDK">\r
-            <Directory Id="IB_libs" Name="lib">\r
-              <Component Id="cIBAL_Libs"\r
-                         Guid="12E15947-F84E-49d0-B5DF-FFC505C3F5C9">\r
-                <CreateFolder />\r
-                <File Id="ibal.lib" Compressed="yes" DiskId="1"\r
-                      LongName="ibal.lib" Name="ibal.lib"\r
-                      Source="..\bin\HCA\ia64\ibal.lib" />\r
-                <File Id="ibal.pdb" Compressed="yes" DiskId="1"\r
-                      LongName="ibal.pdb" Name="ibal.pdb"\r
-                      Source="..\bin\HCA\ia64\ibal.pdb" />\r
-                <File Id="complib.lib" Compressed="yes" DiskId="1"\r
-                      LongName="complib.lib" Name="complib.lib"\r
-                      Source="..\bin\HCA\ia64\complib.lib" />\r
-                <File Id="complib.pdb" Compressed="yes" DiskId="1"\r
-                      LongName="complib.pdb" Name="complib.pdb"\r
-                      Source="..\bin\HCA\ia64\complib.pdb" />\r
-              <File Id="ibald.lib" Compressed="yes" DiskId="1"\r
-                    LongName="ibald.lib" Name="ibald.lib"\r
-                    Source="..\bin\HCA\ia64\ibald.lib" />\r
-              <File Id="ibald.pdb" Compressed="yes" DiskId="1"\r
-                    LongName="ibald.pdb" Name="ibald.pdb"\r
-                    Source="..\bin\HCA\ia64\ibald.pdb" />\r
-              <File Id="complibd.lib" Compressed="yes" DiskId="1"\r
-                    LongName="complibd.lib" Name="complibd.lib"\r
-                    Source="..\bin\HCA\ia64\complibd.lib" />\r
-              <File Id="complibd.pdb" Compressed="yes" DiskId="1"\r
-                    LongName="complibd.pdb" Name="complibd.pdb"\r
-                    Source="..\bin\HCA\ia64\complibd.pdb" />\r
-\r
-              <!-- SysWOW64\ 32-bit libs -->\r
-              <File Id="cl32.lib" Compressed="yes" DiskId="1"\r
-                    LongName="complib32.lib" Name="cl32.lib"\r
-                    Source="..\bin\HCA\ia64\cl32.lib" />\r
-              <File Id="cl32.pdb" Compressed="yes" DiskId="1"\r
-                    LongName="complib32.pdb" Name="cl32.pdb"\r
-                    Source="..\bin\HCA\ia64\cl32.pdb" />\r
-              <File Id="cl32d.lib" Compressed="yes" DiskId="1"\r
-                    LongName="complib32d.lib" Name="cl32d.lib"\r
-                    Source="..\bin\HCA\ia64\cl32d.lib" />\r
-              <File Id="cl32d.pdb" Compressed="yes" DiskId="1"\r
-                    LongName="complib32d.pdb" Name="cl32d.pdb"\r
-                    Source="..\bin\HCA\ia64\cl32d.pdb" />\r
-              <File Id="ibal32.lib" Compressed="yes" DiskId="1"\r
-                    LongName="ibal32.lib" Name="ibal32.lib"\r
-                    Source="..\bin\HCA\ia64\ibal32.lib" />\r
-              <File Id="ibal32.pdb" Compressed="yes" DiskId="1"\r
-                    LongName="ibal32.pdb" Name="ibal32.pdb"\r
-                    Source="..\bin\HCA\ia64\ibal32.pdb" />\r
-              <File Id="ibal32d.lib" Compressed="yes" DiskId="1"\r
-                    LongName="ibal32d.lib" Name="ibal32d.lib"\r
-                    Source="..\bin\HCA\ia64\ibal32d.lib" />\r
-              <File Id="ibal32d.pdb" Compressed="yes" DiskId="1"\r
-                    LongName="ibal32d.pdb" Name="ibal32d.pdb"\r
-                    Source="..\bin\HCA\ia64\ibal32d.pdb" />\r
-\r
-              <File Id="winverbs.lib" Compressed="yes" DiskId="1"\r
-                    LongName="winverbs.lib" Name="winverbs.lib"\r
-                    Source="..\bin\HCA\x86\winverbs.lib" />\r
-              <File Id="winverbsd.lib" Compressed="yes" DiskId="1"\r
-                    LongName="winverbsd.lib" Name="winvrbsd.lib"\r
-                    Source="..\bin\HCA\x86\winverbsd.lib" />\r
-\r
-              <File Id="libibverbs.lib" Compressed="yes" DiskId="1"\r
-                    LongName="libibverbs.lib" Name="ibverbs.lib"\r
-                    Source="..\bin\HCA\x86\libibverbs.lib" />\r
-              <File Id="libibverbs2.pdb" Compressed="yes" DiskId="1"\r
-                    LongName="libibverbs.pdb" Name="ibverbs.pdb"\r
-                    Source="..\bin\HCA\x86\libibverbs.pdb" />\r
-              <File Id="libibverbsd.lib" Compressed="yes" DiskId="1"\r
-                    LongName="libibverbsd.lib" Name="ibverbsd.lib"\r
-                    Source="..\bin\HCA\x86\libibverbsd.lib" />\r
-              <File Id="libibverbsd2.pdb" Compressed="yes" DiskId="1"\r
-                    LongName="libibverbsd.pdb" Name="ibverbsd.pdb"\r
-                    Source="..\bin\HCA\x86\libibverbsd.pdb" />\r
-\r
-              <File Id="libibmad.lib" Compressed="yes" DiskId="1"\r
-                    LongName="libibmad.lib" Name="ibmad.lib"\r
-                    Source="..\bin\HCA\x86\libibmad.lib" />\r
-              <File Id="libibmad2.pdb" Compressed="yes" DiskId="1"\r
-                    LongName="libibmad.pdb" Name="ibmad.pdb"\r
-                    Source="..\bin\HCA\x86\libibmad.pdb" />\r
-              <File Id="libibmadd.lib" Compressed="yes" DiskId="1"\r
-                    LongName="libibmadd.lib" Name="ibmadd.lib"\r
-                    Source="..\bin\HCA\x86\libibmadd.lib" />\r
-              <File Id="libibmadd2.pdb" Compressed="yes" DiskId="1"\r
-                    LongName="libibmadd.pdb" Name="ibmadd.pdb"\r
-                    Source="..\bin\HCA\x86\libibmadd.pdb" />\r
-\r
-              <File Id="libibumad.lib" Compressed="yes" DiskId="1"\r
-                    LongName="libibumad.lib" Name="ibumad.lib"\r
-                    Source="..\bin\HCA\x86\libibumad.lib" />\r
-              <File Id="libibumad2.pdb" Compressed="yes" DiskId="1"\r
-                    LongName="libibumad.pdb" Name="ibumad.pdb"\r
-                    Source="..\bin\HCA\x86\libibumad.pdb" />\r
-              <File Id="libibumadd.lib" Compressed="yes" DiskId="1"\r
-                    LongName="libibumadd.lib" Name="ibumadd.lib"\r
-                    Source="..\bin\HCA\x86\libibumadd.lib" />\r
-              <File Id="libibumadd2.pdb" Compressed="yes" DiskId="1"\r
-                    LongName="libibumadd.pdb" Name="ibumadd.pdb"\r
-                    Source="..\bin\HCA\x86\libibumadd.pdb" />\r
-              </Component>\r
-            </Directory>\r
-\r
-            <Directory Id="IB_inc" Name="Inc">\r
-              <Component Id="cIBAL_Incs"\r
-                         Guid="54C2903E-65DF-4c62-B31D-21DB1AFB5819">\r
-                <CreateFolder />\r
-\r
-                <File Id="oib_ver.h" Compressed="yes" DiskId="1"\r
-                       LongName="oib_ver.h" Name="oib_ver.h"\r
-                       Source="..\bin\Inc\oib_ver.h" />\r
-                <File Id="openib.def" Compressed="yes" DiskId="1"\r
-                       LongName="openib.def" Name="openib.def"\r
-                       Source="..\bin\Inc\openib.def" />\r
-              </Component>\r
+      <Directory Id="WindowsVolume" Name="Root" SourceName="WinRoot">\r
 \r
-              <Directory Id="IB_complib" Name="complib">\r
-                <Component Id="cIBAL_Complib"\r
-                           Guid="9F9EE1F2-5ACE-47c7-89F8-B0EA1D4363AF">\r
-                  <CreateFolder />\r
-                  <File Id="cl_async_proc.h" Compressed="yes" DiskId="1"\r
-                        LongName="cl_async_proc.h" Name="CL_ASYN.H" \r
-                        Source="..\bin\Inc\complib\cl_async_proc.h" />\r
-                  <File Id="cl_atomic.h" Compressed="yes" DiskId="1"\r
-                        LongName="cl_atomic.h" Name="CL_ATOM.H" \r
-                        Source="..\bin\Inc\complib\cl_atomic.h" />\r
-                  <File Id="cl_atomic_osd.h" Compressed="yes" DiskId="1"\r
-                        LongName="cl_atomic_osd.h" Name="CL_ATOM1.H" \r
-                        Source="..\bin\Inc\complib\cl_atomic_osd.h" />\r
-                  <File Id="cl_byteswap.h" Compressed="yes" DiskId="1"\r
-                        LongName="cl_byteswap.h" Name="CL_BYTE.H" \r
-                        Source="..\bin\Inc\complib\cl_byteswap.h" />\r
-                  <File Id="cl_byteswap_osd.h" Compressed="yes" DiskId="1"\r
-                        LongName="cl_byteswap_osd.h" Name="CL_BYTE1.H" \r
-                        Source="..\bin\Inc\complib\cl_byteswap_osd.h" />\r
-                  <File Id="cl_comppool.h" Compressed="yes" DiskId="1"\r
-                        LongName="cl_comppool.h" Name="CL_COMP.H" \r
-                        Source="..\bin\Inc\complib\cl_comppool.h" />\r
-                  <File Id="cl_debug.h" Compressed="yes" DiskId="1"\r
-                        LongName="cl_debug.h" Name="CL_DEBU.H" \r
-                        Source="..\bin\Inc\complib\cl_debug.h" />\r
-                  <File Id="cl_debug_osd.h" Compressed="yes" DiskId="1"\r
-                        LongName="cl_debug_osd.h" Name="CL_DEBU1.H" \r
-                        Source="..\bin\Inc\complib\cl_debug_osd.h" />\r
-                  <File Id="cl_event.h" Compressed="yes" DiskId="1"\r
-                        LongName="cl_event.h" Name="CL_EVEN.H" \r
-                        Source="..\bin\Inc\complib\cl_event.h" />\r
-                  <File Id="cl_event_osd.h" Compressed="yes" DiskId="1"\r
-                        LongName="cl_event_osd.h" Name="CL_EVEN1.H" \r
-                        Source="..\bin\Inc\complib\cl_event_osd.h" />\r
-                  <File Id="cl_fleximap.h" Compressed="yes" DiskId="1"\r
-                        LongName="cl_fleximap.h" Name="CL_FLEX.H" \r
-                        Source="..\bin\Inc\complib\cl_fleximap.h" />\r
-                  <File Id="cl_ioctl.h" Compressed="yes" DiskId="1"\r
-                        LongName="cl_ioctl.h" Name="CL_IOCT.H" \r
-                        Source="..\bin\Inc\complib\cl_ioctl.h" />\r
-                  <File Id="cl_ioctl_osd.h" Compressed="yes" DiskId="1"\r
-                        LongName="cl_ioctl_osd.h" Name="CL_IOCT1.H" \r
-                        Source="..\bin\Inc\complib\cl_ioctl_osd.h" />\r
-                  <File Id="cl_irqlock.h" Compressed="yes" DiskId="1"\r
-                        LongName="cl_irqlock.h" Name="CL_IRQL.H" \r
-                        Source="..\bin\Inc\complib\cl_irqlock.h" />\r
-                  <File Id="cl_list.h" Compressed="yes" DiskId="1"\r
-                        LongName="cl_list.h" Name="CL_LIST.H" \r
-                        Source="..\bin\Inc\complib\cl_list.h" />\r
-                  <File Id="cl_log.h" Compressed="yes" DiskId="1"\r
-                        LongName="cl_log.h" Name="CL_LOG.H" \r
-                        Source="..\bin\Inc\complib\cl_log.h" />\r
-                  <File Id="cl_map.h" Compressed="yes" DiskId="1"\r
-                        LongName="cl_map.h" Name="CL_MAP.H" \r
-                        Source="..\bin\Inc\complib\cl_map.h" />\r
-                  <File Id="cl_math.h" Compressed="yes" DiskId="1"\r
-                        LongName="cl_math.h" Name="CL_MATH.H" \r
-                        Source="..\bin\Inc\complib\cl_math.h" />\r
-                  <File Id="cl_memory.h" Compressed="yes" DiskId="1"\r
-                        LongName="cl_memory.h" Name="CL_MEMO.H" \r
-                        Source="..\bin\Inc\complib\cl_memory.h" />\r
-                  <File Id="cl_memory_osd.h" Compressed="yes" DiskId="1"\r
-                        LongName="cl_memory_osd.h" Name="CL_MEMO1.H" \r
-                        Source="..\bin\Inc\complib\cl_memory_osd.h" />\r
-                  <File Id="cl_mutex.h" Compressed="yes" DiskId="1"\r
-                        LongName="cl_mutex.h" Name="CL_MUTE.H" \r
-                        Source="..\bin\Inc\complib\cl_mutex.h" />\r
-                  <File Id="cl_mutex_osd.h" Compressed="yes" DiskId="1"\r
-                        LongName="cl_mutex_osd.h" Name="CL_MUTE1.H" \r
-                        Source="..\bin\Inc\complib\cl_mutex_osd.h" />\r
-                  <File Id="cl_obj.h" Compressed="yes" DiskId="1"\r
-                        LongName="cl_obj.h" Name="CL_OBJ.H" \r
-                        Source="..\bin\Inc\complib\cl_obj.h" />\r
-                  <File Id="cl_packoff.h" Compressed="yes" DiskId="1"\r
-                        LongName="cl_packoff.h" Name="CL_PACK.H" \r
-                        Source="..\bin\Inc\complib\cl_packoff.h" />\r
-                  <File Id="cl_packon.h" Compressed="yes" DiskId="1"\r
-                        LongName="cl_packon.h" Name="CL_PACK1.H" \r
-                        Source="..\bin\Inc\complib\cl_packon.h" />\r
-                  <File Id="cl_passivelock.h" Compressed="yes" DiskId="1"\r
-                        LongName="cl_passivelock.h" Name="CL_PASS.H" \r
-                        Source="..\bin\Inc\complib\cl_passivelock.h" />\r
-                  <File Id="cl_perf.h" Compressed="yes" DiskId="1"\r
-                        LongName="cl_perf.h" Name="CL_PERF.H" \r
-                        Source="..\bin\Inc\complib\cl_perf.h" />\r
-                  <File Id="cl_pool.h" Compressed="yes" DiskId="1"\r
-                        LongName="cl_pool.h" Name="CL_POOL.H" \r
-                        Source="..\bin\Inc\complib\cl_pool.h" />\r
-                  <File Id="cl_ptr_vector.h" Compressed="yes" DiskId="1"\r
-                        LongName="cl_ptr_vector.h" Name="CL_PTR_.H" \r
-                        Source="..\bin\Inc\complib\cl_ptr_vector.h" />\r
-                  <File Id="cl_qcomppool.h" Compressed="yes" DiskId="1"\r
-                        LongName="cl_qcomppool.h" Name="CL_QCOM.H" \r
-                        Source="..\bin\Inc\complib\cl_qcomppool.h" />\r
-                  <File Id="cl_qlist.h" Compressed="yes" DiskId="1"\r
-                        LongName="cl_qlist.h" Name="CL_QLIS.H" \r
-                        Source="..\bin\Inc\complib\cl_qlist.h" />\r
-                  <File Id="cl_qlockpool.h" Compressed="yes" DiskId="1"\r
-                        LongName="cl_qlockpool.h" Name="CL_QLOC.H" \r
-                        Source="..\bin\Inc\complib\cl_qlockpool.h" />\r
-                  <File Id="cl_qmap.h" Compressed="yes" DiskId="1"\r
-                        LongName="cl_qmap.h" Name="CL_QMAP.H" \r
-                        Source="..\bin\Inc\complib\cl_qmap.h" />\r
-                  <File Id="cl_qpool.h" Compressed="yes" DiskId="1"\r
-                        LongName="cl_qpool.h" Name="CL_QPOO.H" \r
-                        Source="..\bin\Inc\complib\cl_qpool.h" />\r
-                  <File Id="cl_rbmap.h" Compressed="yes" DiskId="1"\r
-                        LongName="cl_rbmap.h" Name="CL_RBMA.H" \r
-                        Source="..\bin\Inc\complib\cl_rbmap.h" />\r
-                  <File Id="cl_reqmgr.h" Compressed="yes" DiskId="1"\r
-                        LongName="cl_reqmgr.h" Name="CL_REQM.H" \r
-                        Source="..\bin\Inc\complib\cl_reqmgr.h" />\r
-                  <File Id="cl_spinlock.h" Compressed="yes" DiskId="1"\r
-                        LongName="cl_spinlock.h" Name="CL_SPIN.H" \r
-                        Source="..\bin\Inc\complib\cl_spinlock.h" />\r
-                  <File Id="cl_spinlock_osd.h" Compressed="yes" DiskId="1"\r
-                        LongName="cl_spinlock_osd.h" Name="CL_SPIN1.H" \r
-                        Source="..\bin\Inc\complib\cl_spinlock_osd.h" />\r
-                  <File Id="cl_syscallback.h" Compressed="yes" DiskId="1"\r
-                        LongName="cl_syscallback.h" Name="CL_SYSC.H" \r
-                        Source="..\bin\Inc\complib\cl_syscallback.h" />\r
-                  <File Id="cl_syscallback_osd.h" Compressed="yes" DiskId="1"\r
-                        LongName="cl_syscallback_osd.h" Name="CL_SYSC1.H" \r
-                        Source="..\bin\Inc\complib\cl_syscallback_osd.h" />\r
-                  <File Id="cl_thread.h" Compressed="yes" DiskId="1"\r
-                        LongName="cl_thread.h" Name="CL_THRE.H" \r
-                        Source="..\bin\Inc\complib\cl_thread.h" />\r
-                  <File Id="cl_thread_osd.h" Compressed="yes" DiskId="1"\r
-                        LongName="cl_thread_osd.h" Name="CL_THRE1.H" \r
-                        Source="..\bin\Inc\complib\cl_thread_osd.h" />\r
-                  <File Id="cl_threadpool.h" Compressed="yes" DiskId="1"\r
-                        LongName="cl_threadpool.h" Name="CL_THRE2.H" \r
-                        Source="..\bin\Inc\complib\cl_threadpool.h" />\r
-                  <File Id="cl_timer.h" Compressed="yes" DiskId="1"\r
-                        LongName="cl_timer.h" Name="CL_TIME.H" \r
-                        Source="..\bin\Inc\complib\cl_timer.h" />\r
-                  <File Id="cl_timer_osd.h" Compressed="yes" DiskId="1"\r
-                        LongName="cl_timer_osd.h" Name="CL_TIME1.H" \r
-                        Source="..\bin\Inc\complib\cl_timer_osd.h" />\r
-                  <File Id="cl_types.h" Compressed="yes" DiskId="1"\r
-                        LongName="cl_types.h" Name="CL_TYPE.H" \r
-                        Source="..\bin\Inc\complib\cl_types.h" />\r
-                  <File Id="cl_types_osd.h" Compressed="yes" DiskId="1"\r
-                        LongName="cl_types_osd.h" Name="CL_TYPE1.H" \r
-                        Source="..\bin\Inc\complib\cl_types_osd.h" />\r
-                  <File Id="cl_vector.h" Compressed="yes" DiskId="1"\r
-                        LongName="cl_vector.h" Name="CL_VECT.H" \r
-                        Source="..\bin\Inc\complib\cl_vector.h" />\r
-                  <File Id="cl_waitobj.h" Compressed="yes" DiskId="1"\r
-                        LongName="cl_waitobj.h" Name="CL_WAIT.H" \r
-                        Source="..\bin\Inc\complib\cl_waitobj.h" />\r
-                  <File Id="cl_waitobj_osd.h" Compressed="yes" DiskId="1"\r
-                        LongName="cl_waitobj_osd.h" Name="CL_WAIT1.H" \r
-                        Source="..\bin\Inc\complib\cl_waitobj_osd.h" />\r
-                  <File Id="comp_lib.h" Compressed="yes" DiskId="1"\r
-                        LongName="comp_lib.h" Name="COMP_LI.H" \r
-                        Source="..\bin\Inc\complib\comp_lib.h" />\r
-                </Component>\r
-              </Directory>\r
+      <!-- copy DAT header files to\r
+         %SystemDrive%\DAT\v1-1\DAT\r
+         %SystemDrive%\DAT\v2-0\DAT\r
+      -->\r
 \r
-              <Directory Id="IB_iba" Name="iba">\r
-                <Component Id="cIBAL_IBA"\r
-                           Guid="2EC5C324-734D-4a06-AE35-D7B80D76B77A">\r
-                  <CreateFolder />\r
-                  <File Id="ib_al.h" Compressed="yes" DiskId="1"\r
-                        LongName="ib_al.h" Name="ib_al.h"\r
-                        Source="..\bin\Inc\iba\ib_al.h" />\r
-                  <File Id="ib_al_ioctl.h" Compressed="yes" DiskId="1"\r
-                        LongName="ib_al_ioctl.h" Name="ib_ioctl.h"\r
-                        Source="..\bin\Inc\iba\ib_al_ioctl.h" />\r
-                  <File Id="ib_at_ioctl.h" Compressed="yes" DiskId="1"\r
-                        LongName="ib_at_ioctl.h" Name="ib_iocat.h"\r
-                        Source="..\bin\Inc\iba\ib_at_ioctl.h" />\r
-                  <File Id="ib_ci.h" Compressed="yes" DiskId="1"\r
-                        LongName="ib_ci.h" Name="ib_ci.h"\r
-                        Source="..\bin\Inc\iba\ib_ci.h" />\r
-                  <File Id="ib_types.h" Compressed="yes" DiskId="1"\r
-                        LongName="ib_types.h" Name="ib_types.h"\r
-                        Source="..\bin\Inc\iba\ib_types.h" />\r
-                  <File Id="ib_uvp.h" Compressed="yes" DiskId="1"\r
-                        LongName="ib_uvp.h" Name="ib_uvp.h"\r
-                        Source="..\bin\Inc\iba\ib_uvp.h" />\r
-                </Component>\r
-              </Directory>\r
-            </Directory>\r
+        <Directory Id="dDATD" Name="DAT">\r
+          <?include ..\..\common\DAT_config.inc ?>\r
+        </Directory>\r
 \r
-            <Directory Id="IB_samples" Name="Samples">\r
-              <Directory Id="sample_DDK" Name="DDK">\r
-                <Component Id="cDDK_example"\r
-                           Guid="8C27B926-FCFE-4f46-83B4-A27482A5EB3B">\r
-                  <CreateFolder />\r
-                      <File Id="cmtest.c" Compressed="yes" DiskId="1"\r
-                            LongName="cmtest.c" Name="cmtest.c"\r
-                            Source="..\bin\Misc\cmtest.c" />\r
-                      <File Id="makefile" Compressed="yes" DiskId="1"\r
-                            LongName="makefile" Name="makefile"\r
-                            Source="..\..\SDK_Samples\DDK\makefile" />\r
-                      <File Id="SOURCES" Compressed="yes" DiskId="1"\r
-                            LongName="SOURCES" Name="SOURCES"\r
-                            Source="..\..\SDK_Samples\DDK\SOURCES" />\r
-                      <File Id="README.txt" Compressed="yes" DiskId="1"\r
-                            LongName="README.txt" Name="README.txt"\r
-                            Source="..\..\SDK_Samples\DDK\README.txt" />\r
-                </Component>\r
-              </Directory>    <!-- End DDK -->\r
-              <Directory Id="sample_VS" Name="VS">\r
-                <Component Id="cVS_example"\r
-                           Guid="35E03D7E-E943-4346-8F63-7E991AF68F53">\r
-                  <CreateFolder />\r
-                      <File Id="vs_cmtest.c" Compressed="yes" DiskId="1"\r
-                            LongName="cmtest.c" Name="cmtest.c"\r
-                            Source="..\bin\misc\cmtest.c" />\r
-                      <File Id="vscmtest.rc" Compressed="yes" DiskId="1"\r
-                            LongName="cmtest.rc" Name="cmtest.rc"\r
-                            Source="..\..\SDK_Samples\VS\cmtest.rc" />\r
-                      <File Id="vsREADME.txt" Compressed="yes" DiskId="1"\r
-                            LongName="README.txt" Name="README.txt"\r
-                            Source="..\..\SDK_Samples\VS\README.txt" />\r
-                </Component>\r
-              </Directory>    <!-- End VS -->\r
-            </Directory>    <!-- End Samples -->\r
-          </Directory>    <!-- End IBSDK -->\r
+        <Directory Id="IBSDK" Name="IBSDK">\r
+          <?include ..\..\common\ib_sdk.inc ?>\r
+        </Directory>\r
 \r
-      </Directory>   <!-- WinRoot -->   \r
-    </Directory> <!-- TARGETDIR --> \r
+      </Directory>\r
+    </Directory> <!-- End TARGETDIR -->\r
 \r
 <!--\r
     <Property Id='ARPNOMODIFY'>1</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
-\r
     <!--\r
-       Features - Level=1 == Typical, no WSD on XP\r
+       Features - Level=1 == Typical, no WSD on XP or SRP on 32-bit XP\r
      -->\r
 \r
     <Feature Id="fMxDrivers" Title="Mellanox HCA Drivers" Level="1"\r
-         Description="Mellanox Host Channel Adapter Drivers for InfiniHost"\r
+         Description="Mellanox InfiniBand Host Channel Adapter Drivers"\r
          Display="expand" ConfigurableDirectory="INSTALLDIR"\r
          AllowAdvertise='no' InstallDefault='local' Absent='allow'>\r
-\r
-        <ComponentRef Id="cMthcaDriver" />\r
-        <ComponentRef Id="cConnectXDriver" />\r
+      <ComponentRef Id="cMthcaDriver" />\r
+      <ComponentRef Id="cConnectXDriver" />\r
     </Feature>\r
 \r
-    <Feature Id="IBcore" Title="InfiniBand Core" Level="1"\r
-         Description="InfiniBand: Core, Tools, Docs"\r
-         Display="expand" ConfigurableDirectory="INSTALLDIR"\r
-         AllowAdvertise='no' InstallDefault='local' Absent='disallow'>\r
+    <Feature Id="IBcore" Title="InfiniBand Core Modules" Level="1"\r
+        Description="InfiniBand: Core, Tools, Docs"\r
+        Display="expand" ConfigurableDirectory="INSTALLDIR"\r
+        AllowAdvertise="no" InstallDefault="local" Absent="disallow">\r
       <ComponentRef Id="cIBcore" />\r
       <ComponentRef Id="cWinVerbsDrivers" />\r
       <ComponentRef Id="Docs" />\r
     </Feature>\r
 \r
     <Feature Id="fWV" Title="WinVerbs"\r
-        Description="OFED verbs - Libraries and utilities"\r
+        Description="OFED verbs - Libraries + utilities"\r
         Display="expand" Level="1" ConfigurableDirectory="INSTALLDIR"\r
         AllowAdvertise="no" InstallDefault="local" Absent="allow">\r
         <ComponentRef Id="cWinVerbsOFED" />\r
     </Feature>\r
 \r
     <Feature Id="fIPoIB" Title="IPoIB" Level="1"\r
-         Description="Internet Protocols over InfiniBand" Display="expand"\r
-         ConfigurableDirectory="INSTALLDIR"\r
-         AllowAdvertise='no' InstallDefault='local' Absent='allow'>\r
+        Description="Internet Protocols over InfiniBand" Display="expand"\r
+        ConfigurableDirectory="INSTALLDIR" AllowAdvertise="no"\r
+        InstallDefault="local" Absent="allow">\r
       <ComponentRef Id="IPoIB" />\r
     </Feature>\r
 \r
         <Condition Level="201"> IPOIB_EXISTS </Condition> \r
     </Feature>\r
 -->\r
-\r
     <Feature Id="fOSMS" Title="OpenSM Service Started" Level="5"\r
-         Description="Open Subnet Management started as a local Windows Service"\r
-         Display="expand" ConfigurableDirectory="INSTALLDIR"\r
-         AllowAdvertise='no' InstallDefault='local' Absent='allow'>\r
-      <ComponentRef Id="OpenSM_Service_enabled" />\r
+        Description="Open Subnet Management started as a local Windows Service"\r
+        Display="expand" ConfigurableDirectory="INSTALLDIR" AllowAdvertise="no"\r
+        InstallDefault="local" Absent="allow">\r
+        <ComponentRef Id="OpenSM_Service_enabled" />\r
     </Feature>\r
 \r
-    <Feature Id="fDAPL" Title="DAPL" Description="DAT/DAPL over InfiniBand"\r
-         Display="collapse" Level="1" ConfigurableDirectory="INSTALLDIR"\r
-         AllowAdvertise='no' InstallDefault='local' Absent='allow'>\r
+    <Feature Id="fDAPL" Title="DAPL" Description="DAT+DAPL over InfiniBand"\r
+        Display="collapse" Level="1" ConfigurableDirectory="INSTALLDIR"\r
+        AllowAdvertise="no" InstallDefault="local" Absent="allow">\r
       <Condition Level="201"> IPOIB_EXISTS </Condition>\r
 \r
       <Feature Id="fDatConf" Title="DAT-DAPL Config File"\r
-         Description="DAT-DAPL runtime configuration file; installed if %SystemDrive%\DAT\dat.conf does not exist."\r
+         Description="DAPL runtime configuration file; installed if %SystemDrive%\DAT\dat.conf does not exist."\r
          Display="expand" Level="1" \r
          AllowAdvertise='no' InstallDefault='local' Absent='allow'>\r
         <Condition Level="0"> DAT_CONF_EXISTS AND Not Installed </Condition>\r
     </Feature>\r
 \r
     <Feature Id="fVNIC" Title="QLogic-VNIC"\r
-         Description="QLogic - Virtual NIC over InfiniBand"\r
-         Display="expand" Level="5" ConfigurableDirectory="INSTALLDIR"\r
-         AllowAdvertise='no' InstallDefault='local' Absent='allow'>\r
+        Description="QLogic - Virtual NIC over InfiniBand"\r
+        Display="expand" Level="5" ConfigurableDirectory="INSTALLDIR"\r
+        AllowAdvertise="no" InstallDefault="local" Absent="allow">\r
       <ComponentRef Id="cQLVNIC_driver_installed" />\r
     </Feature>\r
 \r
       <ComponentRef Id="cCHK_user" />\r
     </Feature>\r
 \r
-    <!--> File where Custom Actions are defined -->\r
-    <Binary Id='CA' src='..\..\CustomActions.vbs' />\r
-\r
-    <CustomAction Id='WinOF_setup' BinaryKey='CA'\r
-         VBScriptCall='WinOF_setup' Return='check' />\r
-\r
-    <CustomAction Id='ChkPreviousInstall' BinaryKey='CA'\r
-         VBScriptCall='ChkInstallAndReboot' Return='check' />\r
-\r
-    <CustomAction Id='DriverInstall' BinaryKey='CA'\r
-         VBScriptCall='DriverInstall' Return='check' Execute='deferred' />\r
-\r
-    <CustomAction Id='DriverUninstall' BinaryKey='CA'\r
-         VBScriptCall='DriverUninstall' Return='check' />\r
-\r
-    <CustomAction Id='WSDStart' BinaryKey='CA'\r
-         VBScriptCall='WSDEnable' Return='check' />\r
-\r
-    <CustomAction Id="ND_start" BinaryKey="CA"\r
-         VBScriptCall="ND_StartMeUp" Return="check" />\r
-\r
-    <CustomAction Id='HammerTime' BinaryKey='CA'\r
-         VBScriptCall='HammerTime' Return='check' />\r
-\r
-    <CustomAction Id="BcastRegChanged" BinaryKey="CA"\r
-         VBScriptCall="BcastRegChanged" Return="check" />\r
-\r
-    <CustomAction Id="InstallChanged" BinaryKey="CA"\r
-         VBScriptCall="InstallChanged" Return="check" />\r
-\r
-    <InstallExecuteSequence>\r
-       <!--> Always executed (Install or uninstall </!-->\r
-       <Custom Action="WinOF_setup" After='InstallInitialize' />\r
-\r
-       <!--> Install ONLY </!-->\r
-       <Custom Action="ChkPreviousInstall" After='WinOF_setup'>\r
-               NOT Installed</Custom>\r
-\r
-       <ScheduleReboot After='ChkPreviousInstall'>\r
-               REBOOT="FORCE"</ScheduleReboot>\r
-\r
-       <Custom Action="DriverInstall" After='InstallServices'>\r
-               Not Installed AND Not NODRV </Custom>\r
-\r
-       <Custom Action="WSDStart" After='InstallFinalize'>\r
-               Not Installed AND Not NODRV </Custom>\r
-\r
-       <Custom Action="ND_start" After="WSDStart">\r
-          ($cNetworkDirect = 3) AND Not Installed AND Not NODRV </Custom>\r
-\r
-       <Custom Action="BcastRegChanged" After="ND_start">\r
-               Not Installed</Custom>\r
-\r
-       <!--> CHANGE ONLY </!-->\r
-       <Custom Action="InstallChanged" After="InstallFinalize">\r
-           Installed </Custom>\r
-\r
-       <!--> REMOVE ONLY </!-->\r
-       <Custom Action="DriverUninstall" After='PublishProduct'>\r
-               REMOVE="ALL" </Custom>\r
-       <Custom Action="HammerTime" After='InstallFinalize'>REMOVE="ALL"</Custom>\r
-    </InstallExecuteSequence>\r
-\r
+    <?include ..\..\common\InstallExecuteSeq.inc ?>\r
 \r
     <UIRef Id="WixUI_FeatureTree" />\r
-    <UIRef Id="WixUI_ErrorProgressText" />\r
-    <Icon Id="openfabrics" SourceFile="..\..\openfabrics.ico" />\r
+      <UIRef Id="WixUI_ErrorProgressText" />\r
+      <Icon Id="openfabrics" SourceFile="..\..\openfabrics.ico" />\r
     <UI />\r
   </Product>\r
 </Wix>\r
index 84d4b0a..bcea0fb 100644 (file)
@@ -1,12 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>\r
 <!--\r
-   WinOF (Windows OpenFabrics) for x64 Windows Server 2008 or Vista\r
+   WinOF (Windows OpenFabrics) for x64 Windows 7\r
 -->\r
+\r
+<?define ARCH=amd64 ?>\r
+<?define ARCHP=x64 ?>\r
+<?define OS=win7 ?>\r
+<?include ..\..\common\WinOF_cfg.inc ?>\r
+\r
 <Wix xmlns="http://schemas.microsoft.com/wix/2003/01/wi">\r
-  <Product Name="Windows Open Fabrics InfiniBand v2.1.0 (RC0) x64"\r
-    Version="2.1.0"\r
+  <Product\r
+    Name="Windows OpenFabrics InfiniBand $(var.WOFREL) $(var.ARCHP)"\r
+    Version="$(var.WOFRELNUM)"\r
     Id="3A6A276E-A636-48e8-8624-9A0DE3F2A15E"\r
-    UpgradeCode='E38964D6-359D-4E38-9BBF-8C79D84DF6CF' \r
+    UpgradeCode='E38964D6-359D-4E38-9BBF-8C79D84DF6CF'\r
     Language="1033" Codepage="1252"\r
     Manufacturer="Open Fabrics Alliance Windows">\r
 \r
@@ -14,8 +21,8 @@
      Keywords="Installer, InfiniBand, WinOF, OpenFabrics"\r
      InstallPrivileges='elevated'\r
      Description="WinOF Installer"\r
-     Comments="Windows Open Fabrics Alliance InfiniBand stack"\r
-     Manufacturer="Open Fabrics Alliance Windows" InstallerVersion="200"\r
+     Comments="Windows OpenFabrics Alliance InfiniBand stack"\r
+     Manufacturer="OpenFabrics Alliance" InstallerVersion="200"\r
      Languages="1033" Compressed="yes" SummaryCodepage="1252" />\r
 \r
     <Condition Message="Administrator required to install [ProductName].">\r
          <![CDATA[(VersionNT=600)]]>\r
     </Condition>\r
 \r
-    <!--\r
-        System/Machine-wide install, otherwise per-user (Administrator) only.\r
-        All users see OpenFabrics WinOF Release Notes & Manual in Programs.\r
-     -->\r
-    <Property Id="ALLUSERS"> Value="1" </Property>\r
-\r
-    <!-- Requires files sc.exe & reg.exe -->\r
-    <Property Id="REG_EXISTS">\r
-      <DirectorySearch Id="RegFileDir" Path="[WindowsFolder]" Depth="1">\r
-        <FileSearch Id="RegFile" Name="reg.exe" />\r
-      </DirectorySearch>\r
-    </Property>\r
-\r
-    <Property Id="SC_EXISTS">\r
-      <DirectorySearch Id="ScFileDir" Path="[WindowsFolder]" Depth="1">\r
-        <FileSearch Id="ScFile" Name="sc.exe" />\r
-      </DirectorySearch>\r
-    </Property>\r
-\r
-    <Property Id="IPOIB_EXISTS">\r
-      <DirectorySearch Id="ipoibFileDir" Path="[INSTALLDIR]\net" Depth="0">\r
-        <FileSearch Id="ipoibFile" Name="netipoib.inf" />\r
-      </DirectorySearch>\r
-    </Property>\r
-\r
-    <Property Id="DAT_CONF_EXISTS">\r
-      <DirectorySearch Id="DCscan" Path="[WindowsVolume]\DAT" Depth="0">\r
-        <FileSearch Id="DCFile" Name="dat.conf" />\r
-      </DirectorySearch>\r
-    </Property>\r
-\r
-    <Property Id="DAT1_INSTALLED">\r
-      <DirectorySearch Id="Dat1DS" Path="[INSTALLDIR]" Depth="0">\r
-        <FileSearch Id="daplFS" Name="dapl.dll" />\r
-      </DirectorySearch>\r
-    </Property>\r
-\r
-    <Property Id="DAT2_INSTALLED">\r
-      <DirectorySearch Id="Dat2DS" Path="[INSTALLDIR]" Depth="0">\r
-        <FileSearch Id="dapl2FS" Name="dapl2.dll" />\r
-      </DirectorySearch>\r
-    </Property>\r
-\r
-    <Condition Message="[ProductName] requires system file reg.exe">\r
-       REG_EXISTS\r
-    </Condition>\r
-\r
-    <Condition Message="[ProductName] requires system file sc.exe">\r
-       SC_EXISTS\r
-    </Condition>\r
-\r
-    <Media Id="1" Cabinet="Sample.cab" EmbedCab="yes" DiskPrompt="CD-ROM #1" />\r
-    <Property Id="DiskPrompt" Value="WinOF 1.0 Installation [1]" />\r
+    <?include ..\..\common\requirements.inc ?>\r
 \r
     <Directory Id="TARGETDIR" Name="SourceDir">\r
       <Directory Id="ProgramMenuFolder" Name="PMenu" LongName="Programs">\r
       <Directory Id="DesktopFolder" Name="Desktop" />\r
       <Directory Id="ProgramFilesFolder" Name="PFiles">\r
         <Directory Id="INSTALLDIR" Name="WinOF">\r
-          <Component Id="Docs" Guid="931C58EF-3759-4cf4-89CC-276C017305BB">\r
-\r
-            <File Id="OFAlogo" Compressed="yes" DiskId="1"\r
-                    LongName="openfabrics.gif" Name="ofa.gif"\r
-                    Source="..\..\openfabrics.gif" />\r
-\r
-            <!-- implies WIX build only from an svn structured tree.  -->\r
-            <File Id="manual.htm" Compressed="yes" DiskId="1" Name="Manual.htm"\r
-                    LongName="Manual.htm"\r
-                    Source="..\bin\Misc\Manual.htm" Vital="yes" />\r
 \r
-            <Shortcut Id="Manual.htm" Directory="ProgramMenuDir"\r
-                    Name="Manual.htm" LongName="Manual"\r
-                    Target="[INSTALLDIR]\Manual.htm" Show="normal"\r
-                    WorkingDirectory="INSTALLDIR" Icon="openfabrics"\r
-                    IconIndex="0" />\r
-\r
-            <File Id="dRelnotes" Compressed="yes" DiskId="1"\r
-                    LongName="Release_notes.htm" Name="RELEASE_.HTM"\r
-                    Source="..\..\Release_notes.htm" />\r
-\r
-            <Shortcut Id="RelNotes" Directory="ProgramMenuDir"\r
-                    Name="RelNotes" LongName="Release Notes"\r
-                    Target="[INSTALLDIR]\Release_notes.htm" Show="normal"\r
-                    WorkingDirectory="INSTALLDIR" Icon="openfabrics"\r
-                    IconIndex="0" />\r
-\r
-            <File Id="command_window" Name="COMMAND.LNK"\r
-                    LongName="Command Window.lnk" Compressed="yes" DiskId="1"\r
-                    Source="..\..\x64\Command Window.lnk" Vital="yes" />\r
-\r
-            <Shortcut Id="Command_Window.lnk" Directory="ProgramMenuDir"\r
-                    Name="COMMAND.LNK" LongName="Command Window.lnk"\r
-                    Target="[INSTALLDIR]\Command Window.lnk" Icon="openfabrics"\r
-                    IconIndex="0" Show="normal" WorkingDirectory="INSTALLDIR" />\r
-\r
-            <Shortcut Id="UninstallProduct" Name="UnMyApp"\r
-                Directory="ProgramMenuDir"\r
-                LongName="Uninstall WinOF"\r
-                               Target="[System64Folder]msiexec.exe"\r
-                Arguments="/X [ProductCode]"\r
-                Description="Uninstalls OpenFabrics InfiniBand" />\r
-            <RemoveFolder Id="RemoveShorcutFolder" On="uninstall" />\r
-          </Component>\r
-\r
-          <Component Id="Tools" Guid="1B89230E-5D8D-41a5-BD1F-A3E308FEE026">\r
-            <Environment Id='UpdatePath' Name='PATH' Action='create'\r
-                         System='yes' Part='last' Value='[INSTALLDIR]' /> \r
-\r
-            <File Id="qlgcvnic_config" Compressed="yes" DiskId="1" Vital="yes"\r
-                    Name="vnic_cfg.exe" LongName="qlgcvnic_config.exe"\r
-                    Source="..\bin\tools\amd64\release\qlgcvnic_config.exe" />\r
-            <File Id="part_man" Name="part_man.exe"\r
-                    Compressed="yes" DiskId="1" Vital="yes"\r
-                    Source="..\bin\tools\amd64\release\part_man.exe" />\r
-            <File Id="vstat" Name="vstat.exe"\r
-                    Compressed="yes" DiskId="1" Vital="yes"\r
-                    Source="..\bin\tools\amd64\release\vstat.exe" />\r
-            <File Id="ttcp.exe" LongName="ttcp.exe" Compressed="yes"\r
-                    DiskId="1" Name="TTCP.EXE"\r
-                    Source="..\bin\tools\amd64\release\ttcp.exe" />\r
-            <File Id="cmtest.exe" LongName="cmtest.exe" Compressed="yes"\r
-                    DiskId="1" Name="CMTEST.EXE"\r
-                    Source="..\bin\tools\amd64\release\cmtest.exe" />\r
-            <File Id="ib_limits.exe" Compressed="yes" DiskId="1"\r
-                     LongName="ib_limits.exe" Name="IB_LIMI.EXE"\r
-                     Source="..\bin\tools\amd64\release\ib_limits.exe" />\r
-            <File Id="ib_read_bw.exe" Compressed="yes" DiskId="1"\r
-                     LongName="ib_read_bw.exe" Name="IB_READ.EXE"\r
-                     Source="..\bin\tools\amd64\release\ib_read_bw.exe" />\r
-            <File Id="ib_read_lat.exe" Compressed="yes" DiskId="1"\r
-                     LongName="ib_read_lat.exe" Name="IB_READ1.EXE"\r
-                     Source="..\bin\tools\amd64\release\ib_read_lat.exe" />\r
-            <File Id="ib_send_bw.exe" Compressed="yes" DiskId="1"\r
-                     LongName="ib_send_bw.exe" Name="IB_SEND.EXE"\r
-                     Source="..\bin\tools\amd64\release\ib_send_bw.exe" />\r
-            <File Id="ib_send_lat.exe" Compressed="yes" DiskId="1"\r
-                     LongName="ib_send_lat.exe" Name="IB_SEND1.EXE"\r
-                     Source="..\bin\tools\amd64\release\ib_send_lat.exe" />\r
-            <File Id="ib_write_bw.exe" Compressed="yes" DiskId="1"\r
-                     LongName="ib_write_bw.exe" Name="IB_WRIT.EXE"\r
-                     Source="..\bin\tools\amd64\release\ib_write_bw.exe" />\r
-            <File Id="ib_write_lat.exe" Compressed="yes" DiskId="1"\r
-                     LongName="ib_write_lat.exe" Name="IB_WRIT1.EXE"\r
-                     Source="..\bin\tools\amd64\release\ib_write_lat.exe" />\r
-            <File Id="ibtrapgen.exe" Compressed="yes" DiskId="1"\r
-                     LongName="ibtrapgen.exe" Name="IBTRAPG.EXE"\r
-                     Source="..\bin\tools\amd64\release\ibtrapgen.exe" />\r
-            <File Id="osmtest.exe" Compressed="yes" DiskId="1"\r
-                     LongName="osmtest.exe" Name="OSMTEST.EXE"\r
-                     Source="..\bin\tools\amd64\release\osmtest.exe" />\r
-            <File Id="PrintIP.exe" Compressed="yes" DiskId="1"\r
-                     LongName="PrintIP.exe" Name="PRINTIP.EXE"\r
-                     Source="..\bin\tools\amd64\release\PrintIP.exe" />\r
-            <File Id="nsc" Name="nsc.exe" Compressed="yes" DiskId="1"\r
-                     Vital="yes" Source="..\bin\tools\amd64\release\nsc.exe" />\r
-          </Component>\r
-\r
-          <Component Id='OpenSMservice'\r
-                     Guid='90042B4F-51B5-4720-8E54-6D366253634B'\r
-                     SharedDllRefCount='no' KeyPath='no'\r
-                     NeverOverwrite='no'\r
-                     Permanent='no' Transitive='no' Win64='no'\r
-                     Location='either'>\r
-\r
-              <File Id="opensm.exe" Compressed="yes" DiskId="1"\r
-                    LongName="opensm.exe" Name="OPENSM.EXE"\r
-                    Source="..\bin\tools\amd64\release\opensm.exe"\r
-                    Vital='yes' KeyPath='yes' Hidden='no' System='no' \r
-                    Checksum='no' ReadOnly='no' />\r
-\r
-              <ServiceInstall Id='osmSvcInstall' Vital='yes' Name='OpenSM'\r
-                  Description='InfiniBand Subnet Configuration and Management'\r
-                  DisplayName='InfiniBand Subnet Manager'\r
-                  Arguments='-e --service'\r
-                  ErrorControl='normal'\r
-                  Start='disabled'\r
-                  Interactive='no'\r
-                  Type='ownProcess' />\r
-\r
-              <ServiceControl Id='osmSvcControl' Name='OpenSM'\r
-                              Stop='uninstall'\r
-                              Wait='no'\r
-                              Remove='uninstall' />\r
-          </Component>\r
+          <?include ..\..\common\Docs.inc ?>\r
+          <?include ..\..\common\Tools.inc ?>\r
+          <?include ..\..\common\OpenSM_service.inc ?>\r
 \r
           <Directory Id="IBcoreDir" Name="IBcore">\r
-            <Component Id="cIBcore"\r
-                       Guid="4B4EA649-65ED-4B0D-8717-D60481412211">\r
-              <CreateFolder />\r
-              <File Id="dpinst.exe" Compressed="yes" DiskId="1"\r
-                     LongName="dpinst.exe" Name="dpinst.exe"\r
-                     Source="..\..\x64\dpinst.exe" />\r
-              <File Id="dpinst.xml" Compressed="yes" DiskId="1"\r
-                     LongName="dpinst.xml" Name="dpinst.xml"\r
-                     Source="..\..\dpinst.xml" />\r
-              <File Id="devman.exe" Compressed="yes" DiskId="1"\r
-                     LongName="devman.exe" Name="devman.exe"\r
-                     Source="..\..\x64\devman.exe" />\r
-              <File Id="wdfcoinstaller" Compressed="yes" DiskId="1"\r
-                     LongName="WdfCoInstaller01009.dll" Name="WCO.dll"\r
-                     Source="..\bin\hca\amd64\WdfCoInstaller01009.dll" />\r
-              <File Id="cl32.dll" Compressed="yes" DiskId="1"\r
-                     LongName="cl32.dll" Name="CL32.DLL"\r
-                     Source="..\bin\HCA\amd64\cl32.dll" />\r
-              <File Id="cl32d.dll" Compressed="yes" DiskId="1"\r
-                     LongName="cl32d.dll" Name="CL32D.DLL"\r
-                     Source="..\bin\HCA\amd64\cl32d.dll" />\r
-              <File Id="complib.dll" Compressed="yes" DiskId="1"\r
-                     LongName="complib.dll" Name="COMPLIB.DLL"\r
-                     Source="..\bin\HCA\amd64\complib.dll" />\r
-              <File Id="complibd.dll" Compressed="yes" DiskId="1"\r
-                     LongName="complibd.dll" Name="COMPLIB1.DLL"\r
-                     Source="..\bin\HCA\amd64\complibd.dll" />\r
-              <File Id="ibal32.dll" Compressed="yes" DiskId="1"\r
-                     LongName="ibal32.dll" Name="IBAL32.DLL"\r
-                     Source="..\bin\HCA\amd64\ibal32.dll" />\r
-              <File Id="ibal32d.dll" Compressed="yes" DiskId="1"\r
-                     LongName="ibal32d.dll" Name="IBAL32D.DLL"\r
-                     Source="..\bin\HCA\amd64\ibal32d.dll" />\r
-              <File Id="ibal.dll" Compressed="yes" DiskId="1"\r
-                     LongName="ibal.dll" Name="IBAL.DLL"\r
-                     Source="..\bin\HCA\amd64\ibal.dll" />\r
-              <File Id="ibald.dll" Compressed="yes" DiskId="1"\r
-                     LongName="ibald.dll" Name="IBALD.DLL"\r
-                     Source="..\bin\HCA\amd64\ibald.dll" />\r
-              <File Id="ibbus.sys" Compressed="yes" DiskId="1"\r
-                     LongName="ibbus.sys" Name="IBBUS.SYS"\r
-                     Source="..\bin\HCA\amd64\ibbus.sys" />\r
-              <File Id="ibbus.pdb" Compressed="yes" DiskId="1"\r
-                     Name="ibbus.pdb" Source="..\bin\HCA\amd64\ibbus.pdb" />\r
-              <File Id="ibiou.sys" Compressed="yes" DiskId="1"\r
-                     LongName="ibiou.sys" Name="IBIOU.SYS"\r
-                     Source="..\bin\HCA\amd64\ibiou.sys" />\r
-              <File Id="ibiou.pdb" Compressed="yes" DiskId="1"\r
-                     Name="ibiou.pdb"\r
-                     Source="..\bin\HCA\amd64\ibiou.pdb" />\r
-              <File Id="ib_iou.cat" Compressed="yes" DiskId="1"\r
-                     LongName="ib_iou.cat" Name="IB_IOU.cat"\r
-                     Source="..\bin\HCA\amd64\ib_iou.cat" />\r
-              <File Id="ib_iou.inf" Compressed="yes" DiskId="1"\r
-                     LongName="ib_iou.inf" Name="IB_IOU.inf"\r
-                     Source="..\bin\HCA\amd64\ib_iou.inf" />\r
-              <!--\r
-                 Orphaned install files - remove on uninstall\r
-                 Here SystemFolder == SysWOW64, System64Folder == System32\r
-              -->\r
-              <RemoveFile Id='o64_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
-            </Component>\r
-\r
-            <Component Id="cMthcaDriver"\r
-                       Guid="BE4ED061-C852-40a2-A240-F06DBBE1159F">\r
-              <File Id="mthca32.dll" Compressed="yes" DiskId="1"\r
-                     LongName="mthca32.dll" Name="MTHCA32.DLL"\r
-                     Source="..\bin\HCA\amd64\mthca32.dll" />\r
-              <File Id="mthca32d.dll" Compressed="yes" DiskId="1"\r
-                     LongName="mthca32d.dll" Name="MTHCA321.DLL"\r
-                     Source="..\bin\HCA\amd64\mthca32d.dll" />\r
-              <File Id="mthca.inf" Compressed="yes" DiskId="1"\r
-                     LongName="mthca.inf" Name="MTHCA.INF"\r
-                     Source="..\bin\HCA\amd64\mthca.inf" />\r
-              <File Id="mthca.cat" Compressed="yes" DiskId="1"\r
-                     LongName="mthca.cat" Name="MTHCA.cat"\r
-                     Source="..\bin\HCA\amd64\mthca.cat" />\r
-              <File Id="mthca.sys" Compressed="yes" DiskId="1"\r
-                     LongName="mthca.sys" Name="MTHCA.SYS"\r
-                     Source="..\bin\HCA\amd64\mthca.sys" />\r
-              <File Id="mthca.pdb" Compressed="yes" DiskId="1"\r
-                     Name="mthca.pdb"\r
-                     Source="..\bin\HCA\amd64\mthca.pdb" />\r
-              <File Id="mthcau.dll" Compressed="yes" DiskId="1"\r
-                     LongName="mthcau.dll" Name="MTHCAU.DLL"\r
-                     Source="..\bin\HCA\amd64\mthcau.dll" />\r
-              <File Id="mthcaud.dll" Compressed="yes" DiskId="1"\r
-                     LongName="mthcaud.dll" Name="MTHCAUD.DLL"\r
-                     Source="..\bin\HCA\amd64\mthcaud.dll" />\r
-            </Component>\r
-\r
-            <Component Id="cConnectXDriver"\r
-                       Guid="C1EFF4D6-CE55-432a-9D92-E46AB983D9E3">\r
-              <File Id="mlx4_bus.inf" Compressed="yes" DiskId="1"\r
-                     LongName="mlx4_bus.inf" Name="mlx4_bus.INF"\r
-                     Source="..\bin\hca\amd64\mlx4_bus.inf" />\r
-              <File Id="mlx4_bus.cat" Compressed="yes" DiskId="1"\r
-                     LongName="mlx4_bus.cat" Name="mlx4_bus.cat"\r
-                     Source="..\bin\hca\amd64\mlx4_bus.cat" />\r
-              <File Id="mlx4_bus.sys" Compressed="yes" DiskId="1"\r
-                     LongName="mlx4_bus.sys" Name="mlx4_bus.sys"\r
-                     Source="..\bin\hca\amd64\mlx4_bus.sys" />\r
-              <File Id="mlx4_bus.pdb" Compressed="yes" DiskId="1"\r
-                     Name="mlx4_bus.pdb"\r
-                     Source="..\bin\hca\amd64\mlx4_bus.pdb" />\r
-              <File Id="mlx4_hca.inf" Compressed="yes" DiskId="1"\r
-                     LongName="mlx4_hca.inf" Name="mlx4_hca.INF"\r
-                     Source="..\bin\hca\amd64\mlx4_hca.inf" />\r
-              <File Id="mlx4_hca.cat" Compressed="yes" DiskId="1"\r
-                     LongName="mlx4_hca.cat" Name="mlx4_hca.cat"\r
-                     Source="..\bin\hca\amd64\mlx4_hca.cat" />\r
-              <File Id="mlx4_hca.sys" Compressed="yes" DiskId="1"\r
-                     LongName="mlx4_hca.sys" Name="mlx4_hca.sys"\r
-                     Source="..\bin\hca\amd64\mlx4_hca.sys" />\r
-              <File Id="mlx4_hca.pdb" Compressed="yes" DiskId="1"\r
-                     Name="mlx4_hca.pdb"\r
-                     Source="..\bin\hca\amd64\mlx4_hca.pdb" />\r
-              <File Id="mlx4u.dll" Compressed="yes" DiskId="1"\r
-                     LongName="mlx4u.dll" Name="mlx4u.dll"\r
-                     Source="..\bin\hca\amd64\mlx4u.dll" />\r
-              <File Id="mlx4ud.dll" Compressed="yes" DiskId="1"\r
-                     LongName="mlx4ud.dll" Name="mlx4ud.dll"\r
-                     Source="..\bin\hca\amd64\mlx4ud.dll" />\r
-\r
-              <!-- copy 32-bit binaries for 32b in x64 -->\r
-              <File Id="mlx4u32d.dll" Compressed="yes" DiskId="1"\r
-                     LongName="mlx4u32d.dll" Name="mlx4u32.dll"\r
-                     Source="..\bin\hca\amd64\mlx4u32d.dll" />\r
-              <File Id="mlx4u32.dll" Compressed="yes" DiskId="1"\r
-                     LongName="mlx4u32.dll" Name="mlx4u32.dll"\r
-                     Source="..\bin\hca\amd64\mlx4u32.dll" />\r
-            </Component>\r
-\r
-            <Component Id="cWinVerbsDrivers"\r
-                       Guid="F5FA1491-E2D2-4f22-9549-07C61F86BFEB">\r
-\r
-              <File Id="winverbs.sys" Compressed="yes" DiskId="1"\r
-                    LongName="winverbs.sys" Name="winverbs.sys"\r
-                    Source="..\bin\HCA\amd64\winverbs.sys" />\r
-              <File Id="winverbs.pdb" Compressed="yes" DiskId="1"\r
-                    LongName="winverbs.pdb" Name="winverbs.pdb"\r
-                    Source="..\bin\HCA\amd64\winverbs.pdb" />\r
-              <File Id="winverbs.dll" Compressed="yes" DiskId="1"\r
-                    LongName="winverbs.dll" Name="winvrbs.dll"\r
-                    Source="..\bin\HCA\amd64\winverbs.dll" />\r
-              <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="winmad.sys" Compressed="yes" DiskId="1"\r
-                    LongName="winmad.sys" Name="winmad.sys"\r
-                    Source="..\bin\HCA\amd64\winmad.sys" />\r
-              <File Id="winmad.pdb" Compressed="yes" DiskId="1"\r
-                    LongName="winmad.pdb" Name="winmad.pdb"\r
-                    Source="..\bin\HCA\amd64\winmad.pdb" />\r
-              <File Id="winmad.dll" Compressed="yes" DiskId="1"\r
-                    LongName="winmad.dll" Name="winmad.dll"\r
-                    Source="..\bin\HCA\amd64\winmad.dll" />\r
-              <File Id="winmadd.dll" Compressed="yes" DiskId="1"\r
-                    LongName="winmadd.dll" Name="winmaddd.dll"\r
-                    Source="..\bin\HCA\amd64\winmadd.dll" />\r
-            </Component>\r
-\r
-          </Directory>\r
-\r
-          <Directory Id="dir_0" Name="Checked">\r
-            <Directory Id="dir_1" Name="kernel">\r
-                <Component Id="cCHK_kernel"\r
-                           Guid="D96F299E-EEAA-44a5-BBC4-A862A158BA6B">\r
-                  <CreateFolder />\r
-\r
-                  <File Id="chk0" DiskId="1" Compressed="yes"\r
-                        Name="README.txt"\r
-                        Source="..\..\README_checked.txt" />\r
-                  <File Id="chk1" DiskId="1" Compressed="yes"\r
-                        Name="mthca.sys"\r
-                        Source="..\bin\Chk\HCA\amd64\mthca.sys" />\r
-                  <File Id="cat1" DiskId="1" Compressed="yes"\r
-                        Name="mthca.cat"\r
-                        Source="..\bin\Chk\HCA\amd64\mthca.cat" />\r
-                  <File Id="sym1" DiskId="1" Compressed="yes"\r
-                        Name="mthca.pdb"\r
-                        Source="..\bin\Chk\HCA\amd64\mthca.pdb" />\r
-\r
-                  <File Id="chk2" DiskId="1" Compressed="yes"\r
-                        Name="ibbus.sys"\r
-                        Source="..\bin\Chk\HCA\amd64\ibbus.sys" />\r
-                  <File Id="sym2" DiskId="1" Compressed="yes"\r
-                        Name="ibbus.pdb"\r
-                        Source="..\bin\Chk\HCA\amd64\ibbus.pdb" />\r
-\r
-                  <File Id="chk3" DiskId="1" Compressed="yes"\r
-                        Name="ibiou.sys"\r
-                        Source="..\bin\Chk\HCA\amd64\ibiou.sys" />\r
-                  <File Id="cat3" DiskId="1" Compressed="yes"\r
-                        Name="ib_iou.cat"\r
-                        Source="..\bin\Chk\HCA\amd64\ib_iou.cat" />\r
-                  <File Id="sym3" DiskId="1" Compressed="yes"\r
-                        Name="ibiou.pdb"\r
-                        Source="..\bin\Chk\HCA\amd64\ibiou.pdb" />\r
-\r
-                  <File Id="chk4" DiskId="1" Compressed="yes"\r
-                        Name="ipoib.sys"\r
-                        Source="..\bin\Chk\net\amd64\ipoib.sys" />\r
-                  <File Id="cat4" DiskId="1" Compressed="yes"\r
-                        Name="ipoib.cat"\r
-                        Source="..\bin\Chk\net\amd64\ipoib.cat" />\r
-                  <File Id="sym4" DiskId="1" Compressed="yes"\r
-                        Name="ipoib.pdb"\r
-                        Source="..\bin\Chk\net\amd64\ipoib.pdb" />\r
-\r
-                  <File Id="chk5" DiskId="1" Compressed="yes"\r
-                        Name="qlgcvnic.sys"\r
-                        Source="..\bin\Chk\net\amd64\qlgcvnic.sys" />\r
-                  <File Id="cat5" DiskId="1" Compressed="yes"\r
-                        Name="netvnic.cat"\r
-                        Source="..\bin\Chk\net\amd64\netvnic.cat" />\r
-                  <File Id="sym5" DiskId="1" Compressed="yes"\r
-                        Name="qlgcvnic.pdb"\r
-                        Source="..\bin\Chk\net\amd64\qlgcvnic.pdb" />\r
-\r
-                  <File Id="chk6" DiskId="1" Compressed="yes"\r
-                        Name="ibsrp.sys"\r
-                        Source="..\bin\Chk\storage\amd64\ibsrp.sys" />\r
-                  <File Id="cat6" DiskId="1" Compressed="yes"\r
-                        Name="ibsrp.cat"\r
-                        Source="..\bin\Chk\storage\amd64\ibsrp.cat" />\r
-                  <File Id="sym6" DiskId="1" Compressed="yes"\r
-                        Name="ibsrp.pdb"\r
-                        Source="..\bin\Chk\storage\amd64\ibsrp.pdb" />\r
-\r
-                  <File Id="chk7" DiskId="1" Compressed="yes"\r
-                        Name="mlx4_bus.sys"\r
-                        Source="..\bin\Chk\HCA\amd64\mlx4_bus.sys" />\r
-                  <File Id="cat7" DiskId="1" Compressed="yes"\r
-                        Name="mlx4_bus.cat"\r
-                        Source="..\bin\Chk\HCA\amd64\mlx4_bus.cat" />\r
-                  <File Id="sym7" DiskId="1" Compressed="yes"\r
-                        Name="mlx4_bus.pdb"\r
-                        Source="..\bin\Chk\HCA\amd64\mlx4_bus.pdb" />\r
-\r
-                  <File Id="chk8" DiskId="1" Compressed="yes"\r
-                        Name="mlx4_hca.sys"\r
-                        Source="..\bin\Chk\HCA\amd64\mlx4_hca.sys" />\r
-                  <File Id="cat8" DiskId="1" Compressed="yes"\r
-                        Name="mlx4_hca.cat"\r
-                        Source="..\bin\Chk\HCA\amd64\mlx4_hca.cat" />\r
-                  <File Id="sym8" DiskId="1" Compressed="yes"\r
-                        Name="mlx4_hca.pdb"\r
-                        Source="..\bin\Chk\HCA\amd64\mlx4_hca.pdb" />\r
-\r
-                  <File Id="chk9" DiskId="1" Compressed="yes"\r
-                        Name="winverbs.sys"\r
-                        Source="..\bin\Chk\HCA\amd64\winverbs.sys" />\r
-                  <File Id="sym9" DiskId="1" Compressed="yes"\r
-                        Name="winverbs.pdb"\r
-                        Source="..\bin\Chk\HCA\amd64\winverbs.pdb" />\r
-                  <File Id="dll9" DiskId="1" Compressed="yes"\r
-                        Name="winverbs.dll"\r
-                        Source="..\bin\Chk\HCA\amd64\winverbs.dll" />\r
-                  <File Id="dlld9" DiskId="1" Compressed="yes"\r
-                        Name="winverbd.dll"\r
-                        LongName="winverbsd.dll"\r
-                        Source="..\bin\Chk\HCA\amd64\winverbsd.dll" />\r
-                </Component>\r
-            </Directory>\r
-      \r
-            <Directory Id="dir_14" Name="user">\r
-                <Component Id="cCHK_user"\r
-                               Guid="A4AC788B-6517-47b2-A898-0493ADC794D5">\r
-                  <CreateFolder />\r
-                  <File Id="file45" Name="complibd.dll"\r
-                    DiskId="1" Compressed="yes"\r
-                    Source="..\bin\bin\user\objchk_win7_amd64\amd64\complibd.dll" />\r
-                  <File Id="file46" Name="DAPL2-_1.DLL"\r
-                    LongName="dapl2-scmd.dll"\r
-                    DiskId="1" Compressed="yes"\r
-                    Source="..\bin\bin\user\objchk_win7_amd64\amd64\dapl2-scmd.dll" />\r
-                  <File Id="file47" Name="dapl2d.dll"\r
-                    DiskId="1" Compressed="yes"\r
-                    Source="..\bin\bin\user\objchk_win7_amd64\amd64\dapl2d.dll" />\r
-                  <File Id="file48" Name="DAPL2T_1.EXE"\r
-                    LongName="dapl2testd.exe"\r
-                    DiskId="1" Compressed="yes"\r
-                    Source="..\bin\bin\user\objchk_win7_amd64\amd64\dapl2testd.exe" />\r
-                  <File Id="file49" Name="dapld.dll"\r
-                    DiskId="1" Compressed="yes"\r
-                    Source="..\bin\bin\user\objchk_win7_amd64\amd64\dapld.dll" />\r
-                  <File Id="file50" Name="DAPLTE_1.EXE"\r
-                    LongName="dapltestd.exe"\r
-                    DiskId="1" Compressed="yes"\r
-                    Source="..\bin\bin\user\objchk_win7_amd64\amd64\dapltestd.exe" />\r
-                  <File Id="file51" Name="dat2d.dll"\r
-                    DiskId="1" Compressed="yes"\r
-                    Source="..\bin\bin\user\objchk_win7_amd64\amd64\dat2d.dll" />\r
-                  <File Id="file52" Name="datd.dll"\r
-                    DiskId="1" Compressed="yes"\r
-                    Source="..\bin\bin\user\objchk_win7_amd64\amd64\datd.dll" />\r
-                  <File Id="file53" Name="dtest2d.exe"\r
-                    DiskId="1" Compressed="yes"\r
-                    Source="..\bin\bin\user\objchk_win7_amd64\amd64\dtest2d.exe" />\r
-                  <File Id="file54" Name="dtestxd.exe"\r
-                    DiskId="1" Compressed="yes"\r
-                    Source="..\bin\bin\user\objchk_win7_amd64\amd64\dtestxd.exe" />\r
-                  <File Id="file57" Name="ibald.dll"\r
-                    DiskId="1" Compressed="yes"\r
-                    Source="..\bin\bin\user\objchk_win7_amd64\amd64\ibald.dll" />\r
-                  <File Id="file60" Name="ibwsd.dll"\r
-                    DiskId="1" Compressed="yes"\r
-                    Source="..\bin\bin\user\objchk_win7_amd64\amd64\ibwsd.dll" />\r
-                  <File Id="file68" Name="INSTAL_1.EXE"\r
-                    LongName="installsp.exe"\r
-                    DiskId="1" Compressed="yes"\r
-                    Source="..\bin\bin\user\objchk_win7_amd64\amd64\installsp.exe" />\r
-                  <File Id="file69" Name="mlx4ud.dll"\r
-                    DiskId="1" Compressed="yes"\r
-                    Source="..\bin\bin\user\objchk_win7_amd64\amd64\mlx4ud.dll" />\r
-                  <File Id="file72" Name="mthcaud.dll"\r
-                    DiskId="1" Compressed="yes"\r
-                    Source="..\bin\bin\user\objchk_win7_amd64\amd64\mthcaud.dll" />\r
-                  <File Id="file73" Name="opensm.exe"\r
-                    DiskId="1" Compressed="yes"\r
-                    Source="..\bin\bin\user\objchk_win7_amd64\amd64\opensm.exe" />\r
-                  <File Id="file174" Name="vstat.exe"\r
-                    DiskId="1" Compressed="yes"\r
-                    Source="..\bin\bin\user\objchk_win7_amd64\amd64\vstat.exe" />\r
-                  <File Id="file175" Name="part_man.exe"\r
-                    DiskId="1" Compressed="yes"\r
-                    Source="..\bin\bin\user\objchk_win7_amd64\amd64\part_man.exe" />\r
-                </Component>\r
-            </Directory>\r
+            <?include ..\..\common\IBcore.inc ?>\r
+            <?include ..\..\common\mlnx_drivers.inc ?>\r
+            <?include ..\..\common\winverbs_drivers.inc ?>\r
           </Directory>\r
-     \r
-          <Component Id="cWinVerbsOFED"\r
-                     Guid="20916BB0-5E16-49bb-BE9F-3A202D760E72">\r
-\r
-            <File Id="libibverbs.dll" Compressed="yes" DiskId="1"\r
-                  LongName="libibverbs.dll" Name="ibverbs.dll"\r
-                  Source="..\bin\HCA\amd64\libibverbs.dll" />\r
-              <CopyFile Id="dupLibibverbs.dll" FileId="libibverbs.dll"\r
-                     DestinationName="ibverbs.dll"\r
-                     DestinationLongName="libibverbs.dll"\r
-                     DestinationProperty="WindowsFolder" />\r
-            <File Id="libibverbs.pdb" Compressed="yes" DiskId="1"\r
-                  LongName="libibverbs.pdb" Name="ibverbs.pdb"\r
-                  Source="..\bin\HCA\amd64\libibverbs.pdb" />\r
-\r
-            <File Id="libibverbsd.dll" Compressed="yes" DiskId="1"\r
-                  LongName="libibverbsd.dll" Name="ibverbsd.dll"\r
-                  Source="..\bin\HCA\amd64\libibverbsd.dll" />\r
-              <CopyFile Id="dupLibibverbsd.dll" FileId="libibverbsd.dll"\r
-                     DestinationName="ibverbsd.dll"\r
-                     DestinationLongName="libibverbsd.dll"\r
-                     DestinationProperty="WindowsFolder" />\r
-            <File Id="libibverbsd.pdb" Compressed="yes" DiskId="1"\r
-                  LongName="libibverbsd.pdb" Name="ibverbsd.pdb"\r
-                  Source="..\bin\HCA\amd64\libibverbsd.pdb" />\r
-\r
-            <File Id="libibmad.dll" Compressed="yes" DiskId="1"\r
-                  LongName="libibmad.dll" Name="ibmad.dll"\r
-                  Source="..\bin\HCA\amd64\libibmad.dll" />\r
-              <CopyFile Id="dupLibibmad.dll" FileId="libibmad.dll"\r
-                     DestinationName="ibmad.dll"\r
-                     DestinationLongName="libibmad.dll"\r
-                     DestinationProperty="WindowsFolder" />\r
-            <File Id="libibmad.pdb" Compressed="yes" DiskId="1"\r
-                  LongName="libibmad.pdb" Name="ibmad.pdb"\r
-                  Source="..\bin\HCA\amd64\libibmad.pdb" />\r
-\r
-            <File Id="libibmadd.dll" Compressed="yes" DiskId="1"\r
-                  LongName="libibmadd.dll" Name="ibmadd.dll"\r
-                  Source="..\bin\HCA\amd64\libibmadd.dll" />\r
-              <CopyFile Id="dupLibibmadd.dll" FileId="libibmadd.dll"\r
-                     DestinationName="ibmadd.dll"\r
-                     DestinationLongName="libibmadd.dll"\r
-                     DestinationProperty="WindowsFolder" />\r
-            <File Id="libibmadd.pdb" Compressed="yes" DiskId="1"\r
-                  LongName="libibmadd.pdb" Name="ibmadd.pdb"\r
-                  Source="..\bin\HCA\amd64\libibmadd.pdb" />\r
-\r
-            <File Id="libibumad.dll" Compressed="yes" DiskId="1"\r
-                  LongName="libibumad.dll" Name="ibumad.dll"\r
-                  Source="..\bin\HCA\amd64\libibumad.dll" />\r
-              <CopyFile Id="dupLibibumad.dll" FileId="libibumad.dll"\r
-                     DestinationName="ibumad.dll"\r
-                     DestinationLongName="libibumad.dll"\r
-                     DestinationProperty="WindowsFolder" />\r
-            <File Id="libibumad.pdb" Compressed="yes" DiskId="1"\r
-                  LongName="libibumad.pdb" Name="ibumad.pdb"\r
-                  Source="..\bin\HCA\amd64\libibumad.pdb" />\r
-\r
-            <File Id="libibumadd.dll" Compressed="yes" DiskId="1"\r
-                  LongName="libibumadd.dll" Name="ibumadd.dll"\r
-                  Source="..\bin\HCA\amd64\libibumadd.dll" />\r
-              <CopyFile Id="dupLibibumadd.dll" FileId="libibumadd.dll"\r
-                     DestinationName="ibumadd.dll"\r
-                     DestinationLongName="libibumadd.dll"\r
-                     DestinationProperty="WindowsFolder" />\r
-            <File Id="libibumadd.pdb" Compressed="yes" DiskId="1"\r
-                  LongName="libibumadd.pdb" Name="ibumadd.pdb"\r
-                  Source="..\bin\HCA\amd64\libibumadd.pdb" />\r
-\r
-            <File Id="librdmacm.dll" Compressed="yes" DiskId="1"\r
-                  LongName="librdmacm.dll" Name="rdmacm.dll"\r
-                  Source="..\bin\HCA\amd64\librdmacm.dll" />\r
-              <CopyFile Id="dupLibrdmacm.dll" FileId="librdmacm.dll"\r
-                     DestinationName="rdmacm.dll"\r
-                     DestinationLongName="librdmacm.dll"\r
-                     DestinationProperty="SystemFolder" />\r
-            <File Id="librdmacm.pdb" Compressed="yes" DiskId="1"\r
-                  LongName="librdmacm.pdb" Name="rdmacm.pdb"\r
-                  Source="..\bin\HCA\amd64\librdmacm.pdb" />\r
 \r
-            <File Id="librdmacmd.dll" Compressed="yes" DiskId="1"\r
-                  LongName="librdmacmd.dll" Name="rdmacmd.dll"\r
-                  Source="..\bin\HCA\amd64\librdmacmd.dll" />\r
-              <CopyFile Id="dupLibrdmacmd.dll" FileId="librdmacmd.dll"\r
-                     DestinationName="rdmacmd.dll"\r
-                     DestinationLongName="librdmacmd.dll"\r
-                     DestinationProperty="SystemFolder" />\r
-            <File Id="librdmacmd.pdb" Compressed="yes" DiskId="1"\r
-                  LongName="librdmacmd.pdb" Name="rdmacmd.pdb"\r
-                  Source="..\bin\HCA\amd64\librdmacmd.pdb" />\r
-\r
-          </Component>\r
-\r
-          <Component Id="cWinVerbsUApps"\r
-                    Guid="ECAB2829-AE65-4ef8-8214-9A89E5BBDB9A">\r
-\r
-            <File Id="ibv_asyncwatch.exe" Compressed="yes" DiskId="1"\r
-                  LongName="ibv_asyncwatch.exe" Name="asyncwat.exe"\r
-                  Source="..\bin\tools\amd64\release\ibv_asyncwatch.exe" />\r
-            <File Id="ibv_asyncwatch.pdb" Compressed="yes" DiskId="1"\r
-                  LongName="ibv_asyncwatch.pdb" Name="asyncwat.pdb"\r
-                  Source="..\bin\tools\amd64\release\ibv_asyncwatch.pdb" />\r
-            <File Id="ibv_devinfo.exe" Compressed="yes" DiskId="1"\r
-                  LongName="ibv_devinfo.exe" Name="devinfo.exe"\r
-                  Source="..\bin\tools\amd64\release\ibv_devinfo.exe" />\r
-            <File Id="ibv_devinfo.pdb" Compressed="yes" DiskId="1"\r
-                  LongName="ibv_devinfo.pdb" Name="devinfo.pdb"\r
-                  Source="..\bin\tools\amd64\release\ibv_devinfo.pdb" />\r
-            <File Id="ibv_rc_pingpong.exe" Compressed="yes" DiskId="1"\r
-                  LongName="ibv_rc_pingpong.exe" Name="ibv_rc_p.exe"\r
-                  Source="..\bin\tools\amd64\release\ibv_rc_pingpong.exe" />\r
-            <File Id="ibv_rc_pingpong.pdb" Compressed="yes" DiskId="1"\r
-                  LongName="ibv_rc_pingpong.pdb" Name="ibv_rc_p.pdb"\r
-                  Source="..\bin\tools\amd64\release\ibv_rc_pingpong.pdb" />\r
-            <File Id="ibv_read_bw.exe" Compressed="yes" DiskId="1"\r
-                  LongName="ibv_read_bw.exe" Name="readbw.exe"\r
-                  Source="..\bin\tools\amd64\release\ibv_read_bw.exe" />\r
-            <File Id="ibv_read_bw.pdb" Compressed="yes" DiskId="1"\r
-                  LongName="ibv_read_bw.pdb" Name="readbw.pdb"\r
-                  Source="..\bin\tools\amd64\release\ibv_read_bw.pdb" />\r
-            <File Id="ibv_read_lat.exe" Compressed="yes" DiskId="1"\r
-                  LongName="ibv_read_lat.exe" Name="readlat.exe"\r
-                  Source="..\bin\tools\amd64\release\ibv_read_lat.exe" />\r
-            <File Id="ibv_read_lat.pdb" Compressed="yes" DiskId="1"\r
-                  LongName="ibv_read_lat.pdb" Name="readlat.pdb"\r
-                  Source="..\bin\tools\amd64\release\ibv_read_lat.pdb" />\r
-            <File Id="ibv_send_bw.exe" Compressed="yes" DiskId="1"\r
-                  LongName="ibv_send_bw.exe" Name="send_bw.exe"\r
-                  Source="..\bin\tools\amd64\release\ibv_send_bw.exe" />\r
-            <File Id="ibv_send_bw.pdb" Compressed="yes" DiskId="1"\r
-                  LongName="ibv_send_bw.pdb" Name="send_bw.pdb"\r
-                  Source="..\bin\tools\amd64\release\ibv_send_bw.pdb" />\r
-            <File Id="ibv_send_lat.exe" Compressed="yes" DiskId="1"\r
-                  LongName="ibv_send_lat.exe" Name="send_lat.exe"\r
-                  Source="..\bin\tools\amd64\release\ibv_send_lat.exe" />\r
-            <File Id="ibv_send_lat.pdb" Compressed="yes" DiskId="1"\r
-                  LongName="ibv_send_lat.pdb" Name="send_lat.pdb"\r
-                  Source="..\bin\tools\amd64\release\ibv_send_lat.pdb" />\r
-            <File Id="ibv_uc_pingpong.exe" Compressed="yes" DiskId="1"\r
-                  LongName="ibv_uc_pingpong.exe" Name="uc_ping.exe"\r
-                  Source="..\bin\tools\amd64\release\ibv_uc_pingpong.exe" />\r
-            <File Id="ibv_uc_pingpong.pdb" Compressed="yes" DiskId="1"\r
-                  LongName="ibv_uc_pingpong.pdb" Name="uc_ping.pdb"\r
-                  Source="..\bin\tools\amd64\release\ibv_uc_pingpong.pdb" />\r
-            <File Id="ibv_ud_pingpong.exe" Compressed="yes" DiskId="1"\r
-                  LongName="ibv_ud_pingpong.exe" Name="ud_ping.exe"\r
-                  Source="..\bin\tools\amd64\release\ibv_ud_pingpong.exe" />\r
-            <File Id="ibv_ud_pingpong.pdb" Compressed="yes" DiskId="1"\r
-                  LongName="ibv_ud_pingpong.pdb" Name="ud_ping.pdb"\r
-                  Source="..\bin\tools\amd64\release\ibv_ud_pingpong.pdb" />\r
-            <File Id="ibv_write_bw.exe" Compressed="yes" DiskId="1"\r
-                  LongName="ibv_write_bw.exe" Name="write_bw.exe"\r
-                  Source="..\bin\tools\amd64\release\ibv_write_bw.exe" />\r
-            <File Id="ibv_write_bw.pdb" Compressed="yes" DiskId="1"\r
-                  LongName="ibv_write_bw.pdb" Name="write_bw.pdb"\r
-                  Source="..\bin\tools\amd64\release\ibv_write_bw.pdb" />\r
-            <File Id="ibv_write_lat.exe" Compressed="yes" DiskId="1"\r
-                  LongName="ibv_write_lat.exe" Name="writelat.exe"\r
-                  Source="..\bin\tools\amd64\release\ibv_write_lat.exe" />\r
-            <File Id="ibv_write_lat.pdb" Compressed="yes" DiskId="1"\r
-                  LongName="ibv_write_lat.pdb" Name="writelat.pdb"\r
-                  Source="..\bin\tools\amd64\release\ibv_write_lat.pdb" />\r
-            <File Id="sminfo.exe" Compressed="yes" DiskId="1"\r
-                  LongName="sminfo.exe" Name="sminfo.exe"\r
-                  Source="..\bin\tools\amd64\release\sminfo.exe" />\r
-            <File Id="sminfo.pdb" Compressed="yes" DiskId="1"\r
-                  LongName="sminfo.pdb" Name="sminfo.pdb"\r
-                  Source="..\bin\tools\amd64\release\sminfo.pdb" />\r
-            <File Id="ibstat.exe" Compressed="yes" DiskId="1"\r
-                  LongName="ibstat.exe" Name="ibstat.exe"\r
-                  Source="..\bin\tools\amd64\release\ibstat.exe" />\r
-            <File Id="ibstat.pdb" Compressed="yes" DiskId="1"\r
-                  LongName="ibstat.pdb" Name="ibstat.pdb"\r
-                  Source="..\bin\tools\amd64\release\ibstat.pdb" />\r
-            <File Id="perfquery.exe" Compressed="yes" DiskId="1"\r
-                  LongName="perfquery.exe" Name="perfquer.exe"\r
-                  Source="..\bin\tools\amd64\release\perfquery.exe" />\r
-            <File Id="perfquery.pdb" Compressed="yes" DiskId="1"\r
-                  LongName="perfquery.pdb" Name="perfquer.pdb"\r
-                  Source="..\bin\tools\amd64\release\perfquery.pdb" />\r
-            <File Id="ibaddr.exe" Compressed="yes" DiskId="1"\r
-                  LongName="ibaddr.exe" Name="ibaddr.exe"\r
-                  Source="..\bin\tools\amd64\release\ibaddr.exe" />\r
-            <File Id="ibaddr.pdb" Compressed="yes" DiskId="1"\r
-                  LongName="ibaddr.pdb" Name="ibaddr.pdb"\r
-                  Source="..\bin\tools\amd64\release\ibaddr.pdb" />\r
-            <File Id="ibnetdiscover.exe" Compressed="yes" DiskId="1"\r
-                  LongName="ibnetdiscover.exe" Name="ibnetdis.exe"\r
-                  Source="..\bin\tools\amd64\release\ibnetdiscover.exe" />\r
-            <File Id="ibnetdiscover.pdb" Compressed="yes" DiskId="1"\r
-                  LongName="ibnetdiscover.pdb" Name="ibnetdis.pdb"\r
-                  Source="..\bin\tools\amd64\release\ibnetdiscover.pdb" />\r
-            <File Id="rdma_cmatose.exe" Compressed="yes" DiskId="1"\r
-                  LongName="rdma_cmatose.exe" Name="rcmatose.exe"\r
-                  Source="..\bin\tools\amd64\release\rdma_cmatose.exe" />\r
-            <File Id="rdma_cmatose.pdb" Compressed="yes" DiskId="1"\r
-                  LongName="rdma_cmatose.pdb" Name="rcmatose.pdb"\r
-                  Source="..\bin\tools\amd64\release\rdma_cmatose.pdb" />\r
-            <File Id="ibv_rdma_lat.exe" Compressed="yes" DiskId="1"\r
-                  LongName="ibv_rdma_lat.exe" Name="wrdmalat.exe"\r
-                  Source="..\bin\tools\amd64\release\ibv_rdma_lat.exe" />\r
-            <File Id="ibv_rdma_lat.pdb" Compressed="yes" DiskId="1"\r
-                  LongName="ibv_rdma_lat.pdb" Name="wrdmalat.pdb"\r
-                  Source="..\bin\tools\amd64\release\ibv_rdma_lat.pdb" />\r
-            <File Id="ibv_rdma_bw.exe" Compressed="yes" DiskId="1"\r
-                  LongName="ibv_rdma_bw.exe" Name="wrdma_bw.exe"\r
-                  Source="..\bin\tools\amd64\release\ibv_rdma_bw.exe" />\r
-            <File Id="ibv_rdma_bw.pdb" Compressed="yes" DiskId="1"\r
-                  LongName="ibv_rdma_bw.pdb" Name="wrdma_bw.pdb"\r
-                  Source="..\bin\tools\amd64\release\ibv_rdma_bw.pdb" />\r
-            <File Id="ibroute.exe" Compressed="yes" DiskId="1"\r
-                  LongName="ibroute.exe" Name="ibroute.exe"\r
-                  Source="..\bin\tools\amd64\release\ibroute.exe" />\r
-            <File Id="ibroute.pdb" Compressed="yes" DiskId="1"\r
-                  LongName="ibroute.pdb" Name="ibroute.pdb"\r
-                  Source="..\bin\tools\amd64\release\ibroute.pdb" />\r
-            <File Id="ibtracert.exe" Compressed="yes" DiskId="1"\r
-                  LongName="ibtracert.exe" Name="ibtrt.exe"\r
-                  Source="..\bin\tools\amd64\release\ibtracert.exe" />\r
-            <File Id="ibtracert.pdb" Compressed="yes" DiskId="1"\r
-                  LongName="ibtracert.pdb" Name="ibtrt.pdb"\r
-                  Source="..\bin\tools\amd64\release\ibtracert.pdb" />\r
-          </Component>\r
+          <?include ..\..\common\checked.inc ?>\r
+          <?include ..\..\common\winverbs_OFED.inc ?>\r
 \r
           <Directory Id="ipoibDir" Name="net">\r
-            <Component Id="IPoIB" Guid="18CC13CC-0D29-4B88-8F03-854CE0C6AF94">\r
-              <CreateFolder />\r
-              <File Id="netipoib_inf" Compressed="yes" DiskId="1"\r
-                     LongName="netipoib.inf" Name="NETIPOI.INF"\r
-                     Source="..\bin\net\amd64\netipoib.inf" />\r
-              <File Id="ipoib_cat" Compressed="yes" DiskId="1"\r
-                     LongName="ipoib.cat" Name="IPOI.cat"\r
-                     Source="..\bin\net\amd64\ipoib.cat" />\r
-              <File Id="ipoib.sys" Compressed="yes" DiskId="1"\r
-                     LongName="ipoib.sys" Name="IPOIB.SYS"\r
-                     Source="..\bin\net\amd64\ipoib.sys" />\r
-              <File Id="ipoib.pdb" Compressed="yes" DiskId="1"\r
-                     Name="ipoib.pdb"\r
-                     Source="..\bin\net\amd64\ipoib.pdb" />\r
-              <File Id="ibwsd32.dll" Compressed="yes" DiskId="1"\r
-                     LongName="ibwsd32.dll" Name="IBWSD32.DLL"\r
-                     Source="..\bin\net\amd64\ibwsd32.dll" />\r
-              <File Id="ibwsd.dll" Compressed="yes" DiskId="1"\r
-                     LongName="ibwsd.dll" Name="IBWSD.DLL"\r
-                     Source="..\bin\net\amd64\ibwsd.dll" />\r
-              <File Id="ibndprov.dll" Compressed="yes" DiskId="1"\r
-                     LongName="ibndprov.dll" Name="IBNDPROV.DLL"\r
-                     Source="..\bin\net\amd64\ibndprov.dll" />\r
-              <File Id="ibndprov32.dll" Compressed="yes" DiskId="1"\r
-                     LongName="ibndprov32.dll" Name="IBNDPR32.DLL"\r
-                     Source="..\bin\net\amd64\ibndprov32.dll" />\r
-              <File Id="ndinstall.exe" Compressed="yes" DiskId="1"\r
-                     LongName="ndinstall.exe" Name="NDINSTAL.EXE"\r
-                     Source="..\bin\net\amd64\ndinstall.exe" />\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
-            </Component>\r
+            <?include ..\..\common\ipoib.inc ?>\r
           </Directory>\r
 \r
           <Component Id="WinsockDirect"\r
                      Guid="516A61B4-EBC2-41CE-8D18-81BADA4649D4">\r
             <File Id="installsp.exe" Compressed="yes" DiskId="1"\r
                      LongName="installsp.exe" Name="INSTALL.EXE"\r
-                     Source="..\bin\net\amd64\installsp.exe" />\r
+                     Source="..\bin\net\$(var.ARCH)\installsp.exe" />\r
           </Component>\r
 \r
           <Component Id="cNetworkDirect"\r
                      Guid="F3BA9E15-E532-4b8c-BB0C-E8C1CC0EEF3F">\r
           </Component>\r
 \r
-          <Component Id="cDAPL1RT" Guid="A49F1ECC-14E4-4310-9F37-BEB7B00243A9">\r
-            <File Id="dapl32.dll" Compressed="yes" DiskId="1"\r
-                   LongName="dapl32.dll" Name="DAPL32.DLL"\r
-                   Source="..\bin\DAPL\amd64\dapl32.dll" />\r
-            <File Id="dapl32d.dll" Compressed="yes" DiskId="1"\r
-                   LongName="dapl32d.dll" Name="DAPL32D.DLL"\r
-                   Source="..\bin\DAPL\amd64\dapl32d.dll" />\r
-            <File Id="dapl.dll" Compressed="yes" DiskId="1"\r
-                   LongName="dapl.dll" Name="DAPL.DLL"\r
-                   Source="..\bin\DAPL\amd64\dapl.dll" />\r
-              <CopyFile Id="dupDAPL" FileId="dapl.dll"\r
-                      DestinationName="dapl.dll"\r
-                      DestinationProperty="WindowsFolder" />\r
-            <File Id="dapld.dll" Compressed="yes" DiskId="1"\r
-                   LongName="dapld.dll" Name="DAPLD.DLL"\r
-                   Source="..\bin\DAPL\amd64\dapld.dll" />\r
-            <File Id="dat32.dll" Compressed="yes" DiskId="1"\r
-                   LongName="dat32.dll" Name="DAT32.DLL"\r
-                   Source="..\bin\DAPL\amd64\dat32.dll" />\r
-            <File Id="dat32d.dll" Compressed="yes" DiskId="1"\r
-                   LongName="dat32d.dll" Name="DAT32D.DLL"\r
-                   Source="..\bin\DAPL\amd64\dat32d.dll" />\r
-            <File Id="dat.dll" Compressed="yes" DiskId="1"\r
-                   LongName="dat.dll" Name="DAT.DLL"\r
-                   Source="..\bin\DAPL\amd64\dat.dll" />\r
-            <CopyFile Id="dupDAT" FileId="dat.dll"\r
-                      DestinationName="dat.dll"\r
-                      DestinationProperty="WindowsFolder" />\r
-            <File Id="datd.dll" Compressed="yes" DiskId="1"\r
-                   LongName="datd.dll" Name="DATD.DLL"\r
-                   Source="..\bin\DAPL\amd64\datd.dll" />\r
-            <File Id="dat.conf" Compressed="yes" DiskId="1"\r
-                   LongName="dat.conf" Name="dat.conf"\r
-                   Source="..\..\dat.conf" />\r
-            <File Id="dapltest.exe" Compressed="yes" DiskId="1"\r
-                   LongName="dapltest.exe" Name="dapltest.exe"\r
-                   Source="..\bin\tools\amd64\release\dapltest.exe" />\r
-            <File Id="dapltestd.exe" Compressed="yes" DiskId="1"\r
-                   LongName="dapltestd.exe" Name="dapltesd.exe"\r
-                   Source="..\bin\tools\amd64\debug\dapltestd.exe" />\r
-\r
-            <File Id="dapl.pdb" Compressed="yes" DiskId="1"\r
-                  LongName="dapl.pdb" Name="dapl.pdb"\r
-                  Source="..\bin\DAPL\amd64\dapl.pdb" />\r
-            <File Id="dapld.pdb" Compressed="yes" DiskId="1"\r
-                  LongName="dapld.pdb" Name="dapld.pdb"\r
-                  Source="..\bin\DAPL\amd64\dapld.pdb" />\r
-            <File Id="dat.lib" Compressed="yes" DiskId="1"\r
-                  LongName="dat.lib" Name="dat.lib"\r
-                  Source="..\bin\DAPL\amd64\dat.lib" />\r
-            <File Id="datd.lib" Compressed="yes" DiskId="1"\r
-                  LongName="datd.lib" Name="datd.lib"\r
-                  Source="..\bin\DAPL\amd64\datd.lib" />\r
-            <File Id="dat.pdb" Compressed="yes" DiskId="1"\r
-                  LongName="dat.pdb" Name="dat.pdb"\r
-                  Source="..\bin\DAPL\amd64\dat.pdb" />\r
-            <File Id="datd.pdb" Compressed="yes" DiskId="1"\r
-                  LongName="datd.pdb" Name="datd.pdb"\r
-                  Source="..\bin\DAPL\amd64\datd.pdb" />\r
-            <File Id="dt_svr.bat" Compressed="yes" DiskId="1"\r
-                  LongName="dt-svr.bat" Name="dt-svr.bat"\r
-                  Source="..\bin\DAPL2\dt-svr.bat" />\r
-            <CopyFile Id="dup_dt_svr" FileId="dt_svr.bat"\r
-                      DestinationName="dt1-svr.bat"\r
-                      DestinationProperty="INSTALLDIR" />\r
-            <File Id="dt_cli.bat" Compressed="yes" DiskId="1"\r
-                  LongName="dt-cli.bat" Name="dt-cli.bat"\r
-                  Source="..\bin\DAPL2\dt-cli.bat" />\r
-            <CopyFile Id="dup_dt_cli" FileId="dt_cli.bat"\r
-                      DestinationName="dt1-cli.bat"\r
-                      DestinationProperty="INSTALLDIR" />\r
-          </Component>\r
-\r
-          <Component Id="cDAPL2RT" Guid="02C3490D-EF11-40C9-9E8D-0BEE97082A6A">\r
-              <File Id="_dapl32.dll" Compressed="yes" DiskId="1"\r
-                     LongName="dapl232.dll" Name="DAPL232.DLL"\r
-                     Source="..\bin\DAPL2\amd64\dapl232.dll" />\r
-              <File Id="_dapl32d.dll" Compressed="yes" DiskId="1"\r
-                     LongName="dapl232d.dll" Name="DAPL232D.DLL"\r
-                     Source="..\bin\DAPL2\amd64\dapl232d.dll" />\r
-              <File Id="_dapl2.dll" Compressed="yes" DiskId="1"\r
-                     LongName="dapl2.dll" Name="DAPL2.DLL"\r
-                     Source="..\bin\DAPL2\amd64\dapl2.dll" />\r
-              <CopyFile Id="dupDAPL2" FileId="_dapl2.dll"\r
-                        DestinationName="dapl2.dll"\r
-                        DestinationProperty="WindowsFolder" />\r
-              <File Id="_dapl2d.dll" Compressed="yes" DiskId="1"\r
-                     LongName="dapl2d.dll" Name="DAPL2D.DLL"\r
-                     Source="..\bin\DAPL2\amd64\dapl2d.dll" />\r
-              <File Id="_dapl2_scm.dll" Compressed="yes" DiskId="1"\r
-                     LongName="dapl2-scm.dll" Name="D2-scm.DLL"\r
-                     Source="..\bin\DAPL2\amd64\dapl2-scm.dll" />\r
-              <CopyFile Id="dupDAPL2_scm" FileId="_dapl2_scm.dll"\r
-                        DestinationName="d2-scm.dll"\r
-                        DestinationLongName="dapl2-scm.dll"\r
-                        DestinationProperty="WindowsFolder" />\r
-              <File Id="_dapl2_scmd.dll" Compressed="yes" DiskId="1"\r
-                     LongName="dapl2-scmd.dll" Name="D2-scmd.DLL"\r
-                     Source="..\bin\DAPL2\amd64\dapl2-scmd.dll" />\r
-              <File Id="_dat32.dll" Compressed="yes" DiskId="1"\r
-                     LongName="dat232.dll" Name="DAT232.DLL"\r
-                     Source="..\bin\DAPL2\amd64\dat232.dll" />\r
-              <File Id="_dat32d.dll" Compressed="yes" DiskId="1"\r
-                     LongName="dat232d.dll" Name="DAT232D.DLL"\r
-                     Source="..\bin\DAPL2\amd64\dat232d.dll" />\r
-              <File Id="_dat2.dll" Compressed="yes" DiskId="1"\r
-                     LongName="dat2.dll" Name="DAT2.DLL"\r
-                     Source="..\bin\DAPL2\amd64\dat2.dll" />\r
-              <CopyFile Id="dupDAT2" FileId="_dat2.dll"\r
-                        DestinationName="dat2.dll"\r
-                        DestinationProperty="WindowsFolder" />\r
-              <File Id="_dat2d.dll" Compressed="yes" DiskId="1"\r
-                     LongName="dat2d.dll" Name="DAT2D.DLL"\r
-                     Source="..\bin\DAPL2\amd64\dat2d.dll" />\r
-              <File Id="dapl2test.exe" Compressed="yes" DiskId="1"\r
-                     LongName="dapl2test.exe" Name="dapl2tes.exe"\r
-                     Source="..\bin\tools\amd64\release\dapl2test.exe" />\r
-              <File Id="dapl2testd.exe" Compressed="yes" DiskId="1"\r
-                     LongName="dapl2testd.exe" Name="dapl2tes.exe"\r
-                     Source="..\bin\tools\amd64\debug\dapl2testd.exe" />\r
-              <File Id="dtest2.exe" Compressed="yes" DiskId="1"\r
-                     LongName="dtest2.exe" Name="dtest2.exe"\r
-                     Source="..\bin\tools\amd64\release\dtest2.exe" />\r
-              <File Id="dtestx.exe" Compressed="yes" DiskId="1"\r
-                     LongName="dtestx.exe" Name="dtestx.exe"\r
-                     Source="..\bin\tools\amd64\release\dtestx.exe" />\r
-\r
-              <File Id="dapl2.pdb" Compressed="yes" DiskId="1"\r
-                    LongName="dapl2.pdb" Name="dapl2.pdb"\r
-                    Source="..\bin\DAPL2\amd64\dapl2.pdb" />\r
-              <File Id="dapl2d.pdb" Compressed="yes" DiskId="1"\r
-                    LongName="dapl2d.pdb" Name="dapl2d.pdb"\r
-                    Source="..\bin\DAPL2\amd64\dapl2d.pdb" />\r
-              <File Id="dat2.pdb" Compressed="yes" DiskId="1"\r
-                    LongName="dat2.pdb" Name="dat2.pdb"\r
-                    Source="..\bin\DAPL2\amd64\dat2.pdb" />\r
-              <File Id="dat2d.pdb" Compressed="yes" DiskId="1"\r
-                    LongName="dat2d.pdb" Name="dat2d.pdb"\r
-                    Source="..\bin\DAPL2\amd64\dat2d.pdb" />\r
-              <File Id="dat2.lib" Compressed="yes" DiskId="1"\r
-                    LongName="dat2.lib" Name="dat2.lib"\r
-                    Source="..\bin\DAPL2\amd64\dat2.lib" />\r
-              <File Id="dat2d.lib" Compressed="yes" DiskId="1"\r
-                    LongName="dat2d.lib" Name="dat2d.lib"\r
-                    Source="..\bin\DAPL2\amd64\dat2d.lib" />\r
-          </Component>\r
+          <?include ..\..\common\dapl_rt.inc ?>\r
 \r
           <Component Id="cQLVNIC_driver_installed"\r
                      Guid="730C742E-73D9-4871-A523-6FB7963EA01E">\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\amd64\qlgcvnic.sys" />\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\amd64\qlgcvnic.pdb" />\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\amd64\netvnic.inf" />\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\amd64\netvnic.cat" />\r
+                    LongName="netvnic.cat" Name="NETVNIC.cat"\r
+                    Source="..\bin\net\$(var.ARCH)\netvnic.cat" />\r
             </Component>\r
           </Directory>\r
 \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\amd64\ib_srp.inf" />\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\amd64\ibsrp.cat" />\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\amd64\ibsrp.sys" />\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\amd64\ibsrp.pdb" />\r
+                    Name="ibsrp.pdb"\r
+                    Source="..\bin\storage\$(var.ARCH)\ibsrp.pdb" />\r
             </Component>\r
           </Directory>\r
-\r
-          <Component Id="OpenSM_Service_enabled"\r
-                     Guid="3A148CF8-129D-4AE0-A769-5FC0E0828B5E">\r
-          </Component>\r
         </Directory>\r
       </Directory>\r
 \r
-      <Directory Id="WindowsVolume" Name="Root" SourceName="WinRoot"> \r
+      <Directory Id="WindowsVolume" Name="Root" SourceName="WinRoot">\r
 \r
       <!-- copy DAT header files to\r
          %SystemDrive%\DAT\v1-1\DAT\r
       -->\r
 \r
         <Directory Id="dDATD" Name="DAT">\r
-            <Component Id="cDatCfg"\r
-                       Guid="54A4F997-AC33-45D8-9899-6332E40B62A8" >\r
-              <CreateFolder />\r
-              <File Id="_dat.conf" Compressed="yes" DiskId="1" KeyPath="yes"\r
-                     LongName="dat.conf" Name="dat.conf"\r
-                     Source="..\..\dat.conf" />\r
-            </Component>\r
-\r
-            <Directory Id="v1_1" Name="v1-1">\r
-              <Component Id="cDATV1"\r
-                         Guid="D8EB75CB-8DE0-41B1-904B-CED87C893049">\r
-                <CreateFolder />\r
-              </Component>    \r
-              <Directory Id="DDID" Name="DAT">    \r
-                <Component Id="cDatBldV1Hdrs"\r
-                          Guid="AA6BB350-5146-452F-B5F0-80BB9E3B0F55">    \r
-                  <CreateFolder />    \r
-                  <File Id="dat.h" Compressed="yes" DiskId="1"    \r
-                        LongName="dat.h" Name="dat.h"    \r
-                        Source="..\bin\DAPL\dat.h" />    \r
-\r
-                  <File Id="dat_error.h" Compressed="yes" DiskId="1"    \r
-                        LongName="dat_error.h" Name="dat.h"    \r
-                        Source="..\bin\DAPL\dat_error.h" />    \r
-    \r
-                  <File Id="dat_platform_specific.h" Compressed="yes"    \r
-                        DiskId="1" LongName="dat_platform_specific.h"    \r
-                        Name="dat_plat.h"    \r
-                       Source="..\bin\DAPL\dat_platform_specific.h" />    \r
-    \r
-                  <File Id="dat_redirection.h" Compressed="yes"    \r
-                        DiskId="1" LongName="dat_redirection.h"    \r
-                        Name="dat_redi.h"    \r
-                        Source="..\bin\DAPL\dat_redirection.h" />    \r
-    \r
-                  <File Id="dat_registry.h" Compressed="yes"    \r
-                        DiskId="1" LongName="dat_registry.h"    \r
-                        Name="dat_reg.h"    \r
-                        Source="..\bin\DAPL\dat_registry.h" />    \r
-    \r
-                  <File Id="dat_vendor_specific.h" Compressed="yes"    \r
-                        DiskId="1" LongName="dat_vendor_specific.h"    \r
-                        Name="dat_vend.h"    \r
-                        Source="..\bin\DAPL\dat_vendor_specific.h" />    \r
-    \r
-                  <File Id="udat.h" Compressed="yes" DiskId="1"    \r
-                        LongName="udat.h" Name="udat.h"    \r
-                        Source="..\bin\DAPL\udat.h" />    \r
-    \r
-                  <File Id="udat_config.h" Compressed="yes" DiskId="1"    \r
-                        LongName="udat_config.h" Name="udat_cfg.h"    \r
-                        Source="..\bin\DAPL\udat_config.h" />    \r
-    \r
-                  <File Id="udat_redirection.h" Compressed="yes"    \r
-                        DiskId="1" LongName="udat_redirection.h"    \r
-                        Name="udat_red.h"    \r
-                        Source="..\bin\DAPL\udat_redirection.h" />    \r
-    \r
-                  <File Id="udat_vendor_specific.h" Compressed="yes"    \r
-                        DiskId="1" LongName="udat_vendor_specific.h"    \r
-                        Name="udat_ven.h"    \r
-                        Source="..\bin\DAPL\udat_vendor_specific.h" />    \r
-                </Component>    \r
-              </Directory>    \r
-\r
-              <Component Id="cDatBldV1Libs"\r
-                          Guid="1BB9291E-79F5-4EC5-9400-4175BA1E5A91">    \r
-\r
-                  <File Id="_dat.lib" Compressed="yes" DiskId="1"\r
-                        LongName="dat.lib" Name="dat.lib"\r
-                        Source="..\bin\DAPL\amd64\dat.lib" />\r
-                  <File Id="_datd.lib" Compressed="yes" DiskId="1"\r
-                        LongName="datd.lib" Name="datd.lib"\r
-                        Source="..\bin\DAPL\amd64\datd.lib" />\r
-              </Component>\r
-            </Directory>    \r
-\r
-            <Directory Id="v2_0" Name="v2-0">\r
-              <Component Id="cDATV2" Guid="A3CD6CA7-309B-48D2-B375-C9A91B37A876"\r
-                         KeyPath="yes" SharedDllRefCount="yes">\r
-                <CreateFolder />\r
-              </Component>\r
-\r
-              <Directory Id="DDID2" Name="DAT">    \r
-                <Component Id="cDatBldV2Hdrs"\r
-                          Guid="4D688030-53AC-4351-8999-E3AFEB38A92C" >    \r
-                  <CreateFolder />    \r
-                  <File Id="_dat.h" Compressed="yes" DiskId="1"    \r
-                        LongName="dat.h" Name="dat.h"    \r
-                        Source="..\bin\DAPL2\dat.h" />    \r
-\r
-                  <File Id="_dat_error.h" Compressed="yes" DiskId="1"    \r
-                        LongName="dat_error.h" Name="dat.h"    \r
-                        Source="..\bin\DAPL2\dat_error.h" />    \r
-    \r
-                  <File Id="_dat_platform_specific.h" Compressed="yes"    \r
-                        DiskId="1" LongName="dat_platform_specific.h"    \r
-                        Name="dat_plat.h"    \r
-                       Source="..\bin\DAPL2\dat_platform_specific.h" />    \r
-    \r
-                  <File Id="_dat_redirection.h" Compressed="yes"    \r
-                        DiskId="1" LongName="dat_redirection.h"    \r
-                        Name="dat_redi.h"    \r
-                        Source="..\bin\DAPL2\dat_redirection.h" />    \r
-    \r
-                  <File Id="_dat_registry.h" Compressed="yes"    \r
-                        DiskId="1" LongName="dat_registry.h"    \r
-                        Name="dat_reg.h"    \r
-                        Source="..\bin\DAPL2\dat_registry.h" />    \r
-    \r
-                  <File Id="_dat_vendor_specific.h" Compressed="yes"    \r
-                        DiskId="1" LongName="dat_vendor_specific.h"    \r
-                        Name="dat_vend.h"    \r
-                        Source="..\bin\DAPL2\dat_vendor_specific.h" />    \r
-    \r
-                  <File Id="_udat.h" Compressed="yes" DiskId="1"    \r
-                        LongName="udat.h" Name="udat.h"    \r
-                        Source="..\bin\DAPL2\udat.h" />    \r
-    \r
-                  <File Id="_udat_config.h" Compressed="yes" DiskId="1"    \r
-                        LongName="udat_config.h" Name="udat_cfg.h"    \r
-                        Source="..\bin\DAPL2\udat_config.h" />    \r
-    \r
-                  <File Id="_udat_redirection.h" Compressed="yes"    \r
-                        DiskId="1" LongName="udat_redirection.h"    \r
-                        Name="udat_red.h"    \r
-                        Source="..\bin\DAPL2\udat_redirection.h" />    \r
-    \r
-                  <File Id="_udat_vendor_specific.h" Compressed="yes"    \r
-                        DiskId="1" LongName="udat_vendor_specific.h"    \r
-                        Name="udat_ven.h"    \r
-                        Source="..\bin\DAPL2\udat_vendor_specific.h" />    \r
-\r
-                </Component>    \r
-              </Directory>    \r
-\r
-              <Component Id="cDatBldV2Libs"\r
-                          Guid="4DCE2855-1F42-4A7D-957A-44A47715C051" >    \r
-\r
-                  <File Id="_dat2.lib" Compressed="yes" DiskId="1"\r
-                        LongName="dat2.lib" Name="dat2.lib"\r
-                        Source="..\bin\DAPL2\amd64\dat2.lib" />\r
-                  <File Id="_dat2d.lib" Compressed="yes" DiskId="1"\r
-                        LongName="dat2d.lib" Name="dat2d.lib"\r
-                        Source="..\bin\DAPL2\amd64\dat2d.lib" />\r
-              </Component>    \r
-            </Directory>    \r
-\r
-        </Directory>    \r
+          <?include ..\..\common\DAT_config.inc ?>\r
+        </Directory>\r
 \r
         <Directory Id="IBSDK" Name="IBSDK">\r
-          <Directory Id="IB_libs" Name="lib">\r
-            <Component Id="cIBAL_Libs"\r
-                       Guid="12E15947-F84E-49d0-B5DF-FFC505C3F5C9">\r
-              <CreateFolder />\r
-              <File Id="ibal.lib" Compressed="yes" DiskId="1"\r
-                    LongName="ibal.lib" Name="ibal.lib"\r
-                    Source="..\bin\HCA\amd64\ibal.lib" />\r
-              <File Id="ibal.pdb" Compressed="yes" DiskId="1"\r
-                    LongName="ibal.pdb" Name="ibal.pdb"\r
-                    Source="..\bin\HCA\amd64\ibal.pdb" />\r
-              <File Id="complib.lib" Compressed="yes" DiskId="1"\r
-                    LongName="complib.lib" Name="complib.lib"\r
-                    Source="..\bin\HCA\amd64\complib.lib" />\r
-              <File Id="complib.pdb" Compressed="yes" DiskId="1"\r
-                    LongName="complib.pdb" Name="complib.pdb"\r
-                    Source="..\bin\HCA\amd64\complib.pdb" />\r
-              <File Id="ibald.lib" Compressed="yes" DiskId="1"\r
-                    LongName="ibald.lib" Name="ibald.lib"\r
-                    Source="..\bin\HCA\amd64\ibald.lib" />\r
-              <File Id="ibald.pdb" Compressed="yes" DiskId="1"\r
-                    LongName="ibald.pdb" Name="ibald.pdb"\r
-                    Source="..\bin\HCA\amd64\ibald.pdb" />\r
-              <File Id="complibd.lib" Compressed="yes" DiskId="1"\r
-                    LongName="complibd.lib" Name="complibd.lib"\r
-                    Source="..\bin\HCA\amd64\complibd.lib" />\r
-              <File Id="complibd.pdb" Compressed="yes" DiskId="1"\r
-                    LongName="complibd.pdb" Name="complibd.pdb"\r
-                    Source="..\bin\HCA\amd64\complibd.pdb" />\r
-\r
-               <!-- SysWOW64\ 32-bit libs -->\r
-              <File Id="cl32.lib" Compressed="yes" DiskId="1"\r
-                    LongName="complib32.lib" Name="cl32.lib"\r
-                    Source="..\bin\HCA\amd64\cl32.lib" />\r
-              <File Id="cl32.pdb" Compressed="yes" DiskId="1"\r
-                    LongName="complib32.pdb" Name="cl32.pdb"\r
-                    Source="..\bin\HCA\amd64\cl32.pdb" />\r
-              <File Id="cl32d.lib" Compressed="yes" DiskId="1"\r
-                    LongName="complib32d.lib" Name="cl32d.lib"\r
-                    Source="..\bin\HCA\amd64\cl32d.lib" />\r
-              <File Id="cl32d.pdb" Compressed="yes" DiskId="1"\r
-                    LongName="complib32d.pdb" Name="cl32d.pdb"\r
-                    Source="..\bin\HCA\amd64\cl32d.pdb" />\r
-              <File Id="ibal32.lib" Compressed="yes" DiskId="1"\r
-                    LongName="ibal32.lib" Name="ibal32.lib"\r
-                    Source="..\bin\HCA\amd64\ibal32.lib" />\r
-              <File Id="ibal32.pdb" Compressed="yes" DiskId="1"\r
-                    LongName="ibal32.pdb" Name="ibal32.pdb"\r
-                    Source="..\bin\HCA\amd64\ibal32.pdb" />\r
-              <File Id="ibal32d.lib" Compressed="yes" DiskId="1"\r
-                    LongName="ibal32d.lib" Name="ibal32d.lib"\r
-                    Source="..\bin\HCA\amd64\ibal32d.lib" />\r
-              <File Id="ibal32d.pdb" Compressed="yes" DiskId="1"\r
-                    LongName="ibal32d.pdb" Name="ibal32d.pdb"\r
-                    Source="..\bin\HCA\amd64\ibal32d.pdb" />\r
-\r
-              <File Id="winverbs.lib" Compressed="yes" DiskId="1"\r
-                    LongName="winverbs.lib" Name="winverbs.lib"\r
-                    Source="..\bin\HCA\amd64\winverbs.lib" />\r
-              <File Id="winverbsd.lib" Compressed="yes" DiskId="1"\r
-                    LongName="winverbsd.lib" Name="winvrbsd.lib"\r
-                    Source="..\bin\HCA\amd64\winverbsd.lib" />\r
-\r
-              <File Id="libibverbs.lib" Compressed="yes" DiskId="1"\r
-                    LongName="libibverbs.lib" Name="ibverbs.lib"\r
-                    Source="..\bin\HCA\amd64\libibverbs.lib" />\r
-              <File Id="libibverbs2.pdb" Compressed="yes" DiskId="1"\r
-                    LongName="libibverbs.pdb" Name="ibverbs.pdb"\r
-                    Source="..\bin\HCA\amd64\libibverbs.pdb" />\r
-              <File Id="libibverbsd.lib" Compressed="yes" DiskId="1"\r
-                    LongName="libibverbsd.lib" Name="ibverbsd.lib"\r
-                    Source="..\bin\HCA\amd64\libibverbsd.lib" />\r
-              <File Id="libibverbsd2.pdb" Compressed="yes" DiskId="1"\r
-                    LongName="libibverbsd.pdb" Name="ibverbsd.pdb"\r
-                    Source="..\bin\HCA\amd64\libibverbsd.pdb" />\r
-\r
-              <File Id="libibmad.lib" Compressed="yes" DiskId="1"\r
-                    LongName="libibmad.lib" Name="ibmad.lib"\r
-                    Source="..\bin\HCA\amd64\libibmad.lib" />\r
-              <File Id="libibmad2.pdb" Compressed="yes" DiskId="1"\r
-                    LongName="libibmad.pdb" Name="ibmad.pdb"\r
-                    Source="..\bin\HCA\amd64\libibmad.pdb" />\r
-              <File Id="libibmadd.lib" Compressed="yes" DiskId="1"\r
-                    LongName="libibmadd.lib" Name="ibmadd.lib"\r
-                    Source="..\bin\HCA\amd64\libibmadd.lib" />\r
-              <File Id="libibmadd2.pdb" Compressed="yes" DiskId="1"\r
-                    LongName="libibmadd.pdb" Name="ibmadd.pdb"\r
-                    Source="..\bin\HCA\amd64\libibmadd.pdb" />\r
-\r
-              <File Id="libibumad.lib" Compressed="yes" DiskId="1"\r
-                    LongName="libibumad.lib" Name="ibumad.lib"\r
-                    Source="..\bin\HCA\amd64\libibumad.lib" />\r
-              <File Id="libibumad2.pdb" Compressed="yes" DiskId="1"\r
-                    LongName="libibumad.pdb" Name="ibumad.pdb"\r
-                    Source="..\bin\HCA\amd64\libibumad.pdb" />\r
-              <File Id="libibumadd.lib" Compressed="yes" DiskId="1"\r
-                    LongName="libibumadd.lib" Name="ibumadd.lib"\r
-                    Source="..\bin\HCA\amd64\libibumadd.lib" />\r
-              <File Id="libibumadd2.pdb" Compressed="yes" DiskId="1"\r
-                    LongName="libibumadd.pdb" Name="ibumadd.pdb"\r
-                    Source="..\bin\HCA\amd64\libibumadd.pdb" />\r
-            </Component>\r
-          </Directory>\r
-\r
-          <Directory Id="IB_inc" Name="Inc">\r
-            <Component Id="cIBAL_Incs"\r
-                       Guid="54C2903E-65DF-4c62-B31D-21DB1AFB5819">\r
-              <CreateFolder />\r
-\r
-              <File Id="oib_ver.h" Compressed="yes" DiskId="1"\r
-                     LongName="oib_ver.h" Name="oib_ver.h"\r
-                     Source="..\bin\Inc\oib_ver.h" />\r
-              <File Id="openib.def" Compressed="yes" DiskId="1"\r
-                     LongName="openib.def" Name="openib.def"\r
-                     Source="..\bin\Inc\openib.def" />\r
-            </Component>\r
-\r
-            <Directory Id="IB_complib" Name="complib">\r
-              <Component Id="cIBAL_Complib"\r
-                         Guid="9F9EE1F2-5ACE-47c7-89F8-B0EA1D4363AF">\r
-                <CreateFolder />\r
-                <File Id="cl_async_proc.h" Compressed="yes" DiskId="1"\r
-                      LongName="cl_async_proc.h" Name="CL_ASYN.H" \r
-                      Source="..\bin\Inc\complib\cl_async_proc.h" />\r
-                <File Id="cl_atomic.h" Compressed="yes" DiskId="1"\r
-                      LongName="cl_atomic.h" Name="CL_ATOM.H" \r
-                      Source="..\bin\Inc\complib\cl_atomic.h" />\r
-                <File Id="cl_atomic_osd.h" Compressed="yes" DiskId="1"\r
-                      LongName="cl_atomic_osd.h" Name="CL_ATOM1.H" \r
-                      Source="..\bin\Inc\complib\cl_atomic_osd.h" />\r
-                <File Id="cl_byteswap.h" Compressed="yes" DiskId="1"\r
-                      LongName="cl_byteswap.h" Name="CL_BYTE.H" \r
-                      Source="..\bin\Inc\complib\cl_byteswap.h" />\r
-                <File Id="cl_byteswap_osd.h" Compressed="yes" DiskId="1"\r
-                      LongName="cl_byteswap_osd.h" Name="CL_BYTE1.H" \r
-                      Source="..\bin\Inc\complib\cl_byteswap_osd.h" />\r
-                <File Id="cl_comppool.h" Compressed="yes" DiskId="1"\r
-                      LongName="cl_comppool.h" Name="CL_COMP.H" \r
-                      Source="..\bin\Inc\complib\cl_comppool.h" />\r
-                <File Id="cl_debug.h" Compressed="yes" DiskId="1"\r
-                      LongName="cl_debug.h" Name="CL_DEBU.H" \r
-                      Source="..\bin\Inc\complib\cl_debug.h" />\r
-                <File Id="cl_debug_osd.h" Compressed="yes" DiskId="1"\r
-                      LongName="cl_debug_osd.h" Name="CL_DEBU1.H" \r
-                      Source="..\bin\Inc\complib\cl_debug_osd.h" />\r
-                <File Id="cl_event.h" Compressed="yes" DiskId="1"\r
-                      LongName="cl_event.h" Name="CL_EVEN.H" \r
-                      Source="..\bin\Inc\complib\cl_event.h" />\r
-                <File Id="cl_event_osd.h" Compressed="yes" DiskId="1"\r
-                      LongName="cl_event_osd.h" Name="CL_EVEN1.H" \r
-                      Source="..\bin\Inc\complib\cl_event_osd.h" />\r
-                <File Id="cl_fleximap.h" Compressed="yes" DiskId="1"\r
-                      LongName="cl_fleximap.h" Name="CL_FLEX.H" \r
-                      Source="..\bin\Inc\complib\cl_fleximap.h" />\r
-                <File Id="cl_ioctl.h" Compressed="yes" DiskId="1"\r
-                      LongName="cl_ioctl.h" Name="CL_IOCT.H" \r
-                      Source="..\bin\Inc\complib\cl_ioctl.h" />\r
-                <File Id="cl_ioctl_osd.h" Compressed="yes" DiskId="1"\r
-                      LongName="cl_ioctl_osd.h" Name="CL_IOCT1.H" \r
-                      Source="..\bin\Inc\complib\cl_ioctl_osd.h" />\r
-                <File Id="cl_irqlock.h" Compressed="yes" DiskId="1"\r
-                      LongName="cl_irqlock.h" Name="CL_IRQL.H" \r
-                      Source="..\bin\Inc\complib\cl_irqlock.h" />\r
-                <File Id="cl_list.h" Compressed="yes" DiskId="1"\r
-                      LongName="cl_list.h" Name="CL_LIST.H" \r
-                      Source="..\bin\Inc\complib\cl_list.h" />\r
-                <File Id="cl_log.h" Compressed="yes" DiskId="1"\r
-                      LongName="cl_log.h" Name="CL_LOG.H" \r
-                      Source="..\bin\Inc\complib\cl_log.h" />\r
-                <File Id="cl_map.h" Compressed="yes" DiskId="1"\r
-                      LongName="cl_map.h" Name="CL_MAP.H" \r
-                      Source="..\bin\Inc\complib\cl_map.h" />\r
-                <File Id="cl_math.h" Compressed="yes" DiskId="1"\r
-                      LongName="cl_math.h" Name="CL_MATH.H" \r
-                      Source="..\bin\Inc\complib\cl_math.h" />\r
-                <File Id="cl_memory.h" Compressed="yes" DiskId="1"\r
-                      LongName="cl_memory.h" Name="CL_MEMO.H" \r
-                      Source="..\bin\Inc\complib\cl_memory.h" />\r
-                <File Id="cl_memory_osd.h" Compressed="yes" DiskId="1"\r
-                      LongName="cl_memory_osd.h" Name="CL_MEMO1.H" \r
-                      Source="..\bin\Inc\complib\cl_memory_osd.h" />\r
-                <File Id="cl_mutex.h" Compressed="yes" DiskId="1"\r
-                      LongName="cl_mutex.h" Name="CL_MUTE.H" \r
-                      Source="..\bin\Inc\complib\cl_mutex.h" />\r
-                <File Id="cl_mutex_osd.h" Compressed="yes" DiskId="1"\r
-                      LongName="cl_mutex_osd.h" Name="CL_MUTE1.H" \r
-                      Source="..\bin\Inc\complib\cl_mutex_osd.h" />\r
-                <File Id="cl_obj.h" Compressed="yes" DiskId="1"\r
-                      LongName="cl_obj.h" Name="CL_OBJ.H" \r
-                      Source="..\bin\Inc\complib\cl_obj.h" />\r
-                <File Id="cl_packoff.h" Compressed="yes" DiskId="1"\r
-                      LongName="cl_packoff.h" Name="CL_PACK.H" \r
-                      Source="..\bin\Inc\complib\cl_packoff.h" />\r
-                <File Id="cl_packon.h" Compressed="yes" DiskId="1"\r
-                      LongName="cl_packon.h" Name="CL_PACK1.H" \r
-                      Source="..\bin\Inc\complib\cl_packon.h" />\r
-                <File Id="cl_passivelock.h" Compressed="yes" DiskId="1"\r
-                      LongName="cl_passivelock.h" Name="CL_PASS.H" \r
-                      Source="..\bin\Inc\complib\cl_passivelock.h" />\r
-                <File Id="cl_perf.h" Compressed="yes" DiskId="1"\r
-                      LongName="cl_perf.h" Name="CL_PERF.H" \r
-                      Source="..\bin\Inc\complib\cl_perf.h" />\r
-                <File Id="cl_pool.h" Compressed="yes" DiskId="1"\r
-                      LongName="cl_pool.h" Name="CL_POOL.H" \r
-                      Source="..\bin\Inc\complib\cl_pool.h" />\r
-                <File Id="cl_ptr_vector.h" Compressed="yes" DiskId="1"\r
-                      LongName="cl_ptr_vector.h" Name="CL_PTR_.H" \r
-                      Source="..\bin\Inc\complib\cl_ptr_vector.h" />\r
-                <File Id="cl_qcomppool.h" Compressed="yes" DiskId="1"\r
-                      LongName="cl_qcomppool.h" Name="CL_QCOM.H" \r
-                      Source="..\bin\Inc\complib\cl_qcomppool.h" />\r
-                <File Id="cl_qlist.h" Compressed="yes" DiskId="1"\r
-                      LongName="cl_qlist.h" Name="CL_QLIS.H" \r
-                      Source="..\bin\Inc\complib\cl_qlist.h" />\r
-                <File Id="cl_qlockpool.h" Compressed="yes" DiskId="1"\r
-                      LongName="cl_qlockpool.h" Name="CL_QLOC.H" \r
-                      Source="..\bin\Inc\complib\cl_qlockpool.h" />\r
-                <File Id="cl_qmap.h" Compressed="yes" DiskId="1"\r
-                      LongName="cl_qmap.h" Name="CL_QMAP.H" \r
-                      Source="..\bin\Inc\complib\cl_qmap.h" />\r
-                <File Id="cl_qpool.h" Compressed="yes" DiskId="1"\r
-                      LongName="cl_qpool.h" Name="CL_QPOO.H" \r
-                      Source="..\bin\Inc\complib\cl_qpool.h" />\r
-                <File Id="cl_rbmap.h" Compressed="yes" DiskId="1"\r
-                      LongName="cl_rbmap.h" Name="CL_RBMA.H" \r
-                      Source="..\bin\Inc\complib\cl_rbmap.h" />\r
-                <File Id="cl_reqmgr.h" Compressed="yes" DiskId="1"\r
-                      LongName="cl_reqmgr.h" Name="CL_REQM.H" \r
-                      Source="..\bin\Inc\complib\cl_reqmgr.h" />\r
-                <File Id="cl_spinlock.h" Compressed="yes" DiskId="1"\r
-                      LongName="cl_spinlock.h" Name="CL_SPIN.H" \r
-                      Source="..\bin\Inc\complib\cl_spinlock.h" />\r
-                <File Id="cl_spinlock_osd.h" Compressed="yes" DiskId="1"\r
-                      LongName="cl_spinlock_osd.h" Name="CL_SPIN1.H" \r
-                      Source="..\bin\Inc\complib\cl_spinlock_osd.h" />\r
-                <File Id="cl_syscallback.h" Compressed="yes" DiskId="1"\r
-                      LongName="cl_syscallback.h" Name="CL_SYSC.H" \r
-                      Source="..\bin\Inc\complib\cl_syscallback.h" />\r
-                <File Id="cl_syscallback_osd.h" Compressed="yes" DiskId="1"\r
-                      LongName="cl_syscallback_osd.h" Name="CL_SYSC1.H" \r
-                      Source="..\bin\Inc\complib\cl_syscallback_osd.h" />\r
-                <File Id="cl_thread.h" Compressed="yes" DiskId="1"\r
-                      LongName="cl_thread.h" Name="CL_THRE.H" \r
-                      Source="..\bin\Inc\complib\cl_thread.h" />\r
-                <File Id="cl_thread_osd.h" Compressed="yes" DiskId="1"\r
-                      LongName="cl_thread_osd.h" Name="CL_THRE1.H" \r
-                      Source="..\bin\Inc\complib\cl_thread_osd.h" />\r
-                <File Id="cl_threadpool.h" Compressed="yes" DiskId="1"\r
-                      LongName="cl_threadpool.h" Name="CL_THRE2.H" \r
-                      Source="..\bin\Inc\complib\cl_threadpool.h" />\r
-                <File Id="cl_timer.h" Compressed="yes" DiskId="1"\r
-                      LongName="cl_timer.h" Name="CL_TIME.H" \r
-                      Source="..\bin\Inc\complib\cl_timer.h" />\r
-                <File Id="cl_timer_osd.h" Compressed="yes" DiskId="1"\r
-                      LongName="cl_timer_osd.h" Name="CL_TIME1.H" \r
-                      Source="..\bin\Inc\complib\cl_timer_osd.h" />\r
-                <File Id="cl_types.h" Compressed="yes" DiskId="1"\r
-                      LongName="cl_types.h" Name="CL_TYPE.H" \r
-                      Source="..\bin\Inc\complib\cl_types.h" />\r
-                <File Id="cl_types_osd.h" Compressed="yes" DiskId="1"\r
-                      LongName="cl_types_osd.h" Name="CL_TYPE1.H" \r
-                      Source="..\bin\Inc\complib\cl_types_osd.h" />\r
-                <File Id="cl_vector.h" Compressed="yes" DiskId="1"\r
-                      LongName="cl_vector.h" Name="CL_VECT.H" \r
-                      Source="..\bin\Inc\complib\cl_vector.h" />\r
-                <File Id="cl_waitobj.h" Compressed="yes" DiskId="1"\r
-                      LongName="cl_waitobj.h" Name="CL_WAIT.H" \r
-                      Source="..\bin\Inc\complib\cl_waitobj.h" />\r
-                <File Id="cl_waitobj_osd.h" Compressed="yes" DiskId="1"\r
-                      LongName="cl_waitobj_osd.h" Name="CL_WAIT1.H" \r
-                      Source="..\bin\Inc\complib\cl_waitobj_osd.h" />\r
-                <File Id="comp_lib.h" Compressed="yes" DiskId="1"\r
-                      LongName="comp_lib.h" Name="COMP_LI.H" \r
-                      Source="..\bin\Inc\complib\comp_lib.h" />\r
-              </Component>\r
-            </Directory>\r
-\r
-            <Directory Id="IB_iba" Name="iba">\r
-              <Component Id="cIBAL_IBA"\r
-                         Guid="2EC5C324-734D-4a06-AE35-D7B80D76B77A">\r
-                <CreateFolder />\r
-                <File Id="ib_al.h" Compressed="yes" DiskId="1"\r
-                      LongName="ib_al.h" Name="ib_al.h"\r
-                      Source="..\bin\Inc\iba\ib_al.h" />\r
-                <File Id="ib_al_ioctl.h" Compressed="yes" DiskId="1"\r
-                      LongName="ib_al_ioctl.h" Name="ib_ioctl.h"\r
-                      Source="..\bin\Inc\iba\ib_al_ioctl.h" />\r
-                <File Id="ib_at_ioctl.h" Compressed="yes" DiskId="1"\r
-                      LongName="ib_at_ioctl.h" Name="ib_iocat.h"\r
-                      Source="..\bin\Inc\iba\ib_at_ioctl.h" />\r
-                <File Id="ib_ci.h" Compressed="yes" DiskId="1"\r
-                      LongName="ib_ci.h" Name="ib_ci.h"\r
-                      Source="..\bin\Inc\iba\ib_ci.h" />\r
-                <File Id="ib_types.h" Compressed="yes" DiskId="1"\r
-                      LongName="ib_types.h" Name="ib_types.h"\r
-                      Source="..\bin\Inc\iba\ib_types.h" />\r
-                <File Id="ib_uvp.h" Compressed="yes" DiskId="1"\r
-                      LongName="ib_uvp.h" Name="ib_uvp.h"\r
-                      Source="..\bin\Inc\iba\ib_uvp.h" />\r
-              </Component>\r
-            </Directory>\r
-          </Directory>\r
-\r
-          <Directory Id="IB_samples" Name="Samples">\r
-            <Directory Id="sample_DDK" Name="DDK">\r
-              <Component Id="cDDK_example"\r
-                         Guid="8C27B926-FCFE-4f46-83B4-A27482A5EB3B">\r
-                <CreateFolder />\r
-                    <File Id="cmtest.c" Compressed="yes" DiskId="1"\r
-                          LongName="cmtest.c" Name="cmtest.c"\r
-                          Source="..\bin\misc\cmtest.c" />\r
-                    <File Id="cmtest.rc" Compressed="yes" DiskId="1"\r
-                          LongName="cmtest.rc" Name="cmtest.rc"\r
-                          Source="..\..\SDK_Samples\DDK\cmtest.rc" />\r
-                    <File Id="makefile" Compressed="yes" DiskId="1"\r
-                          LongName="makefile" Name="makefile"\r
-                          Source="..\..\SDK_Samples\DDK\makefile" /