[ofw] [COMMIT] simplify WIX dir structure definition + system32 installs

[Smith, Stan]

Signed-off-by: stan smith <stan.smith at intel.com>

Revision: 2833
Author: stansmith
Date: 9:20:07 AM, Thursday, June 24, 2010
Message:
[WIX] Incorporate WIX DirRef construct to simplify wix files (installed folder structure defined in a single
file; much easier to understand overall structure).
Additionally install .dlls in %SystemRoot%\system32 instead of %SystemRoot%.
----
Modified : /gen1/trunk/OFED/WIX/build-all-MSI.bat
Added : /gen1/trunk/OFED/WIX/common/Drivers.inc
Modified : /gen1/trunk/OFED/WIX/common/PgmMenuShortcuts.inc
Modified : /gen1/trunk/OFED/WIX/common/dapl_rt.inc
Added : /gen1/trunk/OFED/WIX/common/directory_structure.inc
Modified : /gen1/trunk/OFED/WIX/common/std_features.inc
Added : /gen1/trunk/OFED/WIX/common/system32_files.inc
Modified : /gen1/trunk/OFED/WIX/common/winverbs_OFED.inc
Modified : /gen1/trunk/OFED/WIX/dat.conf
Modified : /gen1/trunk/OFED/WIX/sign-all-drivers.bat
Modified : /gen1/trunk/OFED/WIX/win7/ia64/ofed.wxs
Modified : /gen1/trunk/OFED/WIX/win7/x64/ofed.wxs
Modified : /gen1/trunk/OFED/WIX/win7/x86/ofed.wxs
Modified : /gen1/trunk/OFED/WIX/wlh/ia64/ofed.wxs
Modified : /gen1/trunk/OFED/WIX/wlh/x64/ofed.wxs
Modified : /gen1/trunk/OFED/WIX/wlh/x86/ofed.wxs
Modified : /gen1/trunk/OFED/WIX/wnet/ia64/ofed.wxs
Modified : /gen1/trunk/OFED/WIX/wnet/x64/ofed.wxs
Modified : /gen1/trunk/OFED/WIX/wnet/x86/ofed.wxs
Modified : /gen1/trunk/OFED/WIX/wxp/x86/ofed.wxs

Example of changes applied to all ofed.wxs files.

--- C:/Documents and Settings/scsmith/Local Settings/Temp/ofed.wx-revBASE.svn001.tmp.wxs        Thu Jun 24 09:14:03 2010
+++ C:/Documents and Settings/scsmith/My Documents/openIB-windows/SVN/gen1/trunk/OFED/WIX/win7/x64/ofed.wxs     Fri Jun 18 12:26:41 2010
@@ -3,9 +3,13 @@
    OpenFabrics Enterprise Distribution for x64 Windows 7 or Server 2008 R2
 -->

-<?define ARCH=amd64 ?>
-<?define ARCHP=x64 ?>
-<?define OS=win7 ?>
+<?define OS=win7?>
+<?define ARCH=amd64?>
+<?define ARCHP=x64?>
+<?define SysNative=System64Folder?>
+<?define ProgramFilesNative=ProgramFiles64Folder?>
+<?define Win64=yes?>
+
 <?include ..\..\common\Config.inc ?>

 <Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'
@@ -39,54 +43,49 @@

     <?include ..\..\common\requirements.inc ?>

-    <Directory Id="TARGETDIR" Name="SourceDir">
+    <?include ..\..\common\directory_structure.inc ?>
+
+    <?include ..\..\common\PgmMenuShortcuts.inc ?>

-      <?include ..\..\common\PgmMenuShortcuts.inc ?>
+    <?include ..\..\common\Drivers.inc ?>

-      <Directory Id="ProgramFiles64Folder" Name="PFiles">
-        <Directory Id="INSTALLDIR" Name="$(var.PID)">
+    <DirectoryRef Id="INSTALLDIR">

-          <?include ..\..\common\Docs.inc ?>
-          <?include ..\..\common\Tools.inc ?>
-          <?include ..\..\common\OpenSM_service.inc ?>
+      <?include ..\..\common\Docs.inc ?>
+      <?include ..\..\common\Tools.inc ?>
+      <?include ..\..\common\OpenSM_service.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 ?>

-          <?include ..\..\common\checked.inc ?>
-          <?include ..\..\common\winverbs_OFED.inc ?>
+      <Component Id="WinsockDirect"
+                 Guid="516A61B4-EBC2-41CE-8D18-81BADA4649D4">
+        <File Id="installsp.exe" DiskId="1"
+              Name="installsp.exe"
+              Source="..\bin\net\$(var.ARCH)\installsp.exe" />
+      </Component>

-          <Component Id="WinsockDirect"
-                     Guid="516A61B4-EBC2-41CE-8D18-81BADA4649D4">
-            <File Id="installsp.exe" DiskId="1"
-                  Name="installsp.exe"
-                  Source="..\bin\net\$(var.ARCH)\installsp.exe" />
-          </Component>
+      <Component Id="cNetworkDirect" KeyPath="yes"
+                 Guid="F3BA9E15-E532-4b8c-BB0C-E8C1CC0EEF3F">
+      </Component>

-          <Component Id="cNetworkDirect" KeyPath="yes"
-                     Guid="F3BA9E15-E532-4b8c-BB0C-E8C1CC0EEF3F">
-          </Component>
+      <?include ..\..\common\dapl_rt.inc ?>

-          <?include ..\..\common\dapl_rt.inc ?>
+      <?include ..\..\HPC\HPC.inc ?>

-          <?include ..\..\HPC\HPC.inc ?>
+    </DirectoryRef>

-        </Directory>
-      </Directory>
+    <DirectoryRef Id="WINROOT">

-      <Directory Id="WINROOT" Name="WinRoot">
+      <?include ..\..\common\DAT_config.inc ?>

-        <?include ..\..\common\DAT_config.inc ?>
+      <?include ..\..\common\ib_sdk.inc ?>

-        <?include ..\..\common\ib_sdk.inc ?>
+    </DirectoryRef>

-      </Directory>
+    <?include ..\..\common\system32_files.inc ?>

-    </Directory> <!-- End TARGETDIR -->
+    <!-- End of installed Files -->

     <?include ..\..\common\arp.inc ?>