[WinOF] support additional OFED Diags (winverbs_OFED.inc)

  ibqueryerrors iblinkinfo saquery sminfo smpdump smpquery venstat ibportstate perfquery mcm_rereg_test
  libibnetdisc
cleanup makebin.bat with single env var defs of what's to be copied.
ipoib.inc - no ND for ia64

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

diff --git a/trunk/WinOF/WIX/common/ipoib.inc b/trunk/WinOF/WIX/common/ipoib.inc
index 5d4020e2c49ccb9fe45bf84ce246cabfd3b40951..cfb035399d8e0dcf244d548f63b7a956f31dd765 100644 (file)
--- a/trunk/WinOF/WIX/common/ipoib.inc
+++ b/trunk/WinOF/WIX/common/ipoib.inc
@@ -29,7 +29,7 @@
                 Source="..\bin\net\$(var.ARCH)\ndinstall.exe" />\r
       <?endif?>\r
 \r
-      <?if $(var.ARCHP) = "x64" Or $(var.ARCHP) = "ia64" ?>\r
+      <?if $(var.ARCHP) = "x64" ?>\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
@@ -37,18 +37,22 @@
                  LongName="ibndprov32.dll" Name="IBNDPR32.DLL"\r
                  Source="..\bin\net\$(var.ARCH)\ibndprov32.dll" />\r
 \r
-          <RemoveFile Id='rm64_ibwsd.dll' On='uninstall'\r
-                 Property="System64Folder"\r
-                 Name="ibwsd.dll" LongName='ibwsd.dll' />\r
           <RemoveFile Id='rm64_ibndprov.dll' On='uninstall'\r
                  Property="System64Folder"\r
-                 Name="ibndprov.dll" LongName='ibndprov.dll' />\r
+                 Name="ibndpr32.dll" LongName='ibndprov32.dll' />\r
           <RemoveFile Id='rm64_ndinstall.exe' On='uninstall'\r
                  Property="System64Folder"\r
                  Name="ndinstal.exe" LongName='ndinstall.exe' />\r
       <?endif?>\r
 \r
       <!-- Orphaned install files - remove on uninstall -->\r
+\r
+      <?if $(var.ARCHP) = "x64" Or $(var.ARCHP) = "ia64" ?>\r
+          <RemoveFile Id='rm64_ibwsd.dll' On='uninstall'\r
+                 Property="System64Folder"\r
+                 Name="ibwsd.dll" LongName='ibwsd.dll' />\r
+      <?endif?>\r
+\r
       <RemoveFile Id='o64_ibwsd.dll' On='uninstall'\r
              Property="SystemFolder"\r
              Name="ibwsd.dll" LongName='ibwsd.dll' />\r

diff --git a/trunk/WinOF/WIX/common/winverbs_OFED.inc b/trunk/WinOF/WIX/common/winverbs_OFED.inc
index 3fbcd1ba4190c9fecd72d3490f80aea4c5a7e4bd..955f94e2402fea5fe2ed89dec5865f47af15e248 100644 (file)
--- a/trunk/WinOF/WIX/common/winverbs_OFED.inc
+++ b/trunk/WinOF/WIX/common/winverbs_OFED.inc
@@ -67,6 +67,7 @@
       <File Id="libibumadd.pdb" Compressed="yes" DiskId="1"\r
             LongName="libibumadd.pdb" Name="ibumadd.pdb"\r
             Source="..\bin\HCA\$(var.ARCH)\libibumadd.pdb" />\r
+\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
@@ -88,6 +89,28 @@
       <File Id="librdmacmd.pdb" Compressed="yes" DiskId="1"\r
             LongName="librdmacmd.pdb" Name="rdmacmd.pdb"\r
             Source="..\bin\HCA\$(var.ARCH)\librdmacmd.pdb" />\r
