[WINOF] switch from WIX 2.0 to use the stable release of WIX 3.0 for building WinOF...
authorstansmith <stansmith@ad392aa1-c5ef-ae45-8dd8-e69d62a5ef86>
Mon, 23 Nov 2009 20:10:16 +0000 (20:10 +0000)
committerstansmith <stansmith@ad392aa1-c5ef-ae45-8dd8-e69d62a5ef86>
Mon, 23 Nov 2009 20:10:16 +0000 (20:10 +0000)
git-svn-id: svn://openib.tc.cornell.edu/gen1/trunk@2595 ad392aa1-c5ef-ae45-8dd8-e69d62a5ef86

45 files changed:
WinOF/BuildRelease.bat
WinOF/WIX/HPC/HPC.inc
WinOF/WIX/HPC/readme-HPC.txt
WinOF/WIX/README.txt
WinOF/WIX/README_release.txt
WinOF/WIX/Release_notes.htm
WinOF/WIX/WIX_tools/README.txt
WinOF/WIX/common/DAT_config.inc
WinOF/WIX/common/Docs.inc
WinOF/WIX/common/IBcore.inc
WinOF/WIX/common/InstallExecuteSeq.inc
WinOF/WIX/common/Makefile.inc
WinOF/WIX/common/OpenSM_service.inc
WinOF/WIX/common/PgmMenuShortcuts.inc [new file with mode: 0644]
WinOF/WIX/common/UserInterface.inc
WinOF/WIX/common/WinOF_cfg.inc
WinOF/WIX/common/arp.inc
WinOF/WIX/common/checked.inc
WinOF/WIX/common/dapl_rt.inc
WinOF/WIX/common/hca_filters.inc
WinOF/WIX/common/ib_sdk.inc
WinOF/WIX/common/iou.inc
WinOF/WIX/common/ipoib.inc
WinOF/WIX/common/mlnx_drivers.inc
WinOF/WIX/common/qlgc_vnic.inc
WinOF/WIX/common/requirements.inc
WinOF/WIX/common/srp.inc
WinOF/WIX/common/std_features.inc
WinOF/WIX/common/tools.inc
WinOF/WIX/common/winverbs_OFED.inc
WinOF/WIX/common/winverbs_drivers.inc
WinOF/WIX/sign-all-drivers.bat
WinOF/WIX/win7/ia64/Makefile
WinOF/WIX/win7/ia64/wof.wxs
WinOF/WIX/win7/x64/Makefile
WinOF/WIX/win7/x64/wof.wxs
WinOF/WIX/win7/x86/wof.wxs
WinOF/WIX/wlh/ia64/wof.wxs
WinOF/WIX/wlh/x64/Makefile
WinOF/WIX/wlh/x64/wof.wxs
WinOF/WIX/wlh/x86/wof.wxs
WinOF/WIX/wnet/ia64/wof.wxs
WinOF/WIX/wnet/x64/wof.wxs
WinOF/WIX/wnet/x86/wof.wxs
WinOF/WIX/wxp/x86/wof.wxs

index 8d61c9d..8dc7264 100644 (file)
@@ -9,8 +9,8 @@ rem           in %IDIR%
 rem\r
 rem BuildRelease option\r
 rem  option: all | allnoforce | allf | compile | compilenoforce | compf path |\r
-rem          makebin | msi |sign | wix | clean | msi-label | msi-del |\r
-rem          msi-dir {OPENIB_REV}\r
+rem          compnf path | makebin | msi |sign | wix | clean | msi-label |\r
+rem          msi-del | msi-dir {OPENIB_REV}\r
 \r
 rem This script is an 'example' of a one-command entire IB stack build to\r
 rem single-file installer; used to build a WinOF releases.\r
@@ -34,11 +34,13 @@ if "%1" == "allf" (
 if "%1" == "compile" goto OK\r
 if "%1" == "compilenoforce" goto OK\r
 if "%1" == "compf" (\r
+:cpf\r
     if "%2" == "" goto usage\r
     if exist "%2" goto OK\r
        echo %0 Err - path .\%2 does not exist?\r
        exit /B 1\r
 )\r
+if "%1" == "compnf" goto cpf\r
 if "%1" == "makebin" goto OK\r
 if "%1" == "msi" goto OK\r
 if "%1" == "sign" goto OK\r
@@ -63,6 +65,7 @@ echo                sign drivers and build installers.
 echo    compile - force a recompile/link of everything then exit.\r
 echo    compilenoforce - recompile/link only if needed then exit.\r
 echo    compf path - force recompile (all arch*) specified folder\r
+echo    compnf path - No-force recompile (all arch*) specified folder\r
 echo    makebin - assumes binaries are built, installs binaries to WIX tree\r
 echo              then exit.\r
 echo    msi - assumes binaries are installed in WIX tree, signs drivers and\r
@@ -96,9 +99,10 @@ rem assumes %CD% == '<...>\gen1\trunk'
 set BSE=%CD%\r
 set WIX=%CD%\WinOF\WIX\r
 \r
-rem Use Wix V2 binaries.\r
-rem set WIX_BIN=wix-2.0.5325.0-binaries\r
-set WIX_BIN=wix-2.0.5805.0-binaries\r
+rem Setup Wix 3.0 items\r
+\r
+set WIX_BIN=wix3.0.5419.0-binaries\r
+\r
 \r
 set RBIN_W7=%WIX%\win7\bin%\r
 set RBIN_WLH=%WIX%\wlh\bin%\r
@@ -143,10 +147,10 @@ if "%1" == "sign" goto chk_cert
 goto cert_OK\r
 \r
 :chk_cert\r
-    if "%CERTFILE%" == "noCert" set /P CERTFILE=[Enter Certificate FileName] \r
+    if "%CERTFILE%" == "noCert" set /P CERTFILE=[Enter Cross Certificate FileName] \r
     if "%CERTFILE%" == "" (\r
         echo %0\r
-        echo %0: Err - driver signing certificate filename required.\r
+        echo %0: Err - MS cross certificate %CERTFILE% required.\r
         echo %0: see certmgr.exe\r
         exit /B 1\r
     )\r
@@ -203,13 +207,12 @@ rem set USE_SVN=1748
 set USE_SVN=latest\r
 \r
 if "%1" == "allf" (\r
+:fp\r
        set FPATH=%2\r
        goto svn\r
 )\r
-if "%1" == "compf" (\r
-       set FPATH=%2\r
-       goto svn\r
-)\r
+if "%1" == "compf" goto fp\r
+if "%1" == "compnf" goto fp\r
 \r
 rem setup value for OPENIB_REV assignment; AND supported by if would be nice.\r
 if not "%2" == "" (\r
@@ -329,7 +332,7 @@ if NOT EXIST "%IDIR%" (
     exit /B 1\r
 )\r
 \r
-rem Verify WIX 2.0 toolset is available - if not, download from\r
+rem Verify WIX toolset is available - if not, download from\r
 rem http://sourceforge.net/project/showfiles.php?group_id=105970&package_id=114109\r
 rem   select wix-2.0.5805.0-binaries.zip download and unzip to\r
 rem   <...>\WinOF\WIX\WIX_tools\\r
@@ -394,6 +397,10 @@ if "%1" == "compf" (
     rem Force Compile everything\r
     set OPS=-wgcfPM 3\r
 )\r
+if "%1" == "compnf" (\r
+    rem Force Compile everything\r
+    set OPS=-wgPM 3\r
+)\r
 \r
 if "%1" == "all" (\r
     echo Removing build artifacts and folders...\r
@@ -419,7 +426,7 @@ set WINOF_PATH=%CD%
 set OPENIB_REV=%SVN%\r
 if not DEFINED PLATFORM_SDK_PATH  set PLATFORM_SDK_PATH=%_PSDK%\r
 \r
-rem Compile in a specific folder? compf | allf\r
+rem Compile in a specific folder? compf | compnf | allf\r
 if EXIST "%FPATH%" pushd %FPATH%\r
 \r
 rem ********* Compile for win7 - Windows 7\r
@@ -508,10 +515,11 @@ echo %0 - Build WNET ia64 Free
 %COMSPEC% /C "%BSE%\etc\bldwo.bat fre ia64 2003 %OPS%"\r
 if ERRORLEVEL 1 exit /B 1\r
 \r
-rem compf | allf\r
+rem compnf | compf | allf\r
 if EXIST "%FPATH%" popd\r
 \r
 if "%1" == "compf" goto finito\r
+if "%1" == "compnf" goto finito\r
 if "%1" == "compile" goto finito\r
 if "%1" == "compilenoforce" goto finito\r
 \r
@@ -561,7 +569,7 @@ if "%1" == "makebin" goto finito
 :mk_msi\r
 \r
 echo %0 - Drivers Signed with %CERTFILE%\r
-echo   Binary releases created in\r
+echo   Binary release trees created in\r
 if "%WIN7%" == "yes"  echo     %RBIN_W7%\r
 echo     %RBIN_WLH%\r
 echo     %RBIN_WNET%\r
index 9d25961..65d1be0 100644 (file)
@@ -5,20 +5,20 @@
 \r
             <CreateFolder />\r
 \r
-            <File Id="cert_add.bat" Compressed="yes" DiskId="1"\r
-                     LongName="cert-add.bat" Name="cert-add.bat"\r
+            <File Id="cert_add.bat" DiskId="1"\r
+                     Name="cert-add.bat"\r
                      Source="..\..\HPC\cert-add.bat" />\r
-            <File Id="rem_cert_add.bat" Compressed="yes" DiskId="1"\r
-                     LongName="rem-cert-add.bat" Name="remC-add.bat"\r
+            <File Id="rem_cert_add.bat" DiskId="1"\r
+                     Name="rem-cert-add.bat"\r
                      Source="..\..\HPC\rem-cert-ADD.bat" />\r
-            <File Id="OFA_cert_install.bat" Compressed="yes" DiskId="1"\r
-                     LongName="OFA-cert-install.bat" Name="Cinstall.bat"\r
+            <File Id="OFA_cert_install.bat" DiskId="1"\r
+                     Name="OFA-cert-install.bat"\r
                      Source="..\..\HPC\OFA-cert-install.bat" />\r
-            <File Id="WinOF_install.bat" Compressed="yes" DiskId="1"\r
-                     LongName="WinOF-install.bat" Name="Winstall.bat"\r
+            <File Id="WinOF_install.bat" DiskId="1"\r
+                     Name="WinOF-install.bat"\r
                      Source="..\..\HPC\WinOF-install.bat" />\r
-            <File Id="readme_HPC.txt" Compressed="yes" DiskId="1"\r
-                     LongName="readme-HPC.txt" Name="readme.txt"\r
+            <File Id="readme_HPC.txt" DiskId="1"\r
+                     Name="readme-HPC.txt"\r
                      Source="..\..\HPC\readme-HPC.txt" />\r
           </Component>\r
    </Directory>\r
index ee9760c..8df14aa 100644 (file)
@@ -1,12 +1,25 @@
 [7-28-09] stan.\r
 \r
 Files in this folder are Windows Server 2008 HPC specific.\r
+For full HPC install details,\r
+see Start-->All Programs-->Windows OpenFabrics-->WinOF Release Notes-->HPC Install\r
 \r
 cert_add.bat\r
   Extract OFA Trusted Publisher certificate from the head-node local certificate\r
   store to a local file OFA_TP.cer, then insert OFA_TP.cer into remote node's\r
   Trusted Publisher certificate store by calling '.\rem-cert-add.bat'.\r
 \r
+  For the example, assume \\HN\WOF is the compute node visible share name;\r
+  head-node local name is \Program Files\Microsoft HPC Pack\Data\InstallShare\WOF\r
+\r
+ First extract OFA TP certificate into a remote node visible share file OFA_TP.cer,\r
+ creates \\HN\WOF\OFA_TP.cer & \\HN\WOF\rem-cert-ADD.bat\r
+\r
+    cert-add \\HN\WOF\r
+\r
+    Instert OFA TP certificate into a remote node's Trusted Publisher Store\r
+    cert-add \\HN\WOF cn01 cn02 cn03 [...]\r
+\r
 rem-cert-add.bat\r
   Add Trusted Publisher certificate to local node's TP store. Can be run via\r
   clusrun.exe or locally as a WDM provisioning template step.\r
index 3005787..d8846f3 100644 (file)
@@ -1,4 +1,4 @@
-[04-10-09]\r
+[09-30-09]\r
 \r
 How to generate a Windows OpenFabrics Release (WinOF) using the WIX 2.0 open\r
 source installer tool set ( http://sourceforge.net/projects/wix/ ).\r
@@ -16,7 +16,7 @@ WinOF Revisions: (based on)
   1.1  svn.1177\r
   2.0  svn.1763\r
   2.0.2        svn.1975\r
-\r
+  2.1   svn.2476\r
 \r
 \r
 Creating a binary release tree\r
index 89afa5e..f3c0e0d 100644 (file)
 \r
-[6-23-09] WinOF 2.1 (pre-RC0) release\r
+[12-20-09] WinOF 2.2 RC0 Release\r
 \r
-Downloads available at http://www.openfabrics.org/downloads/WinOF/v2.1_rc0\r
+Release available @ http://www.openfabrics.org/downloads/WinOF/v2.2_RC0\r
 \r
+Please address comments and concerns to https://bugs.openfabrics.org and/or the\r
+Windows OpenFabrics email list ofw@lists.openfabrics.org \r
 \r
-WinOF 2.1 Summary Changes \r
--------------------------\r
 \r
-1) The WinOF 2.1 release is based on openib-windows source svn revision\r
-   (branches\WOF2-1 svn.2272).\r
+WinOF Release Summary\r
+-----------------\r
 \r
-   Last WinOF release (2.0.2) based on svn.1975.\r
+1) The WinOF 2.2 release is based on openib-windows source svn revision\r
+   (branches\WOF2-2 svn.25XX).\r
+\r
+   Last WinOF release (2.1) based on svn.2476.\r
+\r
+2) Features\r
+\r
+   NDIS 6 IPoIB for Server 2008, Svr 2008 R2, Windows 7 and Vista\r
+\r
+   NDIS 5.3 IPoIB for Server 2003 64/32 & XP\r
+\r
+   uDAPL 2.0.24 code base, uDAT/uDAPL version 2.0 only.\r
+\r
+   Support for new Mellanox devices: XXX YYY\r
+\r
+   WIX 3.0 WinOF installer\r
 \r
 2) Bug fixes in\r
 \r
    IB Core\r
    IPoIB\r
    WSD\r
-   SRP\r
    DAT/DAPL\r
    WinVerbs\r
    WinMAD\r
    OFED (Open Fabrics Enterprise Distribution [Linux]) verbs API\r
-   OFED Diagnostic utilities\r
    WinOF Installer\r
 \r
-3) Integrated Functionality\r
-\r
-  - OFED Compatibility layers allow for easy porting of OFED applications\r
-    into the WinOF environment.\r
-        libibverbs - OFED verbs API library.\r
-        libmad - InfiniBand MAD (Management Datagram) library.\r
-        libumad - IB MAD exported user-mode interface library.\r
-        librdmacm - OFED RDMA CM (Comunications Manager).\r
-\r
-  - OFED Fabric Diagnostics available ( for usage info, see --help ).\r
-       ibaddr - query InfiniBand address(es)\r
-       ibnetdiscover - generate a fabric topology.\r
-       iblinkinfo - report link info for all links in the fabric\r
-       ibping - ping an InfiniBand address\r
-       ibportstate - manage IB port (physical) state and link speed\r
-       ibqueryerrors - query and report non-zero IB port counters\r
-       ibroute - query InfiniBand switch forwarding tables\r
-       ibstat - display HCA information.\r
-       ibsysstat - system status for an InfiniBand address\r
-       ibtracert - trace InfiniBand path\r
-       saquery - SA (Subnet Administrator) query test.\r
-       sminfo - query InfiniBand SMInfo attributes\r
-       smpdump - dump InfiniBand subnet management attributes\r
-       smpquery - query InfiniBand subnet management attributes\r
-       vendstat - query InfiniBand vendor specific functions\r
-\r
-  - Connected mode IPoIB ensures higher performance IPoIB transfers in\r
-     addition to OFED (Linux) IPoIB connectivity.\r
-\r
-  - All WinOF installs now utilize the Windows Driver Store along with the\r
-     Plug-n-Play (PNP) subsystem to install the correct HCA driver(s).\r
-     Selection of a specific Mellanox HCA type is no longer required.\r
-\r
-  - Server 2008-HPC install support has been enhanced to provide a no-drivers\r
-     installed mode to ease WinOF installation when drivers have been previously\r
-     installed with WDM (Windows Deployment Manager) node templates.\r
-     From an msiexec.exe command line when NODRV=1, device driver '.inf' files\r
-     are not processed during the WinOF install.\r
-     The base assumption is the WDM node provisioning template (see cluster\r
-     Manager) will install WinOF drivers. All other WinOF files are installed\r
-     to the standard WinOF location '%ProgramFiles(x86)%\WinOF'.\r
-     When uninstalling a WinOF install which was done with NODRV=1, you MUST\r
-     include NODRV=1 on the msiexec.exe uninstall command line or the uninstall\r
-     will uninstall WinOF drivers installed via WDM templates.\r
-\r
-     Examples\r
-\r
-        unattended install (for use with clusrun.bat)\r
-           start/wait msiexec /I WOF.msi /quiet NODRV=1\r
-\r
-        console based non-interactive install:\r
-           start/wait msiexec /I WOF.msi /passive NODRV=1\r
-\r
-        Install selectable features (No drivers):\r
-          start/wait msiexec /I WOF.msi NODRV=1\r
-\r
-        Extract WinOF install files (aka driver files for WDM install)\r
-          start/wait msiexec /A WinOF_wlh_x64.msi TARGETDIR=%TEMP%\r
-\r
-          The folder %TEMP%\PFiles\WinOF will be created.\r
-\r
-        console based unattended uninstall with auto-reboot:\r
-          start/wait msiexec /X WOF.msi /passive\r
-\r
-        clusrun unattended uninstall with auto-reboot\r
-          start/wait msiexec /X WOF.msi /quiet /forcereboot\r
-\r
-  - Subnet Management started as a local Windows Service from a command line:\r
-        start/wait msiexec /I WOF.msi /passive OSMS=1\r
-\r
-  - HCA drivers now load WinVerbs and WinMad filter drivers by default.\r
-\r
-\r
-\r
-Note on Vista installs Only:\r
-\r
-  Vista installs must be performed from an Administrator priviledged command\r
-  window. Right-clicking the .msi installer file for a Vista installation\r
-  will fail due to insufficent privileges to install the HCA driver!\r
-  From the Administrator privileged cmd-window (Interactive install) say\r
-\r
-    start/wait msiexec /I WinOF_wlh_xxx.msi\r
-          -or-\r
-    a quiet, default install:  start/wait msiexec /I WinOF_wlh_xxx.msi /passive\r
-\r
 \r
 **** WARNING ****\r
 \r
-After the WinOF.msi file has started installation execution, an errant\r
-"Welcome to the Found New Hardware Wizard" window 'may' popup.\r
+After the WinOF.msi file has started installation, an errant\r
+"Welcome to the Found New Hardware Wizard" window 'may' popup; XP & Svr 2003.\r
 \r
 Just ignore or 'cancel' the errant FNHW popup window in order to proceed with\r
-the installation. XP requires a cancel, for WLH & WNET, the notifiers will\r
+the installation. XP requires a cancel, for WLH & WNET, the notifier will\r
 disappear on their own. \r
 \r
-You do need to answer 'Yes' or 'Continue' to those popup windows which refer to\r
-non-WHQL'ed drivers.\r
+You do need to answer 'Yes' or 'Continue' to popup windows which refer to\r
+Non-Logo'ed (aka, Non-WHQL'ed) drivers.\r
 \r
 If the install appears to hang, look around for popup windows requesting input\r
-which are covered by other windows. Such is the case on Server 2008 initial \r
-install - Answer 'yes' to always trust the OpenFabrics Alliance as a SW\r
-publisher.\r
-\r
+which are covered by other windows.\r
+Such is the case on Server 2008 initial install - Answer 'yes' to always trust\r
+the OpenFabrics Alliance as a SW publisher.\r
 \r
 \r
 Please:\r
-  read the Release_notes.htm file!\r
-  make 'sure' your HCA firmware is recent; vstat.exe displays HCA firmware\r
-  version.\r
+  Read the Release_notes.htm file!\r
 \r
-thank you,\r
+  make 'sure' your HCA firmware is recent:\r
+      vstat.exe displays HCA firmware version & PSID.\r
+      flint.exe (only in Mellanox firmware tools dist) displays PSID.\r
 \r
-WinOF Developers.\r
+Thank you,\r
 \r
+WinOF Developers.\r
index 42a907a..1eb3a3b 100644 (file)
@@ -89,10 +89,10 @@ src=openfabrics.gif></h1>
 \r
 <h1 align=center style='text-align:center'>Windows OpenFabrics </h1>\r
 \r
-<h1 align=center style='text-align:center'><a name="WinOF_Release_Notes">2.1 Release Notes</a></h1>\r
+<h1 align=center style='text-align:center'><a name="WinOF_Release_Notes">2.2 Release Notes</a></h1>\r
 \r
 <h3 align=center style='text-align:center'>\r
-<!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%m/%d/%Y" startspan -->07/13/2009<!--webbot bot="Timestamp" endspan i-checksum="12564" --></h3>\r
+<!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%m/%d/%Y" startspan -->11/20/2009<!--webbot bot="Timestamp" endspan i-checksum="12513" --></h3>\r
 \r
 <div class=MsoNormal align=center style='text-align:center'>\r
 \r
@@ -150,24 +150,23 @@ InfiniBand fabric.</span></p>
 \r
 <p class=MsoPlainText><span style='font-size:12.0pt;font-family:"Arial"'>&nbsp;Binary\r
 files generated from the OpenIB-windows developers subversion (svn) source tree </span>\r
-<font face="Arial">'svn://openib.tc.cornell.edu'<span style='font-size:12.0pt;'> \r
-(branches\WOF2-1 svn revision <font color="#FF0000">1835</font>)\r
-are packaged into a <a href="http://www.dalun.com/wix/default.htm">WIX 2.0 \r
+<font face="Arial">'<font size="3">svn://openib.tc.cornell.edu</font>'<span style='font-size:12.0pt;'> \r
+(branches\WOF2-2 svn revision <font color="#FF0000">2476</font>)\r
+are packaged into a <a href="http://www.dalun.com/wix/default.htm">WIX \r
 (Windows Installer Xml)</a> single file install package referred to as the \r
-Windows OpenFabrics&nbsp;(WinOF) release 2.1.</span></font><span style='font-size:12.0pt;font-family:"Times New Roman"'><br>\r
+Windows OpenFabrics&nbsp;(WinOF) release 2.2.</span></font><span style='font-size:12.0pt;font-family:"Times New Roman"'><br>\r
 &nbsp;</span></p>\r
 <p class=MsoPlainText><font size="3"><span style="font-family: Arial">\r
-This WinOF 2.1 is a full release as it contains WHQL fixes \r
-to numerous components along with full Winverbs and OFED integration modules:</span></font></p>\r
+This WinOF 2.2 is a full release as it contains:</span></font></p>\r
 \r
 </div>\r
 <ul>\r
        <li>\r
-       <p class="MsoPlainText"><font face="Arial" size="3">Windows Server \r
-       2008, HPC and Vista are supported.</font></p></li>\r
+       <p class="MsoPlainText"><font face="Arial" size="3">Windows 7 and Windows Server \r
+       2008 R2 and HPC SP2 are now supported.</font></p></li>\r
        <li>\r
        <p class="MsoPlainText"><font face="Arial" size="3">Network Direct \r
-       supported on Server 2008/HPC.</font></p></li>\r
+       supported on Server 2008/HPC and Server 2008 R2/HPC (SP2).</font></p></li>\r
        <li>\r
        <p class="MsoPlainText"><font face="Arial" size="3">Mellanox ConnectX(mlx4) drivers \r
        enhanced for increased performance and stability.</font></p></li>\r
@@ -180,16 +179,16 @@ to numerous components along with full Winverbs and OFED integration modules:</s
        enables easy porting of Linux OFED applications into the WinOF environment.</font></p>\r
        </li>\r
        <li>\r
-       <p class="MsoPlainText"><font face="Arial" size="3">QLogic has \r
-       enhanced VNIC &amp; SRP for increased performance and stability.</font></p>\r
-       </li>\r
-       <li>\r
        <p class="MsoPlainText"><font face="Arial" size="3">uDAT/DAPL is now a \r
        common code base with OFED uDAT/DAPL; supported DAPL providers: IBAL, \r
        socket-cm and rdma-cm.</font></p></li>\r
        <li>\r
