[ofw] SVN commits - 2261 & 2262

[Smith, Stan]

WinOF install now utilizes Microsoft's DIFxApp (Driver Install Frameworks for Applications)
to install WinOF drivers instead of the home-grown CustomAction invocations of
devman.exe (Server 2003 & XP) and DPInst.exe (Server 2008, HPC, Vista and Windows 7).

Now all OS flavors use the same MS install routines with the elimination
of the install requiring an HCA model selection (InfiniHost or ConnectX); select by Vendor (Mellanox default).

DIFxApp populates the Driver Store which then allows PNP to select the correct drivers at install
or into the future (case of adding an SRP target).

makebin.bat now copies DIFxApp files (3) and DPInst.exe from the WDK release tree to the WinOF binary build tree.
WinOF\Wix\{ia64,x86,x64}\DPInst.exe files have been removed from SVN in favor of the WDK released versions.

Common WIX include file mods migrated individual driver files into separate .inc files which in individual
Install folders as DIFxApp can not tolerate multiple .inf files in a single folder.

The installed WinOF folder structure has changed: IBcore\ renamed --> Drivers\

Program Files(x86)\WinOF\Drivers\
        mlx4_bus\
        mlx4_hca\
        mthca\
        net\
        iou\
        srp\
        qlgcvnic\

Signed off by stan.smith at intel.com

trunk\winof\wix\common\
  Added
        hca_filters.inc
        iou.inc

  Modified:
        IBcore.inc
        ipoib.inc
        mlnx_drivers.inc
        qlgc_vnic.inc
        srp.inc
        winverbs_drivers.inc

trunk\etc\makebin.bat


Same mods for all file variants

trunk\winof\wix\{wlh,wnet,win7,wxp}\{ia64,x86,x64}
        makefile
        wof.wix


--- C:/Documents and Settings/scsmith/Local Settings/Temp/Makefile-revBASE.svn000.tmp   Mon Jun 22 13:30:53 2009
+++ C:/Documents and Settings/scsmith/My Documents/openIB-windows/SVN/gen1/trunk/WinOF/WIX/wlh/x64/Makefile     Sat Jun 20 14:10:26 2009
@@ -12,26 +12,39 @@

 WIX_UI="$(L)\wixui.wixlib" -loc "$(L)\WixUI_en-us.wxl"

+DFX=DIFxApp.wixlib
+# Since makebin.bat knows correct WDK version, it copies the DIFX APP files
+# to the bin\ tree; eliminates Makefiles having to know about WDK versions.
+DFXP=..\bin\Misc\amd64
+
 full: clean $(P).msi

 clean:
-  @del /q $(P).msi 2>nul
-  @del /q $(S).wixobj 2>nul
-  @del /q license.rtf 2>nul
+       @del /q $(S).wixobj 2>nul
+       @del /q $(P).msi 2>nul
+       @del /q license.rtf 2>nul
+       @del /q/f DIFxA*.* 2>nul

 MySetup: $(P).msi

 license.rtf: ..\..\license.rtf
        @copy ..\..\license.rtf .\license.rtf

+# .dlls need to be in the current folder
+$(DFX) : $(DFXP)\$(DFX) $(DFXP)\DIFxApp.dll $(DFXP)\DIFxAppA.dll
+       @copy /B/Y $(DFXP)\DIFxApp.dll .
+       @copy /B/Y $(DFXP)\DIFxAppA.dll .
+       @copy /B/Y $(DFXP)\$(DFX) .
+
 $(S).wixobj: $(S).wxs

-$(P).msi: $(S).wixobj license.rtf
+$(P).msi: $(S).wixobj license.rtf $(DFX)
        @echo --
        @echo Building $(P).msi
-       $(L)\light.exe /nologo -out $(P).msi $(S).wixobj $(WIX_UI)
+       $(L)\light.exe /nologo -out $(P).msi $(S).wixobj $(DFX) $(WIX_UI)
        @del /q $(S).wixobj 2>nul
        @del /q license.rtf 2>nul
+       @del /q/f DIFxA*.* 2>nul


 ###################



--- C:/Documents and Settings/scsmith/Local Settings/Temp/wof.wxs-revBASE.svn000.tmp.wxs        Mon Jun 22 13:30:27 2009
+++ C:/Documents and Settings/scsmith/My Documents/openIB-windows/SVN/gen1/trunk/WinOF/WIX/wlh/x64/wof.wxs      Wed Jun 17 14:02:16 2009
@@ -57,19 +57,16 @@
           <?include ..\..\common\Tools.inc ?>
           <?include ..\..\common\OpenSM_service.inc ?>

-          <Directory Id="IBcoreDir" Name="IBcore">
-            <?include ..\..\common\IBcore.inc ?>
-            <?include ..\..\common\mlnx_drivers.inc ?>
-            <?include ..\..\common\winverbs_drivers.inc ?>
+          <Directory Id="DriversDir" Name="Drivers">
+              <?include ..\..\common\IBcore.inc ?>
+              <?include ..\..\common\ipoib.inc ?>
+              <?include ..\..\common\qlgc_vnic.inc ?>
+              <?include ..\..\common\srp.inc ?>
           </Directory>

           <?include ..\..\common\checked.inc ?>
           <?include ..\..\common\winverbs_OFED.inc ?>

-          <Directory Id="ipoibDir" Name="net">
-            <?include ..\..\common\ipoib.inc ?>
-          </Directory>
-
           <Component Id="WinsockDirect"
                      Guid="516A61B4-EBC2-41CE-8D18-81BADA4649D4">
             <File Id="installsp.exe" Compressed="yes" DiskId="1"
@@ -82,8 +79,6 @@
           </Component>

           <?include ..\..\common\dapl_rt.inc ?>
-          <?include ..\..\common\qlgc_vnic.inc ?>
-          <?include ..\..\common\srp.inc ?>

           <Component Id="cCertPush"
                      Guid="8B3AEC30-CFED-4d90-A48E-AD2C8C55FEFD">
@@ -127,7 +122,8 @@
          Display="expand" ConfigurableDirectory="INSTALLDIR"
          AllowAdvertise='no' InstallDefault='local' Absent='allow'>
       <ComponentRef Id="cMthcaDriver" />
-      <ComponentRef Id="cConnectXDriver" />
+      <ComponentRef Id="cMLX4BusDriver" />
+      <ComponentRef Id="cMLX4HcaDriver" />
     </Feature>

     <Feature Id="IBcore" Title="InfiniBand Core Modules" Level="1"
@@ -135,12 +131,10 @@
         Display="expand" ConfigurableDirectory="INSTALLDIR"
         AllowAdvertise="no" InstallDefault="local" Absent="disallow">
       <ComponentRef Id="cIBcore" />
-      <ComponentRef Id="cWinVerbsDrivers" />
+      <ComponentRef Id="cIOUdriver" />
       <ComponentRef Id="Docs" />
       <ComponentRef Id="Tools" />
       <ComponentRef Id="OpenSMservice" />
-      <ComponentRef Id="cQLVNIC_files" />
-      <ComponentRef Id="cSRP_files" />
       <ComponentRef Id="cCertPush" />
     </Feature>

@@ -156,7 +150,7 @@
         Description="Internet Protocols over InfiniBand" Display="expand"
         ConfigurableDirectory="INSTALLDIR" AllowAdvertise="no"
         InstallDefault="local" Absent="allow">
-      <ComponentRef Id="IPoIB" />
+      <ComponentRef Id="cIPoIB" />
     </Feature>

     <Feature Id="fWSD" Title="WSD" Description="Winsock Direct Enabled"