+\r
+      <File Id="libibnetdisc.dll" Compressed="yes" DiskId="1"\r
+            LongName="libibnetdisc.dll" Name="libibnet.dll"\r
+            Source="..\bin\HCA\$(var.ARCH)\libibnetdisc.dll" />\r
+        <CopyFile Id="duplibibnetdisc.dll" FileId="libibnetdisc.dll"\r
+               DestinationName="libnetd.dll"\r
+               DestinationLongName="libibnetdisc.dll"\r
+               DestinationProperty="WindowsFolder" />\r
+      <File Id="libibnetdisc.pdb" Compressed="yes" DiskId="1"\r
+            LongName="libibnetdisc.pdb" Name="libnetd.pdb"\r
+            Source="..\bin\HCA\$(var.ARCH)\libibnetdisc.pdb" />\r
+\r
+      <File Id="libibnetdiscd.dll" Compressed="yes" DiskId="1"\r
+            LongName="libibnetdiscd.dll" Name="libnetdd.dll"\r
+            Source="..\bin\HCA\$(var.ARCH)\libibnetdiscd.dll" />\r
+        <CopyFile Id="duplibibnetdiscd.dll" FileId="libibnetdiscd.dll"\r
+               DestinationName="libnetdd.dll"\r
+               DestinationLongName="libibnetdiscd.dll"\r
+               DestinationProperty="WindowsFolder" />\r
+      <File Id="libibnetdiscd.pdb" Compressed="yes" DiskId="1"\r
+            LongName="libibnetdiscd.pdb" Name="libnetdd.pdb"\r
+            Source="..\bin\HCA\$(var.ARCH)\libibnetdiscd.pdb" />\r
     </Component>\r
 \r
     <Component Id="cWinVerbsUApps"\r
@@ -159,36 +182,7 @@
       <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
+\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
@@ -207,17 +201,114 @@
       <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
+\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="iblinkinfo.exe" Compressed="yes" DiskId="1"\r
+            LongName="iblinkinfo.exe" Name="iblink.exe"\r
+            Source="..\bin\tools\$(var.ARCH)\release\iblinkinfo.exe" />\r
+      <File Id="iblinkinfo.pdb" Compressed="yes" DiskId="1"\r
+            LongName="iblinkinfo.pdb" Name="iblink.pdb"\r
+            Source="..\bin\tools\$(var.ARCH)\release\iblinkinfo.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="ibping.exe" Compressed="yes" DiskId="1"\r
+            LongName="ibping.exe" Name="ibping.exe"\r
+            Source="..\bin\tools\$(var.ARCH)\release\ibping.exe" />\r
+      <File Id="ibping.pdb" Compressed="yes" DiskId="1"\r
+            LongName="ibping.pdb" Name="ibping.pdb"\r
+            Source="..\bin\tools\$(var.ARCH)\release\ibping.pdb" />\r
+      <File Id="ibportstate.exe" Compressed="yes" DiskId="1"\r
+            LongName="ibportstate.exe" Name="ibprtsta.exe"\r
+            Source="..\bin\tools\$(var.ARCH)\release\ibportstate.exe" />\r
+      <File Id="ibportstate.pdb" Compressed="yes" DiskId="1"\r
+            LongName="ibportstate.pdb" Name="ibprtsta.pdb"\r
+            Source="..\bin\tools\$(var.ARCH)\release\ibportstate.pdb" />\r
+      <File Id="ibqueryerrors.exe" Compressed="yes" DiskId="1"\r
+            LongName="ibqueryerrors.exe" Name="iberrs.exe"\r
+            Source="..\bin\tools\$(var.ARCH)\release\ibqueryerrors.exe" />\r
+      <File Id="ibqueryerrors.pdb" Compressed="yes" DiskId="1"\r
+            LongName="ibqueryerrors.pdb" Name="iberrs.pdb"\r
+            Source="..\bin\tools\$(var.ARCH)\release\ibqueryerrors.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="ibsendtrap.exe" Compressed="yes" DiskId="1"\r
+            LongName="ibsendtrap.exe" Name="ibsndtrp.exe"\r
+            Source="..\bin\tools\$(var.ARCH)\release\ibsendtrap.exe" />\r
+      <File Id="ibsendtrap.pdb" Compressed="yes" DiskId="1"\r
+            LongName="ibsendtrap.pdb" Name="ibsndtrp.pdb"\r
+            Source="..\bin\tools\$(var.ARCH)\release\ibsendtrap.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="ibsysstat.exe" Compressed="yes" DiskId="1"\r
+            LongName="ibsysstat.exe" Name="ibsstat.exe"\r
+            Source="..\bin\tools\$(var.ARCH)\release\ibsysstat.exe" />\r
+      <File Id="ibsysstat.pdb" Compressed="yes" DiskId="1"\r
+            LongName="ibsysstat.pdb" Name="ibsstat.pdb"\r
+            Source="..\bin\tools\$(var.ARCH)\release\ibsysstat.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
+      <File Id="mcm_rereg_test.exe" Compressed="yes" DiskId="1"\r
+            LongName="mcm_rereg_test.exe" Name="mcm_rreg.exe"\r
+            Source="..\bin\tools\$(var.ARCH)\release\mcm_rereg_test.exe" />\r
+      <File Id="mcm_rereg_test.pdb" Compressed="yes" DiskId="1"\r
+            LongName="mcm_rereg_test.pdb" Name="mcm_rreg.pdb"\r
+            Source="..\bin\tools\$(var.ARCH)\release\mcm_rereg_test.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="saquery.exe" Compressed="yes" DiskId="1"\r
+            LongName="saquery.exe" Name="saquery.exe"\r
+            Source="..\bin\tools\$(var.ARCH)\release\saquery.exe" />\r
+      <File Id="saquery.pdb" Compressed="yes" DiskId="1"\r
+            LongName="saquery.pdb" Name="saquery.pdb"\r
+            Source="..\bin\tools\$(var.ARCH)\release\saquery.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="smpdump.exe" Compressed="yes" DiskId="1"\r
+            LongName="smpdump.exe" Name="smpdump.exe"\r
+            Source="..\bin\tools\$(var.ARCH)\release\smpdump.exe" />\r
+      <File Id="smpdump.pdb" Compressed="yes" DiskId="1"\r
+            LongName="smpdump.pdb" Name="smpdump.pdb"\r
+            Source="..\bin\tools\$(var.ARCH)\release\smpdump.pdb" />\r
+      <File Id="smpquery.exe" Compressed="yes" DiskId="1"\r
+            LongName="smpquery.exe" Name="smpquery.exe"\r
+            Source="..\bin\tools\$(var.ARCH)\release\smpquery.exe" />\r
+      <File Id="smpquery.pdb" Compressed="yes" DiskId="1"\r
+            LongName="smpquery.pdb" Name="smpquery.pdb"\r
+            Source="..\bin\tools\$(var.ARCH)\release\smpquery.pdb" />\r
+      <File Id="vendstat.exe" Compressed="yes" DiskId="1"\r
+            LongName="vendstat.exe" Name="vendstat.exe"\r
+            Source="..\bin\tools\$(var.ARCH)\release\vendstat.exe" />\r
+      <File Id="vendstat.pdb" Compressed="yes" DiskId="1"\r
+            LongName="vendstat.pdb" Name="vendstat.pdb"\r
+            Source="..\bin\tools\$(var.ARCH)\release\vendstat.pdb" />\r
     </Component>\r
 </Include>\r