-       <p class="MsoPlainText"><font face="Arial" size="3">Bug fixes for stability in IBcore, WSD, VNIC, SRP, IPoIB, DAT/DAPL</font></p>\r
-       </li>\r
+       <p class="MsoPlainText"><font face="Arial" size="3">Bug fixes for stability in IBcore, \r
+       ConnectX, WSD, NetworkDirect, VNIC, SRP, IPoIB, DAT/DAPL</font></p></li>\r
+       <li>\r
+       <p class="MsoPlainText"><font face="Arial" size="3">\r
+       <a href="http://www.wixwiki.com/index.php?title=Main_Page">WIX 3.0</a> based \r
+       installer</font></p></li>\r
 </ul>\r
 <div class=Section1>\r
 \r
@@ -201,18 +200,22 @@ OpenFabrics InfiniBand core drivers and Upper Level Protocols (ULPs):</font></p>
        <p style="text-indent: -.25in; margin-left: .5in"><font face="Arial"><span dir="LTR">HCA \r
        Drivers - </span>\r
        <span style='background-position: 0% 0%; mso-highlight:yellow; background-image:none; background-repeat:repeat; background-attachment:scroll' dir="LTR">&nbsp;Mellanox \r
+       : \r
        </span>\r
        <st1:stockticker>\r
        <span\r
  style='background-position: 0% 0%; mso-highlight:yellow; background-image:none; background-repeat:repeat; background-attachment:scroll'>\r
-       InfiniHost &amp; ConnectX</span></st1:stockticker><span\r
-style='background-position: 0% 0%; mso-highlight:yellow; background-image:none; background-repeat:repeat; background-attachment:scroll'> low level drivers; See list of\r
-supported devices below</span></font></li>\r
+       ConnectX &amp; </span></st1:stockticker>\r
+       <st1:stockticker>\r
+       <span\r
+ style='background-position: 0% 0%; mso-highlight:yellow; background-image:none; background-repeat:repeat; background-attachment:scroll'>\r
+       InfiniHost</span></st1:stockticker><span\r
+style='background-position: 0% 0%; mso-highlight:yellow; background-image:none; background-repeat:repeat; background-attachment:scroll'> low level drivers.</span></font></li>\r
        <li>\r
        <p style="text-indent: -.25in; margin-left: .5in">\r
        <font face="Arial">\r
        <span style="background-position: 0% 0%">Infiniband Core components: IBAL, \r
-       WInverbs, Winmad, OFED verbs and rdma_cm.</span></font></li>\r
+       Winverbs, Winmad, OFED verbs and rdma_cm.</span></font></li>\r
        <li>\r
        <p style="text-indent: -.25in; margin-left: .5in"><font face="Arial">Upper Layer Protocols: \r
        IPoIB, WSD, ND, VNIC, SRP Initiator and DAT/DAPL</font></li>\r
@@ -229,7 +232,7 @@ supported devices below</span></font></li>
        tests</span></font></p></li>\r
        <li>\r
        <p style='margin-left:.5in;text-indent:-.25in'><font face="Arial"><span dir="LTR">\r
-       OFED Diagnostic tools</span></font></p>\r
+       OFED Diagnostics</span></font></p>\r
        </li>\r
 </ul>\r
 \r
@@ -269,18 +272,24 @@ supported devices below</span></font></li>
 <ul>\r
        <li>\r
        <p style='margin-left:.5in;text-indent:-.25in'><font face="Arial"><span dir="LTR">Windows \r
-       Server 2008</span></font></p>\r
+       Server 2008 R2</span></font></p>\r
        </li>\r
        <li>\r
-       <p style='margin-left:.5in;text-indent:-.25in'><font face="Arial">Windows \r
-       Server 2008 R2</font></p>\r
+       <p style='margin-left:.5in;text-indent:-.25in'><font face="Arial"><span dir="LTR">Windows \r
+       Server 2008 R2 + HPC SP2</span></font></p>\r
+       </li>\r
+       <li>\r
+       <p style='margin-left:.5in;text-indent:-.25in'><font face="Arial">Windows 7</font></p>\r
        </li>\r
        <li>\r
+       <p style='margin-left:.5in;text-indent:-.25in'><font face="Arial">Windows \r
+       Server 2008</font></p></li>\r
+       <li>\r
        <p style='margin-left:.5in;text-indent:-.25in'><font face="Arial">\r
-       <span dir="LTR">Vista</span></font></p></li>\r
+       <span dir=LTR>Windows Server 2008 HPC</span></font></p></li>\r
        <li>\r
        <p style='margin-left:.5in;text-indent:-.25in'><font face="Arial">\r
-       <span dir=LTR>Windows Server 2008 HPC Edition</span></font></p></li>\r
+       <span dir="LTR">Vista</span></font></p></li>\r
        <li>\r
        <p style='margin-left:.5in;text-indent:-.25in'><font face="Arial">\r
        <span dir="LTR">Windows Server 2003 \r
@@ -292,7 +301,7 @@ supported devices below</span></font></li>
 \r
 <h4><u>Supported HCAs (Host Channel Adapters)</u></h4>\r
 \r
-<p><font face="Arial">Mellanox: all InfiniBand HCA products are supported.<br><br>\r
+<p><font face="Arial">Mellanox - all InfiniBand HCA products are supported.<br><br>\r
 <a href="http://www.mellanox.com/content/pages.php?pg=firmware_download">\r
 Mellanox Firmware (FW) versions and update tools</a><br>\r
 <br>\r
@@ -327,15 +336,15 @@ Current HCA firmware version can be viewed from the 'vstat' command.</font></p>
 <h2><u><a name="Installation_Specifics">Installation </a></u>\r
 <a name="Installation_Specifics"><u>Notes</u></a></h2>\r
 \r
-<p><font face="Arial">User mode tools and diagnostics are installed in '%SystemDrive%\Program\r
-Files (x86)\WinOF'.&nbsp; Although device driver modules initially reside in \r
-'%SystemDrive%\Program Files (x86)\WinOF\Drivers', when installed the Windows device \r
+<p><font face="Arial">User mode tools and diagnostics are installed in '%SystemDrive%\Program \r
+Files\WinOF'.&nbsp; Although device driver modules initially reside in \r
+'%SystemDrive%\Program Files\WinOF\Drivers', when installed the Windows device \r
 installer copies driver files to %SystemRoot%\system32 &amp; %SystemRoot%\SysWOW64'. \r
 DAT &amp; DAPL runtime libraries are installed into %SystemRoot% in order to be \r
 accessible to user mode applications.<br>\r
 WinOF user mode executables are designed to be run from\r
 a Command Prompt window; see&nbsp; 'Start-&gt;Program Files-&gt; Windows OpenFabrics-&gt; Command Prompt'. </font></p>\r
-<p><font face="Arial">'%SystemDrive%\Program Files (x86)\WinOF' is appended to the system wide search \r
+<p><font face="Arial">'%SystemDrive%\Program Files\WinOF' is appended to the system wide search \r
 path environment variable 'PATH'; new command windows created after the installation will have the updated \r
 %PATH% environment variable, hence will be able to access WinOF executables.</font></p>\r
 \r
@@ -351,7 +360,7 @@ WinOF install will install OpenSM as a Windows service which
 is disabled; after an installation, choose your openSM node and start the openSM \r
 service.&nbsp; \r
 See the WinOF Manual for details on opensm as a service.<br>\r
-By selecting the 'OpenSM_Service_Enabled' install feature, an OpenSM subnet \r
+By selecting the 'OpenSM_Service_Enabled' install feature, a local OpenSM subnet \r
 management service will be automatically started. </font> </p>\r
 \r
 <p><font face="Arial">Note, the opensm.exe process must continue to run in order\r
@@ -371,8 +380,9 @@ OpenFabrics manual.</font></p>
 \r
 <h3>Summary</h3>\r
 <ul>\r
-       <li><font face="Arial">Double-click the .msi installer file. <b>Except for \r
-       Vista: </b>from an administrator command window, execute 'msiexec /I \r
+       <li><font face="Arial">Double-click the .msi installer file, <b>Except for \r
+       Vista. </b></font></li>\r
+       <li><font face="Arial">For Vista installs, from an privileged administrator command window, execute 'msiexec /I \r
        WinOF_2-1_wlh_xxx.msi'.</font></li>\r
 </ul>\r
 <h3>Requirements</h3>\r
@@ -422,7 +432,7 @@ window and type</font></p>
 <p><font face="Arial">&nbsp;&nbsp;&nbsp; start/wait msiexec /I WinOF_2-1_wlh_xxx.msi</font></p>\r
 <p><font face="Arial">For all other Windows variants, double-clicking the installer file (.msi) \r
 works correctly to start a WinOF installation.<br>\r
-From a login session with administrator privileges, double-click the WinOF_M-m{-p}_OSE_arch.msi file to begin the Windows OpenFabrics \r
+From a login session with administrator privileges, File Explorer view, double-click the WinOF_M-m{-p}_OSE_arch.msi file to begin the Windows OpenFabrics \r
 installation.</font></p>\r
 <p><font face="Arial">Where 'M-n{-p}' indicates Major release number, Minor release number, and \r
 optional point-release number.</font></p>\r
@@ -600,7 +610,7 @@ system</font></p>
 <BLOCKQUOTE></BLOCKQUOTE>\r
 <h2><u><a name="Server_2008_HPC_Install_Notes">Server 2008 HPC Install Notes</a></u></h2>\r
 <p><font face="Arial">Device drivers in WinOF 2.0 and later releases are Digitally \r
-signed by the OpenFabrics Alliance, although they are not WHQL'ed (Windows Quality Hardware Labs) certified. \r
+signed by the 3rd party Software Publisher 'OpenFabrics Alliance', although they are not WHQL'ed (Windows Quality Hardware Labs) certified. \r
 The WinOF source code is used&nbsp; by hardware vendors to achieve WHQL \r
 certification.</font></p>\r
 <p><font face="Arial">The lack of WHQL driver certification places WinOF drivers \r
@@ -608,8 +618,8 @@ in the 'unknown 3rd party SW publishers' category. <br>
 When installing 'Unknown 3rd party SW publishers' drivers, Windows prompts on \r
 the install console for instructions as what to do (Install, Trust or not)?<br>\r
 This prompting results in a failed remote node install when performing a \r
-first-time unattended WinOF install.<br>\r
-By preloading the remote node's Trusted 3rd party Software Publisher certificate \r
+<font color="#FF0000">first-time</font> unattended WinOF install.<br>\r
+By preloading the remote node's Trusted 3rd party Software Publisher Certificate \r
 Store, the unattended install will proceed without prompting, thus allowing the WinOF install to complete \r
 successfully.</font></p>\r
 <p><font face="Arial">Be aware: if a node is reimaged (same or different template applied) the \r
@@ -618,9 +628,8 @@ needs to be reinstalled.</font></p>
 <p><font face="Arial">How to install WinOF drivers and components in the HPC \r
 Server 2008 environment.</font></p>\r
 <ul>\r
-       <li><font face="Arial">Add the OpenFabrics Alliance public key digital \r
-       certificate to the head-node's Trusted Publisher Certificate store by</font><ul>\r
-       <li><font face="Arial">Installing&nbsp; WinOF on the head node - start Open Subnet \r
+       <li><font face="Arial">Add the OpenFabrics Alliance Trusted SW Publisher certificate to the head-node's Trusted Publisher Certificate store by</font><ul>\r
+       <li><font face="Arial">Installing&nbsp;WinOF on the head node - start Open Subnet \r
        Manager if needed, otherwise depend on another OpenSM on the IB fabric.</font></li>\r
        <li><font face="Arial">Our recommendation is to install WinOF on the \r
        head-node; Set head-node IPoIB interface IPv4 address after WinOF install.</font></li>\r
@@ -639,7 +648,7 @@ Server 2008 environment.</font></p>
 </ul>\r
        </li>\r
        <li><font face="Arial">Once the OFA certificate is installed, it will remain \r
-       until the node is wiped clean by WDM reprovisioning.<br>\r
+       until the node is wiped clean by reprovisioning.<br>\r
 &nbsp;</font></li>\r
        <li><font face="Arial">If remote nodes are <b>operational </b>(booted &amp; \r
        network accessible), then run the digital certificate install script 'cert-add.bat' \r
@@ -648,11 +657,14 @@ Server 2008 environment.</font></p>
        <li><font face="Arial">CD your administrator command window to the WinOF \r
        folder which contains the 'cert-add.bat' script file. </font></li>\r
        <li><font face="Arial">If WinOF was installed on the head-node, then 'cd /d \r
-       %ProgramFiles(x86)%\WinOF </font></li>\r
+       %ProgramFiles%\WinOF </font></li>\r
        <li><font face="Arial">Otherwise unpack, not install, the WinOF files to \r
        gain access to cert-add.bat file by executing the following commands:</font><ul>\r
-               <li><font face="Arial">msiexec /A WinOF_2-1_wlh.msi TARGETDIR=%TEMP%</font></li>\r
-               <li><font face="Arial">cd /d %TEMP%\PFiles\WinOF</font></li>\r
+               <li><font face="Arial">Folder %TARGETDIR% folder must not exist, msiexec \r
+               /A will create it.</font></li>\r
+               <li><font face="Arial">msiexec /A WinOF_2-1_wlh.msi TARGETDIR=%TEMP%\WOF&nbsp;&nbsp;&nbsp; \r
+               # WOF folder does not exist.</font></li>\r
+               <li><font face="Arial">cd /d %TEMP%\WOF\PFiles\WinOF</font></li>\r
        </ul></li>\r
 </ul>\r
        <ul>\r
@@ -663,47 +675,116 @@ Server 2008 environment.</font></p>
                certificate to the local store.</font></li>\r
                <li><font face="Arial">Cert add command format:&nbsp; cert-add&nbsp;&nbsp;&nbsp; \r
                share-folder&nbsp;&nbsp; list-of-remote-nodes</font></li>\r
-               <li><font face="Arial">example:&nbsp; cert-add\r
-               <a href="file://orion-hn/winof">\\orion-hn\winof</a> cn01 cn02 cn03 cn04 \r
-               cn05<br>\r
+               <li><font face="Arial">For the examples, assume <a href="file://HN/WOF">\r
+               \\HN\WOF</a> is the compute node visible share name;<br>\r
+               head-node local name is \Program Files\Microsoft HPC Pack\Data\InstallShare\WOF<br>\r
+               Head-node uses remote share name \\HN\WOF.</font></li>\r
+               <li><font face="Arial">First extract OFA TP certificate to remote \r
+               node visible share, creates\r
+               <a href="file://orion-hn/winof">\\HN\WOF\OFA_TP.cer</a> &amp;\r
+               <a href="file://orion-hn/winof">\\HN\WOF\rem-cert-ADD.bat</a><br>\r
+&nbsp;&nbsp;&nbsp; cert-add\r
+               <a href="file://orion-hn/winof">\\HN\WOF</a> </font></li>\r
+               <li><font face="Arial">example:&nbsp; add OFA Trusted Publisher \r
+               certificate to remote node's local certificate store<br>&nbsp;&nbsp;&nbsp; cert-add\r
+               <a href="file://orion-hn/winof">\\HN\WOF</a> cn01 cn02 cn03 cn04 \r
+               cn05</font></li>\r
+               <li></li>\r
+               <li><font face="Arial">For all compute nodes:&nbsp; clusrun /nodes:X&nbsp; msiexec /I\r
+               <a href="file://orion-hn/winof">\\HN\WOF\</a>WinOF_xxx_yyy.msi \r
+               /quiet /qn /Lv msi.log <br>&nbsp;</font></li>\r
+       </ul></li>\r
+       <li><font face="Arial"><b>Node Template Provisioning:</b> if remote nodes are <b>not \r
+       operational </b>(not yet provisioned) then do the following:</font><ul>\r
+       <li><font face="Arial">See %ProgramFiles%\WinOF\HPC\* for provisioning \r
+       example scripts; customization is required.<br>\r
+&nbsp;</font></li>\r
+       <li><font face="Arial">From the head node, extract the OFA certificate to a \r
+       file in the remote node visible share file OFA_TP.cer;<br>&nbsp;(example \r
+       Remote node visible share: \Program Files\Microsoft HPC Pack\Data\InstallShare\WOF&nbsp; \r
+       == \\HN\WOF)<br>\r
+&nbsp;&nbsp;&nbsp; Start --&gt;All Programs --&gt;Windows OpenFabric --&gt; WinOF Command \r
+       Window<br>\r
+&nbsp;&nbsp;&nbsp; cd HPC<br>\r
+&nbsp;&nbsp;&nbsp; cert-add <a href="file://orion-hn/winof">\\HN\WOF</a>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; \r
+       # <a href="file://orion-hn/winof">\\HN\WOF</a> is the remote node visible \r
+       share; create <a href="file://orion-hn/winof">\\HN\WOF</a>\OFA_TP.cer<br>&nbsp;</font></li>\r
+       <li><font face="Arial">copy the following files to (example: \Program \r
+       Files\Microsoft HPC Pack\Data\InstallShare\WOF)</font><ul>\r
+               <li><font face="Arial">WinOF installer .msi file</font></li>\r
+               <li><font face="Arial">%ProgramFiles%\WinOF\HPC\OFA-cert-install.bat</font></li>\r
+               <li><font face="Arial">%ProgramFiles%\WinOF\HPC\WinOF-install.bat<br>\r
 &nbsp;</font></li>\r
        </ul></li>\r
-       <li><font face="Arial">If remote nodes are <b>not </b>yet provisioned (not \r
-       running Windows), then do the following:</font><ul>\r
-       <li><font face="Arial">From the head node, extract OFA certificate to a \r
-       file:<br>\r
-       certutil -store TRUSTEDPUBLISHER 71175fca6b85d5c2e0864df16349ad84 OFA-TP.cer</font></li>\r
-       <li><font face="Arial">Place OFA-TP.cer in a remote node accessible share.</font></li>\r
-       <li><font face="Arial">As part of the node provisioning template process \r
-       before loading WinOF drivers, execute the certutil command on the remote \r
-       node:<br>\r
-&nbsp;certutil -addstore TRUSTEDPUBLISHER <a href="file://share/OFA_TP.cer">\r
-       \\share\OFA-TP.cer</a><br>\r
+       <li><font face="Arial">Verify you have the required WinOF provisioning files \r
+       in the remote node visible share:</font><ul>\r
+       <li><font face="Arial">WinOF installer .msi file, referenced in \r
+       WinOF-install.bat</font></li>\r
+       <li><font face="Arial">OFA-cert-install.bat</font></li>\r
+       <li><font face="Arial">WinOF-install.bat</font></li>\r
+       <li><font face="Arial">rem-cert-ADD.bat</font></li>\r
+       <li><font face="Arial">OFA_TP.cer<br>\r
 &nbsp;</font></li>\r
 </ul></li>\r
-       <li><font face="Arial">Run the cluster manager tool to create compute node \r
-       templates using WinOF drivers in %ProgramFiles(x86)%\Winof\IDrivers.</font></li>\r
-       <li><font face="Arial">Use 'cluster manager' to provision all compute nodes.</font></li>\r
-       <li><font face="Arial">Set IPoIB interface IPv4 address on all compute \r
-       nodes.</font></li>\r
-       <li><font face="Arial">At this juncture, the WinOF drivers are installed and \r
-       operational, although additional WInOF components are not; IB diags, DAPL &amp; \r
-       docs.</font></li>\r
-       <li><font face="Arial">To install remaining WinOF components without \r
-       installing device drivers, use the \r
-       unattended install process with NO Drivers:</font><ul>\r
-       <li><font face="Arial">Place WinOF_wlh_x64.msi in a remote node accessible \r
-       share</font></li>\r
-       <li><font face="Arial">&nbsp;Use the Cluster Manager tool to execute the \r
-       misexec command on all remote nodes to perform the WinOF install:<br>\r
-       'msiexec /I \\share-name\WinOF_wlh_x64.msi /qn /quiet NODRV=1'</font></li>\r
+       <li><font face="Arial">Run the cluster manager tool to create a compute node \r
+       template; include the following steps as part of the node provisioning \r
+       template steps after the HPC pack has been installed:</font><ul>\r
+               <li><font face="Arial">&nbsp;copy entire contents of (example: \Program \r
+               Files\Microsoft HPC Pack\Data\InstallShare\WOF) to remote node as <br>\r
+               %INSTALLDRIVE%\WOF</font></li>\r
+               <li><font face="Arial">execute the DOS command: %INSTALLDRIVE%\WOF\OFA-cert-install.bat</font></li>\r
+               <li><font face="Arial">execute the DOS command: %INSTALLDRIVE%\WOF\WinOF-install.bat<br>\r
+&nbsp;</font></li>\r
+       </ul></li>\r
+       <li><font face="Arial">Use 'cluster manager' to provision all compute nodes \r
+       using newly created compute node template.<br>\r
+&nbsp;</font></li>\r
+</ul></li>\r
+       <li><font face="Arial">Set the IPoIB interface static IPv4 address on all compute \r
+       nodes; 1st IPoIB instance will be the next 'Local Area Connection X' after \r
+       the Ethernet port(s) on the compute node.</font><ul>\r
+       <li><font face="Arial">clusrun /nodes:X netsh interface ip set address \r
+       &quot;Local Area Connection 3&quot; static 10.10.4.1 255.255.255.0</font></li>\r
+       <li><font face="Arial">clusrun /nodes:X netsh interface ip show address \r
+       &quot;Local Area Connection 3&quot;<br>\r
+&nbsp;</font></li>\r
 </ul></li>\r
-       <li><font face="Arial"><b>Note</b>: when uninstalling WinOF from an \r
-       installation which was done with NODRV=1, you <b>MUST </b>include NODRV=1 on \r
-       the uninstall command line; otherwise WinOF drivers will be uninstalled \r
-       also.<br>&nbsp;</font></li>\r
+       <li><font face="Arial">IPoIB supports DHCP IP address assignment for those \r
+       who choose to use it. Static IP address binding allows a direct mapping from \r
+       IP address to physical node number.<br>\r
+&nbsp;</font></li>\r
+       <li><font face="Arial">IPoIB static IPv4 address assignment points of \r
+       Interest<br>\r
+       When installing WinOF one must consider how the Interface name 'Local Area \r
+       Connection {x}' is assigned to the IPoIB ports in order to correctly target \r
+       IP address assignment. <br>\r
+       Assume the target compute node has two Ethernet port and your HCA has two IB \r
+       ports.&nbsp; After the 1st&nbsp; WinOF installation, or node reprovisioing \r
+       you will see the following assignments:</font><ul>\r
+       <li><font face="Arial">Ethernet port 0 is 'Local Area Connection'</font></li>\r
+       <li><font face="Arial">Ethernet port 1 is 'Local Area Connection 2'</font></li>\r
+       <li><font face="Arial">IB port 1 is 'Local Area Connection 3'</font></li>\r
+       <li><font face="Arial">IB port 2 is 'Local Area Connection 4'</font></li>\r
+</ul>\r
+       <p><font face="Arial">A few minutes after the WinOF install completes, the \r
+       HPC manager will rename the active IPoIB 'Local Area Connection 3' network \r
+       interface to the 'Application' network interface along with the active \r
+       Ethernet interface being renamed to the 'Private' network; 'Local Area \r
+       Connection' is no longer in use.<br>\r
+       If WinOF is uninstalled and then reinstalled without node reprovisioning, \r
+       the active IPoIB network interface is installed as 'Local Area Connection'.&nbsp; \r
+       Within a few minutes, the active IPoIB network interface will again be \r
+       renamed the 'Application' network interface.<br>\r
+       Summary:<br>\r
+&nbsp;&nbsp;&nbsp; 1st WinOF install, an IB cable is attached to HCA port 1, \r
+       IPoIB is named 'Local Area Connection 3'.<br>\r
+&nbsp;&nbsp;&nbsp; 2nd WinOF install, IPoIB is named 'Local Area Connection' as \r
+       the Ethernet interface is renamed the 'Private' network.<br>\r
+&nbsp;</font></li>\r
+       <li><font face="Arial">At this juncture, the WinOF drivers are installed.<br>\r
+&nbsp;</font></li>\r
 </ul>\r
-<h4><u>Windows Deployment Manager usage for HPC compute node provisioning</u></h4>\r
+<h3><u>Windows Deployment Manager usage for HPC compute node provisioning</u></h3>\r
 <p><font face="Arial">Microsoft has chosen WDM to provision HPC \r
 cluster compute nodes; see&nbsp;\r
 <a href="http://technet.microsoft.com/en-us/library/dd391826.aspx">Microsoft HPC \r
@@ -711,23 +792,17 @@ installs</a> for details.</font></p>
 <p><font face="Arial">In support of the new Microsoft WDM HPC cluster \r
 provisioning process, WinOF now supports an administrative install mode which is \r
 a method to extract WinOF files to the local filesystem without actually installing them; \r