diff --git a/trunk/etc/makebin.bat b/trunk/etc/makebin.bat
index 92e4242e06e8ef5a5aad52ac1c298c944af759cc..846a7a638cb623c5d83fe220b6add80b2013bd24 100644 (file)
--- a/trunk/etc/makebin.bat
+++ b/trunk/etc/makebin.bat
@@ -73,6 +73,25 @@ if /I "%OSE%" == "wxp" (
     if not exist %1\bin\user\objchk_%OSE%_x86\i386 goto error9\r
 )\r
 \r
+set CORE_DRV_FRE=ibbus.sys ibbus.pdb ibiou.sys ibiou.pdb ib_iou.inf mthca.sys mthca.inf mthca.pdb mlx4_hca.sys mlx4_hca.pdb mlx4_hca.inf mlx4_bus.sys mlx4_bus.pdb mlx4_bus.inf winverbs.sys winverbs.pdb winmad.sys winmad.pdb\r
+\r
+set CORE_UM_F=ibal.dll ibal.lib ibal.pdb complib.dll complib.lib complib.pdb mthcau.dll mthcau.pdb mlx4u.dll mlx4u.pdb\r
+\r
+set CORE_UM_D=ibald.dll ibald.lib ibald.pdb complibd.dll complibd.lib complibd.pdb mthcaud.dll mthcaud.pdb mlx4ud.dll mlx4ud.pdb\r
+\r
+set WV_CHK=winverbsd.dll winverbsd.lib winmadd.dll winmadd.lib libibverbsd.dll libibverbsd.lib libibverbsd.pdb libibumadd.lib libibumadd.dll libibumadd.pdb libibmadd.lib libibmadd.dll libibmadd.pdb librdmacmd.lib librdmacmd.dll librdmacmd.pdb libibnetdiscd.dll libibnetdiscd.pdb\r
+\r
+set WV_FRE=winverbs.dll winverbs.lib winmad.dll winmad.lib libibverbs.dll libibverbs.lib libibverbs.pdb libibumad.lib libibumad.dll libibumad.pdb libibmad.lib libibmad.dll libibmad.pdb librdmacm.dll librdmacm.lib librdmacm.pdb libibnetdisc.dll libibnetdisc.pdb\r
+\r
+set DAPL2_F=dapl2.dll dapl2.pdb dapl2-ofa-scm.dll dapl2-ofa-scm.pdb dapl2-ofa-cma.dll dapl2-ofa-cma.pdb dat2.dll dat2.lib dat2.pdb\r
+\r
+set DAPL2_D=dapl2d.dll dapl2d.pdb dapl2-ofa-scmd.dll dapl2-ofa-scmd.pdb dapl2-ofa-cmad.dll dapl2-ofa-cmad.pdb dat2d.dll dat2d.lib dat2d.pdb\r
+\r
+set DAPL_F=dapl.dll dapl.pdb dat.dll dat.lib dat.pdb\r
+\r
+set DAPL_D=dapld.dll dapld.pdb datd.dll datd.lib datd.pdb\r
+\r
+\r
 rem\r
 rem KERNEL MODE\r
 rem\r
@@ -85,8 +104,7 @@ set dest_dir=%2\HCA\amd64\
 \r
 if "%DBG%" == "TRUE" echo DBG: AMD64 free drivers\r
 \r
-set F=ibbus.sys ibbus.pdb ibiou.sys ibiou.pdb ib_iou.inf mthca.sys mthca.inf mthca.pdb mlx4_hca.sys mlx4_hca.pdb mlx4_hca.inf mlx4_bus.sys mlx4_bus.pdb mlx4_bus.inf winverbs.sys winverbs.pdb winmad.sys winmad.pdb\r
-for %%i in ( %F% ) do (\r
+for %%i in ( %CORE_DRV_FRE% ) do (\r
     xcopy %bin_dir%\%%i %dest_dir% /yq 1> nul\r
     if ERRORLEVEL 1 (\r
         echo ERR on xcopy %bin_dir%\%%i %dest_dir% /yq\r
@@ -113,8 +131,7 @@ set dest_dir=%2\HCA\ia64\
 \r
 if "%DBG%" == "TRUE" echo DBG: ia64 free drivers\r
 \r
-set F=ibbus.sys ibbus.pdb ibiou.sys ibiou.pdb ib_iou.inf mthca.sys mthca.inf mthca.pdb mlx4_hca.sys mlx4_hca.pdb mlx4_hca.inf mlx4_bus.sys mlx4_bus.pdb mlx4_bus.inf winverbs.sys winverbs.pdb winmad.sys winmad.pdb\r
-for %%i in ( %F% ) do (\r
+for %%i in ( %CORE_DRV_FRE% ) do (\r
     xcopy %bin_dir%\%%i %dest_dir% /yq 1>nul\r
     if ERRORLEVEL 1 (\r
         echo ERR on xcopy %bin_dir%\%%i %dest_dir% /yq\r
@@ -144,8 +161,7 @@ if "%DBG%" == "TRUE" echo DBG: x86 free drivers
 set bin_dir=%1\bin\kernel\objfre_%OSE%_x86\i386\r
 set dest_dir=%2\HCA\x86\\r
 \r
-set F=ibbus.sys ibbus.pdb ibiou.sys ibiou.pdb ib_iou.inf mthca.sys mthca.pdb mthca.inf mlx4_hca.sys mlx4_hca.pdb mlx4_hca.inf mlx4_bus.sys mlx4_bus.pdb mlx4_bus.inf winverbs.sys winverbs.pdb winmad.sys winmad.pdb\r
-for %%i in ( %F% ) do (\r
+for %%i in ( %CORE_DRV_FRE% ) do (\r
     xcopy %bin_dir%\%%i %dest_dir% /yq 1>nul\r
     if ERRORLEVEL 1 (\r
         echo ERR on xcopy %bin_dir%\%%i %dest_dir% /yq\r
@@ -184,15 +200,7 @@ if "%DBG%" == "TRUE" echo DBG: amd64 Checked amd64 user-mode
 set bin_dir=%1\bin\user\objchk_%OSE%_amd64\amd64\r
 set dest_dir=%2\HCA\amd64\\r
 \r
-for %%i in (ibald.dll complibd.dll mthcaud.dll mlx4ud.dll) do (\r
-    xcopy %bin_dir%\%%i %dest_dir% /yq 1>nul\r
-    if ERRORLEVEL 1 (\r
-        echo ERR on xcopy %bin_dir%\%%i %dest_dir% /yq\r
-        exit /B 1\r
-    )\r
-)\r
-\r
-for %%i in (ibald.lib ibald.pdb complibd.lib complibd.pdb) do (\r
+for %%i in (%CORE_UM_D%) do (\r
     xcopy %bin_dir%\%%i %dest_dir% /yq 1>nul\r
     if ERRORLEVEL 1 (\r
         echo ERR on xcopy %bin_dir%\%%i %dest_dir% /yq\r
@@ -201,9 +209,8 @@ for %%i in (ibald.lib ibald.pdb complibd.lib complibd.pdb) do (
 )\r
 \r
 echo xcopy winverbs: User checked to HCA\amd64\r
-set F=winverbsd.dll winverbsd.lib winmadd.dll winmadd.lib libibverbsd.dll libibverbsd.lib libibverbsd.pdb libibumadd.lib libibumadd.dll libibumadd.pdb libibmadd.lib libibmadd.dll libibmadd.pdb librdmacmd.lib librdmacmd.dll librdmacmd.pdb\r
 \r
-for %%i in ( %F% ) do (\r
+for %%i in ( %WV_CHK% ) do (\r
     xcopy %bin_dir%\%%i %dest_dir% /yq 1>nul\r
     if ERRORLEVEL 1 (\r
         echo ERR on xcopy %bin_dir%\%%i %dest_dir% /yq\r
@@ -214,9 +221,7 @@ for %%i in ( %F% ) do (
 echo xcopy *.exe tools\amd64\debug\\r
 xcopy %bin_dir%\*.exe %2\tools\amd64\debug\ /yq 1>nul\r
 \r
-set F=dapld.dll dapld.pdb datd.dll datd.lib datd.pdb\r
-\r
-for %%i in ( %F% ) do (\r
+for %%i in ( %DAPL_D% ) do (\r
     xcopy %bin_dir%\%%i %2\DAPL\amd64\ /yq 1>nul\r
     if ERRORLEVEL 1 (\r
         echo ERR on xcopy %bin_dir%\%%i %2\DAPL\amd64\ /yq\r
@@ -224,9 +229,7 @@ for %%i in ( %F% ) do (
     )\r
 )\r
 \r
-set F=dapl2d.dll dapl2d.pdb dapl2-ofa-scmd.dll dapl2-ofa-scmd.pdb dapl2-ofa-cmad.dll dapl2-ofa-cmad.pdb dat2d.dll dat2d.lib dat2d.pdb\r
-\r
-for %%i in ( %F% ) do (\r
+for %%i in ( %DAPL2_D% ) do (\r
     xcopy %bin_dir%\%%i %2\DAPL2\amd64\ /yq 1>nul\r
     if ERRORLEVEL 1 (\r
         echo ERR on xcopy %bin_dir%\%%i %2\DAPL2\amd64\ /yq\r
@@ -242,15 +245,7 @@ if "%DBG%" == "TRUE" echo DBG: ia64 Checked dlls
 set bin_dir=%1\bin\user\objchk_%OSE%_ia64\ia64\r
 set dest_dir=%2\HCA\ia64\\r
 \r
-for %%i in (ibald.dll complibd.dll mthcaud.dll mlx4ud.dll) do (\r
-    xcopy %bin_dir%\%%i %dest_dir% /yq 1>nul\r
-    if ERRORLEVEL 1 (\r
-        echo ERR on xcopy %bin_dir%\%%i %dest_dir% /yq\r
-        exit /B 1\r
-    )\r
-)\r
-\r
-for %%i in (ibald.lib ibald.pdb complibd.lib complibd.pdb) do (\r
+for %%i in (%CORE_UM_D%) do (\r
     xcopy %bin_dir%\%%i %dest_dir% /yq 1>nul\r
     if ERRORLEVEL 1 (\r
         echo ERR on xcopy %bin_dir%\%%i %dest_dir% /yq\r
@@ -259,9 +254,8 @@ for %%i in (ibald.lib ibald.pdb complibd.lib complibd.pdb) do (
 )\r
 \r
 echo xcopy winverbs: User checked to HCA\ia64\r
-set F=winverbsd.dll winverbsd.lib winmadd.dll winmadd.lib libibverbsd.dll libibverbsd.lib libibverbsd.pdb libibumadd.lib libibumadd.dll libibumadd.pdb libibmadd.lib libibmadd.dll libibmadd.pdb librdmacmd.lib librdmacmd.dll librdmacmd.pdb\r
 \r
-for %%i in ( %F% ) do (\r
+for %%i in ( %WV_CHK% ) do (\r
     xcopy %bin_dir%\%%i %dest_dir% /yq 1>nul\r
     if ERRORLEVEL 1 (\r
         echo ERR on xcopy %bin_dir%\%%i %dest_dir% /yq\r
@@ -272,9 +266,7 @@ for %%i in ( %F% ) do (
 echo xcopy *.exe tools\ia64\debug\ \r
 xcopy %bin_dir%\*.exe %2\tools\ia64\debug\ /yq 1>nul\r
 \r
-set F=dapld.dll dapld.pdb datd.dll datd.lib datd.pdb\r
-\r
-for %%i in ( %F% ) do (\r
+for %%i in ( %DAPL_D% ) do (\r
     xcopy %bin_dir%\%%i %2\DAPL\ia64\ /yq 1>nul\r
     if ERRORLEVEL 1 (\r
         echo ERR on xcopy %bin_dir%\%%i %2\DAPL\ia64\ /yq\r
@@ -282,9 +274,7 @@ for %%i in ( %F% ) do (
     )\r
 )\r
 \r
-set F=dapl2d.dll dapl2d.pdb dapl2-ofa-scmd.dll dapl2-ofa-scmd.pdb dapl2-ofa-cmad.dll dapl2-ofa-cmad.pdb dat2d.dll dat2d.lib dat2d.pdb\r
-\r
-for %%i in ( %F% ) do (\r
+for %%i in ( %DAPL2_D% ) do (\r
     xcopy %bin_dir%\%%i %2\DAPL2\ia64\ /yq 1>nul\r
     if ERRORLEVEL 1 (\r
         echo ERR on xcopy %bin_dir%\%%i %2\DAPL2\ia64\ /yq\r
@@ -302,15 +292,7 @@ if "%DBG%" == "TRUE" echo DBG: x86 Checked user-mode dlls
 set bin_dir=%1\bin\user\objchk_%OSE%_x86\i386\r
 set dest_dir=%2\HCA\x86\\r
 \r
-for %%i in (ibald.dll complibd.dll mthcaud.dll mlx4ud.dll) do (\r
-    xcopy %bin_dir%\%%i %dest_dir% /yq 1>nul\r
-    if ERRORLEVEL 1 (\r
-        echo ERR on xcopy %bin_dir%\%%i %dest_dir% /yq\r
-        exit /B 1\r
-    )\r
-)\r
-\r
-for %%i in (ibald.lib ibald.pdb complibd.lib complibd.pdb) do (\r
+for %%i in (%CORE_UM_D%) do (\r
     xcopy %bin_dir%\%%i %dest_dir% /yq 1>nul\r
     if ERRORLEVEL 1 (\r
         echo ERR on xcopy %bin_dir%\%%i %dest_dir% /yq\r
@@ -319,9 +301,8 @@ for %%i in (ibald.lib ibald.pdb complibd.lib complibd.pdb) do (
 )\r
 \r
 echo xcopy winverbs: User checked to HCA\x86\r
-set F=winverbsd.dll winverbsd.lib winmadd.dll winmadd.lib libibverbsd.dll libibverbsd.lib libibverbsd.pdb libibumadd.lib libibumadd.dll libibumadd.pdb libibmadd.lib libibmadd.dll libibmadd.pdb librdmacmd.lib librdmacmd.dll librdmacmd.pdb\r
 \r
-for %%i in ( %F% ) do (\r
+for %%i in ( %WV_CHK% ) do (\r
     xcopy %bin_dir%\%%i %dest_dir% /yq 1>nul\r
     if ERRORLEVEL 1 (\r
         echo ERR on xcopy %bin_dir%\%%i %dest_dir% /yq\r
@@ -332,9 +313,7 @@ for %%i in ( %F% ) do (
 if "%DBG%" == "TRUE"  echo DBG: checked *.exe to tools\x86\debug\ \r
 xcopy %bin_dir%\*.exe %2\tools\x86\debug\ /yq 1>nul\r
 \r
-set F=dapld.dll dapld.pdb datd.dll datd.lib datd.pdb\r
-\r
-for %%i in ( %F% ) do (\r
+for %%i in ( %DAPL_D% ) do (\r
     xcopy %bin_dir%\%%i %2\DAPL\x86\ /yq 1>nul\r
     if ERRORLEVEL 1 (\r
         echo ERR on xcopy %bin_dir%\%%i %2\DAPL\x86\ /yq\r
@@ -342,9 +321,7 @@ for %%i in ( %F% ) do (
     )\r
 )\r
 \r
-set F=dapl2d.dll dapl2d.pdb dapl2-ofa-scmd.dll dapl2-ofa-scmd.pdb dapl2-ofa-cmad.dll dapl2-ofa-cmad.pdb dat2d.dll dat2d.lib dat2d.pdb\r
-\r
-for %%i in ( %F% ) do (\r
+for %%i in ( %DAPL2_D% ) do (\r
     xcopy %bin_dir%\%%i %2\DAPL2\x86\ /yq 1>nul\r
     if ERRORLEVEL 1 (\r
         echo ERR on xcopy %bin_dir%\%%i %2\DAPL2\x86\ /yq\r
@@ -398,7 +375,7 @@ set dest_dir=%2\HCA\amd64\
 \r
 if "%DBG%" == "TRUE" echo DBG: copy amd64 Free dlls\r
 \r
-for %%i in (ibal.dll complib.dll mthcau.dll mlx4u.dll) do (\r
+for %%i in (%CORE_UM_F%) do (\r
     xcopy %bin_dir%\%%i %dest_dir% /yq 1>nul\r
     if ERRORLEVEL 1 (\r
         echo ERR on xcopy %bin_dir%\%%i %dest_dir% /y\r
@@ -406,18 +383,9 @@ for %%i in (ibal.dll complib.dll mthcau.dll mlx4u.dll) do (
     )\r
 )\r
 \r
-for %%i in (ibal.lib ibal.pdb complib.lib complib.pdb) do (\r
-    xcopy %bin_dir%\%%i %dest_dir% /yq 1>nul\r
-    if ERRORLEVEL 1 (\r
-        echo ERR on xcopy %bin_dir%\%%i %dest_dir% /yq\r
-        exit /B 1\r
-    )\r
-)\r
-\r
 echo xcopy winverbs: User free to HCA\amd64\r
-set F=winverbs.dll winverbs.lib winmad.dll winmad.lib libibverbs.dll libibverbs.lib libibverbs.pdb libibumad.lib libibumad.dll libibumad.pdb libibmad.lib libibmad.dll libibmad.pdb librdmacm.dll librdmacm.lib librdmacm.pdb\r
 \r
-for %%i in ( %F% ) do (\r
+for %%i in ( %WV_FRE% ) do (\r
     xcopy %bin_dir%\%%i %dest_dir% /yq 1>nul\r
     if ERRORLEVEL 1 (\r
         echo ERR on xcopy %bin_dir%\%%i %dest_dir% /yq\r
@@ -447,9 +415,7 @@ if ERRORLEVEL 1 (
        exit /B 1\r
 )\r
 \r
-set F=dapl.dll dapl.pdb dat.dll dat.lib dat.pdb\r
-\r
-for %%i in ( %F% ) do (\r
+for %%i in ( %DAPL_F% ) do (\r
     xcopy %bin_dir%\%%i %2\DAPL\amd64\ /yq 1>nul\r
     if ERRORLEVEL 1 (\r
         echo ERR on xcopy %bin_dir%\%%i %2\DAPL\amd64\ /yq\r
@@ -457,9 +423,7 @@ for %%i in ( %F% ) do (
     )\r
 )\r
 \r
-set F=dapl2.dll dapl2.pdb dapl2-ofa-scm.dll dapl2-ofa-scm.pdb dapl2-ofa-cma.dll dapl2-ofa-cma.pdb dat2.dll dat2.lib dat2.pdb\r
-\r
-for %%i in ( %F% ) do (\r
+for %%i in ( %DAPL2_F% ) do (\r
     xcopy %bin_dir%\%%i %2\DAPL2\amd64\ /yq 1>nul\r
     if ERRORLEVEL 1 (\r
         echo ERR on xcopy %bin_dir%\%%i %2\DAPL2\amd64\ /yq\r
@@ -475,15 +439,7 @@ set dest_dir=%2\HCA\ia64\
 \r
 if "%DBG%" == "TRUE" echo DBG: copy IA64 Free dlls\r
 \r
-for %%i in (ibal.dll complib.dll mthcau.dll mlx4u.dll) do (\r
-    xcopy %bin_dir%\%%i %dest_dir% /yq 1>nul\r
-    if ERRORLEVEL 1 (\r
-        echo ERR on xcopy %%i %dest_dir% /yq\r
-        exit /B 1\r
-    )\r
-)\r
-\r
-for %%i in (ibal.lib ibal.pdb complib.lib complib.pdb) do (\r
+for %%i in (%CORE_UM_F%) do (\r
     xcopy %bin_dir%\%%i %dest_dir% /yq 1>nul\r
     if ERRORLEVEL 1 (\r
         echo ERR on xcopy %%i %dest_dir% /yq\r
@@ -492,9 +448,8 @@ for %%i in (ibal.lib ibal.pdb complib.lib complib.pdb) do (
 )\r
 \r
 echo xcopy winverbs: User free to HCA\ia64\r
-set F=winverbs.dll winverbs.lib winmad.dll winmad.lib libibverbs.dll libibverbs.lib libibverbs.pdb libibumad.lib libibumad.dll libibumad.pdb libibmad.lib libibmad.dll libibmad.pdb librdmacm.dll librdmacm.lib librdmacm.pdb\r
 \r
-for %%i in ( %F% ) do (\r
+for %%i in ( %WV_FRE% ) do (\r
     xcopy %bin_dir%\%%i %dest_dir% /yq 1>nul\r
     if ERRORLEVEL 1 (\r
         echo ERR on xcopy %bin_dir%\%%i %dest_dir% /yq\r
@@ -517,9 +472,7 @@ if ERRORLEVEL 1 (
        exit /B 1\r
 )\r
 \r
-set F=dapl.dll dapl.pdb dat.dll dat.lib dat.pdb \r
-\r
-for %%i in ( %F% ) do (\r
+for %%i in ( %DAPL_F% ) do (\r
     xcopy %bin_dir%\%%i %2\DAPL\ia64\ /yq 1>nul\r
     if ERRORLEVEL 1 (\r
         echo ERR on xcopy %bin_dir%\%%i %2\DAPL2\ia64\ /yq\r
@@ -527,9 +480,7 @@ for %%i in ( %F% ) do (
     )\r
 )\r
 \r
-set F=dapl2.dll dapl2.pdb dapl2-ofa-scm.dll dapl2-ofa-scm.pdb dapl2-ofa-cma.dll dapl2-ofa-cma.pdb dat2.dll dat2.lib dat2.pdb\r
-\r
-for %%i in ( %F% ) do (\r
+for %%i in ( %DAPL2_F% ) do (\r
     xcopy %bin_dir%\%%i %2\DAPL2\ia64\ /yq 1>nul\r
     if ERRORLEVEL 1 (\r
         echo ERR on xcopy %bin_dir%\%%i %2\DAPL2\ia64\ /yq\r
@@ -547,15 +498,7 @@ set dest_dir=%2\HCA\x86\
 \r
 if "%DBG%" == "TRUE" echo DBG: copy x86 Free dlls\r
 \r
-for %%i in (ibal.dll complib.dll mthcau.dll mlx4u.dll) do (\r
-    xcopy %bin_dir%\%%i %dest_dir% /yq 1>nul\r
-    if ERRORLEVEL 1 (\r
-        echo ERR on xcopy %bin_dir%\%%i %dest_dir% /yq\r
-        exit /B 1\r
-    )\r
-)\r
-\r
-for %%i in (ibal.lib ibal.pdb complib.lib complib.pdb) do (\r
+for %%i in (%CORE_UM_F%) do (\r
     xcopy %bin_dir%\%%i %dest_dir% /yq 1>nul\r
     if ERRORLEVEL 1 (\r
         echo ERR on xcopy %bin_dir%\%%i %dest_dir% /yq\r
@@ -564,9 +507,8 @@ for %%i in (ibal.lib ibal.pdb complib.lib complib.pdb) do (
 )\r
 \r
 echo xcopy winverbs: User free to HCA\x86\r
-set F=winverbs.dll winverbs.lib winmad.dll winmad.lib libibverbs.dll libibverbs.lib libibverbs.pdb libibumad.lib libibumad.dll libibumad.pdb libibmad.lib libibmad.dll libibmad.pdb librdmacm.dll librdmacm.lib librdmacm.pdb\r
 \r
-for %%i in ( %F% ) do (\r
+for %%i in ( %WV_FRE% ) do (\r
     xcopy %bin_dir%\%%i %dest_dir% /yq 1>nul\r
     if ERRORLEVEL 1 (\r
         echo ERR on xcopy %bin_dir%\%%i %dest_dir% /yq\r
@@ -584,9 +526,7 @@ if ERRORLEVEL 1 (
        exit /B 1\r
 )\r
 \r
-set F=dapl.dll dapl.pdb dat.dll dat.lib dat.pdb\r
-\r
-for %%i in ( %F% ) do (\r
+for %%i in ( %DAPL_F% ) do (\r
     xcopy %bin_dir%\%%i %2\DAPL\x86\ /yq 1>nul\r
     if ERRORLEVEL 1 (\r
         echo ERR on xcopy %bin_dir%\%%i %2\DAPL2\x86\ /yq\r
@@ -594,9 +534,7 @@ for %%i in ( %F% ) do (
     )\r
 )\r
 \r
-set F=dapl2.dll dapl2.pdb dapl2-ofa-scm.dll dapl2-ofa-scm.pdb dapl2-ofa-cma.dll dapl2-ofa-cma.pdb dat2.dll dat2.lib dat2.pdb\r
-\r
-for %%i in ( %F% ) do (\r
+for %%i in ( %DAPL2_F% ) do (\r
     xcopy %bin_dir%\%%i %2\DAPL2\x86\ /yq 1>nul\r
     if ERRORLEVEL 1 (\r
         echo ERR on xcopy %bin_dir%\%%i %2\DAPL2\x86\ /yq\r