-thus making WinOF driver files accessible to WDM provisioning; the other \r
-approach is to install WinOF on the head-node and point Cluster Manager node \r
-template creation at the WinOF device driver .inf files located in \r
-the folder %ProgramFiles(x86)%\WinOF\Drivers. </font></p>\r
-<p><font face="Arial">msiexec /A WinOF_2-1_wlh_x64.msi TARGETDIR=dev:\path-to-extracted-files</font></p>\r
-<p><font face="Arial">example:&nbsp; msiexec /A WinOF_2-1_wlh_x64.msi TARGETDIR=%TEMP%&nbsp;&nbsp; \r
-(note: TARGETDIR is case sensitive)</font></p>\r
-<p><font face="Arial">The above command creates the following folder structure:<br>\r
-<br>\r
-<a href="file:///C:/windows/Temp/WOF/PFiles/WinOF/">%TEMP%\PFiles\WinOF\</a><br>&nbsp;&nbsp;&nbsp; \r
-Drivers\mthca\mthca.inf&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; Mellanox InfiniHost HCA driver<br>&nbsp;&nbsp;&nbsp; \r
-Drivers\mlx4_bus\mlx4_bus.inf&nbsp;&nbsp;&nbsp;&nbsp; Mellanox ConnectX bus driver<br>&nbsp;&nbsp;&nbsp; \r
-Drivers\mlx4_hca\mlx4_hca.inf&nbsp;&nbsp;&nbsp;&nbsp; Mellanox ConnectX HCA driver (both ConnectX drivers required).<br>&nbsp;&nbsp;&nbsp; \r
-Drivers\net\netipoib.inf&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; IPoIB + Network Direct IB provider + WSD (Winsock Direct) provider.<br>\r
-&nbsp;&nbsp;&nbsp; Drivers\srp\ibsrp.inf&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; SCSI over IB.<br>\r
-&nbsp;&nbsp;&nbsp; Drivers\qlgcvnic\qlgcvnic.inf&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; QLogic VNIC (Virtual Ethernet controller over InfiniBand)</font></p>\r
-<h4><u>WinOF device driver-less installs:</u></h4>\r
+thus making WinOF files accessible to WDM provisioning.</font></p>\r
+<p><font face="Arial">Disclaimer - WDM 'driver' provisioning ONLY works for \r
+WHQL'ed drivers; WinOF drivers are not WHQL'ed.&nbsp; For WinOF installs, see \r
+previous node template provisioning discussion.</font></p>\r
+<p><font face="Arial">msiexec /A WinOF_2-1_wlh_x64.msi TARGETDIR=dev:\path-to-extracted-files&nbsp;&nbsp;&nbsp; \r
+# last folder in path-to-extracted-files must NOT exist.</font></p>\r
+<p><font face="Arial">example:&nbsp; msiexec /A WinOF_2-1_wlh_x64.msi TARGETDIR=%TEMP%\WOF&nbsp;&nbsp; \r
+(note: TARGETDIR is case sensitive, WOF must not exist)</font></p>\r
+<p><font face="Arial">The above command creates the folder structure:\r
+<a href="file:///C:/windows/Temp/WOF/PFiles/WinOF/">%TEMP%\WOF\PFiles\WinOF\</a></font></p>\r
+<h3><u>WinOF device driver-less installs:</u></h3>\r
 <p><font face="Arial">Normally WinOF device driver files are installed by processing the driver '.inf' \r
 files. To install the WinOF package by selecting install features without \r
 installing any device drivers [HCA, IPoIB, ND, WSD, SRP or VNIC] (assumed \r
@@ -752,13 +827,13 @@ By default, an IPoIB interface is configured to use DHCP. The following
 discussion deals with setting a static IP address on an IPoIB interface.<br>\r
 If your system has two Ethernet ports, then IPoIB interfaces (HCA port 1, 2...) \r
 will be assigned to 'Local Area Connection 3' and 'Local Area Connection 4'.&nbsp; \r
-If you system has a single Ethernet port, then IPoIB interface is Local Area \r
+If you system has a single Ethernet port, then IPoIB interface is 'Local Area \r
 Connection 2'.</font></p>\r
 <p><font face="Arial">For Server 2008/HPC systems, the WinOF installation follows the above \r
-discussion. In defining HPC network interfaces, the IPoIB network can be \r
-identified as the 'Application' network. In this case, a few minutes after a \r
-compute node is installed, the local network manager will rename the installed \r
-IPoIB 'Local Area Connection X' network interface to the 'Application' network.</font></p>\r
+discussion. In defining HPC network interfaces, the IPoIB network will \r
+eventually be \r
+identified as the 'Application' network '.&nbsp; A few minutes after a \r
+compute node is installed, the HPC&nbsp; network manager will rename the installed IPoIB 'Local Area Connection X' network interface to the 'Application' network.</font></p>\r
 <p><font face="Arial">Display all network interface configuration information<br>\r
 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; netsh interface ip show config<br>\r
 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; netsh interface ip show address \r
@@ -1045,7 +1120,7 @@ check for your desired adapter ordering.<br></font><br>
 Adapters-&gt; OpenFabrics IPoIB Adapter-&gt; Properties-&gt; Driver-&gt; Details<br>&nbsp;&nbsp;&nbsp; The subversion (svn) revision number will be listed under \r
 'Driver Version'. The svn revision number will match what's listed in the \r
 release notes.</font></li>\r
-       <li><font face="Arial">Hold the mouse point over \Program Files(x86)\WinOF\ib_read_bw.exe to display \r
+       <li><font face="Arial">Hold the mouse point over \Program Files\WinOF\ib_read_bw.exe to display \r
 the file version; [WinOF-Major.Minor.not-used.svn revision number].</font></li>\r
 </ol>\r
 <ul>\r
@@ -1059,7 +1134,7 @@ the file version; [WinOF-Major.Minor.not-used.svn revision number].</font></li>
 &nbsp;</u></b></font></li>\r
        <li><font face="Arial">WinOF 2.0 is based on<b> (<u>svn.1763 branches\WOF2-0</u>)<br>\r
 &nbsp;</b></font></li>\r
-       <li><font face="Arial">WinOF 2.1 is based on<b> (<u>svn.2210 branches\WOF2-1</u>)</b></font></li>\r
+       <li><font face="Arial">WinOF 2.1 is based on<b> (<u>svn.2476 branches\WOF2-1</u>)</b></font></li>\r
 </ul>\r
 <p><a href="#WinOF_Release_Notes"><font color="#000000">&lt;Return-to-Top&gt;</font></a></p>\r
 <p>&nbsp;</p>\r
@@ -1159,7 +1234,7 @@ folder (a.k.a. \Windows).</font></p>
 a template configuration file will be installed as '%SystemDrive%\DAT\dat.conf'.<br>\r
 In order to preserve existing installations, the dat.conf file is not \r
 automatically installed if '%SystemDrive%\DAT\dat.conf' exists.<br>\r
-A sample dat.conf file is always installed as '\Program Files (x86)\WinOF\dat.conf \r
+A sample dat.conf file is always installed as '\Program Files\WinOF\dat.conf \r
 '.</font></p>\r
 <p align="left"><font face="Arial">The default DAT configuration file specification can be overridden by use \r
 of the environment variable DAT_OVERRIDE. Such that 'DAT_OVERRIDE=D:\MyDAT\test.conf' \r
@@ -1173,7 +1248,7 @@ library file specification must be contained within double-quotes. A side effect
 of the double-quotes is the library specification is treated as a Windows string \r
 which implies the '\' (backslash character) is treated as an 'escape' character.&nbsp; \r
 Hence all backslashes in the library path must be duplicated when enclosed in \r
-double-quotes (e.g., &quot;C:\\Programs Files (x86)\\WinOF\\dapl.dll&quot;).</font></p>\r
+double-quotes (e.g., &quot;C:\\Programs Files\\WinOF\\dapl.dll&quot;).</font></p>\r
 <h4 align="left"><span style="font-weight: 400"><font face="Arial">DAT/DAPL version 2.0 runtime \r
 libraries are identified as dat2.dll and dapl2.dll, both in %SystemRoot%; see \r
 manual for further details.</font><br>\r
@@ -1259,6 +1334,13 @@ WinOF install.</font></p>
 <h2><u><a name="Known_Issues">Known Issues</a></u><font face="Arial" size="3"><br>&nbsp;</font></h2>\r
 \r
 <ul>\r
+       <li>\r
+       <p class=MsoPlainText><font face="Arial" size="3">DAPL2 providers Socket-CM \r
+       or DAPL2 rdma-CM<br>\r
+&nbsp;Configuring&nbsp; &gt; 1 rank \r
+       per node can cause connection establishment problems; not an issue with the \r
+       IBAL provider.</font></p>\r
+       <p class=MsoPlainText>&nbsp;</p></li>\r
        <li>\r
        <p class=MsoPlainText><font face="Arial" size="3">IPoIB partition \r
        multicast \r
index c50670a..7859313 100644 (file)
@@ -1,22 +1,22 @@
 \r
-[1-29-09]\r
+[11-16-09]\r
 \r
 Creating the WIX tool set\r
 -------------------------\r
 \r
-Download the WIX v2 (stable) tool set to \91WinOF\WIX\WIX_tools\\92.\r
+Download the WIX 3.0 (stable) tool to \91WinOF\WIX\WIX_tools\\92.\r
 \r
-http://sourceforge.net/project/showfiles.php?group_id=105970&package_id=114109&release_id=574429\r
+http://sourceforge.net/projects/wix/files/\r
 \r
-Download WIX binaries wix-2.0.5805.0-binaries.zip into 'trunk\WinOF\WIX\WIX_tools\'.\r
+Download WIX binaries wix-3.0.5419.0-RTM wix-3.0.5419.0-binaries.zip into 'trunk\WinOF\WIX\WIX_tools\'.\r
 \r
 Unzip the archive to a folder within 'WIX_tools\'; the new folder represents the version of the\r
 tool set.\r
 \r
-Something like unzip wix-2.0.5805.0-binaries.zip into wix-2.0.5805.0-binaries\.\r
+Something like unzip wix-3.0.5419.0-binaries.zip into wix-3.0.5419.0-binaries\.\r
 \r
 You should now have the following structure:\r
-       trunk\WinOF\WIX\WIX_tools\wix-2.0.5805.0-binaries\{candle.exe,light.exe,...}\r
+       trunk\WinOF\WIX\WIX_tools\wix-3.0.5419.0-binaries\{candle.exe,light.exe,...}\r
 \r
 The path to the WIX binaries is referenced in files:\r
     trunk\WinOF\buildrelease.bat\r
index a80eeff..dd78e2c 100644 (file)
@@ -2,81 +2,11 @@
     <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
+      <File Id="_dat.conf" DiskId="1" KeyPath="yes"\r
+             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
         <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
+          <File Id="_dat.h" DiskId="1"    \r
+                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
+          <File Id="_dat_error.h" DiskId="1"    \r
+                Name="dat_error.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
+          <File Id="_dat_platform_specific.h"    \r
+                DiskId="1" Name="dat_platform_specific.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
+          <File Id="_dat_redirection.h"    \r
+                DiskId="1" Name="dat_redirection.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
+          <File Id="_dat_registry.h"    \r
+                DiskId="1" Name="dat_registry.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
+          <File Id="_dat_vendor_specific.h"    \r
+                DiskId="1" Name="dat_vendor_specific.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
+          <File Id="_udat.h" DiskId="1"    \r
+                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
+          <File Id="_udat_config.h" DiskId="1"    \r
+                Name="udat_config.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
+          <File Id="_udat_redirection.h"    \r
+                DiskId="1" Name="udat_redirection.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
+          <File Id="_udat_vendor_specific.h"    \r
+                DiskId="1" Name="udat_vendor_specific.h"    \r
                 Source="..\bin\DAPL2\udat_vendor_specific.h" />    \r
         </Component>\r
       </Directory>\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
+          <File Id="_dat2.lib" DiskId="1"\r
+                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
+          <File Id="_dat2d.lib" DiskId="1"\r
+                Name="dat2d.lib"\r
                 Source="..\bin\DAPL2\$(var.ARCH)\dat2d.lib" />\r
       </Component>\r
     </Directory>\r
index b6f54b3..c5fadb4 100644 (file)
@@ -1,59 +1,25 @@
 <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
+    <Component Id="Docs" Guid="931C58EF-3759-4cf4-89CC-276C017305BB">\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
+      <CreateFolder />\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
+      <File Id="OFAlogo" DiskId="1"\r
+              Name="openfabrics.gif"\r
+              Source="..\..\openfabrics.gif" />\r
 \r
-      <File Id="dRelnotes" Compressed="yes" DiskId="1"\r
-              LongName="Release_notes.htm" Name="RELEASE_.HTM"\r
-              Source="..\..\Release_notes.htm" />\r
+      <File Id="manual.htm" DiskId="1"\r
+              Name="Manual.htm"\r
+              Source="..\bin\Misc\Manual.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
+      <File Id="Relnotes" DiskId="1"\r
+              Name="Release_notes.htm"\r
+              Source="..\..\Release_notes.htm" />\r
 \r
-      <File Id="command_window" Name="COMMAND.LNK"\r
-              LongName="Command Window.lnk" Compressed="yes" DiskId="1"\r
+      <File Id="command_window" DiskId="1"\r
+              Name="Command Window.lnk"\r
               Source="..\..\$(var.ARCHP)\Command Window.lnk" Vital="yes" />\r
 \r
-      <Shortcut Id="Command_Window.lnk" Directory="ProgramMenuDir"\r
-              Name="COMMAND.LNK" LongName="WinOF Command Window"\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 $(var.WOFREL)"\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 $(var.WOFREL)"\r
-                 Target="[SystemFolder]msiexec.exe"\r
-          Arguments="/X [ProductCode]"\r
-          Description="Uninstalls Windows OpenFabrics InfiniBand" />\r
-<?endif?>\r
-\r
-      <RemoveFolder Id="ProgramMenuDir" On="uninstall" />\r
-\r
     </Component>\r
 \r
 </Include>\r
index 18a8fbe..3e1b2c4 100644 (file)
@@ -1,21 +1,21 @@
 <Include>\r
 \r
-    <Component Id="cDriverTools"\r
+    <Component Id="cDriverTools" DiskId="1"\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
+      <File Id="dpinst.exe"\r
+             Name="DPInst.exe"\r
              Source="..\bin\misc\$(var.ARCH)\DPInst.exe" />\r
-      <File Id="dpinst.xml" Compressed="yes" DiskId="1"\r
-             LongName="dpinst.xml" Name="dpinst.xml"\r
+      <File Id="dpinst.xml"\r
+             Name="dpinst.xml"\r
              Source="..\..\dpinst.xml" />\r
-      <File Id="devman.exe" Compressed="yes" DiskId="1"\r
-             LongName="devman.exe" Name="devman.exe"\r
+      <File Id="devman.exe"\r
+             Name="devman.exe"\r
              Source="..\..\$(var.ARCHP)\devman.exe" />\r
     </Component>\r
 \r
-    <?include ..\..\common\mlnx_drivers.inc ?>\r
+    <?include $(sys.CURRENTDIR)\..\..\common\mlnx_drivers.inc ?>\r
 \r
-    <?include ..\..\common\iou.inc ?>\r
+    <?include $(sys.CURRENTDIR)\..\..\common\iou.inc ?>\r
 \r
 </Include>\r
index e7dd4c5..05837b0 100644 (file)
@@ -1,7 +1,7 @@
 <Include>\r
 \r
     <!--> File where Custom Actions are defined -->\r
-    <Binary Id="CA" src="..\..\CustomActions.vbs" />\r
+    <Binary Id="CA" SourceFile="..\..\CustomActions.vbs" />\r
 \r
     <CustomAction Id="WinOF_setup" BinaryKey="CA"\r
          VBScriptCall="WinOF_setup" Return="check" />\r
index 4cbf30a..8a35b0b 100644 (file)
@@ -6,52 +6,46 @@
 # S == WIX src & obj filename: .wxs & .wixobj\r
 # A == arch {x86,ia64,x64}\r
 # P == Installer (.msi) filename\r
-# optional: DFXP == Path to arch specific DifxApp files setup in makebin.bat\r
-\r
-#WIX 2.0\r
-L=..\..\WIX_tools\wix-2.0.5805.0-binaries\r
-\r
-WIX_UI="$(L)\wixui.wixlib" -loc "$(L)\WixUI_en-us.wxl"\r
-\r
-DFX=DIFxApp.wixlib\r
-\r
-# Since makebin.bat knows correct WDK version, it copies the DIFX APP files\r
-# to the bin\ tree; eliminates Makefiles having to know about WDK versions.\r
+# optional: DFXP == Path to DifxApp files setup in makebin.bat\r
 \r
 !ifndef DFXP\r
 DFXP=..\bin\Misc\$(A)\r
 !endif\r
 \r
+# WIX 3.0\r
+L=..\..\WIX_tools\wix3.0.5419.0-binaries\r
+\r
+DFX=difxapp_$(A).wixlib\r
+\r
+# Since makebin.bat knows correct WDK version, makebin copies the DIFX APP files\r
+# to the bin\Misc\arch tree; this eliminates Makefiles having to know about\r
+# WDK versions.  see DFXP=..\bin\Misc\arch\r
 \r
 full: clean $(P).msi\r
 \r
 clean:\r
        @del /q $(S).wixobj 2>nul\r
+       @del /q $(P).wixpdb 2>nul\r
        @del /q $(P).msi 2>nul\r
-       @del /q license.rtf 2>nul\r
        @del /q/f DIFxA*.* 2>nul\r
 \r
 MySetup: $(P).msi\r
 \r
-license.rtf: ..\..\license.rtf\r
-       @copy ..\..\license.rtf .\license.rtf\r
-\r
 # .dlls need to be in the current folder\r
-\r
-$(DFX) : $(DFXP)\$(DFX) $(DFXP)\DIFxApp.dll $(DFXP)\DIFxAppA.dll\r
+$(DFX) : $(L)\$(DFX) $(DFXP)\DIFxApp.dll $(DFXP)\DIFxAppA.dll\r
        @copy /B/Y $(DFXP)\DIFxApp.dll .\r
        @copy /B/Y $(DFXP)\DIFxAppA.dll .\r
-       @copy /B/Y $(DFXP)\$(DFX) .\r
+       @copy /B/Y $(L)\$(DFX) .\r
 \r
 $(S).wixobj: $(S).wxs\r
 \r
-$(P).msi: $(S).wixobj license.rtf $(DFX)\r
+$(P).msi: $(S).wixobj $(DFX)\r
        @echo --\r
        @echo Building $(P).msi\r
-       $(L)\light.exe /nologo -out $(P).msi $(S).wixobj $(DFX) $(WIX_UI)\r
+       $(L)\light.exe -nologo -ext WixUiExtension -ext WixDifxAppExtension -out $(P).msi $(S).wixobj $(DFX)\r
        @del /q $(S).wixobj 2>nul\r
-       @del /q license.rtf 2>nul\r
        @del /q/f DIFxA*.* 2>nul\r
+       @del /q $(P).wixpdb 2>nul\r
 \r
 \r
 ###################\r
@@ -60,6 +54,5 @@ $(P).msi: $(S).wixobj license.rtf $(DFX)
 .SUFFIXES: .wxs .wixobj\r
 \r
 .wxs.wixobj::\r
-       @$(L)\candle.exe -nologo -trace -v $<\r
-\r
+       @$(L)\candle.exe -nologo -arch $(A) -ext WixDifxAppExtension  -trace -v $<\r
 \r
index 1f310b0..7f38fb3 100644 (file)
@@ -6,8 +6,8 @@
                Permanent='no' Transitive='no'\r
                Location='either'>\r
 \r
-         <File Id="opensm.exe" Compressed="yes" DiskId="1"\r
-               LongName="opensm.exe" Name="OPENSM.EXE"\r
+         <File Id="opensm.exe" DiskId="1"\r
+               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
                Remove='uninstall' />\r
     </Component>\r
 \r
-    <Component Id="OpenSM_Service_enabled"\r
+    <Component Id="OpenSM_Service_enabled" KeyPath="yes"\r
                Guid="3A148CF8-129D-4AE0-A769-5FC0E0828B5E">\r
+\r
+         <ServiceControl Id='osmSvcControlStart' Name='OpenSM'\r
+               Start='install'\r
+               Stop='uninstall'\r
+               Wait='no'\r
+               Remove='uninstall' />\r
+\r
     </Component>\r
+\r
 </Include>\r
diff --git a/WinOF/WIX/common/PgmMenuShortcuts.inc b/WinOF/WIX/common/PgmMenuShortcuts.inc
new file mode 100644 (file)
index 0000000..8767f99
--- /dev/null
@@ -0,0 +1,44 @@
+<Include>\r
+\r
+  <Directory Id="ProgramMenuFolder">\r
+     <Directory Id="ProgramMenuDir" Name="Windows OpenFabrics" >\r
+        <Component Id="WinOFshortcuts"\r
+                   Guid="DD67D6B3-F7C5-4fa3-A249-A0D87557333E">\r
+\r
+            <Shortcut Id="sc_manual"\r
+                      Name="Manual"\r
+                      Description="WinOF Manual"\r
+                      Target="[INSTALLDIR]Manual.htm"\r
+                      WorkingDirectory="INSTALLDIR"\r
+                      Icon="openfabrics.ico" IconIndex="0" />\r
+\r
+            <Shortcut Id="sc_RelNotes"\r
+                      Name="Release Notes"\r
+                      Description="WinOF Release/Install Notes"\r
+                                         Target="[INSTALLDIR]Release_notes.htm"\r
+                      WorkingDirectory="INSTALLDIR"\r
+                      Icon="openfabrics.ico" IconIndex="0" />\r
+\r
+            <Shortcut Id="sc_Command_Window"\r
+                      Name="WinOF Command Window"\r
+                      Description="Cmd Window in WinOF folder"\r
+                                         Target="[INSTALLDIR]Command Window.lnk"\r
+                      WorkingDirectory="INSTALLDIR"\r
+                      Icon="openfabrics.ico" IconIndex="0" />\r
+\r
+            <Shortcut Id="sc_UninstallProduct"\r
+                      Name="Uninstall WinOF $(var.WOFREL)"\r
+                             Target="[System64Folder]msiexec.exe"\r
+                      Arguments="/X [ProductCode]"\r
+                      Description="Uninstalls Windows OpenFabrics InfiniBand" />\r
+\r
+            <RemoveFolder Id="ProgramMenuDir" On="uninstall" />\r
+\r
+            <RegistryValue Root="HKCU" Key="Software\Microsoft\WinOF"\r
+                           Name="installed" Type="integer" Value="1"\r
+                           KeyPath="yes" />\r
+        </Component>\r
+     </Directory>\r
+  </Directory>\r
+\r
+</Include>\r
index 3f9ee6e..9f5e1e8 100644 (file)
@@ -1,10 +1,14 @@
 \r
 <Include>\r
 \r
-      <UIRef Id="WixUI_FeatureTree" />\r
+    <UIRef Id="WixUI_FeatureTree" />\r
 \r
-      <UIRef Id="WixUI_ErrorProgressText" />\r
+      <WixVariable Id="WixUILicenseRtf" Value="..\..\License.rtf" />\r
+      <WixVariable Id="WixUIBannerBmp" Value="..\..\banner.bmp" />\r
+      <WixVariable Id="WixUIDialogBmp" Value="..\..\dialog.bmp" />\r
 \r
-      <Icon Id="openfabrics" SourceFile="..\..\openfabrics.ico" />\r
+      <UIRef Id="WixUI_ErrorProgressText" />\r
+      <Icon Id="openfabrics.ico" SourceFile="..\..\openfabrics.ico" />\r
+    <UI />\r
 \r
-</Include>\r
+</Include>
\ No newline at end of file
index c84d900..d71aad0 100644 (file)
@@ -1,9 +1,9 @@
 \r
 <Include>\r
 \r
-       <?define WOFREL="v2.1.1 (pre-RC0)" ?>\r
+       <?define WOFREL="v2.2 (pre-RC0)" ?>\r
 \r
-       <?define WOFRELNUM=2.1.1 ?>\r
+       <?define WOFRELNUM=2.2 ?>\r
 \r
        <?define WDFVER=01009 ?>\r
 \r
index 3de2e99..761bbf6 100644 (file)
@@ -7,9 +7,10 @@
     <Property Id='ARPNOREPAIR'>1</Property>\r
 -->\r
     <Property Id='ARPCOMMENTS'>OpenFabrics Windows InfiniBand</Property>\r
-    <Property Id='ARPCONTACT'>Openfabrics Alliance [www.openfabrics.org]</Property>\r
+    <Property Id='ARPCONTACT'>Openfabrics Alliance www.OpenFabrics.org</Property>\r
     <Property Id='ARPURLINFOABOUT'>https://wiki.openfabrics.org/tiki-index.php?page=OpenIB%20Windows</Property>\r
     <Property Id='ARPHELPLINK'>https://wiki.openfabrics.org/tiki-index.php?page=Windows+FAQ</Property>\r
     <Property Id='ARPURLUPDATEINFO'>http://www.openfabrics.org/downloads/WinOF/</Property>\r
+    <Property Id='ARPPRODUCTICON'>openfabrics.ico</Property>\r
 \r
 </Include>\r
index 2b1eba5..6ab523e 100644 (file)
                    Guid="D96F299E-EEAA-44a5-BBC4-A862A158BA6B">\r
           <CreateFolder />\r
 \r
-          <File Id="chk0" DiskId="1" Compressed="yes"\r
+          <File Id="chk0" DiskId="1"\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
+        </Component>\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
+          <Directory Id="kdir_mthca" Name="mthca">\r
+            <Component Id="cCHK_mthca"\r
+                       Guid="CAC772A9-9B00-44ef-AB67-ED935A079869">\r
+              <CreateFolder />\r
+              <File Id="chk1" DiskId="1"\r
+                    Name="mthca.sys"\r
+                    Source="..\bin\Chk\HCA\$(var.ARCH)\mthca.sys" />\r
+              <File Id="cat1" DiskId="1"\r
+                    Name="mthca.cat"\r
+                    Source="..\bin\Chk\HCA\$(var.ARCH)\mthca.cat" />\r
+              <File Id="sym1" DiskId="1"\r
+                    Name="mthca.pdb"\r
+                    Source="..\bin\Chk\HCA\$(var.ARCH)\mthca.pdb" />\r
+            </Component>\r
+          </Directory>\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
+          <Directory Id="kdir_ibbus" Name="bus">\r
+            <Component Id="cCHK_ibbus"\r
+                       Guid="10FC2995-A014-4b7b-8FBF-12529F997E9F">\r
+              <CreateFolder />\r
+              <File Id="chk2" DiskId="1"\r
+                    Name="ibbus.sys"\r
+                    Source="..\bin\Chk\HCA\$(var.ARCH)\ibbus.sys" />\r
+              <File Id="sym2" DiskId="1"\r
+                    Name="ibbus.pdb"\r
+                    Source="..\bin\Chk\HCA\$(var.ARCH)\ibbus.pdb" />\r
+            </Component>\r
+          </Directory>\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
+          <Directory Id="kdir_ibiou" Name="iou">\r
+            <Component Id="cCHK_iou"\r
+                       Guid="B14C5FD2-9793-47dc-BA4C-9CA1D2DE2319">\r
+              <CreateFolder />\r
+              <File Id="chk3" DiskId="1"\r
+                    Name="ibiou.sys"\r
+                    Source="..\bin\Chk\HCA\$(var.ARCH)\ibiou.sys" />\r
+              <File Id="cat3" DiskId="1"\r
+                    Name="ib_iou.cat"\r
+                    Source="..\bin\Chk\HCA\$(var.ARCH)\ib_iou.cat" />\r
+              <File Id="sym3" DiskId="1"\r
+                    Name="ibiou.pdb"\r
+                    Source="..\bin\Chk\HCA\$(var.ARCH)\ibiou.pdb" />\r
+            </Component>\r
+          </Directory>\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
+          <Directory Id="kdir_ipoib" Name="ipoib">\r
+            <Component Id="cCHK_ipoib"\r
+                       Guid="95E5F891-7F97-4209-AED3-AF009DA18C5D">\r
+              <CreateFolder />\r
+              <File Id="inf4" DiskId="1"\r
+                    Name="netipoib.inf"\r
+                    Source="..\bin\Chk\net\$(var.ARCH)\netipoib.inf" />\r
+              <File Id="cat4" DiskId="1"\r
+                    Name="ipoib.cat"\r
+                    Source="..\bin\Chk\net\$(var.ARCH)\ipoib.cat" />\r
+              <File Id="sym4" DiskId="1"\r
+                    Name="ipoib.pdb"\r
+                    Source="..\bin\Chk\net\$(var.ARCH)\ipoib.pdb" />\r
+              <File Id="chk_ipoib1" DiskId="1" Name="ipoib.sys"\r
+                    Source="..\bin\Chk\net\$(var.ARCH)\ipoib.sys" />\r
+<?if $(var.OS) != "XP" ?>\r
+              <File Id="chk_ipoib3" DiskId="1" Name="ibwsd.dll"\r
+                    Source="..\bin\Chk\net\$(var.ARCH)\ibwsd.dll" />\r
+              <File Id="chk_ipoib6" DiskId="1" Name="installsp.exe"\r
+                    Source="..\bin\Chk\net\$(var.ARCH)\installsp.exe" />\r
+<?endif?>\r
+<?if $(var.ARCHP) != "x86" ?>\r
+              <File Id="chk_ipoib4" DiskId="1" Name="ibwsd32.dll"\r
+                    Source="..\bin\Chk\net\$(var.ARCH)\ibwsd32.dll" />\r
+<?endif?>\r
+<?if $(var.ARCHP) != "ia64" ?>\r
+              <File Id="chk_ipoib8" DiskId="1" Name="ibndprov.dll"\r
+                    Source="..\bin\Chk\net\$(var.ARCH)\ibndprov.dll" />\r
+<?endif?>\r
+<?if $(var.ARCHP) = "x64" ?>\r
+              <File Id="chk_ipoib2" DiskId="1" Name="ibndprov32.dll"\r
+                    Source="..\bin\Chk\net\$(var.ARCH)\ibndprov32.dll" />\r
+<?endif?>\r
+              <File Id="chk_ipoib5" DiskId="1" Name="ndinstall.exe"\r
+                    Source="..\bin\Chk\net\$(var.ARCH)\ndinstall.exe" />\r
+              <File Id="chk_ipoib7" DiskId="1" Name="wvndprov.dll"\r
+                    Source="..\bin\Chk\net\$(var.ARCH)\wvndprov.dll" />\r
+            </Component>\r
+          </Directory>\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
+          <Directory Id="kdir_vnic" Name="vnic">\r
+            <Component Id="cCHK_vnic"\r
+                       Guid="22E6256B-E655-4004-BCA9-44A329CBEE57">\r
+              <CreateFolder />\r
+              <File Id="chk5" DiskId="1"\r
+                    Name="qlgcvnic.sys"\r
+                    Source="..\bin\Chk\net\$(var.ARCH)\qlgcvnic.sys" />\r
+              <File Id="cat5" DiskId="1"\r
+                    Name="netvnic.cat"\r
+                    Source="..\bin\Chk\net\$(var.ARCH)\netvnic.cat" />\r
+              <File Id="sym5" DiskId="1"\r
+                    Name="qlgcvnic.pdb"\r
+                    Source="..\bin\Chk\net\$(var.ARCH)\qlgcvnic.pdb" />\r
+            </Component>\r
+          </Directory>\r
+\r
+          <Directory Id="kdir_srp" Name="srp">\r
+            <Component Id="cCHK_srp"\r
+                       Guid="FD6E2410-66A5-415e-9AB4-A19CFE07EC56">\r
+              <CreateFolder />\r
+              <File Id="chk6" DiskId="1"\r
+                    Name="ibsrp.sys"\r
+                    Source="..\bin\Chk\storage\$(var.ARCH)\ibsrp.sys" />\r
+              <File Id="cat6" DiskId="1"\r
+                    Name="ibsrp.cat"\r
+                    Source="..\bin\Chk\storage\$(var.ARCH)\ibsrp.cat" />\r
+              <File Id="sym6" DiskId="1"\r
+                    Name="ibsrp.pdb"\r
+                    Source="..\bin\Chk\storage\$(var.ARCH)\ibsrp.pdb" />\r
+            </Component>\r
+          </Directory>\r
+\r
+          <Directory Id="kdir_mlx4" Name="mlx4">\r
+            <Component Id="cCHK_mlx4"\r
+                       Guid="05EFF991-9434-4c39-93B5-61834A18F5AB">\r
+              <CreateFolder />\r
+              <File Id="chk7" DiskId="1"\r
+                    Name="mlx4_bus.sys"\r
+                    Source="..\bin\Chk\HCA\$(var.ARCH)\mlx4_bus.sys" />\r
+              <File Id="cat7" DiskId="1"\r
+                    Name="mlx4_bus.cat"\r
+                    Source="..\bin\Chk\HCA\$(var.ARCH)\mlx4_bus.cat" />\r
+              <File Id="sym7" DiskId="1"\r
+                    Name="mlx4_bus.pdb"\r
+                    Source="..\bin\Chk\HCA\$(var.ARCH)\mlx4_bus.pdb" />\r
+\r
+              <File Id="chk8" DiskId="1"\r
+                    Name="mlx4_hca.sys"\r
+                    Source="..\bin\Chk\HCA\$(var.ARCH)\mlx4_hca.sys" />\r
+              <File Id="cat8" DiskId="1"\r
+                    Name="mlx4_hca.cat"\r
+                    Source="..\bin\Chk\HCA\$(var.ARCH)\mlx4_hca.cat" />\r
+              <File Id="sym8" DiskId="1"\r
+                    Name="mlx4_hca.pdb"\r
+                    Source="..\bin\Chk\HCA\$(var.ARCH)\mlx4_hca.pdb" />\r
+            </Component>\r
+          </Directory>\r
+\r
+          <Directory Id="kdir_winverbs" Name="winverbs">\r
+            <Component Id="cCHK_winverbs"\r
+                       Guid="CDEBE21F-03F8-472a-9F14-7743C41E3E69">\r
+              <CreateFolder />\r
+              <File Id="chk9" DiskId="1"\r
+                    Name="winverbs.sys"\r
+                    Source="..\bin\Chk\HCA\$(var.ARCH)\winverbs.sys" />\r
+              <File Id="sym9" DiskId="1"\r
+                    Name="winverbs.pdb"\r
+                    Source="..\bin\Chk\HCA\$(var.ARCH)\winverbs.pdb" />\r
+              <File Id="dll9" DiskId="1"\r
+                    Name="winverbs.dll"\r
+                    Source="..\bin\Chk\HCA\$(var.ARCH)\winverbs.dll" />\r
+              <File Id="dlld9" DiskId="1"\r
+                    Name="winverbsd.dll"\r
+                    Source="..\bin\Chk\HCA\$(var.ARCH)\winverbsd.dll" />\r
+            </Component>\r
+          </Directory>\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="file82" Name="d2-cmad.dll"\r
-            LongName="dapl2-ofa-cmad.dll"\r
-            DiskId="1" Compressed="yes"\r
+          <File Id="file82" DiskId="1"\r
+            Name="dapl2-ofa-cmad.dll"\r
             Source="..\bin\DAPL2\$(var.ARCH)\dapl2-ofa-cmad.dll" />\r
-          <File Id="file83" Name="d2-scmd.dll"\r
-            LongName="dapl2-ofa-scmd.dll"\r
-            DiskId="1" Compressed="yes"\r
+          <File Id="file83" DiskId="1"\r
+            Name="dapl2-ofa-scmd.dll"\r
             Source="..\bin\DAPL2\$(var.ARCH)\dapl2-ofa-scmd.dll" />\r
-          <File Id="file84" Name="dapl2d.dll"\r
-            DiskId="1" Compressed="yes"\r
+          <File Id="file84" DiskId="1"\r
+            Name="dapl2d.dll"\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
+          <File Id="file85" DiskId="1"\r
+            Name="dapl2testd.exe"\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
+          <File Id="file88" DiskId="1"\r
+            Name="dat2d.dll"\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
+          <File Id="file90" DiskId="1"\r
+            Name="dtest2d.exe"\r
             Source="..\bin\tools\$(var.ARCH)\debug\dtest2d.exe" />\r
-          <File Id="file91" Name="dtestxd.exe"\r
-            DiskId="1" Compressed="yes"\r
+          <File Id="file91" DiskId="1"\r
+            Name="dtestxd.exe"\r
             Source="..\bin\tools\$(var.ARCH)\debug\dtestxd.exe" />\r
-          <File Id="file45" Name="complibd.dll"\r
-            DiskId="1" Compressed="yes"\r
+          <File Id="file45" DiskId="1"\r
+            Name="complibd.dll"\r
             Source="..\bin\Chk\HCA\$(var.ARCH)\complibd.dll" />\r
-          <File Id="file94" Name="ibald.dll"\r
-            DiskId="1" Compressed="yes"\r
+          <File Id="file94" DiskId="1"\r
+            Name="ibald.dll"\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
+            <File Id="file97" DiskId="1"\r
+              Name="ibwsd.dll"\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
+            <File Id="file105" DiskId="1"\r
+              Name="installsp.exe"\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
+          <File Id="file69" DiskId="1"\r
+            Name="mlx4ud.dll"\r
             Source="..\bin\Chk\HCA\$(var.ARCH)\mlx4ud.dll" />\r
-          <File Id="file108" Name="mthcaud.dll"\r
-            DiskId="1" Compressed="yes"\r
+          <File Id="file108" DiskId="1"\r
+            Name="mthcaud.dll"\r
             Source="..\bin\Chk\HCA\$(var.ARCH)\mthcaud.dll" />\r
-          <File Id="file110" Name="opensm.exe"\r
-            DiskId="1" Compressed="yes"\r
+          <File Id="file110" DiskId="1"\r
+            Name="opensm.exe"\r
             Source="..\bin\tools\$(var.ARCH)\debug\opensm.exe" />\r
-          <File Id="file115" Name="vstat.exe"\r
-            DiskId="1" Compressed="yes"\r
+          <File Id="file115" DiskId="1"\r
+            Name="vstat.exe"\r
             Source="..\bin\tools\$(var.ARCH)\debug\vstat.exe" />\r
-          <File Id="file116" Name="part_man.exe"\r
-            DiskId="1" Compressed="yes"\r
+          <File Id="file116" DiskId="1"\r
+            Name="part_man.exe"\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
+          <File Id="file117" DiskId="1"\r
+            Name="qlgcvnic_config.exe"\r
             Source="..\bin\tools\$(var.ARCH)\debug\qlgcvnic_config.exe" />\r
         </Component>\r
       </Directory>\r
index 31da5ca..cbf3c79 100644 (file)
 <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
+              <File Id="_dapl32.dll" DiskId="1"\r
+                     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
+              <File Id="_dapl32d.dll" DiskId="1"\r
+                     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
+              <File Id="_dat32.dll" DiskId="1"\r
+                     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
+              <File Id="_dat32d.dll" DiskId="1"\r
+                     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
+          <File Id="_dapl2.dll" DiskId="1"\r
+                 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
+          <File Id="_dapl2d.dll" DiskId="1"\r
+                 Name="dapl2d.dll"\r
                  Source="..\bin\DAPL2\$(var.ARCH)\dapl2d.dll" />\r
-          <File Id="_dapl2_ofa_scm.dll" Compressed="yes" DiskId="1"\r
-                 LongName="dapl2-ofa-scm.dll" Name="D2-scm.DLL"\r
+          <File Id="_dapl2_ofa_scm.dll" DiskId="1"\r
+                 Name="dapl2-ofa-scm.dll"\r
                  Source="..\bin\DAPL2\$(var.ARCH)\dapl2-ofa-scm.dll" />\r
-          <CopyFile Id="dupDAPL2_ofa-scm" FileId="_dapl2_ofa_scm.dll"\r
-                    DestinationName="d2-scm.dll"\r
-                    DestinationLongName="dapl2-ofa-scm.dll"\r
+          <CopyFile Id="dupDAPL2_ofa_scm" FileId="_dapl2_ofa_scm.dll"\r
+                    DestinationName="dapl2-ofa-scm.dll"\r
                     DestinationProperty="WindowsFolder" />\r
-          <File Id="_dapl2_ofa_scmd.dll" Compressed="yes" DiskId="1"\r
-                 LongName="dapl2-ofa-scmd.dll" Name="D2-scmd.DLL"\r
+          <File Id="_dapl2_ofa_scmd.dll" DiskId="1"\r
+                 Name="dapl2-ofa-scmd.dll"\r
                  Source="..\bin\DAPL2\$(var.ARCH)\dapl2-ofa-scmd.dll" />\r
-          <File Id="_dapl2_ofa_cma.dll" Compressed="yes" DiskId="1"\r
-                 LongName="dapl2-ofa-cma.dll" Name="D2-cma.DLL"\r
+          <File Id="_dapl2_ofa_cma.dll" DiskId="1"\r
+                 Name="dapl2-ofa-cma.dll"\r
                  Source="..\bin\DAPL2\$(var.ARCH)\dapl2-ofa-cma.dll" />\r
-          <CopyFile Id="dupDAPL2_ofa-cma" FileId="_dapl2_ofa_cma.dll"\r
-                    DestinationName="d2-cma.dll"\r
-                    DestinationLongName="dapl2-ofa-cma.dll"\r
+          <CopyFile Id="dupDAPL2_ofa_cma" FileId="_dapl2_ofa_cma.dll"\r
+                    DestinationName="dapl2-ofa-cma.dll"\r
                     DestinationProperty="WindowsFolder" />\r
-          <File Id="_dapl2_ofa_cmad.dll" Compressed="yes" DiskId="1"\r
-                 LongName="dapl2-ofa-cmad.dll" Name="D2-cmad.DLL"\r
+          <File Id="_dapl2_ofa_cmad.dll" DiskId="1"\r
+                 Name="dapl2-ofa-cmad.dll"\r
                  Source="..\bin\DAPL2\$(var.ARCH)\dapl2-ofa-cmad.dll" />\r
-          <File Id="_dat2.dll" Compressed="yes" DiskId="1"\r
-                 LongName="dat2.dll" Name="DAT2.DLL"\r
+          <File Id="_dat2.dll" DiskId="1"\r
+                 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
+          <File Id="_dat2d.dll" DiskId="1"\r
+                 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
+          <File Id="dapl2test.exe" DiskId="1"\r
+                 Name="dapl2test.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
+          <File Id="dapl2testd.exe" DiskId="1"\r
+                 Name="dapl2testd.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
+          <File Id="dtest2.exe" DiskId="1"\r
+                 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
+          <File Id="dtestx.exe" DiskId="1"\r
+                 Name="dtestx.exe"\r
                  Source="..\bin\tools\$(var.ARCH)\release\dtestx.exe" />\r
-          <File Id="dtestcm.exe" Compressed="yes" DiskId="1"\r
-                 LongName="dtestcm.exe" Name="dtestcm.exe"\r
+          <File Id="dtestcm.exe" DiskId="1"\r
+                 Name="dtestcm.exe"\r
                  Source="..\bin\tools\$(var.ARCH)\release\dtestcm.exe" />\r
+          <File Id="dt_svr.bat" DiskId="1"\r
+                Name="dt-svr.bat"\r
+                Source="..\bin\DAPL2\dt-svr.bat" />\r
+          <File Id="dt_cli.bat" DiskId="1"\r
+                Name="dt-cli.bat"\r
+                Source="..\bin\DAPL2\dt-cli.bat" />\r
 \r
-          <File Id="dapl2.pdb" Compressed="yes" DiskId="1"\r
-                LongName="dapl2.pdb" Name="dapl2.pdb"\r
+          <File Id="dapl2.pdb" DiskId="1"\r
+                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
+          <File Id="dapl2d.pdb" DiskId="1"\r
+                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
+          <File Id="dat2.pdb" DiskId="1"\r
+                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
+          <File Id="dat2d.pdb" DiskId="1"\r
+                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
+          <File Id="dat2.lib" DiskId="1"\r
+                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
+          <File Id="dat2d.lib" DiskId="1"\r
+                Name="dat2d.lib"\r
                 Source="..\bin\DAPL2\$(var.ARCH)\dat2d.lib" />\r
       </Component>\r
 </Include>\r
index eeaa49e..42a9d83 100644 (file)
@@ -2,54 +2,54 @@
 \r
       <!-- Assumes FLTR is uiniquely set, see mlnx_drivers.inc -->\r
 \r
-      <File Id="$(var.FLTR)complib.dll" Compressed="yes" DiskId="1"\r
-             LongName="complib.dll" Name="COMPLIB.DLL"\r
+      <File Id="$(var.FLTR)complib.dll" DiskId="1"\r
+             Name="complib.dll"\r
              Source="..\bin\HCA\$(var.ARCH)\complib.dll" />\r
-      <File Id="$(var.FLTR)complibd.dll" Compressed="yes" DiskId="1"\r
-             LongName="complibd.dll" Name="COMPLIB1.DLL"\r
+      <File Id="$(var.FLTR)complibd.dll" DiskId="1"\r
+             Name="complibd.dll"\r
              Source="..\bin\HCA\$(var.ARCH)\complibd.dll" />\r
 \r
-      <File Id="$(var.FLTR)ibal.dll" Compressed="yes" DiskId="1"\r
-             LongName="ibal.dll" Name="IBAL.DLL"\r
+      <File Id="$(var.FLTR)ibal.dll" DiskId="1"\r
+             Name="ibal.dll"\r
              Source="..\bin\HCA\$(var.ARCH)\ibal.dll" />\r
-      <File Id="$(var.FLTR)ibald.dll" Compressed="yes" DiskId="1"\r
-             LongName="ibald.dll" Name="IBALD.DLL"\r
+      <File Id="$(var.FLTR)ibald.dll" DiskId="1"\r
+             Name="ibald.dll"\r
              Source="..\bin\HCA\$(var.ARCH)\ibald.dll" />\r
 \r
-      <File Id="$(var.FLTR)ibbus.sys" Compressed="yes" DiskId="1"\r
-             LongName="ibbus.sys" Name="IBBUS.SYS"\r
+      <File Id="$(var.FLTR)ibbus.sys" DiskId="1"\r
+             Name="ibbus.sys"\r
              Source="..\bin\HCA\$(var.ARCH)\ibbus.sys" />\r
       <File Id="$(var.FLTR)ibbus.pdb" Name="ibbus.pdb" DiskId="1"\r
-             Compressed="yes"\r
+            \r
              Source="..\bin\HCA\$(var.ARCH)\ibbus.pdb" />\r
 \r
       <?if $(var.ARCHP) = "x64" Or $(var.ARCHP) = "ia64" ?>\r
-          <File Id="$(var.FLTR)cl32.dll" Compressed="yes" DiskId="1"\r
-                 LongName="cl32.dll" Name="CL32.DLL"\r
+          <File Id="$(var.FLTR)cl32.dll" DiskId="1"\r
+                 Name="cl32.dll"\r
                  Source="..\bin\HCA\$(var.ARCH)\cl32.dll" />\r
-          <File Id="$(var.FLTR)cl32d.dll" Compressed="yes" DiskId="1"\r
-                 LongName="cl32d.dll" Name="CL32D.DLL"\r
+          <File Id="$(var.FLTR)cl32d.dll" DiskId="1"\r
+                 Name="cl32d.dll"\r
                  Source="..\bin\HCA\$(var.ARCH)\cl32d.dll" />\r
 \r
-          <File Id="$(var.FLTR)ibal32.dll" Compressed="yes" DiskId="1"\r
-                 LongName="ibal32.dll" Name="IBAL32.DLL"\r
+          <File Id="$(var.FLTR)ibal32.dll" DiskId="1"\r
+                 Name="ibal32.dll"\r
                  Source="..\bin\HCA\$(var.ARCH)\ibal32.dll" />\r
-          <File Id="$(var.FLTR)ibal32d.dll" Compressed="yes" DiskId="1"\r
-                 LongName="ibal32d.dll" Name="IBAL32D.DLL"\r
+          <File Id="$(var.FLTR)ibal32d.dll" DiskId="1"\r
+                 Name="ibal32d.dll"\r
                  Source="..\bin\HCA\$(var.ARCH)\ibal32d.dll" />\r
 \r
           <RemoveFile Id='$(var.FLTR)rm64_ibal.dll' On='uninstall'\r
                  Property="System64Folder"\r
-                 Name="ibal.dll" LongName='ibal.dll' />\r
+                 Name="ibal.dll" />\r
           <RemoveFile Id='$(var.FLTR)rm64_ibald.dll' On='uninstall'\r
                  Property="System64Folder"\r
-                 Name="ibald.dll" LongName='ibald.dll' />\r
+                 Name="ibald.dll" />\r
           <RemoveFile Id='$(var.FLTR)rm64_complib.dll' On='uninstall'\r
                  Property="System64Folder"\r
-                 Name="complib.dll" LongName='complib.dll' />\r
+                 Name="complib.dll" />\r
           <RemoveFile Id='$(var.FLTR)rm64_complibd.dll' On='uninstall'\r
                  Property="System64Folder"\r
-                 Name="complibd.dll" LongName='complibd.dll' />\r
+                 Name="complibd.dll" />\r
       <?endif?>\r
 \r
       <!--\r
       -->\r
       <RemoveFile Id='$(var.FLTR)rm_ibal.dll' On='uninstall'\r
              Property="SystemFolder"\r
-             Name="ibal.dll" LongName='ibal.dll' />\r
+             Name="ibal.dll" />\r
       <RemoveFile Id='$(var.FLTR)rm_ibald.dll' On='uninstall'\r
              Property="SystemFolder"\r
-             Name="ibald.dll" LongName='ibald.dll' />\r
+             Name="ibald.dll" />\r
       <RemoveFile Id='$(var.FLTR)rm_complib.dll' On='uninstall'\r
              Property="SystemFolder"\r
-             Name="complib.dll" LongName='complib.dll' />\r
+             Name="complib.dll" />\r
       <RemoveFile Id='$(var.FLTR)rm_complibd.dll' On='uninstall'\r
              Property="SystemFolder"\r
-             Name="complibd.dll" LongName='complibd.dll' />\r
+             Name="complibd.dll" />\r
 \r
       <RemoveFile Id='$(var.FLTR)rm_ibbus.sys' On='uninstall'\r
              Property="SystemFolder"\r
-             Name="ibbus.sys" LongName='ibbus.sys' />\r
+             Name="ibbus.sys" />\r
 \r
-      <?include ..\..\common\winverbs_drivers.inc ?> \r
+      <?include $(sys.CURRENTDIR)\..\..\common\winverbs_drivers.inc ?> \r
 \r
 </Include>\r
index ec855ed..0a0c704 100644 (file)
       <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
+        <File Id="ibal.lib" DiskId="1"\r
+              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
+        <File Id="ibal.pdb" DiskId="1"\r
+              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
+        <File Id="complib.lib" DiskId="1"\r
+              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
+        <File Id="complib.pdb" DiskId="1"\r
+              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
+        <File Id="ibald.lib" DiskId="1"\r
+              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
+        <File Id="ibald.pdb" DiskId="1"\r
+              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
+        <File Id="complibd.lib" DiskId="1"\r
+              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
+        <File Id="complibd.pdb" DiskId="1"\r
+              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
+            <File Id="cl32.lib" DiskId="1"\r
+                  Name="complib32.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
+            <File Id="cl32.pdb" DiskId="1"\r
+                  Name="complib32.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
+            <File Id="cl32d.lib" DiskId="1"\r
+                  Name="complib32d.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
+            <File Id="cl32d.pdb" DiskId="1"\r
+                  Name="complib32d.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
+            <File Id="ibal32.lib" DiskId="1"\r
+                  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
+            <File Id="ibal32.pdb" DiskId="1"\r
+                  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
+            <File Id="ibal32d.lib" DiskId="1"\r
+                  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
+            <File Id="ibal32d.pdb" DiskId="1"\r
+                  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
+        <File Id="winverbs.lib" DiskId="1"\r
+              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
+        <File Id="winverbsd.lib" DiskId="1"\r
+              Name="winverbsd.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
+        <File Id="libibverbs.lib" DiskId="1"\r
+              Name="libibverbs.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
+        <File Id="libibverbs2.pdb" DiskId="1"\r
+              Name="libibverbs.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
+        <File Id="libibverbsd.lib" DiskId="1"\r
+              Name="libibverbsd.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
+        <File Id="libibverbsd2.pdb" DiskId="1"\r
+              Name="libibverbsd.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
+        <File Id="libibmad.lib" DiskId="1"\r
+              Name="libibmad.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
+        <File Id="libibmad2.pdb" DiskId="1"\r
+              Name="libibmad.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
+        <File Id="libibmadd.lib" DiskId="1"\r
+              Name="libibmadd.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
+        <File Id="libibmadd2.pdb" DiskId="1"\r
+              Name="libibmadd.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
+        <File Id="libibumad.lib" DiskId="1"\r
+              Name="libibumad.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
+        <File Id="libibumad2.pdb" DiskId="1"\r
+              Name="libibumad.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
+        <File Id="libibumadd.lib" DiskId="1"\r
+              Name="libibumadd.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
+        <File Id="libibumadd2.pdb" DiskId="1"\r
+              Name="libibumadd.pdb"\r
               Source="..\bin\HCA\$(var.ARCH)\libibumadd.pdb" />\r
       </Component>\r
     </Directory>\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
+        <File Id="oib_ver.h" DiskId="1"\r
+               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
+        <File Id="openib.def" DiskId="1"\r
+               Name="openib.def"\r
                Source="..\bin\Inc\openib.def" />\r
       </Component>\r
 \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
+          <File Id="cl_async_proc.h" DiskId="1"\r
+                Name="cl_async_proc.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
+          <File Id="cl_atomic.h" DiskId="1"\r
+                Name="cl_atomic.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
+          <File Id="cl_atomic_osd.h" DiskId="1"\r
+                Name="cl_atomic_osd.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
+          <File Id="cl_byteswap.h" DiskId="1"\r
+                Name="cl_byteswap.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
+          <File Id="cl_byteswap_osd.h" DiskId="1"\r
+                Name="cl_byteswap_osd.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
+          <File Id="cl_comppool.h" DiskId="1"\r
+                Name="cl_comppool.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
+          <File Id="cl_debug.h" DiskId="1"\r
+                Name="cl_debug.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
+          <File Id="cl_debug_osd.h" DiskId="1"\r
+                Name="cl_debug_osd.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
+          <File Id="cl_event.h" DiskId="1"\r
+                Name="cl_event.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
+          <File Id="cl_event_osd.h" DiskId="1"\r
+                Name="cl_event_osd.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
+          <File Id="cl_fleximap.h" DiskId="1"\r
+                Name="cl_fleximap.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
+          <File Id="cl_ioctl.h" DiskId="1"\r
+                Name="cl_ioctl.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
+          <File Id="cl_ioctl_osd.h" DiskId="1"\r
+                Name="cl_ioctl_osd.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
+          <File Id="cl_irqlock.h" DiskId="1"\r
+                Name="cl_irqlock.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
+          <File Id="cl_list.h" DiskId="1"\r
+                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
+          <File Id="cl_log.h" DiskId="1"\r
+                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
+          <File Id="cl_map.h" DiskId="1"\r
+                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
+          <File Id="cl_math.h" DiskId="1"\r
+                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
+          <File Id="cl_memory.h" DiskId="1"\r
+                Name="cl_memory.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
+          <File Id="cl_memory_osd.h" DiskId="1"\r
+                Name="cl_memory_osd.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
+          <File Id="cl_mutex.h" DiskId="1"\r
+                Name="cl_mutex.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
+          <File Id="cl_mutex_osd.h" DiskId="1"\r
+                Name="cl_mutex_osd.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
+          <File Id="cl_obj.h" DiskId="1"\r
+                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
+          <File Id="cl_packoff.h" DiskId="1"\r
+                Name="cl_packoff.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
+          <File Id="cl_packon.h" DiskId="1"\r
+                Name="cl_packon.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
+          <File Id="cl_passivelock.h" DiskId="1"\r
+                Name="cl_passivelock.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
+          <File Id="cl_perf.h" DiskId="1"\r
+                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
+          <File Id="cl_pool.h" DiskId="1"\r
+                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
+          <File Id="cl_ptr_vector.h" DiskId="1"\r
+                Name="cl_ptr_vector.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
+          <File Id="cl_qcomppool.h" DiskId="1"\r
+                Name="cl_qcomppool.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
+          <File Id="cl_qlist.h" DiskId="1"\r
+                Name="cl_qlist.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
+          <File Id="cl_qlockpool.h" DiskId="1"\r
+                Name="cl_qlockpool.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
+          <File Id="cl_qmap.h" DiskId="1"\r
+                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
+          <File Id="cl_qpool.h" DiskId="1"\r
+                Name="cl_qpool.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
+          <File Id="cl_rbmap.h" DiskId="1"\r
+                Name="cl_rbmap.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
+          <File Id="cl_reqmgr.h" DiskId="1"\r
+                Name="cl_reqmgr.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
+          <File Id="cl_spinlock.h" DiskId="1"\r
+                Name="cl_spinlock.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
+          <File Id="cl_spinlock_osd.h" DiskId="1"\r
+                Name="cl_spinlock_osd.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
+          <File Id="cl_syscallback.h" DiskId="1"\r
+                Name="cl_syscallback.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
+          <File Id="cl_syscallback_osd.h" DiskId="1"\r
+                Name="cl_syscallback_osd.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
+          <File Id="cl_thread.h" DiskId="1"\r
+                Name="cl_thread.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
+          <File Id="cl_thread_osd.h" DiskId="1"\r
+                Name="cl_thread_osd.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
+          <File Id="cl_threadpool.h" DiskId="1"\r
+                Name="cl_threadpool.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
+          <File Id="cl_timer.h" DiskId="1"\r
+                Name="cl_timer.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
+          <File Id="cl_timer_osd.h" DiskId="1"\r
+                Name="cl_timer_osd.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
+          <File Id="cl_types.h" DiskId="1"\r
+                Name="cl_types.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
+          <File Id="cl_types_osd.h" DiskId="1"\r
+                Name="cl_types_osd.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
+          <File Id="cl_vector.h" DiskId="1"\r
+                Name="cl_vector.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
+          <File Id="cl_waitobj.h" DiskId="1"\r
+                Name="cl_waitobj.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
+          <File Id="cl_waitobj_osd.h" DiskId="1"\r
+                Name="cl_waitobj_osd.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
+          <File Id="comp_lib.h" DiskId="1"\r
+                Name="comp_lib.h"\r
                 Source="..\bin\Inc\complib\comp_lib.h" />\r
         </Component>\r
       </Directory>\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
+          <File Id="ib_al.h" DiskId="1"\r
+                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
+          <File Id="ib_al_ioctl.h" DiskId="1"\r
+                Name="ib_al_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
+          <File Id="ib_at_ioctl.h" DiskId="1"\r
+                Name="ib_at_ioctl.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
+          <File Id="ib_ci.h" DiskId="1"\r
+                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
+          <File Id="ib_types.h" DiskId="1"\r
+                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
+          <File Id="ib_uvp.h" DiskId="1"\r
+                Name="ib_uvp.h"\r
                 Source="..\bin\Inc\iba\ib_uvp.h" />\r
         </Component>\r
       </Directory>\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
+              <File Id="cmtest.c" DiskId="1"\r
+                    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
+              <File Id="cmtest.rc" DiskId="1"\r
+                    Name="cmtest.rc"\r
                     Source="..\..\SDK_Samples\DDK\cmtest.rc" />\r
-              <File Id="makefile" Compressed="yes" DiskId="1"\r
-                    LongName="makefile" Name="makefile"\r
+              <File Id="makefile" DiskId="1"\r
+                    Name="makefile"\r
                     Source="..\..\SDK_Samples\DDK\makefile" />\r
-              <File Id="SOURCES" Compressed="yes" DiskId="1"\r
-                    LongName="SOURCES" Name="SOURCES"\r
+              <File Id="SOURCES" DiskId="1"\r
+                    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
+              <File Id="README.txt" DiskId="1"\r
+                    Name="README.txt"\r
                     Source="..\..\SDK_Samples\DDK\README.txt" />\r
         </Component>\r
       </Directory>    <!-- End DDK -->\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
+              <File Id="vs_cmtest.c" DiskId="1"\r
+                    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
+              <File Id="vs_cmtest.rc" DiskId="1"\r
+                    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
+              <File Id="vsREADME.txt" DiskId="1"\r
+                    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
+                  <File Id="Makefile.x64" DiskId="1"\r
+                        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
+                  <File Id="Makefile.x64" DiskId="1"\r
+                        Name="Makefile.x64"\r
                         Source="..\..\SDK_Samples\VS\Makefile.x86" />\r
               <?endif?>\r
         </Component>\r
index 21c4f56..0eb0636 100644 (file)
@@ -1,27 +1,31 @@
-<Include>\r
+<Include xmlns:DifxApp='http://schemas.microsoft.com/wix/DifxAppExtension'>\r
+\r
   <Directory Id="IOU" Name="IOU">\r
-    <Component Id="cIOUdriver"\r
-               Guid="77F3A3C5-0C12-4e21-A788-8B9F1BF89A01"\r
-               DriverDeleteFiles="yes"\r
-               DriverForceInstall="yes"\r
-               DriverLegacy="no"\r
-               DriverPlugAndPlayPrompt="no"\r
-               DriverAddRemovePrograms="no"\r
-               DriverSequence="5" >\r
+    <Component Id="cIOUdriver" Guid="77F3A3C5-0C12-4e21-A788-8B9F1BF89A01" >\r
+\r
       <CreateFolder />\r
 \r
-      <File Id="ibiou.sys" Compressed="yes" DiskId="1"\r
-             LongName="ibiou.sys" Name="IBIOU.SYS"\r
+      <DifxApp:Driver\r
+          DeleteFiles="yes"\r
+          ForceInstall="no"\r
+          Legacy="no"\r
+          PlugAndPlayPrompt="no"\r
+          AddRemovePrograms="no"\r
+          Sequence="5" />\r
+\r
+      <File Id="ibiou.sys" DiskId="1"\r
+             Name="ibiou.sys"\r
              Source="..\bin\HCA\$(var.ARCH)\ibiou.sys" />\r
-      <File Id="ibiou.pdb" Compressed="yes" DiskId="1"\r
+      <File Id="ibiou.pdb" 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
+      <File Id="ib_iou.cat" DiskId="1"\r
+             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
+      <File Id="ib_iou.inf" DiskId="1"\r
+             Name="ib_iou.inf"\r
              Source="..\bin\HCA\$(var.ARCH)\ib_iou.inf" />\r
+\r
     </Component>\r
   </Directory>\r
 </Include>\r
index 88776c4..2a2c230 100644 (file)
@@ -1,99 +1,88 @@
-<Include>\r
+<Include xmlns:DifxApp='http://schemas.microsoft.com/wix/DifxAppExtension' >\r
 \r
  <Directory Id="ipoibDir" Name="net">\r
 \r
-    <Component Id="cIPoIB" Guid="18CC13CC-0D29-4B88-8F03-854CE0C6AF94"\r
-               DriverDeleteFiles="yes"\r
-               DriverForceInstall="yes"\r
-               DriverLegacy="no"\r
-               DriverPlugAndPlayPrompt="no"\r
-               DriverAddRemovePrograms="no"\r
-               DriverSequence="4" >\r
+    <Component Id="cIPoIB" Guid="18CC13CC-0D29-4B88-8F03-854CE0C6AF94" >\r
+\r
+      <DifxApp:Driver\r
+          DeleteFiles="yes"\r
+          ForceInstall="no"\r
+          Legacy="no"\r
+          PlugAndPlayPrompt="no"\r
+          AddRemovePrograms="no"\r
+          Sequence="4" />\r
+\r
       <CreateFolder />\r
 \r
-      <File Id="netipoib_inf" Compressed="yes" DiskId="1"\r
-             LongName="netipoib.inf" Name="NETIPOI.INF"\r
+      <File Id="netipoib_inf" DiskId="1"\r
+             Name="netipoib.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
+      <File Id="ipoib_cat" DiskId="1"\r
+             Name="ipoib.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
+      <File Id="ipoib.sys" DiskId="1"\r
+             Name="ipoib.sys"\r
              Source="..\bin\net\$(var.ARCH)\ipoib.sys" />\r
-      <File Id="ipoib.pdb" Compressed="yes" DiskId="1"\r
+      <File Id="ipoib.pdb" 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
+        <File Id="ibwsd.dll" DiskId="1"\r
+               Name="ibwsd.dll"\r
                Source="..\bin\net\$(var.ARCH)\ibwsd.dll" />\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
+            <File Id="ibwsd32.dll" DiskId="1"\r
+                 Name="ibwsd32.dll"\r
                  Source="..\bin\net\$(var.ARCH)\ibwsd32.dll" />\r
 \r
             <RemoveFile Id='rm64_ibwsd.dll' On='uninstall'\r
                  Property="System64Folder"\r
-                 Name="ibwsd.dll" LongName='ibwsd.dll' />\r
+                 Name="ibwsd.dll" />\r
             <RemoveFile Id='rm64_ibwsd32.dll' On='uninstall'\r
-                 Property="System64Folder"\r
-                 Name="ibwsd32.dll" LongName='ibwsd32.dll' />\r
+                 Property="System64Folder" Name="ibwsd32.dll" />\r
             <RemoveFile Id='rm32_ibwsd32.dll' On='uninstall'\r
-                 Property="SystemFolder"\r
-                 Name="ibwsd32.dll" LongName='ibwsd32.dll' />\r
+                 Property="SystemFolder" Name="ibwsd32.dll" />\r
         <?endif?>\r
 \r
       <?endif?>\r
 \r
-      <File Id="ndinstall.exe" Compressed="yes" DiskId="1"\r
-            LongName="ndinstall.exe" Name="NDINSTAL.EXE"\r
+      <File Id="ndinstall.exe" DiskId="1"\r
+            Name="ndinstall.exe"\r
             Source="..\bin\net\$(var.ARCH)\ndinstall.exe" />\r
 \r
-      <File Id="wvndprov.dll" Compressed="yes" DiskId="1"\r
-            LongName="wvndprov.dll" Name="wvndprov.DLL"\r
+      <File Id="wvndprov.dll" DiskId="1"\r
+            Name="wvndprov.dll"\r
             Source="..\bin\net\$(var.ARCH)\wvndprov.dll" />\r
 \r
       <?if $(var.ARCHP) != "ia64" ?>\r
-          <File Id="ibndprov.dll" Compressed="yes" DiskId="1"\r
-                LongName="ibndprov.dll" Name="IBNDPROV.DLL"\r
+          <File Id="ibndprov.dll" DiskId="1"\r
+                Name="ibndprov.dll"\r
                 Source="..\bin\net\$(var.ARCH)\ibndprov.dll" />\r
       <?endif?>\r
 \r
       <?if $(var.ARCHP) = "x64" ?>\r
-          <File Id="ibndprov32.dll" Compressed="yes" DiskId="1"\r
-                 LongName="ibndprov32.dll" Name="IBNDPR32.DLL"\r
+          <File Id="ibndprov32.dll" DiskId="1"\r
+                 Name="ibndprov32.dll"\r
                  Source="..\bin\net\$(var.ARCH)\ibndprov32.dll" />\r
 \r
           <RemoveFile Id='rm64_ibndprov.dll' On='uninstall'\r
-                 Property="System64Folder"\r
-                 Name="ibndpr32.dll" LongName='ibndprov32.dll' />\r
-          <RemoveFile Id='rm64_wvndprov.dll' On='uninstall'\r
-                 Property="System64Folder"\r
-                 Name="wvndpr.dll" LongName='wvndprov.dll' />\r
+                 Property="System64Folder" Name='ibndprov32.dll' />\r
           <RemoveFile Id='rm64_ndinstall.exe' On='uninstall'\r
-                 Property="System64Folder"\r
-                 Name="ndinstal.exe" LongName='ndinstall.exe' />\r
+                 Property="System64Folder" Name='ndinstall.exe' />\r
       <?endif?>\r
 \r
       <!-- Orphaned install files - remove on uninstall -->\r
 \r
       <RemoveFile Id='rm_ipoib.sys' On='uninstall'\r
-             Property="SystemFolder"\r
-             Name="ipoib.sys" LongName='ipoib.sys' />\r
+             Property="SystemFolder" Name="ipoib.sys" />\r
       <RemoveFile Id='rm32_ibwsd.dll' On='uninstall'\r
-             Property="SystemFolder"\r
-             Name="ibwsd.dll" LongName='ibwsd.dll' />\r
+             Property="SystemFolder" Name='ibwsd.dll' />\r
       <RemoveFile Id='o64_ibndprov.dll' On='uninstall'\r
-             Property="SystemFolder"\r
-             Name="ibndprov.dll" LongName='ibndprov.dll' />\r
-      <RemoveFile Id='rm_wvndprov.dll' On='uninstall'\r
-            Property="SystemFolder"\r
-            Name="wvndprov.dll" />\r
-      <RemoveFile Id='rm_ndinstall.exe' On='uninstall'\r
-            Property="SystemFolder"\r
-            Name="ndinstal.exe" LongName='ndinstall.exe' />\r
+             Property="SystemFolder" Name='ibndprov.dll' />\r
+      <RemoveFile Id='o64_ndinstall.exe' On='uninstall'\r
+             Property="SystemFolder" Name='ndinstall.exe' />\r
 \r
     </Component>\r
  </Directory>\r
index 6863ca9..1d729ca 100644 (file)
-<Include>\r
+<Include xmlns:DifxApp='http://schemas.microsoft.com/wix/DifxAppExtension' >\r
 \r
   <Directory Id="dMTHCA" Name="mthca">\r
 \r
-    <Component Id="cMthcaDriver"\r
-               Guid="BE4ED061-C852-40a2-A240-F06DBBE1159F"\r
-               DriverDeleteFiles="yes"\r
-               DriverForceInstall="yes"\r
-               DriverLegacy="no"\r
-               DriverPlugAndPlayPrompt="no"\r
-               DriverAddRemovePrograms="no"\r
-               DriverSequence="1" >\r
+    <Component Id="cMthcaDriver" Guid="BE4ED061-C852-40a2-A240-F06DBBE1159F">\r
+\r
+      <DifxApp:Driver\r
+          DeleteFiles="yes"\r
+          ForceInstall="no"\r
+          Legacy="no"\r
+          PlugAndPlayPrompt="no"\r
+          AddRemovePrograms="no"\r
+          Sequence="1" />\r
 \r
       <CreateFolder />\r
 \r
-      <File Id="mthca.inf" Compressed="yes" DiskId="1" Vital="yes" KeyPath="yes"\r
-             LongName="mthca.inf" Name="MTHCA.INF"\r
+      <File Id="mthca.inf" DiskId="1" Vital="yes" KeyPath="yes"\r
+             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
+      <File Id="mthca.cat" DiskId="1"\r
+             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
+      <File Id="mthca.sys" DiskId="1"\r
+             Name="mthca.sys"\r
              Source="..\bin\HCA\$(var.ARCH)\mthca.sys" />\r
-      <File Id="mthca.pdb" Compressed="yes" DiskId="1"\r
+      <File Id="mthca.pdb" 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
+      <File Id="mthcau.dll" DiskId="1"\r
+             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
+      <File Id="mthcaud.dll" DiskId="1"\r
+             Name="mthcaud.dll"\r
              Source="..\bin\HCA\$(var.ARCH)\mthcaud.dll" />\r
-      <File Id="mthca_wdfcoinstaller" Compressed="yes" DiskId="1"\r
-             LongName="WdfCoInstaller$(var.WDFVER).dll" Name="WCO.dll"\r
+      <File Id="mthca_wdfcoinstaller" DiskId="1"\r
+             Name="WdfCoInstaller$(var.WDFVER).dll"\r
              Source="..\bin\hca\$(var.ARCH)\WdfCoInstaller$(var.WDFVER).dll" />\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
+          <File Id="mthca32.dll" DiskId="1"\r
+                 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
+          <File Id="mthca32d.dll" DiskId="1"\r
+                 Name="mthca32d.dll"\r
                  Source="..\bin\HCA\$(var.ARCH)\mthca32d.dll" />\r
 \r
           <!-- Orphaned install files - remove on uninstall -->\r
           <RemoveFile Id='rm64_mthcau.dll' On='uninstall'\r
                  Property="System64Folder"\r
-                 Name="mthcau.dll" LongName='mthcau.dll' />\r
+                 Name='mthcau.dll' />\r
           <RemoveFile Id='rm64_mthcaud.dll' On='uninstall'\r
                  Property="System64Folder"\r
-                 Name="mthcaud.dll" LongName='mthcaud.dll' />\r
+                 Name='mthcaud.dll' />\r
           <RemoveFile Id='rm64_mthca.sys' On='uninstall'\r
                  Property="System64Folder"\r
-                 Name="mthca.sys" LongName='mthca.sys' />\r
+                 Name='mthca.sys' />\r
       <?endif?>\r
 \r
       <!-- Sometimes Orphaned install files - remove on uninstall -->\r
       <RemoveFile Id='rm_mthcau.dll' On='uninstall'\r
              Property="SystemFolder"\r
-             Name="mthcau.dll" LongName='mthcau.dll' />\r
+             Name="mthcau.dll" />\r
       <RemoveFile Id='rm_mthcaud.dll' On='uninstall'\r
              Property="SystemFolder"\r
-             Name="mthcaud.dll" LongName='mthcaud.dll' />\r
+             Name='mthcaud.dll' />\r
       <RemoveFile Id='rm_mthca.sys' On='uninstall'\r
              Property="SystemFolder"\r
-             Name="mthca.sys" LongName='mthca.sys' />\r
+             Name="mthca.sys" />\r
 \r
       <?define FLTR=mth_ ?> \r
-      <?include ..\..\common\hca_filters.inc ?>\r
+      <?include $(sys.CURRENTDIR)\..\..\common\hca_filters.inc ?>\r
 \r
     </Component>\r
   </Directory>\r
 \r
   <Directory Id="dMLX4_hca" Name="mlx4_hca">\r
 \r
-    <Component Id="cMLX4HcaDriver"\r
-               Guid="C1EFF4D6-CE55-432a-9D92-E46AB983D9E3"\r
-               DriverDeleteFiles="yes"\r
-               DriverForceInstall="yes"\r
-               DriverLegacy="no"\r
-               DriverPlugAndPlayPrompt="no"\r
-               DriverAddRemovePrograms="no"\r
-               DriverSequence="2" >\r
-      <!-- seq bus drv after hca so when bus loads, hca is available -->\r
+    <Component Id="cMLX4HcaDriver" Guid="C1EFF4D6-CE55-432a-9D92-E46AB983D9E3" >\r
+\r
       <CreateFolder />\r
 \r
-      <File Id="mlx4_hca.inf" Compressed="yes" DiskId="1"\r
-             LongName="mlx4_hca.inf" Name="mlx4_hca.INF"\r
+      <DifxApp:Driver\r
+          DeleteFiles="yes"\r
+          ForceInstall="no"\r
+          Legacy="no"\r
+          PlugAndPlayPrompt="no"\r
+          AddRemovePrograms="no"\r
+          Sequence="2" />\r
+\r
+      <File Id="mlx4_hca.inf" DiskId="1"\r
+             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
+      <File Id="mlx4_hca.cat" DiskId="1"\r
+             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
+      <File Id="mlx4_hca.sys" DiskId="1"\r
+             Name="mlx4_hca.sys"\r
              Source="..\bin\hca\$(var.ARCH)\mlx4_hca.sys" />\r
-      <File Id="mlx4_hca.pdb" Compressed="yes" DiskId="1"\r
+      <File Id="mlx4_hca.pdb" 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
+      <File Id="mlx4u.dll" DiskId="1"\r
+             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
+      <File Id="mlx4ud.dll" DiskId="1"\r
+             Name="mlx4ud.dll"\r
              Source="..\bin\hca\$(var.ARCH)\mlx4ud.dll" />\r
-      <File Id="mlx1_wdfcoinstaller" Compressed="yes" DiskId="1"\r
-             LongName="WdfCoInstaller$(var.WDFVER).dll" Name="WCO.dll"\r
+      <File Id="mlx1_wdfcoinstaller" DiskId="1"\r
+             Name="WdfCoInstaller$(var.WDFVER).dll"\r
              Source="..\bin\hca\$(var.ARCH)\WdfCoInstaller$(var.WDFVER).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
+          <File Id="mlx4u32d.dll" DiskId="1"\r
+                 Name="mlx4u32d.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
+          <File Id="mlx4u32.dll" DiskId="1"\r
+                 Name="mlx4u32.dll"\r
                  Source="..\bin\hca\$(var.ARCH)\mlx4u32.dll" />\r
+      <?endif?>\r
 \r
+      <?if $(var.ARCHP) = "x64" Or $(var.ARCHP) = "ia64" ?>\r
           <!-- Orphaned install files - remove on uninstall -->\r
           <RemoveFile Id='rm64_mlx4u.dll' On='uninstall'\r
                  Property="System64Folder"\r
-                 Name="mlx4u.dll" LongName='mlx4u.dll' />\r
+                 Name="mlx4u.dll" />\r
           <RemoveFile Id='rm64_mlx4ud.dll' On='uninstall'\r
                  Property="System64Folder"\r
-                 Name="mlx4ud.dll" LongName='mlx4ud.dll' />\r
+                 Name="mlx4ud.dll" />\r
           <RemoveFile Id='rm64_mlx4_bus.sys' On='uninstall'\r
                  Property="System64Folder"\r
-                 Name="mlx4_bus.sys" LongName='mlx4_bus.sys' />\r
+                 Name='mlx4_bus.sys' />\r
           <RemoveFile Id='rm64_mlx4_hca.sys' On='uninstall'\r
                  Property="System64Folder"\r
-                 Name="mlx4_hca.sys" LongName='mlx4_hca.sys' />\r
+                 Name='mlx4_hca.sys' />\r
       <?endif?>\r
 \r
       <!-- Orphaned install files - remove on uninstall -->\r
       <RemoveFile Id='rm_mlx4_bus.sys' On='uninstall'\r
              Property="SystemFolder"\r
-             Name="mlx4_bus.sys" LongName='mlx4_bus.sys' />\r
+             Name="mlx4_bus.sys" />\r
       <RemoveFile Id='rm_mlx4_hca.sys' On='uninstall'\r
              Property="SystemFolder"\r
-             Name="mlx4_hca.sys" LongName='mlx4_hca.sys' />\r
+             Name="mlx4_hca.sys" />\r
       <RemoveFile Id='rm_mlx4u.dll' On='uninstall'\r
              Property="SystemFolder"\r
-             Name="mlx4u.dll" LongName='mlx4u.dll' />\r
+             Name='mlx4u.dll' />\r
       <RemoveFile Id='rm_mlx4ud.dll' On='uninstall'\r
              Property="SystemFolder"\r
-             Name="mlx4ud.dll" LongName='mlx4ud.dll' />\r
+             Name='mlx4ud.dll' />\r
 \r
       <?undef FLTR ?> \r
       <?define FLTR=mlx_ ?> \r
-      <?include ..\..\common\hca_filters.inc ?>\r
+      <?include $(sys.CURRENTDIR)\..\..\common\hca_filters.inc ?>\r
 \r
     </Component>\r
   </Directory>\r
 \r
   <Directory Id="dMLX4_bus" Name="mlx4_bus">\r
-    <Component Id="cMLX4BusDriver"\r
-               Guid="B7EFA77D-1CE7-4bd1-BCFF-077D90C4B06E"\r
-               DriverDeleteFiles="yes"\r
-               DriverForceInstall="yes"\r
-               DriverLegacy="no"\r
-               DriverPlugAndPlayPrompt="no"\r
-               DriverAddRemovePrograms="no"\r
-               DriverSequence="3" >\r
-      <!-- seq bus drv after hca so when bus loads hca is available -->\r
+    <Component Id="cMLX4BusDriver" Guid="B7EFA77D-1CE7-4bd1-BCFF-077D90C4B06E" >\r
+\r
       <CreateFolder />\r
 \r
-      <File Id="mlx4_bus.inf" Compressed="yes" DiskId="1"\r
-             LongName="mlx4_bus.inf" Name="mlx4_bus.INF"\r
+      <DifxApp:Driver\r
+          DeleteFiles="yes"\r
+          ForceInstall="no"\r
+          Legacy="no"\r
+          PlugAndPlayPrompt="no"\r
+          AddRemovePrograms="no"\r
+          Sequence="3" />\r
+\r
+      <File Id="mlx4_bus.inf" DiskId="1"\r
+             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
+      <File Id="mlx4_bus.cat" DiskId="1"\r
+             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
+      <File Id="mlx4_bus.sys" DiskId="1"\r
+             Name="mlx4_bus.sys"\r
              Source="..\bin\hca\$(var.ARCH)\mlx4_bus.sys" />\r
-      <File Id="mlx4_bus.pdb" Compressed="yes" DiskId="1"\r
+      <File Id="mlx4_bus.pdb" DiskId="1"\r
              Name="mlx4_bus.pdb"\r
              Source="..\bin\hca\$(var.ARCH)\mlx4_bus.pdb" />\r
-      <File Id="mlx2_wdfcoinstaller" Compressed="yes" DiskId="1"\r
-             LongName="WdfCoInstaller$(var.WDFVER).dll" Name="WCO.dll"\r
+      <File Id="mlx2_wdfcoinstaller" DiskId="1"\r
+             Name="WdfCoInstaller$(var.WDFVER).dll"\r
              Source="..\bin\hca\$(var.ARCH)\WdfCoInstaller$(var.WDFVER).dll" />\r
+\r
     </Component>\r
   </Directory>\r
 \r
index f8a9239..67b1284 100644 (file)
@@ -1,27 +1,31 @@
-<Include>\r
+<Include xmlns:DifxApp='http://schemas.microsoft.com/wix/DifxAppExtension' >\r
+\r
    <Directory Id="qlgcvnicDir" Name="qlgcvnic">\r
 \r
       <Component Id="cQLVNIC_driver_installed"\r
-               Guid="730C742E-73D9-4871-A523-6FB7963EA01E"\r
-               DriverDeleteFiles="yes"\r
-               DriverForceInstall="yes"\r
-               DriverLegacy="no"\r
-               DriverPlugAndPlayPrompt="no"\r
-               DriverAddRemovePrograms="no"\r
-               DriverSequence="6" >\r
+               Guid="730C742E-73D9-4871-A523-6FB7963EA01E" >\r
+\r
+        <DifxApp:Driver\r
+            DeleteFiles="yes"\r
+            ForceInstall="no"\r
+            Legacy="no"\r
+            PlugAndPlayPrompt="no"\r
+            AddRemovePrograms="no"\r
+            Sequence="6" />\r
+\r
         <CreateFolder />\r
 \r
-        <File Id="qlgcvnic.sys" Compressed="yes" DiskId="1"\r
-              LongName="qlgcvnic.sys" Name="QLGCVNIC.SYS"\r
+        <File Id="qlgcvnic.sys" DiskId="1"\r
+              Name="qlgcvnic.sys"\r
               Source="..\bin\net\$(var.ARCH)\qlgcvnic.sys" />\r
-        <File Id="qlgcvnic.pdb" Compressed="yes" DiskId="1"\r
+        <File Id="qlgcvnic.pdb" DiskId="1"\r
               Name="qlgcvnic.pdb"\r
               Source="..\bin\net\$(var.ARCH)\qlgcvnic.pdb" />\r
-        <File Id="netvnic.inf" Compressed="yes" DiskId="1"\r
-              LongName="netvnic.inf" Name="NETVNIC.INF"\r
+        <File Id="netvnic.inf" DiskId="1"\r
+              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
+        <File Id="netvnic.cat" DiskId="1"\r
+              Name="netvnic.cat"\r
               Source="..\bin\net\$(var.ARCH)\netvnic.cat" />\r
       </Component>\r
    </Directory>\r
index 3b40e47..b8e3be6 100644 (file)
@@ -8,13 +8,13 @@
 \r
     <!-- Requires files sc.exe & reg.exe -->\r
     <Property Id="REG_EXISTS">\r
-      <DirectorySearch Id="RegFileDir" Path="[WindowsFolder]" Depth="1">\r
+      <DirectorySearch Id="RegFileDir" Path="[SystemFolder]" 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
+      <DirectorySearch Id="ScFileDir" Path="[SystemFolder]" Depth="1">\r
         <FileSearch Id="ScFile" Name="sc.exe" />\r
       </DirectorySearch>\r
     </Property>\r
@@ -54,4 +54,6 @@
     <Media Id="1" Cabinet="Data1.cab" EmbedCab="yes" DiskPrompt="CD-ROM #1" />\r
     <Property Id="DiskPrompt" Value="WinOF Installation [1]" />\r
 \r
+    <SetProperty Id="WINROOT" Value="[WindowsVolume]" Before="CostInitialize" />\r
+\r
 </Include>\r
index 2c3ac4d..041131f 100644 (file)
@@ -1,29 +1,32 @@
-<Include>\r
+<Include xmlns:DifxApp='http://schemas.microsoft.com/wix/DifxAppExtension' >\r
 \r
     <!-- RDMA SCSI over IB (aka SRP) -->\r
 \r
    <Directory Id="srpDir" Name="SRP">\r
 \r
       <Component Id="cSRP_driver_installed"\r
-               Guid="6945E66C-ADC0-4258-8858-AE7E7DF70495"\r
-               DriverDeleteFiles="yes"\r
-               DriverForceInstall="yes"\r
-               DriverLegacy="no"\r
-               DriverPlugAndPlayPrompt="no"\r
-               DriverAddRemovePrograms="no"\r
-               DriverSequence="7" >\r
+               Guid="6945E66C-ADC0-4258-8858-AE7E7DF70495" >\r
+\r
+        <DifxApp:Driver\r
+            DeleteFiles="yes"\r
+            ForceInstall="no"\r
+            Legacy="no"\r
+            PlugAndPlayPrompt="no"\r
+            AddRemovePrograms="no"\r
+            Sequence="7" />\r
+\r
         <CreateFolder />\r
 \r
-        <File Id="drv_ib_srp.inf" Compressed="yes" DiskId="1" Vital="yes"\r
+        <File Id="drv_ib_srp.inf" DiskId="1" Vital="yes"\r
               Name="IB_SRP.INF"\r
               Source="..\bin\storage\$(var.ARCH)\ib_srp.inf" />\r
-        <File Id="drv_ibsrp.cat" Compressed="yes" DiskId="1" Vital="yes"\r
+        <File Id="drv_ibsrp.cat" DiskId="1" Vital="yes"\r
               Name="IBSRP.CAT"\r
               Source="..\bin\storage\$(var.ARCH)\ibsrp.cat" />\r
-        <File Id="drv_ibsrp.sys" Compressed="yes" DiskId="1" Vital="yes"\r
+        <File Id="drv_ibsrp.sys" DiskId="1" Vital="yes"\r
               Name="IBSRP.SYS" \r
               Source="..\bin\storage\$(var.ARCH)\ibsrp.sys" />\r
-        <File Id="ibsrp.pdb" Compressed="yes" DiskId="1"\r
+        <File Id="ibsrp.pdb" DiskId="1"\r
               Name="ibsrp.pdb"\r
               Source="..\bin\storage\$(var.ARCH)\ibsrp.pdb" />\r
       </Component>\r
index 8d624a6..cb649e9 100644 (file)
@@ -1,5 +1,9 @@
 <Include>\r
 \r
+    <!--\r
+       Features - Level=1 == Typical, no WSD on XP, or SRP on 32-bit XP\r
+     -->\r
+\r
     <Feature Id="IBcore" Title="InfiniBand Core Modules" Level="1"\r
         Description="Drivers, Libraries, Subnet Management, Tools, Diags, Docs"\r
         Display="collapse" ConfigurableDirectory="INSTALLDIR"\r
@@ -7,6 +11,7 @@
 \r
       <ComponentRef Id="cDriverTools" />\r
       <ComponentRef Id="Docs" />\r
+      <ComponentRef Id="WinOFshortcuts" />\r
       <ComponentRef Id="Tools" />\r
       <ComponentRef Id="OpenSMservice" />\r
 \r
         <ComponentRef Id="cDatCfg" />\r
       </Feature>\r
 \r
-      <Feature Id="fDatBASIC1" Title="DAT 1.1 Runtime"\r
-         Description="DAT 1.1 runtime libraries"\r
-         Display="expand" Level="1" \r
-         AllowAdvertise='no' InstallDefault='local' Absent='allow'>\r
-        <ComponentRef Id="cDAPL1RT" />\r
-      </Feature>\r
-\r
-      <Feature Id="fDatBldKit1" Title="DAT 1.1 Build Kit"\r
-         Description="DAT 1.1 Application Build Kit - Headers and Libraries"\r
-         Display="expand" Level="2" \r
-         AllowAdvertise='no' InstallDefault='local' Absent='allow'>\r
-         <Condition Level="201"> DAT1_INSTALLED </Condition>\r
-         <ComponentRef Id="cDATV1" />\r
-         <ComponentRef Id="cDatBldV1Hdrs" />\r
-         <ComponentRef Id="cDatBldV1Libs" />\r
-      </Feature>\r
-\r
       <Feature Id="fDatBASIC2" Title="DAT 2.0 Runtime"\r
          Description="DAT 2.0 runtime libraries"\r
          Display="expand" Level="1" \r
          Display="expand" Level="5" ConfigurableDirectory="INSTALLDIR"\r
          AllowAdvertise='no' InstallDefault='local' Absent='allow'>\r
       <ComponentRef Id="cCHK_kernel" />\r
+          <ComponentRef Id="cCHK_mthca" />\r
+          <ComponentRef Id="cCHK_ibbus" />\r
+          <ComponentRef Id="cCHK_iou" />\r
+          <ComponentRef Id="cCHK_ipoib" />\r
+          <ComponentRef Id="cCHK_vnic" />\r
+          <ComponentRef Id="cCHK_srp" />\r
+          <ComponentRef Id="cCHK_mlx4" />\r
+          <ComponentRef Id="cCHK_winverbs" />\r
+\r
       <ComponentRef Id="cCHK_user" />\r
     </Feature>\r
 \r
index cb1a8e0..3c13361 100644 (file)
@@ -1,54 +1,53 @@
 <Include>\r
      <Component Id="Tools" Guid="1B89230E-5D8D-41a5-BD1F-A3E308FEE026">\r
-      <Environment Id='UpdatePath' Name='PATH' Action='create'\r
+      <Environment Id='UpdatePath' Name='PATH' Action='set'\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
+       <File Id="qlgcvnic_config" DiskId="1" Vital="yes"\r
+             Name="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
+             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
+             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
+       <File Id="ttcp.exe" Name="ttcp.exe"\r
+             DiskId="1"\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
+       <File Id="cmtest.exe" Name="cmtest.exe"\r
+             DiskId="1" Source="..\bin\tools\$(var.ARCH)\release\cmtest.exe" />\r
+       <File Id="ib_limits.exe" DiskId="1"\r
+             Name="ib_limits.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
+       <File Id="ib_read_bw.exe" DiskId="1"\r
+             Name="ib_read_bw.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
+       <File Id="ib_read_lat.exe" DiskId="1"\r
+             Name="ib_read_lat.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
+       <File Id="ib_send_bw.exe" DiskId="1"\r
+             Name="ib_send_bw.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
+       <File Id="ib_send_lat.exe" DiskId="1"\r
+             Name="ib_send_lat.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
+       <File Id="ib_write_bw.exe" DiskId="1"\r
+             Name="ib_write_bw.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
+       <File Id="ib_write_lat.exe" DiskId="1"\r
+             Name="ib_write_lat.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
+       <File Id="ibtrapgen.exe" DiskId="1"\r
+             Name="ibtrapgen.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
+       <File Id="osmtest.exe" DiskId="1"\r
+             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
+       <File Id="PrintIP.exe" DiskId="1"\r
+             Name="PrintIP.exe"\r
              Source="..\bin\tools\$(var.ARCH)\release\PrintIP.exe" />\r
-       <File Id="nsc" Name="nsc.exe" Compressed="yes" DiskId="1"\r
+       <File Id="nsc" Name="nsc.exe" DiskId="1"\r
                 Vital="yes" Source="..\bin\tools\$(var.ARCH)\release\nsc.exe" />\r
      </Component>\r
 </Include>\r
index 655b44f..15d84cc 100644 (file)
     <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
+      <File Id="libibverbs.dll" DiskId="1"\r
+            Name="libibverbs.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
+               DestinationName="libibverbs.dll"\r
                DestinationProperty="WindowsFolder" />\r
-      <File Id="libibverbs.pdb" Compressed="yes" DiskId="1"\r
-            LongName="libibverbs.pdb" Name="ibverbs.pdb"\r
+      <File Id="libibverbs.pdb" DiskId="1"\r
+            Name="libibverbs.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
+      <File Id="libibverbsd.dll" DiskId="1"\r
+            Name="libibverbsd.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
+               DestinationName="libibverbsd.dll"\r
                DestinationProperty="WindowsFolder" />\r
-      <File Id="libibverbsd.pdb" Compressed="yes" DiskId="1"\r
-            LongName="libibverbsd.pdb" Name="ibverbsd.pdb"\r
+      <File Id="libibverbsd.pdb" DiskId="1"\r
+            Name="libibverbsd.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
+      <File Id="libibmad.dll" DiskId="1"\r
+            Name="libibmad.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
+               DestinationName="libibmad.dll"\r
                DestinationProperty="WindowsFolder" />\r
-      <File Id="libibmad.pdb" Compressed="yes" DiskId="1"\r
-            LongName="libibmad.pdb" Name="ibmad.pdb"\r
+      <File Id="libibmad.pdb" DiskId="1"\r
+            Name="libibmad.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
+      <File Id="libibmadd.dll" DiskId="1"\r
+            Name="libibmadd.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
+               DestinationName="libibmadd.dll"\r
                DestinationProperty="WindowsFolder" />\r
-      <File Id="libibmadd.pdb" Compressed="yes" DiskId="1"\r
-            LongName="libibmadd.pdb" Name="ibmadd.pdb"\r
+      <File Id="libibmadd.pdb" DiskId="1"\r
+            Name="libibmadd.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
+      <File Id="libibumad.dll" DiskId="1"\r
+            Name="libibumad.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
+               DestinationName="libibumad.dll"\r
                DestinationProperty="WindowsFolder" />\r
-      <File Id="libibumad.pdb" Compressed="yes" DiskId="1"\r
-            LongName="libibumad.pdb" Name="ibumad.pdb"\r
+      <File Id="libibumad.pdb" DiskId="1"\r
+            Name="libibumad.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
+      <File Id="libibumadd.dll" DiskId="1"\r
+            Name="libibumadd.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
+               DestinationName="libibumadd.dll"\r
                DestinationProperty="WindowsFolder" />\r
-      <File Id="libibumadd.pdb" Compressed="yes" DiskId="1"\r
-            LongName="libibumadd.pdb" Name="ibumadd.pdb"\r
+      <File Id="libibumadd.pdb" DiskId="1"\r
+            Name="libibumadd.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
+      <File Id="librdmacm.dll" DiskId="1"\r
+            Name="librdmacm.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
+               DestinationName="librdmacm.dll"\r
                DestinationProperty="WindowsFolder" />\r
-      <File Id="librdmacm.pdb" Compressed="yes" DiskId="1"\r
-            LongName="librdmacm.pdb" Name="rdmacm.pdb"\r
+      <File Id="librdmacm.pdb" DiskId="1"\r
+            Name="librdmacm.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
+      <File Id="librdmacmd.dll" DiskId="1"\r
+            Name="librdmacmd.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
+               DestinationName="librdmacmd.dll"\r
                DestinationProperty="WindowsFolder" />\r
-      <File Id="librdmacmd.pdb" Compressed="yes" DiskId="1"\r
-            LongName="librdmacmd.pdb" Name="rdmacmd.pdb"\r
+      <File Id="librdmacmd.pdb" DiskId="1"\r
+            Name="librdmacmd.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
+      <File Id="libibnetdisc.dll" DiskId="1"\r
+            Name="libibnetdisc.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
+               DestinationName="libibnetdisc.dll"\r
                DestinationProperty="WindowsFolder" />\r
-      <File Id="libibnetdisc.pdb" Compressed="yes" DiskId="1"\r
-            LongName="libibnetdisc.pdb" Name="libnetd.pdb"\r
+      <File Id="libibnetdisc.pdb" DiskId="1"\r
+            Name="libibnetdisc.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
+      <File Id="libibnetdiscd.dll" DiskId="1"\r
+            Name="libibnetdiscd.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
+               DestinationName="libibnetdiscd.dll"\r
                DestinationProperty="WindowsFolder" />\r
-      <File Id="libibnetdiscd.pdb" Compressed="yes" DiskId="1"\r
-            LongName="libibnetdiscd.pdb" Name="libnetdd.pdb"\r
+      <File Id="libibnetdiscd.pdb" DiskId="1"\r
+            Name="libibnetdiscd.pdb"\r
             Source="..\bin\HCA\$(var.ARCH)\libibnetdiscd.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
+      <File Id="ibv_asyncwatch.exe" DiskId="1"\r
+            Name="ibv_asyncwatch.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
+      <File Id="ibv_asyncwatch.pdb" DiskId="1"\r
+            Name="ibv_asyncwatch.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
+      <File Id="ibv_devinfo.exe" DiskId="1"\r
+            Name="ibv_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
+      <File Id="ibv_devinfo.pdb" DiskId="1"\r
+            Name="ibv_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
+      <File Id="ibv_rc_pingpong.exe" DiskId="1"\r
+            Name="ibv_rc_pingpong.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
+      <File Id="ibv_rc_pingpong.pdb" DiskId="1"\r
+            Name="ibv_rc_pingpong.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
+      <File Id="ibv_read_bw.exe" DiskId="1"\r
+            Name="ibv_read_bw.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
+      <File Id="ibv_read_bw.pdb" DiskId="1"\r
+            Name="ibv_read_bw.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
+      <File Id="ibv_read_lat.exe" DiskId="1"\r
+            Name="ibv_read_lat.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
+      <File Id="ibv_read_lat.pdb" DiskId="1"\r
+            Name="ibv_read_lat.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
+      <File Id="ibv_send_bw.exe" DiskId="1"\r
+            Name="ibv_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
+      <File Id="ibv_send_bw.pdb" DiskId="1"\r
+            Name="ibv_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
+      <File Id="ibv_send_lat.exe" DiskId="1"\r
+            Name="ibv_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
+      <File Id="ibv_send_lat.pdb" DiskId="1"\r
+            Name="ibv_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
+      <File Id="ibv_uc_pingpong.exe" DiskId="1"\r
+            Name="ibv_uc_pingpong.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
+      <File Id="ibv_uc_pingpong.pdb" DiskId="1"\r
+            Name="ibv_uc_pingpong.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
+      <File Id="ibv_ud_pingpong.exe" DiskId="1"\r
+            Name="ibv_ud_pingpong.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
+      <File Id="ibv_ud_pingpong.pdb" DiskId="1"\r
+            Name="ibv_ud_pingpong.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
+      <File Id="ibv_write_bw.exe" DiskId="1"\r
+            Name="ibv_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
+      <File Id="ibv_write_bw.pdb" DiskId="1"\r
+            Name="ibv_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
+      <File Id="ibv_write_lat.exe" DiskId="1"\r
+            Name="ibv_write_lat.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
+      <File Id="ibv_write_lat.pdb" DiskId="1"\r
+            Name="ibv_write_lat.pdb"\r
             Source="..\bin\tools\$(var.ARCH)\release\ibv_write_lat.pdb" />\r
 \r
-      <File Id="rdma_cmatose.exe" Compressed="yes" DiskId="1"\r
-            LongName="rdma_cmatose.exe" Name="rcmatose.exe"\r
+      <File Id="rdma_cmatose.exe" DiskId="1"\r
+            Name="rdma_cmatose.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
+      <File Id="rdma_cmatose.pdb" DiskId="1"\r
+            Name="rdma_cmatose.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
+      <File Id="ibv_rdma_lat.exe" DiskId="1"\r
+            Name="ibv_rdma_lat.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
+      <File Id="ibv_rdma_lat.pdb" DiskId="1"\r
+            Name="ibv_rdma_lat.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
+      <File Id="ibv_rdma_bw.exe" DiskId="1"\r
+            Name="ibv_rdma_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
+      <File Id="ibv_rdma_bw.pdb" DiskId="1"\r
+            Name="ibv_rdma_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
+      <File Id="ibaddr.exe" DiskId="1"\r
+            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
+      <File Id="ibaddr.pdb" DiskId="1"\r
+            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
+      <File Id="iblinkinfo.exe" DiskId="1"\r
+            Name="iblinkinfo.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
+      <File Id="iblinkinfo.pdb" DiskId="1"\r
+            Name="iblinkinfo.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
+      <File Id="ibnetdiscover.exe" DiskId="1"\r
+            Name="ibnetdiscover.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
+      <File Id="ibnetdiscover.pdb" DiskId="1"\r
+            Name="ibnetdiscover.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
+      <File Id="ibping.exe" DiskId="1"\r
+            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
+      <File Id="ibping.pdb" DiskId="1"\r
+            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
+      <File Id="ibportstate.exe" DiskId="1"\r
+            Name="ibportstate.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
+      <File Id="ibportstate.pdb" DiskId="1"\r
+            Name="ibportstate.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
+      <File Id="ibqueryerrors.exe" DiskId="1"\r
+            Name="ibqueryerrors.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
+      <File Id="ibqueryerrors.pdb" DiskId="1"\r
+            Name="ibqueryerrors.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
+      <File Id="ibroute.exe" DiskId="1"\r
+            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
+      <File Id="ibroute.pdb" DiskId="1"\r
+            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
+      <File Id="ibsendtrap.exe" DiskId="1"\r
+            Name="ibsendtrap.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
+      <File Id="ibsendtrap.pdb" DiskId="1"\r
+            Name="ibsendtrap.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
+      <File Id="ibstat.exe" DiskId="1"\r
+            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
+      <File Id="ibstat.pdb" DiskId="1"\r
+            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
+      <File Id="ibsysstat.exe" DiskId="1"\r
+            Name="ibsysstat.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
+      <File Id="ibsysstat.pdb" DiskId="1"\r
+            Name="ibsysstat.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
+      <File Id="ibtracert.exe" DiskId="1"\r
+            Name="ibtracert.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
+      <File Id="ibtracert.pdb" DiskId="1"\r
+            Name="ibtracert.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
+      <File Id="mcm_rereg_test.exe" DiskId="1"\r
+            Name="mcm_rereg_test.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
+      <File Id="mcm_rereg_test.pdb" DiskId="1"\r
+            Name="mcm_rereg_test.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
+      <File Id="perfquery.exe" DiskId="1"\r
+            Name="perfquery.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
+      <File Id="perfquery.pdb" DiskId="1"\r
+            Name="perfquery.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
+      <File Id="saquery.exe" DiskId="1"\r
+            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
+      <File Id="saquery.pdb" DiskId="1"\r
+            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
+      <File Id="sminfo.exe" DiskId="1"\r
+            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
+      <File Id="sminfo.pdb" DiskId="1"\r
+            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
+      <File Id="smpdump.exe" DiskId="1"\r
+            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
+      <File Id="smpdump.pdb" DiskId="1"\r
+            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
+      <File Id="smpquery.exe" DiskId="1"\r
+            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
+      <File Id="smpquery.pdb" DiskId="1"\r
+            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
+      <File Id="vendstat.exe" DiskId="1"\r
+            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
+      <File Id="vendstat.pdb" DiskId="1"\r
+            Name="vendstat.pdb"\r
             Source="..\bin\tools\$(var.ARCH)\release\vendstat.pdb" />\r
     </Component>\r
 </Include>\r
index 7f58e5c..2ce4321 100644 (file)
@@ -1,47 +1,41 @@
 <Include>\r
 \r
-      <File Id="$(var.FLTR)winverbs.sys" Compressed="yes" DiskId="1"\r
-            LongName="winverbs.sys" Name="winverbs.sys"\r
+      <File Id="$(var.FLTR)winverbs.sys" DiskId="1"\r
+            Name="winverbs.sys"\r
             Source="..\bin\HCA\$(var.ARCH)\winverbs.sys" />\r
-      <File Id="$(var.FLTR)winverbs.pdb" Compressed="yes" DiskId="1"\r
-            LongName="winverbs.pdb" Name="winverbs.pdb"\r
+      <File Id="$(var.FLTR)winverbs.pdb" DiskId="1"\r
+            Name="winverbs.pdb"\r
             Source="..\bin\HCA\$(var.ARCH)\winverbs.pdb" />\r
-      <File Id="$(var.FLTR)winverbs.dll" Compressed="yes" DiskId="1"\r
-            LongName="winverbs.dll" Name="winvrbs.dll"\r
+      <File Id="$(var.FLTR)winverbs.dll" DiskId="1"\r
+            Name="winverbs.dll"\r
             Source="..\bin\HCA\$(var.ARCH)\winverbs.dll" />\r
-      <File Id="$(var.FLTR)winverbsd.dll" Compressed="yes" DiskId="1"\r
-            LongName="winverbsd.dll" Name="winvrbsd.dll"\r
+      <File Id="$(var.FLTR)winverbsd.dll" DiskId="1"\r
+            Name="winverbsd.dll"\r
             Source="..\bin\HCA\$(var.ARCH)\winverbsd.dll" />\r
-      <File Id="$(var.FLTR)winmad.sys" Compressed="yes" DiskId="1"\r
-            LongName="winmad.sys" Name="winmad.sys"\r
+      <File Id="$(var.FLTR)winmad.sys" DiskId="1"\r
+            Name="winmad.sys"\r
             Source="..\bin\HCA\$(var.ARCH)\winmad.sys" />\r
-      <File Id="$(var.FLTR)winmad.pdb" Compressed="yes" DiskId="1"\r
-            LongName="winmad.pdb" Name="winmad.pdb"\r
+      <File Id="$(var.FLTR)winmad.pdb" DiskId="1"\r
+            Name="winmad.pdb"\r
             Source="..\bin\HCA\$(var.ARCH)\winmad.pdb" />\r
-      <File Id="$(var.FLTR)winmad.dll" Compressed="yes" DiskId="1"\r
-            LongName="winmad.dll" Name="winmad.dll"\r
+      <File Id="$(var.FLTR)winmad.dll" DiskId="1"\r
+            Name="winmad.dll"\r
             Source="..\bin\HCA\$(var.ARCH)\winmad.dll" />\r
-      <File Id="$(var.FLTR)winmadd.dll" Compressed="yes" DiskId="1"\r
-            LongName="winmadd.dll" Name="winmaddd.dll"\r
+      <File Id="$(var.FLTR)winmadd.dll" DiskId="1"\r
+            Name="winmadd.dll"\r
             Source="..\bin\HCA\$(var.ARCH)\winmadd.dll" />\r
 \r
       <RemoveFile Id='$(var.FLTR)rm_winverbs.dll' On='uninstall'\r
-             Property="SystemFolder"\r
-             Name="winverbs.dll" LongName='winverbs.dll' />\r
+             Property="SystemFolder" Name='winverbs.dll' />\r
       <RemoveFile Id='$(var.FLTR)rm_winverbsd.dll' On='uninstall'\r
-             Property="SystemFolder"\r
-             Name="winverbd.dll" LongName='winverbsd.dll' />\r
+             Property="SystemFolder" Name='winverbsd.dll' />\r
       <RemoveFile Id='$(var.FLTR)rm_winmad.dll' On='uninstall'\r
-             Property="SystemFolder"\r
-             Name="winmad.dll" LongName='winmad.dll' />\r
+             Property="SystemFolder" Name='winmad.dll' />\r
       <RemoveFile Id='$(var.FLTR)rm_winmadd.dll' On='uninstall'\r
-             Property="SystemFolder"\r
-             Name="winmadd.dll" LongName='winmadd.dll' />\r
+             Property="SystemFolder" Name='winmadd.dll' />\r
       <RemoveFile Id='$(var.FLTR)rm_winverbs.sys' On='uninstall'\r
-             Property="SystemFolder"\r
-             Name="winverbs.sys" LongName='winverbs.sys' />\r
+             Property="SystemFolder" Name='winverbs.sys' />\r
       <RemoveFile Id='$(var.FLTR)rm_winmad.sys' On='uninstall'\r
-             Property="SystemFolder"\r
-             Name="winmad.sys" LongName='winmad.sys' />\r
+             Property="SystemFolder" Name='winmad.sys' />\r
 \r
 </Include>\r
index 59e486d..2c582d2 100644 (file)
@@ -4,6 +4,9 @@ rem
 rem Digitally sign all drivers for all OSes & architectures.\r
 rem\r
 rem example - sign-all-drivers CertFilename CertSubjName {noTimeStamp}\r
+rem   CertFilename - full path to MSCV-VSClass3.cer file\r
+rem                  example ...\trunk\winof\wix\MSCV-VSClass3.cer\r
+rem   CertSubjName - "OpenFabricsAlliance" Your Company CertName in CertStore. \r
 rem see TS below.\r
 rem\r
 \r
index a13fdb9..9ac4650 100644 (file)
@@ -6,3 +6,4 @@ A=ia64
 P=$(S)_win7_$(A)\r
 \r
 !include ..\..\common\Makefile.inc\r
+\r
index 3e3a867..d0a293e 100644 (file)
@@ -8,7 +8,8 @@
 <?define OS=win7 ?>\r
 <?include ..\..\common\WinOF_cfg.inc ?>\r
 \r
-<Wix xmlns="http://schemas.microsoft.com/wix/2003/01/wi">\r
+<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'\r
+     xmlns:DifxApp='http://schemas.microsoft.com/wix/DifxAppExtension' >\r
   <Product\r
     Name="Windows OpenFabrics InfiniBand $(var.WOFREL) $(var.ARCHP)"\r
     Version="$(var.WOFRELNUM)"\r
     Language="1033" Codepage="1252"\r
     Manufacturer="Open Fabrics Alliance Windows">\r
 \r
-    <Package Id="????????-????-????-????-????????????"\r
+    <Package Id="*"\r
      Keywords="Installer, InfiniBand, WinOF, OpenFabrics"\r
      InstallPrivileges='elevated'\r
      Description="WinOF Installer"\r
      Comments="Windows OpenFabrics Alliance InfiniBand stack"\r
      Manufacturer="OpenFabrics Alliance" InstallerVersion="200"\r
-     Platforms="Intel64" Languages="1033"\r
+     Platform="$(var.ARCHP)" Languages="1033"\r
      Compressed="yes" SummaryCodepage="1252" />\r
 \r
     <Condition Message="Administrator required to install [ProductName].">\r
-     AdminUser\r
+      Privileged\r
     </Condition>\r
 \r
     <Condition Message="This package can be installed on IA64 systems only">\r
         <![CDATA[VersionNT64]]>\r
     </Condition>\r
 \r
-    <Condition Message="[ProductName] requires Windows 7 or Server 2008 R2 to install.">\r
-         <![CDATA[(VersionNT=601)]]>\r
+    <Condition\r
+      Message="[ProductName] requires Windows 7 or Server 2008 R2 to install.">\r
+      <![CDATA[(VersionNT=601)]]>\r
     </Condition>\r
 \r
     <?include ..\..\common\requirements.inc ?>\r
 \r
     <Directory Id="TARGETDIR" Name="SourceDir">\r
-      <Directory Id="ProgramMenuFolder" Name="PMenu" LongName="Programs">\r
-        <Directory Id="ProgramMenuDir" LongName="Windows OpenFabrics"\r
-                   Name="WinOF" />\r
-      </Directory>\r
-      <Directory Id="DesktopFolder" Name="Desktop" />\r
+\r
+      <?include ..\..\common\PgmMenuShortcuts.inc ?>\r
+\r
       <Directory Id="ProgramFiles64Folder" Name="PFiles">\r
         <Directory Id="INSTALLDIR" Name="WinOF">\r
 \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\$(var.ARCH)\installsp.exe" />\r
+            <File Id="installsp.exe" DiskId="1"\r
+                  Name="installsp.exe"\r
+                  Source="..\bin\net\$(var.ARCH)\installsp.exe" />\r
           </Component>\r
 <!-- when ND works for ia64\r
-          <Component Id="cNetworkDirect"\r
+          <Component Id="cNetworkDirect" KeyPath="yes"\r
                      Guid="F3BA9E15-E532-4b8c-BB0C-E8C1CC0EEF3F">\r
           </Component>\r
 -->\r
@@ -83,7 +83,7 @@
         </Directory>\r
       </Directory>\r
 \r
-      <Directory Id="WindowsVolume">\r
+      <Directory Id="WINROOT" Name="WinRoot">\r
 \r
         <!-- copy DAT header files to\r
            %SystemDrive%\DAT\v1-1\DAT\r
 \r
     <?include ..\..\common\arp.inc ?>\r
 \r
-    <!--\r
-       Features - Level=1 == Typical, no WSD on XP or SRP on 32-bit XP\r
-     -->\r
-\r
     <?include ..\..\common\std_features.inc ?>\r
 \r
     <?include ..\..\common\InstallExecuteSeq.inc ?>\r
index 8829f27..7492739 100644 (file)
@@ -8,3 +8,4 @@ P=$(S)_win7_$(A)
 DFXP=..\bin\Misc\amd64\r
 \r
 !include ..\..\common\Makefile.inc\r
+\r
index 33a885e..86a24c7 100644 (file)
@@ -8,7 +8,8 @@
 <?define OS=win7 ?>\r
 <?include ..\..\common\WinOF_cfg.inc ?>\r
 \r
-<Wix xmlns="http://schemas.microsoft.com/wix/2003/01/wi">\r
+<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'\r
+     xmlns:DifxApp='http://schemas.microsoft.com/wix/DifxAppExtension' >\r
   <Product\r
     Name="Windows OpenFabrics InfiniBand $(var.WOFREL) $(var.ARCHP)"\r
     Version="$(var.WOFRELNUM)"\r
     Language="1033" Codepage="1252"\r
     Manufacturer="Open Fabrics Alliance Windows">\r
 \r
-    <Package Id="????????-????-????-????-????????????"\r
+    <Package Id="*"\r
      Keywords="Installer, InfiniBand, WinOF, OpenFabrics"\r
      InstallPrivileges='elevated'\r
      Description="WinOF Installer"\r
      Comments="Windows OpenFabrics Alliance InfiniBand stack"\r
      Manufacturer="OpenFabrics Alliance" InstallerVersion="200"\r
-     Platforms="$(var.ARCHP)" Languages="1033"\r
+     Platform="$(var.ARCHP)" Languages="1033"\r
      Compressed="yes" SummaryCodepage="1252" />\r
 \r
     <Condition Message="Administrator required to install [ProductName].">\r
         <![CDATA[Msix64]]>\r
     </Condition>\r
 \r
-    <Condition Message="[ProductName] requires Windows 7 or Server 2008 R2 to install.">\r
-         <![CDATA[(VersionNT=601)]]>\r
+    <Condition\r
+      Message="[ProductName] requires Windows 7 or Server 2008 R2 to install.">\r
+      <![CDATA[(VersionNT=601)]]>\r
     </Condition>\r
 \r
     <?include ..\..\common\requirements.inc ?>\r
 \r
     <Directory Id="TARGETDIR" Name="SourceDir">\r
-      <Directory Id="ProgramMenuFolder" Name="PMenu" LongName="Programs">\r
-        <Directory Id="ProgramMenuDir" LongName="Windows OpenFabrics"\r
-                   Name="WinOF" />\r
-      </Directory>\r
-      <Directory Id="DesktopFolder" Name="Desktop" />\r
+\r
+      <?include ..\..\common\PgmMenuShortcuts.inc ?>\r
+\r
       <Directory Id="ProgramFiles64Folder" Name="PFiles">\r
         <Directory Id="INSTALLDIR" Name="WinOF">\r
 \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\$(var.ARCH)\installsp.exe" />\r
+            <File Id="installsp.exe" DiskId="1"\r
+                  Name="installsp.exe"\r
+                  Source="..\bin\net\$(var.ARCH)\installsp.exe" />\r
           </Component>\r
 \r
-          <Component Id="cNetworkDirect"\r
+          <Component Id="cNetworkDirect" KeyPath="yes"\r
                      Guid="F3BA9E15-E532-4b8c-BB0C-E8C1CC0EEF3F">\r
           </Component>\r
 \r
@@ -85,7 +85,7 @@
         </Directory>\r
       </Directory>\r
 \r
-      <Directory Id="WindowsVolume">\r
+      <Directory Id="WINROOT" Name="WinRoot">\r
 \r
         <!-- copy DAT header files to\r
            %SystemDrive%\DAT\v1-1\DAT\r
 \r
     <?include ..\..\common\arp.inc ?>\r
 \r
-    <!--\r
-       Features - Level=1 == Typical, no WSD on XP or SRP on 32-bit XP\r
-     -->\r
-\r
     <?include ..\..\common\std_features.inc ?>\r
 \r
     <?include ..\..\common\InstallExecuteSeq.inc ?>\r
index b564388..5f66c7c 100644 (file)
@@ -8,7 +8,8 @@
 <?define OS=win7 ?>\r
 <?include ..\..\common\WinOF_cfg.inc ?>\r
 \r
-<Wix xmlns="http://schemas.microsoft.com/wix/2003/01/wi">\r
+<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'\r
+     xmlns:DifxApp='http://schemas.microsoft.com/wix/DifxAppExtension' >\r
   <Product\r
     Name="Windows OpenFabrics InfiniBand $(var.WOFREL) $(var.ARCHP)"\r
     Version="$(var.WOFRELNUM)"\r
     Language="1033" Codepage="1252"\r
     Manufacturer="Open Fabrics Alliance Windows">\r
 \r
-    <Package Id="????????-????-????-????-????????????"\r
+    <Package Id="*"\r
      Keywords="Installer, InfiniBand, WinOF, OpenFabrics"\r
      InstallPrivileges='elevated'\r
      Description="WinOF Installer"\r
      Comments="Windows OpenFabrics Alliance InfiniBand stack"\r
      Manufacturer="OpenFabrics Alliance" InstallerVersion="200"\r
-     Platforms="Intel" Languages="1033"\r
+     Platform="$(var.ARCHP)" Languages="1033"\r
      Compressed="yes" SummaryCodepage="1252" />\r
 \r
     <Condition Message="Administrator required to install [ProductName].">\r
     </Condition>\r
 \r
     <Condition Message="This package can be installed on x86 systems only">\r
-     <![CDATA[(Not Intel64) And (Not Msix64)]]></Condition>\r
+     <![CDATA[(Not Intel64) And (Not Msix64)]]>\r
+    </Condition>\r
 \r
-    <Condition Message="[ProductName] requires Windows 7 or Server 2008 R2 to install.">\r
-     <![CDATA[(VersionNT=601)]]></Condition>\r
+    <Condition\r
+      Message="[ProductName] requires Windows 7 or Server 2008 R2 to install.">\r
+      <![CDATA[(VersionNT=601)]]>\r
+    </Condition>\r
 \r
     <?include ..\..\common\requirements.inc ?>\r
 \r
     <Directory Id="TARGETDIR" Name="SourceDir">\r
-      <Directory Id="ProgramMenuFolder" Name="PMenu" LongName="Programs">\r
-        <Directory Id="ProgramMenuDir" LongName="Windows OpenFabrics"\r
-                   Name="WinOF" />\r
-      </Directory>\r
-      <Directory Id="DesktopFolder" Name="Desktop" />\r
+\r
+      <?include ..\..\common\PgmMenuShortcuts.inc ?>\r
+\r
       <Directory Id="ProgramFilesFolder" Name="PFiles">\r
         <Directory Id="INSTALLDIR" Name="WinOF">\r
 \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\$(var.ARCH)\installsp.exe" />\r
+            <File Id="installsp.exe" DiskId="1"\r
+                  Name="installsp.exe"\r
+                  Source="..\bin\net\$(var.ARCH)\installsp.exe" />\r
           </Component>\r
 \r
-          <Component Id="cNetworkDirect"\r
+          <Component Id="cNetworkDirect" KeyPath="yes"\r
                      Guid="F3BA9E15-E532-4b8c-BB0C-E8C1CC0EEF3F">\r
           </Component>\r
 \r
@@ -77,7 +79,7 @@
         </Directory>\r
       </Directory>\r
 \r
-      <Directory Id="WindowsVolume">\r
+      <Directory Id="WINROOT" Name="WinRoot">\r
 \r
         <!-- copy DAT header files to\r
            %SystemDrive%\DAT\v1-1\DAT\r
 \r
     <?include ..\..\common\arp.inc ?>\r
 \r
-    <!--\r
-       Features - Level=1 == Typical, no WSD on XP or SRP on 32-bit XP\r
-     -->\r
-\r
     <?include ..\..\common\std_features.inc ?>\r
 \r
     <?include ..\..\common\InstallExecuteSeq.inc ?>\r
index a581802..bd779bf 100644 (file)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>\r
 <!--\r
-   WinOF (Windows OpenFabrics) for IA64/IPF Itanium on Windows Server 2008\r
+   WinOF (Windows OpenFabrics) IA64/IPF Itanium Windows Server 2008\r
 -->\r
 \r
 <?define ARCH=ia64 ?>\r
@@ -8,7 +8,8 @@
 <?define OS=wlh ?>\r
 <?include ..\..\common\WinOF_cfg.inc ?>\r
 \r
-<Wix xmlns="http://schemas.microsoft.com/wix/2003/01/wi">\r
+<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'\r
+     xmlns:DifxApp='http://schemas.microsoft.com/wix/DifxAppExtension' >\r
   <Product\r
     Name="Windows OpenFabrics InfiniBand $(var.WOFREL) $(var.ARCHP)"\r
     Version="$(var.WOFRELNUM)"\r
     Language="1033" Codepage="1252"\r
     Manufacturer="Open Fabrics Alliance Windows">\r
 \r
-    <Package Id="????????-????-????-????-????????????"\r
+    <Package Id="*"\r
      Keywords="Installer, InfiniBand, WinOF, OpenFabrics"\r
      InstallPrivileges='elevated'\r
      Description="WinOF Installer"\r
      Comments="Windows OpenFabrics Alliance InfiniBand stack"\r
      Manufacturer="OpenFabrics Alliance" InstallerVersion="200"\r
-     Platforms="Intel64" Languages="1033"\r
+     Platform="$(var.ARCHP)" Languages="1033"\r
      Compressed="yes" SummaryCodepage="1252" />\r
 \r
     <Condition Message="Administrator required to install [ProductName].">\r
-     AdminUser\r
+      Privileged\r
     </Condition>\r
 \r
     <Condition Message="This package can be installed on IA64 systems only">\r
     <?include ..\..\common\requirements.inc ?>\r
 \r
     <Directory Id="TARGETDIR" Name="SourceDir">\r
-      <Directory Id="ProgramMenuFolder" Name="PMenu" LongName="Programs">\r
-        <Directory Id="ProgramMenuDir" LongName="Windows OpenFabrics"\r
-                   Name="WinOF" />\r
-      </Directory>\r
-      <Directory Id="DesktopFolder" Name="Desktop" />\r
+\r
+      <?include ..\..\common\PgmMenuShortcuts.inc ?>\r
+\r
       <Directory Id="ProgramFiles64Folder" Name="PFiles">\r
         <Directory Id="INSTALLDIR" Name="WinOF">\r
 \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\$(var.ARCH)\installsp.exe" />\r
+            <File Id="installsp.exe" DiskId="1"\r
+                  Name="installsp.exe"\r
+                  Source="..\bin\net\$(var.ARCH)\installsp.exe" />\r
           </Component>\r
 <!-- when ND works for ia64\r
-          <Component Id="cNetworkDirect"\r
+          <Component Id="cNetworkDirect" KeyPath="yes"\r
                      Guid="F3BA9E15-E532-4b8c-BB0C-E8C1CC0EEF3F">\r
           </Component>\r
 -->\r
@@ -84,7 +83,7 @@
         </Directory>\r
       </Directory>\r
 \r
-      <Directory Id="WindowsVolume">\r
+      <Directory Id="WINROOT" Name="WinRoot">\r
 \r
         <!-- copy DAT header files to\r
            %SystemDrive%\DAT\v1-1\DAT\r
 \r
     <?include ..\..\common\arp.inc ?>\r
 \r
-    <!--\r
-       Features - Level=1 == Typical, no WSD on XP or SRP on 32-bit XP\r
-     -->\r
-\r
     <?include ..\..\common\std_features.inc ?>\r
 \r
     <?include ..\..\common\InstallExecuteSeq.inc ?>\r
index 8ce50ab..ccf5df3 100644 (file)
@@ -8,3 +8,4 @@ P=$(S)_wlh_$(A)
 DFXP=..\bin\Misc\amd64\r
 \r
 !include ..\..\common\Makefile.inc\r
+\r
index 33b57dc..9c6a86f 100644 (file)
@@ -8,7 +8,8 @@
 <?define OS=wlh ?>\r
 <?include ..\..\common\WinOF_cfg.inc ?>\r
 \r
-<Wix xmlns="http://schemas.microsoft.com/wix/2003/01/wi">\r
+<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'\r
+     xmlns:DifxApp='http://schemas.microsoft.com/wix/DifxAppExtension' >\r
   <Product\r
     Name="Windows OpenFabrics InfiniBand $(var.WOFREL) $(var.ARCHP)"\r
     Version="$(var.WOFRELNUM)"\r
     Language="1033" Codepage="1252"\r
     Manufacturer="Open Fabrics Alliance Windows">\r
 \r
-    <Package Id="????????-????-????-????-????????????"\r
+    <Package Id="*"\r
      Keywords="Installer, InfiniBand, WinOF, OpenFabrics"\r
      InstallPrivileges='elevated'\r
      Description="WinOF Installer"\r
      Comments="Windows OpenFabrics Alliance InfiniBand stack"\r
      Manufacturer="OpenFabrics Alliance" InstallerVersion="200"\r
-     Platforms="$(var.ARCHP)" Languages="1033"\r
+     Platform="$(var.ARCHP)" Languages="1033"\r
      Compressed="yes" SummaryCodepage="1252" />\r
 \r
     <Condition Message="Administrator required to install [ProductName].">\r
     <?include ..\..\common\requirements.inc ?>\r
 \r
     <Directory Id="TARGETDIR" Name="SourceDir">\r
-      <Directory Id="ProgramMenuFolder" Name="PMenu" LongName="Programs">\r
-        <Directory Id="ProgramMenuDir" LongName="Windows OpenFabrics"\r
-                   Name="WinOF" />\r
-      </Directory>\r
-      <Directory Id="DesktopFolder" Name="Desktop" />\r
+\r
+      <?include ..\..\common\PgmMenuShortcuts.inc ?>\r
+\r
       <Directory Id="ProgramFiles64Folder" Name="PFiles">\r
         <Directory Id="INSTALLDIR" Name="WinOF">\r
 \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\$(var.ARCH)\installsp.exe" />\r
+            <File Id="installsp.exe" DiskId="1"\r
+                  Name="installsp.exe"\r
+                  Source="..\bin\net\$(var.ARCH)\installsp.exe" />\r
           </Component>\r
 \r
-          <Component Id="cNetworkDirect"\r
+          <Component Id="cNetworkDirect" KeyPath="yes"\r
                      Guid="F3BA9E15-E532-4b8c-BB0C-E8C1CC0EEF3F">\r
           </Component>\r
 \r
@@ -86,7 +85,7 @@
         </Directory>\r
       </Directory>\r
 \r
-      <Directory Id="WindowsVolume">\r
+      <Directory Id="WINROOT" Name="WinRoot">\r
 \r
         <!-- copy DAT header files to\r
            %SystemDrive%\DAT\v1-1\DAT\r
 \r
     <?include ..\..\common\arp.inc ?>\r
 \r
-    <!--\r
-       Features - Level=1 == Typical, no WSD on XP or SRP on 32-bit XP\r
-     -->\r
-\r
     <?include ..\..\common\std_features.inc ?>\r
 \r
     <?include ..\..\common\InstallExecuteSeq.inc ?>\r
index 16f3f9b..7df1aca 100644 (file)
@@ -8,7 +8,8 @@
 <?define OS=wlh ?>\r
 <?include ..\..\common\WinOF_cfg.inc ?>\r
 \r
-<Wix xmlns="http://schemas.microsoft.com/wix/2003/01/wi">\r
+<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'\r
+     xmlns:DifxApp='http://schemas.microsoft.com/wix/DifxAppExtension' >\r
   <Product\r
     Name="Windows OpenFabrics InfiniBand $(var.WOFREL) $(var.ARCHP)"\r
     Version="$(var.WOFRELNUM)"\r
     Language="1033" Codepage="1252"\r
     Manufacturer="Open Fabrics Alliance Windows">\r
 \r
-    <Package Id="????????-????-????-????-????????????"\r
+    <Package Id="*"\r
      Keywords="Installer, InfiniBand, WinOF, OpenFabrics"\r
      InstallPrivileges='elevated'\r
      Description="WinOF Installer"\r
      Comments="Windows OpenFabrics Alliance InfiniBand stack"\r
      Manufacturer="OpenFabrics Alliance" InstallerVersion="200"\r
-     Platforms="Intel" Languages="1033"\r
+     Platform="$(var.ARCHP)" Languages="1033"\r
      Compressed="yes" SummaryCodepage="1252" />\r
 \r
     <Condition Message="Administrator required to install [ProductName].">\r
     <?include ..\..\common\requirements.inc ?>\r
 \r
     <Directory Id="TARGETDIR" Name="SourceDir">\r
-      <Directory Id="ProgramMenuFolder" Name="PMenu" LongName="Programs">\r
-        <Directory Id="ProgramMenuDir" LongName="Windows OpenFabrics"\r
-                   Name="WinOF" />\r
-      </Directory>\r
-      <Directory Id="DesktopFolder" Name="Desktop" />\r
+\r
+      <?include ..\..\common\PgmMenuShortcuts.inc ?>\r
+\r
       <Directory Id="ProgramFilesFolder" Name="PFiles">\r
         <Directory Id="INSTALLDIR" Name="WinOF">\r
 \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\$(var.ARCH)\installsp.exe" />\r
+            <File Id="installsp.exe" DiskId="1"\r
+                  Name="installsp.exe"\r
+                  Source="..\bin\net\$(var.ARCH)\installsp.exe" />\r
           </Component>\r
 \r
-          <Component Id="cNetworkDirect"\r
+          <Component Id="cNetworkDirect" KeyPath="yes"\r
                      Guid="F3BA9E15-E532-4b8c-BB0C-E8C1CC0EEF3F">\r
           </Component>\r
 \r
@@ -80,7 +79,7 @@
         </Directory>\r
       </Directory>\r
 \r
-      <Directory Id="WindowsVolume">\r
+      <Directory Id="WINROOT" Name="WinRoot">\r
 \r
         <!-- copy DAT header files to\r
            %SystemDrive%\DAT\v1-1\DAT\r
 \r
     <?include ..\..\common\arp.inc ?>\r
 \r
-    <!--\r
-       Features - Level=1 == Typical, no WSD on XP or SRP on 32-bit XP\r
-     -->\r
-\r
     <?include ..\..\common\std_features.inc ?>\r
 \r
     <?include ..\..\common\InstallExecuteSeq.inc ?>\r
index cadf741..083a163 100644 (file)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>\r
 <!--\r
-   WinOF (Windows OpenFabrics InfiniBand) IA64/IPF Itanium Windows Server 2003\r
+   WinOF (Windows OpenFabrics) IA64/IPF Itanium Windows Server 2003\r
 -->\r
 \r
 <?define ARCH=ia64 ?>\r
@@ -8,7 +8,8 @@
 <?define OS=wnet ?>\r
 <?include ..\..\common\WinOF_cfg.inc ?>\r
 \r
-<Wix xmlns="http://schemas.microsoft.com/wix/2003/01/wi">\r
+<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'\r
+     xmlns:DifxApp='http://schemas.microsoft.com/wix/DifxAppExtension' >\r
   <Product\r
     Name="Windows OpenFabrics InfiniBand $(var.WOFREL) $(var.ARCHP)"\r
     Version="$(var.WOFRELNUM)"\r
     Language="1033" Codepage="1252"\r
     Manufacturer="Open Fabrics Alliance Windows">\r
 \r
-    <Package Id="????????-????-????-????-????????????"\r
+    <Package Id="*"\r
      Keywords="Installer, InfiniBand, WinOF, OpenFabrics"\r
      InstallPrivileges='elevated'\r
      Description="WinOF Installer"\r
      Comments="Windows OpenFabrics Alliance InfiniBand stack"\r
      Manufacturer="OpenFabrics Alliance" InstallerVersion="200"\r
-     Platforms="Intel64" Languages="1033"\r
+     Platform="$(var.ARCHP)" Languages="1033"\r
      Compressed="yes" SummaryCodepage="1252" />\r
 \r
     <Condition Message="Administrator required to install [ProductName].">\r
-     Privileged\r
+      Privileged\r
     </Condition>\r
 \r
     <Condition Message="This package can be installed on IA64 systems only">\r
         <![CDATA[VersionNT64]]>\r
     </Condition>\r
 \r
-    <Condition Message="[ProductName] requires Windows Server 2003 to install.">\r
-         <![CDATA[(VersionNT=502)]]>\r
+    <Condition\r
+      Message="[ProductName] requires Windows Server 2003 to install.">\r
+      <![CDATA[(VersionNT=502)]]>\r
     </Condition>\r
 \r
     <?include ..\..\common\requirements.inc ?>\r
 \r
     <Directory Id="TARGETDIR" Name="SourceDir">\r
-      <Directory Id="ProgramMenuFolder" Name="PMenu" LongName="Programs">\r
-        <Directory Id="ProgramMenuDir" LongName="Windows OpenFabrics"\r
-                   Name="WinOF" />\r
-      </Directory>\r
-      <Directory Id="DesktopFolder" Name="Desktop" />\r
+\r
+      <?include ..\..\common\PgmMenuShortcuts.inc ?>\r
+\r
       <Directory Id="ProgramFiles64Folder" Name="PFiles">\r
         <Directory Id="INSTALLDIR" Name="WinOF">\r
 \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\$(var.ARCH)\installsp.exe" />\r
+            <File Id="installsp.exe" DiskId="1"\r
+                  Name="installsp.exe"\r
+                  Source="..\bin\net\$(var.ARCH)\installsp.exe" />\r
           </Component>\r
 <!-- when ND works for ia64\r
-          <Component Id="cNetworkDirect"\r
+          <Component Id="cNetworkDirect" KeyPath="yes"\r
                      Guid="F3BA9E15-E532-4b8c-BB0C-E8C1CC0EEF3F">\r
           </Component>\r
 -->\r
@@ -83,7 +83,7 @@
         </Directory>\r
       </Directory>\r
 \r
-      <Directory Id="WindowsVolume">\r
+      <Directory Id="WINROOT" Name="WinRoot">\r
 \r
         <!-- copy DAT header files to\r
            %SystemDrive%\DAT\v1-1\DAT\r
 \r
     <?include ..\..\common\arp.inc ?>\r
 \r
-    <!--\r
-       Features - Level=1 == Typical, no WSD on XP or SRP on 32-bit XP\r
-     -->\r
-\r
     <?include ..\..\common\std_features.inc ?>\r
 \r
     <?include ..\..\common\InstallExecuteSeq.inc ?>\r
index 84e672d..7c322c6 100644 (file)
@@ -8,7 +8,8 @@
 <?define OS="wnet/xp64" ?>\r
 <?include ..\..\common\WinOF_cfg.inc ?>\r
 \r
-<Wix xmlns="http://schemas.microsoft.com/wix/2003/01/wi">\r
+<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'\r
+     xmlns:DifxApp='http://schemas.microsoft.com/wix/DifxAppExtension' >\r
   <Product\r
     Name="Windows OpenFabrics InfiniBand $(var.WOFREL) $(var.ARCHP)"\r
     Version="$(var.WOFRELNUM)"\r
     Language="1033" Codepage="1252"\r
     Manufacturer="Open Fabrics Alliance Windows">\r
 \r
-    <Package Id="????????-????-????-????-????????????"\r
+    <Package Id="*"\r
      Keywords="Installer, InfiniBand, WinOF, OpenFabrics"\r
      InstallPrivileges='elevated'\r
      Description="WinOF Installer"\r
      Comments="Windows OpenFabrics Alliance InfiniBand stack"\r
      Manufacturer="OpenFabrics Alliance" InstallerVersion="200"\r
-     Platforms="$(var.ARCHP)" Languages="1033"\r
+     Platform="$(var.ARCHP)" Languages="1033"\r
      Compressed="yes" SummaryCodepage="1252" />\r
 \r
     <Condition Message="Administrator required to install [ProductName].">\r
         <![CDATA[Msix64]]>\r
     </Condition>\r
 \r
-    <Condition Message="[ProductName] requires Windows Server 2003 or Windows XP64 to install.">\r
-         <![CDATA[(VersionNT64=502) Or (VersionNT64=501)]]>\r
+    <Condition\r
+      Message="[ProductName] requires Windows Server 2003 or Windows XP64 to install.">\r
+      <![CDATA[(VersionNT64=502) Or (VersionNT64=501)]]>\r
     </Condition>\r
 \r
     <?include ..\..\common\requirements.inc ?>\r
 \r
     <Directory Id="TARGETDIR" Name="SourceDir">\r
-      <Directory Id="ProgramMenuFolder" Name="PMenu" LongName="Programs">\r
-        <Directory Id="ProgramMenuDir" LongName="Windows OpenFabrics"\r
-                   Name="WinOF" />\r
-      </Directory>\r
-      <Directory Id="DesktopFolder" Name="Desktop" />\r
+\r
+      <?include ..\..\common\PgmMenuShortcuts.inc ?>\r
+\r
       <Directory Id="ProgramFiles64Folder" Name="PFiles">\r
         <Directory Id="INSTALLDIR" Name="WinOF">\r
 \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\$(var.ARCH)\installsp.exe" />\r
+            <File Id="installsp.exe" DiskId="1"\r
+                  Name="installsp.exe"\r
+                  Source="..\bin\net\$(var.ARCH)\installsp.exe" />\r
           </Component>\r
 \r
-          <Component Id="cNetworkDirect"\r
+          <Component Id="cNetworkDirect" KeyPath="yes"\r
                      Guid="F3BA9E15-E532-4b8c-BB0C-E8C1CC0EEF3F">\r
           </Component>\r
 \r
         </Directory>\r
       </Directory>\r
 \r
-      <Directory Id="WindowsVolume">\r
+      <Directory Id="WINROOT" Name="WinRoot">\r
 \r
-      <!-- copy DAT header files to\r
-         %SystemDrive%\DAT\v1-1\DAT\r
-         %SystemDrive%\DAT\v2-0\DAT\r
-      -->\r
+        <!-- copy DAT header files to\r
+           %SystemDrive%\DAT\v1-1\DAT\r
+           %SystemDrive%\DAT\v2-0\DAT\r
+        -->\r
 \r
-      <Directory Id="dDATD" Name="DAT">\r
-        <?include ..\..\common\DAT_config.inc ?>\r
-      </Directory>\r
+        <Directory Id="dDATD" Name="DAT">\r
+          <?include ..\..\common\DAT_config.inc ?>\r
+        </Directory>\r
 \r
-      <Directory Id="IBSDK" Name="IBSDK">\r
-        <?include ..\..\common\ib_sdk.inc ?>\r
-      </Directory>\r
+        <Directory Id="IBSDK" Name="IBSDK">\r
+          <?include ..\..\common\ib_sdk.inc ?>\r
+        </Directory>\r
 \r
       </Directory>\r
 \r
 \r
     <?include ..\..\common\arp.inc ?>\r
 \r
-    <!--\r
-       Features - Level=1 == Typical, no WSD on XP or SRP on 32-bit XP\r
-     -->\r
-\r
     <?include ..\..\common\std_features.inc ?>\r
 \r
     <?include ..\..\common\InstallExecuteSeq.inc ?>\r
index 1ca9719..f023473 100644 (file)
@@ -8,7 +8,8 @@
 <?define OS=wnet ?>\r
 <?include ..\..\common\WinOF_cfg.inc ?>\r
 \r
-<Wix xmlns="http://schemas.microsoft.com/wix/2003/01/wi">\r
+<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'\r
+     xmlns:DifxApp='http://schemas.microsoft.com/wix/DifxAppExtension' >\r
   <Product\r
     Name="Windows OpenFabrics InfiniBand $(var.WOFREL) $(var.ARCHP)"\r
     Version="$(var.WOFRELNUM)"\r
     Language="1033" Codepage="1252"\r
     Manufacturer="Open Fabrics Alliance Windows">\r
 \r
-    <Package Id="????????-????-????-????-????????????"\r
+    <Package Id="*"\r
      Keywords="Installer, InfiniBand, WinOF, OpenFabrics"\r
      InstallPrivileges='elevated'\r
      Description="WinOF Installer"\r
      Comments="Windows OpenFabrics Alliance InfiniBand stack"\r
      Manufacturer="OpenFabrics Alliance" InstallerVersion="200"\r
-     Platforms="Intel" Languages="1033"\r
+     Platform="$(var.ARCHP)" Languages="1033"\r
      Compressed="yes" SummaryCodepage="1252" />\r
 \r
     <Condition Message="Administrator required to install [ProductName].">\r
     </Condition>\r
 \r
     <Condition Message="This package can be installed on x86 systems only">\r
-     <![CDATA[(Not Intel64) And (Not Msix64)]]></Condition>\r
+     <![CDATA[(Not Intel64) And (Not Msix64)]]>\r
+    </Condition>\r
 \r
-    <Condition Message="[ProductName] requires Windows 2003 Server to install.">\r
-     <![CDATA[(VersionNT=502)]]></Condition>\r
+    <Condition\r
+      Message="[ProductName] requires Windows 2003 Server to install.">\r
+      <![CDATA[(VersionNT=502)]]>\r
+    </Condition>\r
 \r
     <?include ..\..\common\requirements.inc ?>\r
 \r
     <Directory Id="TARGETDIR" Name="SourceDir">\r
-      <Directory Id="ProgramMenuFolder" Name="PMenu" LongName="Programs">\r
-        <Directory Id="ProgramMenuDir" LongName="Windows OpenFabrics"\r
-                   Name="WinOF" />\r
-      </Directory>\r
-      <Directory Id="DesktopFolder" Name="Desktop" />\r
+\r
+      <?include ..\..\common\PgmMenuShortcuts.inc ?>\r
+\r
       <Directory Id="ProgramFilesFolder" Name="PFiles">\r
         <Directory Id="INSTALLDIR" Name="WinOF">\r
 \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\$(var.ARCH)\installsp.exe" />\r
+            <File Id="installsp.exe" DiskId="1"\r
+                  Name="installsp.exe"\r
+                  Source="..\bin\net\$(var.ARCH)\installsp.exe" />\r
           </Component>\r
 \r
-          <Component Id="cNetworkDirect"\r
+          <Component Id="cNetworkDirect" KeyPath="yes"\r
                      Guid="F3BA9E15-E532-4b8c-BB0C-E8C1CC0EEF3F">\r
           </Component>\r
 \r
@@ -77,7 +79,7 @@
         </Directory>\r
       </Directory>\r
 \r
-      <Directory Id="WindowsVolume">\r
+      <Directory Id="WINROOT" Name="WinRoot">\r
 \r
         <!-- copy DAT header files to\r
            %SystemDrive%\DAT\v1-1\DAT\r
 \r
     <?include ..\..\common\arp.inc ?>\r
 \r
-    <!--\r
-       Features - Level=1 == Typical, no WSD on XP or SRP on 32-bit XP\r
-     -->\r
-\r
     <?include ..\..\common\std_features.inc ?>\r
 \r
     <?include ..\..\common\InstallExecuteSeq.inc ?>\r
index 471fc50..0f65341 100644 (file)
@@ -8,7 +8,8 @@
 <?define OS=XP ?>\r
 <?include ..\..\common\WinOF_cfg.inc ?>\r
 \r
-<Wix xmlns="http://schemas.microsoft.com/wix/2003/01/wi">\r
+<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'\r
+     xmlns:DifxApp='http://schemas.microsoft.com/wix/DifxAppExtension' >\r
   <Product\r
     Name="Windows OpenFabrics InfiniBand $(var.WOFREL) $(var.ARCHP)"\r
     Version="$(var.WOFRELNUM)"\r
     Language="1033" Codepage="1252"\r
     Manufacturer="Open Fabrics Alliance Windows">\r
 \r
-    <Package Id="????????-????-????-????-????????????"\r
+    <Package Id="*"\r
      Keywords="Installer, InfiniBand, WinOF, OpenFabrics"\r
      InstallPrivileges='elevated'\r
      Description="WinOF Installer"\r
      Comments="Windows OpenFabrics Alliance InfiniBand stack"\r
      Manufacturer="OpenFabrics Alliance" InstallerVersion="200"\r
-     Platforms="Intel" Languages="1033"\r
+     Platform="$(var.ARCHP)" Languages="1033"\r
      Compressed="yes" SummaryCodepage="1252" />\r
 \r
     <Condition Message="Administrator required to install [ProductName].">\r
     </Condition>\r
 \r
     <Condition Message="This package can be installed on x86 systems only">\r
-     <![CDATA[(Not Intel64) And (Not Msix64)]]></Condition>\r
+     <![CDATA[(Not Intel64) And (Not Msix64)]]>\r
+    </Condition>\r
 \r
-    <Condition Message="[ProductName] requires Windows XP to install.">\r
-     <![CDATA[(VersionNT=501)]]></Condition>\r
+    <Condition\r
+      Message="[ProductName] requires Windows XP to install.">\r
+      <![CDATA[(VersionNT=501)]]>\r
+    </Condition>\r
 \r
     <?include ..\..\common\requirements.inc ?>\r
 \r
     <Directory Id="TARGETDIR" Name="SourceDir">\r
-      <Directory Id="ProgramMenuFolder" Name="PMenu" LongName="Programs">\r
-        <Directory Id="ProgramMenuDir" LongName="Windows OpenFabrics"\r
-                   Name="WinOF" />\r
-      </Directory>\r
-      <Directory Id="DesktopFolder" Name="Desktop" />\r
+\r
+      <?include ..\..\common\PgmMenuShortcuts.inc ?>\r
+\r
       <Directory Id="ProgramFilesFolder" Name="PFiles">\r
         <Directory Id="INSTALLDIR" Name="WinOF">\r
 \r
           <?include ..\..\common\winverbs_OFED.inc ?>\r
 \r
 <!-- XP does not support WSD\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\$(var.ARCH)\installsp.exe" />\r
-            </Component>\r
+          <Component Id="WinsockDirect"\r
+                     Guid="516A61B4-EBC2-41CE-8D18-81BADA4649D4">\r
+            <File Id="installsp.exe" DiskId="1"\r
+                  Name="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
+          <Component Id="cNetworkDirect" KeyPath="yes"\r
+                     Guid="F3BA9E15-E532-4b8c-BB0C-E8C1CC0EEF3F">\r
+          </Component>\r
 \r
           <?include ..\..\common\dapl_rt.inc ?>\r
 \r
         </Directory>\r
       </Directory>\r
 \r
-      <Directory Id="WindowsVolume">\r
+      <Directory Id="WINROOT" Name="WinRoot">\r
 \r
         <!-- copy DAT header files to\r
            %SystemDrive%\DAT\v1-1\DAT\r
 \r
     <?include ..\..\common\arp.inc ?>\r
 \r
-    <!--\r
-       Features - Level=1 == Typical, no WSD on XP or SRP on 32-bit XP\r
-     -->\r
-\r
     <?include ..\..\common\std_features.inc ?>\r
 \r
     <?include ..\..\common\InstallExecuteSeq.inc ?>\r