[WIX] Incorporate WIX DirRef construct to simplify wix files (installed folder struct...

Additionally install .dlls in %SystemRoot%\system32 instead of %SystemRoot%.

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

diff --git a/trunk/OFED/WIX/build-all-MSI.bat b/trunk/OFED/WIX/build-all-MSI.bat
index fb7566a88ce0c5613e7bd2c2595163112a390368..bb977a217e9a2b7d4e2db8570f8ade434e613641 100644 (file)
--- a/trunk/OFED/WIX/build-all-MSI.bat
+++ b/trunk/OFED/WIX/build-all-MSI.bat
@@ -17,6 +17,8 @@ rem *** Assumes current folder is WIX\
 \r
 set USE=usage build-all-msi all/msi CrossCert-Fname SW_Publisher[see signtool /n] msi-path {target-OS[all,wxp,wnet,wlh,win7] target-arch[all,x86,x64,ia64]}\r
 \r
+set TS=/t http://timestamp.verisign.com/scripts/timstamp.dll\r
+\r
 if "%1" == "" (\r
     echo %USE%\r
     exit /B 1\r
@@ -150,7 +152,6 @@ for %%o in ( %TOS% ) do (
 \r
 rem Digitally Sign the installer .msi files\r
 \r
-set TS=/t http://timestamp.verisign.com/scripts/timstamp.dll\r
 echo %0 - Signing Installer .msi files\r
 for %%o in ( %TOS% ) do (\r
     for %%a in ( %TARCH% ) do (\r

diff --git a/trunk/OFED/WIX/common/Drivers.inc b/trunk/OFED/WIX/common/Drivers.inc
new file mode 100644 (file)
index 0000000..734499e
--- /dev/null
+++ b/trunk/OFED/WIX/common/Drivers.inc
@@ -0,0 +1,15 @@
+\r
+<Include>\r
+\r
+    <!-- available driver packages  -->\r
+\r
+    <DirectoryRef Id="DriversDir">\r
+        <?include IBcore.inc ?>\r
+        <?include ipoib.inc ?>\r
+        <?include qlgc_vnic.inc ?>\r
+        <?if $(var.OS) != "XP" ?>\r
+           <?include srp.inc ?>\r
+        <?endif?>\r
+    </DirectoryRef>\r
+\r
+</Include>\r

diff --git a/trunk/OFED/WIX/common/PgmMenuShortcuts.inc b/trunk/OFED/WIX/common/PgmMenuShortcuts.inc
index 3d84334a10884b6a34789df7e158526e3d2f2352..16c9ec20b6eb251a1f3c339c7d2cb17bd462cca7 100644 (file)
--- a/trunk/OFED/WIX/common/PgmMenuShortcuts.inc
+++ b/trunk/OFED/WIX/common/PgmMenuShortcuts.inc
@@ -1,5 +1,7 @@
 <Include>\r
 \r
+<DirectoryRef Id="TARGETDIR">\r
+\r
   <Directory Id="ProgramMenuFolder">\r
      <Directory Id="ProgramMenuDir" Name="$(var.PRODUCT)" >\r
         <Component Id="WinOFshortcuts"\r
@@ -41,4 +43,6 @@
      </Directory>\r
   </Directory>\r
 \r
+</DirectoryRef>\r
+\r
 </Include>\r

diff --git a/trunk/OFED/WIX/common/dapl_rt.inc b/trunk/OFED/WIX/common/dapl_rt.inc
index cbf3c7906b657c0abccf74f495ed3048385f7032..57eaba47643be4a7cd33244b1f665f105ce8be58 100644 (file)
--- a/trunk/OFED/WIX/common/dapl_rt.inc
+++ b/trunk/OFED/WIX/common/dapl_rt.inc
@@ -1,4 +1,5 @@
 <Include>\r
+\r
       <Component Id="cDAPL2RT" Guid="02C3490D-EF11-40C9-9E8D-0BEE97082A6A">\r
 \r
           <?if $(var.ARCHP) = "ia64" Or $(var.ARCHP) = "x64" ?>\r
@@ -16,42 +17,6 @@
                      Source="..\bin\DAPL2\$(var.ARCH)\dat232d.dll" />\r
           <?endif?>\r
 \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" DiskId="1"\r
-                 Name="dapl2d.dll"\r
-                 Source="..\bin\DAPL2\$(var.ARCH)\dapl2d.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="dapl2-ofa-scm.dll"\r
-                    DestinationProperty="WindowsFolder" />\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" 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="dapl2-ofa-cma.dll"\r
-                    DestinationProperty="WindowsFolder" />\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" 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" DiskId="1"\r
-                 Name="dat2d.dll"\r
-                 Source="..\bin\DAPL2\$(var.ARCH)\dat2d.dll" />\r
           <File Id="dapl2test.exe" DiskId="1"\r
                  Name="dapl2test.exe"\r
                  Source="..\bin\tools\$(var.ARCH)\release\dapl2test.exe" />\r
@@ -93,4 +58,5 @@
                 Name="dat2d.lib"\r
                 Source="..\bin\DAPL2\$(var.ARCH)\dat2d.lib" />\r
       </Component>\r
+\r
 </Include>\r

diff --git a/trunk/OFED/WIX/common/directory_structure.inc b/trunk/OFED/WIX/common/directory_structure.inc
new file mode 100644 (file)
index 0000000..2709c5a
--- /dev/null
+++ b/trunk/OFED/WIX/common/directory_structure.inc
@@ -0,0 +1,16 @@
+\r
+<Include>\r
+\r
+    <!-- Define the install directory structure -->\r
+\r
+    <Directory Id="TARGETDIR" Name="SourceDir">\r
+        <Directory Id="WINROOT" />\r
+        <Directory Id="$(var.SysNative)" />\r
+        <Directory Id="$(var.ProgramFilesNative)" Name="PFiles">\r
+            <Directory Id="INSTALLDIR" Name="$(var.PID)">\r
+               <Directory Id="DriversDir" Name="Drivers" />\r
+            </Directory>\r
+        </Directory>\r
+    </Directory>\r
+\r
+</Include>\r

diff --git a/trunk/OFED/WIX/common/std_features.inc b/trunk/OFED/WIX/common/std_features.inc
index d0543fcb867f996d03e21a178b36d9696eee81dd..6cdf0229e074d0a5e5fb348f8ff444bdc65c8575 100644 (file)
--- a/trunk/OFED/WIX/common/std_features.inc
+++ b/trunk/OFED/WIX/common/std_features.inc
@@ -35,6 +35,7 @@
           Display="expand" Level="1" ConfigurableDirectory="INSTALLDIR"\r
           AllowAdvertise="no" InstallDefault="local" Absent="allow">\r
           <ComponentRef Id="cWinVerbsOFED" />\r
+          <ComponentRef Id="cSys32WinVerbsOFED" />\r
           <ComponentRef Id="cWinVerbsUApps" />\r
       </Feature>\r
 \r
@@ -103,6 +104,7 @@
          Display="expand" Level="1" \r
          AllowAdvertise='no' InstallDefault='local' Absent='allow'>\r
         <ComponentRef Id="cDAPL2RT" />\r
+        <ComponentRef Id="cSys32DAPL2RT" />\r
       </Feature>\r
 \r
       <Feature Id="fDatBldKit2" Title="DAT 2.0 Build Kit"\r

diff --git a/trunk/OFED/WIX/common/system32_files.inc b/trunk/OFED/WIX/common/system32_files.inc
new file mode 100644 (file)
index 0000000..d6fbee1
--- /dev/null
+++ b/trunk/OFED/WIX/common/system32_files.inc
@@ -0,0 +1,93 @@
+<Include>\r
+\r
+ <!-- Files installed in %windir%\system32 -->\r
+\r
+ <DirectoryRef Id="$(var.SysNative)"> \r
+\r
+    <Component Id="cSys32WinVerbsOFED" Win64="$(var.Win64)"\r
+               Guid="3363834C-12D7-43db-95AA-14527C3D1469">\r
+\r
+      <!-- winverbs -->\r
+      <File Id="libibverbs.dll" DiskId="1"\r
+            Name="libibverbs.dll"\r
+            Source="..\bin\HCA\$(var.ARCH)\libibverbs.dll" />\r
+\r
+      <File Id="libibverbsd.dll" DiskId="1"\r
+            Name="libibverbsd.dll"\r
+            Source="..\bin\HCA\$(var.ARCH)\libibverbsd.dll" />\r
+\r
+      <File Id="libibmad.dll" DiskId="1"\r
+            Name="libibmad.dll"\r
+            Source="..\bin\HCA\$(var.ARCH)\libibmad.dll" />\r
+\r
+      <File Id="libibmadd.dll" DiskId="1"\r
+            Name="libibmadd.dll"\r
+            Source="..\bin\HCA\$(var.ARCH)\libibmadd.dll" />\r
+\r
+      <File Id="libibumad.dll" DiskId="1"\r
+            Name="libibumad.dll"\r
+            Source="..\bin\HCA\$(var.ARCH)\libibumad.dll" />\r
+ \r
+      <File Id="libibumadd.dll" DiskId="1"\r
+            Name="libibumadd.dll"\r
+            Source="..\bin\HCA\$(var.ARCH)\libibumadd.dll" />\r
+ \r
+      <File Id="librdmacm.dll" DiskId="1"\r
+            Name="librdmacm.dll"\r
+            Source="..\bin\HCA\$(var.ARCH)\librdmacm.dll" />\r
+ \r
+      <File Id="librdmacmd.dll" DiskId="1"\r
+            Name="librdmacmd.dll"\r
+            Source="..\bin\HCA\$(var.ARCH)\librdmacmd.dll" />\r
+ \r
+      <File Id="libibnetdisc.dll" DiskId="1"\r
+            Name="libibnetdisc.dll"\r
+            Source="..\bin\HCA\$(var.ARCH)\libibnetdisc.dll" />\r
+ \r
+      <File Id="libibnetdiscd.dll" DiskId="1"\r
+            Name="libibnetdiscd.dll"\r
+            Source="..\bin\HCA\$(var.ARCH)\libibnetdiscd.dll" />\r
+    </Component>\r
+ \r
+    <!-- DAPL -->\r
+\r
+    <Component Id="cSys32DAPL2RT" Win64="$(var.Win64)"\r
+               Guid="63AEC400-109C-4409-B9F3-5E900FA7EFCE">\r
+\r
+      <File Id="_dapl2.dll" DiskId="1"\r
+            Name="dapl2.dll"\r
+            Source="..\bin\DAPL2\$(var.ARCH)\dapl2.dll" />\r
+ \r
+      <File Id="_dapl2d.dll" DiskId="1"\r
+            Name="dapl2d.dll"\r
+            Source="..\bin\DAPL2\$(var.ARCH)\dapl2d.dll" />\r
+\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
+ \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
+\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
+ \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
+\r
+      <File Id="_dat2.dll" DiskId="1"\r
+            Name="dat2.dll"\r
+            Source="..\bin\DAPL2\$(var.ARCH)\dat2.dll" />\r
+\r
+      <File Id="_dat2d.dll" DiskId="1"\r
+            Name="dat2d.dll"\r
+            Source="..\bin\DAPL2\$(var.ARCH)\dat2d.dll" />\r
+\r
+    </Component>\r
+\r
+ </DirectoryRef> \r
+\r
+</Include>\r

diff --git a/trunk/OFED/WIX/common/winverbs_OFED.inc b/trunk/OFED/WIX/common/winverbs_OFED.inc
index 15d84cc7691383fd74535545429c02857779c9b7..b03198ed61fca705e8fc90bacd588fd7e6bbcb70 100644 (file)
--- a/trunk/OFED/WIX/common/winverbs_OFED.inc
+++ b/trunk/OFED/WIX/common/winverbs_OFED.inc
@@ -1,103 +1,44 @@
 <Include>\r
+\r
     <Component Id="cWinVerbsOFED"\r
                Guid="20916BB0-5E16-49bb-BE9F-3A202D760E72">\r
 \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="libibverbs.dll"\r
-               DestinationProperty="WindowsFolder" />\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" DiskId="1"\r
-            Name="libibverbsd.dll"\r
-            Source="..\bin\HCA\$(var.ARCH)\libibverbsd.dll" />\r
-        <CopyFile Id="dupLibibverbsd.dll" FileId="libibverbsd.dll"\r
-               DestinationName="libibverbsd.dll"\r
-               DestinationProperty="WindowsFolder" />\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" DiskId="1"\r
-            Name="libibmad.dll"\r
-            Source="..\bin\HCA\$(var.ARCH)\libibmad.dll" />\r
-        <CopyFile Id="dupLibibmad.dll" FileId="libibmad.dll"\r
-               DestinationName="libibmad.dll"\r
-               DestinationProperty="WindowsFolder" />\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" DiskId="1"\r
-            Name="libibmadd.dll"\r
-            Source="..\bin\HCA\$(var.ARCH)\libibmadd.dll" />\r
-        <CopyFile Id="dupLibibmadd.dll" FileId="libibmadd.dll"\r
-               DestinationName="libibmadd.dll"\r
-               DestinationProperty="WindowsFolder" />\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" DiskId="1"\r
-            Name="libibumad.dll"\r
-            Source="..\bin\HCA\$(var.ARCH)\libibumad.dll" />\r
-        <CopyFile Id="dupLibibumad.dll" FileId="libibumad.dll"\r
-               DestinationName="libibumad.dll"\r
-               DestinationProperty="WindowsFolder" />\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" DiskId="1"\r
-            Name="libibumadd.dll"\r
-            Source="..\bin\HCA\$(var.ARCH)\libibumadd.dll" />\r
-        <CopyFile Id="dupLibibumadd.dll" FileId="libibumadd.dll"\r
-               DestinationName="libibumadd.dll"\r
-               DestinationProperty="WindowsFolder" />\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" DiskId="1"\r
-            Name="librdmacm.dll"\r
-            Source="..\bin\HCA\$(var.ARCH)\librdmacm.dll" />\r
-        <CopyFile Id="dupLibrdmacm.dll" FileId="librdmacm.dll"\r
-               DestinationName="librdmacm.dll"\r
-               DestinationProperty="WindowsFolder" />\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" DiskId="1"\r
-            Name="librdmacmd.dll"\r
-            Source="..\bin\HCA\$(var.ARCH)\librdmacmd.dll" />\r
-        <CopyFile Id="dupLibrdmacmd.dll" FileId="librdmacmd.dll"\r
-               DestinationName="librdmacmd.dll"\r
-               DestinationProperty="WindowsFolder" />\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" DiskId="1"\r
-            Name="libibnetdisc.dll"\r
-            Source="..\bin\HCA\$(var.ARCH)\libibnetdisc.dll" />\r
-        <CopyFile Id="duplibibnetdisc.dll" FileId="libibnetdisc.dll"\r
-               DestinationName="libibnetdisc.dll"\r
-               DestinationProperty="WindowsFolder" />\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" DiskId="1"\r
-            Name="libibnetdiscd.dll"\r
-            Source="..\bin\HCA\$(var.ARCH)\libibnetdiscd.dll" />\r
-        <CopyFile Id="duplibibnetdiscd.dll" FileId="libibnetdiscd.dll"\r
-               DestinationName="libibnetdiscd.dll"\r
-               DestinationProperty="WindowsFolder" />\r
       <File Id="libibnetdiscd.pdb" DiskId="1"\r
             Name="libibnetdiscd.pdb"\r
             Source="..\bin\HCA\$(var.ARCH)\libibnetdiscd.pdb" />\r

diff --git a/trunk/OFED/WIX/dat.conf b/trunk/OFED/WIX/dat.conf
index b1598783c705fc0e49a9e6a573ad75206ae09280..22a8720e627eacffcb57fe140556b14bc1882aa4 100644 (file)
--- a/trunk/OFED/WIX/dat.conf
+++ b/trunk/OFED/WIX/dat.conf
@@ -10,23 +10,24 @@
 #           <provider_version> <ia_device_params> <platform_params>\r
 #\r
 # DAT 2.0\r
-ibnic0v2 u2.0 nonthreadsafe default C:\Windows\dapl2.dll ri.2.0 "IbalHca0 1" ""\r
-ibnic1v2 u2.0 nonthreadsafe default C:\Windows\dapl2.dll ri.2.0 "IbalHca1 1" ""\r
-IbalHca0v2 u2.0 nonthreadsafe default C:\Windows\dapl2.dll ri.2.0 "IbalHca0 1" ""\r
+ibnic0v2 u2.0 nonthreadsafe default C:\Windows\system32\dapl2.dll ri.2.0 "IbalHca0 1" ""\r
+ibnic1v2 u2.0 nonthreadsafe default C:\Windows\system32\dapl2.dll ri.2.0 "IbalHca1 1" ""\r
+IbalHca0v2 u2.0 nonthreadsafe default C:\Windows\system32\dapl2.dll ri.2.0 "IbalHca0 1" ""\r
+ibal1 u2.0 nonthreadsafe default C:\Windows\system32\dapl2.dll ri.2.0 "IbalHca1 1" ""\r
 #\r
 # DAT 2.0 (debug)\r
-ibnic0v2d u2.0 nonthreadsafe default "C:\\Program Files\\OFED\\dapl2d.dll" ri.2.0 "IbalHca0 1" ""\r
+ibnic0v2d u2.0 nonthreadsafe default C:\Windows\system32\dapl2d.dll ri.2.0 "IbalHca0 1" ""\r
 #\r
 # DAT 2.0 [socket-cm] InfiniBand QPs setup by passing QP info over a socket\r
 # connection; supports DAT Windows <==> Linux over IB connections.\r
-ibnic0v2-scm u2.0 nonthreadsafe default C:\Windows\dapl2-ofa-scm.dll ri.2.0 "ibv_device0 1" ""\r
+ibnic0v2-scm u2.0 nonthreadsafe default C:\Windows\system32\dapl2-ofa-scm.dll ri.2.0 "ibv_device0 1" ""\r
 #\r
 # Socket-CM (debug)\r
-ibnic0v2-scmd u2.0 nonthreadsafe default "C:\\Program Files\\OFED\\dapl2-ofa-scmd.dll" ri.2.0 "ibv_device0 1" ""\r
+ibnic0v2-scmd u2.0 nonthreadsafe default C:\Windows\system32\dapl2-ofa-scmd.dll ri.2.0 "ibv_device0 1" ""\r
 #\r
 # DAT 2.0 RDMA-CM\r
 # connection; supports DAT Windows <==> Linux over IB connections.\r
-ibnic0v2-cma u2.0 nonthreadsafe default C:\Windows\dapl2-ofa-cma.dll ri.2.0 "rdma_dev0 1" ""\r
+ibnic0v2-cma u2.0 nonthreadsafe default C:\Windows\system32\dapl2-ofa-cma.dll ri.2.0 "rdma_dev0 1" ""\r
 #\r
 # DAT 2.0 RDMA-CM (debug)\r
-ibnic0v2-cmad u2.0 nonthreadsafe default "C:\\Program Files\\OFED\\dapl2-ofa-cmad.dll" ri.2.0 "rdma_dev0 1" ""\r
+ibnic0v2-cmad u2.0 nonthreadsafe default C:\Windows\system32\dapl2-ofa-cmad.dll ri.2.0 "rdma_dev0 1" ""\r

diff --git a/trunk/OFED/WIX/sign-all-drivers.bat b/trunk/OFED/WIX/sign-all-drivers.bat
index 4660c9be0837ae4ea49cd66d194b3ca78b45477f..c6b1039e70ecf529e64e9e78bb218fd4e860b9eb 100644 (file)
--- a/trunk/OFED/WIX/sign-all-drivers.bat
+++ b/trunk/OFED/WIX/sign-all-drivers.bat
@@ -9,8 +9,9 @@ rem                  example ...\trunk\OFED\wix\MSCV-VSClass3.cer
 rem   CertSubjName - "OpenFabricsAlliance" Your Company CertName in CertStore. \r
 rem   OS - one of all,wxp,wlh,wnet,win7\r
 rem   arch - all,x64,x86,ia64\r
-rem see TS below.\r
 rem\r
+rem XXX defeat TimeStamping until net access resolved.\r
+rem set TS=noTimeStamp\r
 \r
 if "%1" == "" (\r
     echo %0 - Missing CertStore Filename?\r
@@ -51,9 +52,6 @@ set ArchArg=%ArchNames%
 \r
 :OK_arch\r
 \r
-rem XXX defeat TimeStamping until net access resolved.\r
-rem set TS=noTimeStamp\r
-\r
 echo.\r
 \r
 for %%p in ( %OS_names% ) do (\r

diff --git a/trunk/OFED/WIX/win7/ia64/ofed.wxs b/trunk/OFED/WIX/win7/ia64/ofed.wxs
index 54852065cdc9b1a7663a4d3e2fd1b92c8db3fbd8..2708bed6cba7f75eef9fb95d6bef063b7fad63a0 100644 (file)
--- a/trunk/OFED/WIX/win7/ia64/ofed.wxs
+++ b/trunk/OFED/WIX/win7/ia64/ofed.wxs
@@ -3,9 +3,13 @@
    OpenFabrics Enterprise Distribution for IA64/IPF Itanium on Windows 7\r
 -->\r
 \r
+<?define OS=win7 ?>\r
 <?define ARCH=ia64 ?>\r
 <?define ARCHP=ia64 ?>\r
-<?define OS=win7 ?>\r
+<?define SysNative=System64Folder?>\r
+<?define ProgramFilesNative=ProgramFiles64Folder?>\r
+<?define Win64=yes?>\r
+\r
 <?include ..\..\common\Config.inc ?>\r
 \r
 <Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'\r
@@ -39,52 +43,47 @@
 \r
     <?include ..\..\common\requirements.inc ?>\r
 \r
-    <Directory Id="TARGETDIR" Name="SourceDir">\r
+    <?include ..\..\common\directory_structure.inc ?>\r
+\r
+    <?include ..\..\common\PgmMenuShortcuts.inc ?>\r
 \r
-      <?include ..\..\common\PgmMenuShortcuts.inc ?>\r
+    <?include ..\..\common\Drivers.inc ?>\r
 \r
-      <Directory Id="ProgramFiles64Folder" Name="PFiles">\r
-        <Directory Id="INSTALLDIR" Name="$(var.PID)">\r
+    <DirectoryRef Id="INSTALLDIR">\r
 \r
-          <?include ..\..\common\Docs.inc ?>\r
-          <?include ..\..\common\Tools.inc ?>\r
-          <?include ..\..\common\OpenSM_service.inc ?>\r
+      <?include ..\..\common\Docs.inc ?>\r
+      <?include ..\..\common\Tools.inc ?>\r
+      <?include ..\..\common\OpenSM_service.inc ?>\r
 \r
-          <Directory Id="DriversDir" Name="Drivers">\r
-              <?include ..\..\common\IBcore.inc ?>\r
-              <?include ..\..\common\ipoib.inc ?>\r
-              <?include ..\..\common\qlgc_vnic.inc ?>\r
-              <?include ..\..\common\srp.inc ?>\r
-          </Directory>\r
+      <?include ..\..\common\checked.inc ?>\r
+      <?include ..\..\common\winverbs_OFED.inc ?>\r
 \r
-          <?include ..\..\common\checked.inc ?>\r
-          <?include ..\..\common\winverbs_OFED.inc ?>\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="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
+      <Component Id="cNetworkDirect" KeyPath="yes"\r
+                 Guid="F3BA9E15-E532-4b8c-BB0C-E8C1CC0EEF3F">\r
+      </Component>\r
 \r
-          <Component Id="cNetworkDirect" KeyPath="yes"\r
-                     Guid="F3BA9E15-E532-4b8c-BB0C-E8C1CC0EEF3F">\r
-          </Component>\r
+      <?include ..\..\common\dapl_rt.inc ?>\r
 \r
-          <?include ..\..\common\dapl_rt.inc ?>\r
+    </DirectoryRef>\r
 \r
-        </Directory>\r
-      </Directory>\r
+    <DirectoryRef Id="WINROOT">\r
 \r
-      <Directory Id="WINROOT" Name="WinRoot">\r
+      <?include ..\..\common\DAT_config.inc ?>\r
 \r
-        <?include ..\..\common\DAT_config.inc ?>\r
+      <?include ..\..\common\ib_sdk.inc ?>\r
 \r
-        <?include ..\..\common\ib_sdk.inc ?>\r
+    </DirectoryRef>\r
 \r
-      </Directory>\r
+    <?include ..\..\common\system32_files.inc ?>\r
 \r
-    </Directory> <!-- End TARGETDIR -->\r
+    <!-- End of installed Files -->\r
 \r
     <?include ..\..\common\arp.inc ?>\r
 \r

diff --git a/trunk/OFED/WIX/win7/x64/ofed.wxs b/trunk/OFED/WIX/win7/x64/ofed.wxs
index 4db299483bbf44b0361886605cddc9d6af5f9cc1..ebabe00f46e48e0d78aabd5793379d6b1fdb1840 100644 (file)
--- a/trunk/OFED/WIX/win7/x64/ofed.wxs
+++ b/trunk/OFED/WIX/win7/x64/ofed.wxs
@@ -3,9 +3,13 @@
    OpenFabrics Enterprise Distribution for x64 Windows 7 or Server 2008 R2\r
 -->\r
 \r
-<?define ARCH=amd64 ?>\r
-<?define ARCHP=x64 ?>\r
-<?define OS=win7 ?>\r
+<?define OS=win7?>\r
+<?define ARCH=amd64?>\r
+<?define ARCHP=x64?>\r
+<?define SysNative=System64Folder?>\r
+<?define ProgramFilesNative=ProgramFiles64Folder?>\r
+<?define Win64=yes?>\r
+\r
 <?include ..\..\common\Config.inc ?>\r
 \r
 <Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'\r
@@ -39,54 +43,49 @@
 \r
     <?include ..\..\common\requirements.inc ?>\r
 \r
-    <Directory Id="TARGETDIR" Name="SourceDir">\r
+    <?include ..\..\common\directory_structure.inc ?>\r
+\r
+    <?include ..\..\common\PgmMenuShortcuts.inc ?>\r
 \r
-      <?include ..\..\common\PgmMenuShortcuts.inc ?>\r
+    <?include ..\..\common\Drivers.inc ?>\r
 \r
-      <Directory Id="ProgramFiles64Folder" Name="PFiles">\r
-        <Directory Id="INSTALLDIR" Name="$(var.PID)">\r
+    <DirectoryRef Id="INSTALLDIR">\r
 \r
-          <?include ..\..\common\Docs.inc ?>\r
-          <?include ..\..\common\Tools.inc ?>\r
-          <?include ..\..\common\OpenSM_service.inc ?>\r
+      <?include ..\..\common\Docs.inc ?>\r
+      <?include ..\..\common\Tools.inc ?>\r
+      <?include ..\..\common\OpenSM_service.inc ?>\r
 \r
-          <Directory Id="DriversDir" Name="Drivers">\r
-              <?include ..\..\common\IBcore.inc ?>\r
-              <?include ..\..\common\ipoib.inc ?>\r
-              <?include ..\..\common\qlgc_vnic.inc ?>\r
-              <?include ..\..\common\srp.inc ?>\r
-          </Directory>\r
+      <?include ..\..\common\checked.inc ?>\r
+      <?include ..\..\common\winverbs_OFED.inc ?>\r
 \r
-          <?include ..\..\common\checked.inc ?>\r
-          <?include ..\..\common\winverbs_OFED.inc ?>\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="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
+      <Component Id="cNetworkDirect" KeyPath="yes"\r
+                 Guid="F3BA9E15-E532-4b8c-BB0C-E8C1CC0EEF3F">\r
+      </Component>\r
 \r
-          <Component Id="cNetworkDirect" KeyPath="yes"\r
-                     Guid="F3BA9E15-E532-4b8c-BB0C-E8C1CC0EEF3F">\r
-          </Component>\r
+      <?include ..\..\common\dapl_rt.inc ?>\r
 \r
-          <?include ..\..\common\dapl_rt.inc ?>\r
+      <?include ..\..\HPC\HPC.inc ?>\r
 \r
-          <?include ..\..\HPC\HPC.inc ?>\r
+    </DirectoryRef>\r
 \r
-        </Directory>\r
-      </Directory>\r
+    <DirectoryRef Id="WINROOT">\r
 \r
-      <Directory Id="WINROOT" Name="WinRoot">\r
+      <?include ..\..\common\DAT_config.inc ?>\r
 \r
-        <?include ..\..\common\DAT_config.inc ?>\r
+      <?include ..\..\common\ib_sdk.inc ?>\r
 \r
-        <?include ..\..\common\ib_sdk.inc ?>\r
+    </DirectoryRef>\r
 \r
-      </Directory>\r
+    <?include ..\..\common\system32_files.inc ?>\r
 \r
-    </Directory> <!-- End TARGETDIR -->\r
+    <!-- End of installed Files -->\r
 \r
     <?include ..\..\common\arp.inc ?>\r
 \r

diff --git a/trunk/OFED/WIX/win7/x86/ofed.wxs b/trunk/OFED/WIX/win7/x86/ofed.wxs
index 62f64701a493beaebe7e41d51e93915eb1bba9c0..d14d09b5155db8544c59ef37c7e9b2b77786ad45 100644 (file)
--- a/trunk/OFED/WIX/win7/x86/ofed.wxs
+++ b/trunk/OFED/WIX/win7/x86/ofed.wxs
@@ -3,9 +3,13 @@
    OpenFabrics Enterprise Distribution for x86 Windows Server 2008 or Vista\r
 -->\r
 \r
-<?define ARCH=x86 ?>\r
-<?define ARCHP=x86 ?>\r
-<?define OS=win7 ?>\r
+<?define OS=win7?>\r
+<?define ARCH=x86?>\r
+<?define ARCHP=x86?>\r
+<?define SysNative=SystemFolder?>\r
+<?define ProgramFilesNative=ProgramFilesFolder?>\r
+<?define Win64=no?>\r
+\r
 <?include ..\..\common\Config.inc ?>\r
 \r
 <Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'\r
@@ -35,52 +39,47 @@
 \r
     <?include ..\..\common\requirements.inc ?>\r
 \r
-    <Directory Id="TARGETDIR" Name="SourceDir">\r
+    <?include ..\..\common\directory_structure.inc ?>\r
+\r
+    <?include ..\..\common\PgmMenuShortcuts.inc ?>\r
 \r
-      <?include ..\..\common\PgmMenuShortcuts.inc ?>\r
+    <?include ..\..\common\Drivers.inc ?>\r
 \r
-      <Directory Id="ProgramFilesFolder" Name="PFiles">\r
-        <Directory Id="INSTALLDIR" Name="$(var.PID)">\r
+    <DirectoryRef Id="INSTALLDIR">\r
 \r
-          <?include ..\..\common\Docs.inc ?>\r
-          <?include ..\..\common\Tools.inc ?>\r
-          <?include ..\..\common\OpenSM_service.inc ?>\r
+      <?include ..\..\common\Docs.inc ?>\r
+      <?include ..\..\common\Tools.inc ?>\r
+      <?include ..\..\common\OpenSM_service.inc ?>\r
 \r
-          <Directory Id="DriversDir" Name="Drivers">\r
-              <?include ..\..\common\IBcore.inc ?>\r
-              <?include ..\..\common\ipoib.inc ?>\r
-              <?include ..\..\common\qlgc_vnic.inc ?>\r
-              <?include ..\..\common\srp.inc ?>\r
-          </Directory>\r
+      <?include ..\..\common\checked.inc ?>\r
+      <?include ..\..\common\winverbs_OFED.inc ?>\r
 \r
-          <?include ..\..\common\checked.inc ?>\r
-          <?include ..\..\common\winverbs_OFED.inc ?>\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="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
+      <Component Id="cNetworkDirect" KeyPath="yes"\r
+                 Guid="F3BA9E15-E532-4b8c-BB0C-E8C1CC0EEF3F">\r
+      </Component>\r
 \r
-          <Component Id="cNetworkDirect" KeyPath="yes"\r
-                     Guid="F3BA9E15-E532-4b8c-BB0C-E8C1CC0EEF3F">\r
-          </Component>\r
+      <?include ..\..\common\dapl_rt.inc ?>\r
 \r
-          <?include ..\..\common\dapl_rt.inc ?>\r
+    </DirectoryRef>\r
 \r
-        </Directory>\r
-      </Directory>\r
+    <DirectoryRef Id="WINROOT">\r
 \r
-      <Directory Id="WINROOT" Name="WinRoot">\r
+      <?include ..\..\common\DAT_config.inc ?>\r
 \r
-        <?include ..\..\common\DAT_config.inc ?>\r
+      <?include ..\..\common\ib_sdk.inc ?>\r
 \r
-        <?include ..\..\common\ib_sdk.inc ?>\r
+    </DirectoryRef>\r
 \r
-      </Directory>\r
+    <?include ..\..\common\system32_files.inc ?>\r
 \r
-    </Directory> <!-- End TARGETDIR -->\r
+    <!-- End of installed Files -->\r
 \r
     <?include ..\..\common\arp.inc ?>\r
 \r

diff --git a/trunk/OFED/WIX/wlh/ia64/ofed.wxs b/trunk/OFED/WIX/wlh/ia64/ofed.wxs
index 095cb87bd0136c9b0d55853dfa430cf709efddfc..50e3cb825d0eaffb63702a720a3b928950277842 100644 (file)
--- a/trunk/OFED/WIX/wlh/ia64/ofed.wxs
+++ b/trunk/OFED/WIX/wlh/ia64/ofed.wxs
@@ -1,11 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>\r
 <!--\r
-   OpenFabrics Enterprise Distribution for IA64/IPF Itanium Windows Server 2008\r
+   OpenFabrics Enterprise Distribution for IA64/IPF Itanium on Windows Server 2008\r
 -->\r
 \r
-<?define ARCH=ia64 ?>\r
-<?define ARCHP=ia64 ?>\r
-<?define OS=wlh ?>\r
+<?define OS=wlh?>\r
+<?define ARCH=ia64?>\r
+<?define ARCHP=ia64?>\r
+<?define SysNative=System64Folder?>\r
+<?define ProgramFilesNative=ProgramFiles64Folder?>\r
+<?define Win64=yes?>\r
+\r
 <?include ..\..\common\Config.inc ?>\r
 \r
 <Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'\r
@@ -39,52 +43,47 @@
 \r
     <?include ..\..\common\requirements.inc ?>\r
 \r
-    <Directory Id="TARGETDIR" Name="SourceDir">\r
+    <?include ..\..\common\directory_structure.inc ?>\r
+\r
+    <?include ..\..\common\PgmMenuShortcuts.inc ?>\r
 \r
-      <?include ..\..\common\PgmMenuShortcuts.inc ?>\r
+    <?include ..\..\common\Drivers.inc ?>\r
 \r
-      <Directory Id="ProgramFiles64Folder" Name="PFiles">\r
-        <Directory Id="INSTALLDIR" Name="$(var.PID)">\r
+    <DirectoryRef Id="INSTALLDIR">\r
 \r
-          <?include ..\..\common\Docs.inc ?>\r
-          <?include ..\..\common\Tools.inc ?>\r
-          <?include ..\..\common\OpenSM_service.inc ?>\r
+      <?include ..\..\common\Docs.inc ?>\r
+      <?include ..\..\common\Tools.inc ?>\r
+      <?include ..\..\common\OpenSM_service.inc ?>\r
 \r
-          <Directory Id="DriversDir" Name="Drivers">\r
-              <?include ..\..\common\IBcore.inc ?>\r
-              <?include ..\..\common\ipoib.inc ?>\r
-              <?include ..\..\common\qlgc_vnic.inc ?>\r
-              <?include ..\..\common\srp.inc ?>\r
-          </Directory>\r
+      <?include ..\..\common\checked.inc ?>\r
+      <?include ..\..\common\winverbs_OFED.inc ?>\r
 \r
-          <?include ..\..\common\checked.inc ?>\r
-          <?include ..\..\common\winverbs_OFED.inc ?>\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="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
+      <Component Id="cNetworkDirect" KeyPath="yes"\r
+                 Guid="F3BA9E15-E532-4b8c-BB0C-E8C1CC0EEF3F">\r
+      </Component>\r
 \r
-          <Component Id="cNetworkDirect" KeyPath="yes"\r
-                     Guid="F3BA9E15-E532-4b8c-BB0C-E8C1CC0EEF3F">\r
-          </Component>\r
+      <?include ..\..\common\dapl_rt.inc ?>\r
 \r
-          <?include ..\..\common\dapl_rt.inc ?>\r
+    </DirectoryRef>\r
 \r
-        </Directory>\r
-      </Directory>\r
+    <DirectoryRef Id="WINROOT">\r
 \r
-      <Directory Id="WINROOT" Name="WinRoot">\r
+      <?include ..\..\common\DAT_config.inc ?>\r
 \r
-        <?include ..\..\common\DAT_config.inc ?>\r
+      <?include ..\..\common\ib_sdk.inc ?>\r
 \r
-        <?include ..\..\common\ib_sdk.inc ?>\r
+    </DirectoryRef>\r
 \r
-      </Directory>\r
+    <?include ..\..\common\system32_files.inc ?>\r
 \r
-    </Directory> <!-- End TARGETDIR -->\r
+    <!-- End of installed Files -->\r
 \r
     <?include ..\..\common\arp.inc ?>\r
 \r

diff --git a/trunk/OFED/WIX/wlh/x64/ofed.wxs b/trunk/OFED/WIX/wlh/x64/ofed.wxs
index 1b56c9e25d3dcb0f7e857cb89e239a5b5e0cb987..bd8b6581392d5c1d5a1efb04b0a22769d2db4284 100644 (file)
--- a/trunk/OFED/WIX/wlh/x64/ofed.wxs
+++ b/trunk/OFED/WIX/wlh/x64/ofed.wxs
@@ -3,9 +3,13 @@
    OpenFabrics Enterprise Distribution for x64 Windows Server 2008 or Vista\r
 -->\r
 \r
-<?define ARCH=amd64 ?>\r
-<?define ARCHP=x64 ?>\r
-<?define OS=wlh ?>\r
+<?define OS=wlh?>\r
+<?define ARCH=amd64?>\r
+<?define ARCHP=x64?>\r
+<?define SysNative=System64Folder?>\r
+<?define ProgramFilesNative=ProgramFiles64Folder?>\r
+<?define Win64=yes?>\r
+\r
 <?include ..\..\common\Config.inc ?>\r
 \r
 <Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'\r
@@ -39,54 +43,49 @@
 \r
     <?include ..\..\common\requirements.inc ?>\r
 \r
-    <Directory Id="TARGETDIR" Name="SourceDir">\r
+    <?include ..\..\common\directory_structure.inc ?>\r
+\r
+    <?include ..\..\common\PgmMenuShortcuts.inc ?>\r
 \r
-      <?include ..\..\common\PgmMenuShortcuts.inc ?>\r
+    <?include ..\..\common\Drivers.inc ?>\r
 \r
-      <Directory Id="ProgramFiles64Folder" Name="PFiles">\r
-        <Directory Id="INSTALLDIR" Name="$(var.PID)">\r
+    <DirectoryRef Id="INSTALLDIR">\r
 \r
-          <?include ..\..\common\Docs.inc ?>\r
-          <?include ..\..\common\Tools.inc ?>\r
-          <?include ..\..\common\OpenSM_service.inc ?>\r
+      <?include ..\..\common\Docs.inc ?>\r
+      <?include ..\..\common\Tools.inc ?>\r
+      <?include ..\..\common\OpenSM_service.inc ?>\r
 \r
-          <Directory Id="DriversDir" Name="Drivers">\r
-              <?include ..\..\common\IBcore.inc ?>\r
-              <?include ..\..\common\ipoib.inc ?>\r
-              <?include ..\..\common\qlgc_vnic.inc ?>\r
-              <?include ..\..\common\srp.inc ?>\r
-          </Directory>\r
+      <?include ..\..\common\checked.inc ?>\r
+      <?include ..\..\common\winverbs_OFED.inc ?>\r
 \r
-          <?include ..\..\common\checked.inc ?>\r
-          <?include ..\..\common\winverbs_OFED.inc ?>\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="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
+      <Component Id="cNetworkDirect" KeyPath="yes"\r
+                 Guid="F3BA9E15-E532-4b8c-BB0C-E8C1CC0EEF3F">\r
+      </Component>\r
 \r
-          <Component Id="cNetworkDirect" KeyPath="yes"\r
-                     Guid="F3BA9E15-E532-4b8c-BB0C-E8C1CC0EEF3F">\r
-          </Component>\r
+      <?include ..\..\common\dapl_rt.inc ?>\r
 \r
-          <?include ..\..\common\dapl_rt.inc ?>\r
+      <?include ..\..\HPC\HPC.inc ?>\r
 \r
-          <?include ..\..\HPC\HPC.inc ?>\r
+    </DirectoryRef>\r
 \r
-        </Directory>\r
-      </Directory>\r
+    <DirectoryRef Id="WINROOT">\r
 \r
-      <Directory Id="WINROOT" Name="WinRoot">\r
+      <?include ..\..\common\DAT_config.inc ?>\r
 \r
-        <?include ..\..\common\DAT_config.inc ?>\r
+      <?include ..\..\common\ib_sdk.inc ?>\r
 \r
-        <?include ..\..\common\ib_sdk.inc ?>\r
+    </DirectoryRef>\r
 \r
-      </Directory>\r
+    <?include ..\..\common\system32_files.inc ?>\r
 \r
-    </Directory> <!-- End TARGETDIR -->\r
+    <!-- End of installed Files -->\r
 \r
     <?include ..\..\common\arp.inc ?>\r
 \r

diff --git a/trunk/OFED/WIX/wlh/x86/ofed.wxs b/trunk/OFED/WIX/wlh/x86/ofed.wxs
index 56977a04c429a145d90854b35866d5228f46049e..352ac8bf3380c5e3db431e4b46058f8042deaa9a 100644 (file)
--- a/trunk/OFED/WIX/wlh/x86/ofed.wxs
+++ b/trunk/OFED/WIX/wlh/x86/ofed.wxs
@@ -3,9 +3,13 @@
    OpenFabrics Enterprise Distribution for x86 Windows Server 2008 or Vista\r
 -->\r
 \r
-<?define ARCH=x86 ?>\r
-<?define ARCHP=x86 ?>\r
-<?define OS=wlh ?>\r
+<?define OS=wlh?>\r
+<?define ARCH=x86?>\r
+<?define ARCHP=x86?>\r
+<?define SysNative=SystemFolder?>\r
+<?define ProgramFilesNative=ProgramFilesFolder?>\r
+<?define Win64=no?>\r
+\r
 <?include ..\..\common\Config.inc ?>\r
 \r
 <Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'\r
@@ -35,52 +39,47 @@
 \r
     <?include ..\..\common\requirements.inc ?>\r
 \r
-    <Directory Id="TARGETDIR" Name="SourceDir">\r
+    <?include ..\..\common\directory_structure.inc ?>\r
+\r
+    <?include ..\..\common\PgmMenuShortcuts.inc ?>\r
 \r
-      <?include ..\..\common\PgmMenuShortcuts.inc ?>\r
+    <?include ..\..\common\Drivers.inc ?>\r
 \r
-      <Directory Id="ProgramFilesFolder" Name="PFiles">\r
-        <Directory Id="INSTALLDIR" Name="$(var.PID)">\r
+    <DirectoryRef Id="INSTALLDIR">\r
 \r
-          <?include ..\..\common\Docs.inc ?>\r
-          <?include ..\..\common\Tools.inc ?>\r
-          <?include ..\..\common\OpenSM_service.inc ?>\r
+      <?include ..\..\common\Docs.inc ?>\r
+      <?include ..\..\common\Tools.inc ?>\r
+      <?include ..\..\common\OpenSM_service.inc ?>\r
 \r
-          <Directory Id="DriversDir" Name="Drivers">\r
-              <?include ..\..\common\IBcore.inc ?>\r
-              <?include ..\..\common\ipoib.inc ?>\r
-              <?include ..\..\common\qlgc_vnic.inc ?>\r
-              <?include ..\..\common\srp.inc ?>\r
-          </Directory>\r
+      <?include ..\..\common\checked.inc ?>\r
+      <?include ..\..\common\winverbs_OFED.inc ?>\r
 \r
-          <?include ..\..\common\checked.inc ?>\r
-          <?include ..\..\common\winverbs_OFED.inc ?>\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="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
+      <Component Id="cNetworkDirect" KeyPath="yes"\r
+                 Guid="F3BA9E15-E532-4b8c-BB0C-E8C1CC0EEF3F">\r
+      </Component>\r
 \r
-          <Component Id="cNetworkDirect" KeyPath="yes"\r
-                     Guid="F3BA9E15-E532-4b8c-BB0C-E8C1CC0EEF3F">\r
-          </Component>\r
+      <?include ..\..\common\dapl_rt.inc ?>\r
 \r
-          <?include ..\..\common\dapl_rt.inc ?>\r
+    </DirectoryRef>\r
 \r
-        </Directory>\r
-      </Directory>\r
+    <DirectoryRef Id="WINROOT">\r
 \r
-      <Directory Id="WINROOT" Name="WinRoot">\r
+      <?include ..\..\common\DAT_config.inc ?>\r
 \r
-        <?include ..\..\common\DAT_config.inc ?>\r
+      <?include ..\..\common\ib_sdk.inc ?>\r
 \r
-        <?include ..\..\common\ib_sdk.inc ?>\r
+    </DirectoryRef>\r
 \r
-      </Directory>\r
+    <?include ..\..\common\system32_files.inc ?>\r
 \r
-    </Directory> <!-- End TARGETDIR -->\r
+    <!-- End of installed Files -->\r
 \r
     <?include ..\..\common\arp.inc ?>\r
 \r

diff --git a/trunk/OFED/WIX/wnet/ia64/ofed.wxs b/trunk/OFED/WIX/wnet/ia64/ofed.wxs
index 7b1009f3da2af0133ea6cbd3b837af709d0d64c7..4ecabb773ff1cf4b7194deb923bd31d7f0f037b9 100644 (file)
--- a/trunk/OFED/WIX/wnet/ia64/ofed.wxs
+++ b/trunk/OFED/WIX/wnet/ia64/ofed.wxs
@@ -1,11 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>\r
 <!--\r
-   OpenFabrics Enterprise Distribution for IA64/IPF Itanium Windows Server 2003\r
+   OpenFabrics Enterprise Distribution for IA64/IPF Itanium on Windows Server 2003\r
 -->\r
 \r
-<?define ARCH=ia64 ?>\r
-<?define ARCHP=ia64 ?>\r
-<?define OS=wnet ?>\r
+<?define OS=wnet?>\r
+<?define ARCH=ia64?>\r
+<?define ARCHP=ia64?>\r
+<?define SysNative=System64Folder?>\r
+<?define ProgramFilesNative=ProgramFiles64Folder?>\r
+<?define Win64=yes?>\r
+\r
 <?include ..\..\common\Config.inc ?>\r
 \r
 <Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'\r
@@ -39,52 +43,47 @@
 \r
     <?include ..\..\common\requirements.inc ?>\r
 \r
-    <Directory Id="TARGETDIR" Name="SourceDir">\r
+    <?include ..\..\common\directory_structure.inc ?>\r
+\r
+    <?include ..\..\common\PgmMenuShortcuts.inc ?>\r
 \r
-      <?include ..\..\common\PgmMenuShortcuts.inc ?>\r
+    <?include ..\..\common\Drivers.inc ?>\r
 \r
-      <Directory Id="ProgramFiles64Folder" Name="PFiles">\r
-        <Directory Id="INSTALLDIR" Name="$(var.PID)">\r
+    <DirectoryRef Id="INSTALLDIR">\r
 \r
-          <?include ..\..\common\Docs.inc ?>\r
-          <?include ..\..\common\Tools.inc ?>\r
-          <?include ..\..\common\OpenSM_service.inc ?>\r
+      <?include ..\..\common\Docs.inc ?>\r
+      <?include ..\..\common\Tools.inc ?>\r
+      <?include ..\..\common\OpenSM_service.inc ?>\r
 \r
-          <Directory Id="DriversDir" Name="Drivers">\r
-              <?include ..\..\common\IBcore.inc ?>\r
-              <?include ..\..\common\ipoib.inc ?>\r
-              <?include ..\..\common\qlgc_vnic.inc ?>\r
-              <?include ..\..\common\srp.inc ?>\r
-          </Directory>\r
+      <?include ..\..\common\checked.inc ?>\r
+      <?include ..\..\common\winverbs_OFED.inc ?>\r
 \r
-          <?include ..\..\common\checked.inc ?>\r
-          <?include ..\..\common\winverbs_OFED.inc ?>\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="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
+      <Component Id="cNetworkDirect" KeyPath="yes"\r
+                 Guid="F3BA9E15-E532-4b8c-BB0C-E8C1CC0EEF3F">\r
+      </Component>\r
 \r
-          <Component Id="cNetworkDirect" KeyPath="yes"\r
-                     Guid="F3BA9E15-E532-4b8c-BB0C-E8C1CC0EEF3F">\r
-          </Component>\r
+      <?include ..\..\common\dapl_rt.inc ?>\r
 \r
-          <?include ..\..\common\dapl_rt.inc ?>\r
+    </DirectoryRef>\r
 \r
-        </Directory>\r
-      </Directory>\r
+    <DirectoryRef Id="WINROOT">\r
 \r
-      <Directory Id="WINROOT" Name="WinRoot">\r
+      <?include ..\..\common\DAT_config.inc ?>\r
 \r
-        <?include ..\..\common\DAT_config.inc ?>\r
+      <?include ..\..\common\ib_sdk.inc ?>\r
 \r
-        <?include ..\..\common\ib_sdk.inc ?>\r
+    </DirectoryRef>\r
 \r
-      </Directory>\r
+    <?include ..\..\common\system32_files.inc ?>\r
 \r
-    </Directory> <!-- End TARGETDIR -->\r
+    <!-- End of installed Files -->\r
 \r
     <?include ..\..\common\arp.inc ?>\r
 \r

diff --git a/trunk/OFED/WIX/wnet/x64/ofed.wxs b/trunk/OFED/WIX/wnet/x64/ofed.wxs
index 0e4c3d2be55cc6dcac1a6b4fd9e6d9917468024a..0b7d409dc513dc54d3e30ef3f3ecacd0f124ad3a 100644 (file)
--- a/trunk/OFED/WIX/wnet/x64/ofed.wxs
+++ b/trunk/OFED/WIX/wnet/x64/ofed.wxs
@@ -3,9 +3,13 @@
    OpenFabrics Enterprise Distribution for x64 Windows Server 2003 or XP64\r
 -->\r
 \r
-<?define ARCH=amd64 ?>\r
-<?define ARCHP=x64 ?>\r
-<?define OS="wnet/xp64" ?>\r
+<?define OS="wnet/xp64"?>\r
+<?define ARCH=amd64?>\r
+<?define ARCHP=x64?>\r
+<?define SysNative=System64Folder?>\r
+<?define ProgramFilesNative=ProgramFiles64Folder?>\r
+<?define Win64=yes?>\r
+\r
 <?include ..\..\common\Config.inc ?>\r
 \r
 <Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'\r
@@ -39,52 +43,47 @@
 \r
     <?include ..\..\common\requirements.inc ?>\r
 \r
-    <Directory Id="TARGETDIR" Name="SourceDir">\r
+    <?include ..\..\common\directory_structure.inc ?>\r
+\r
+    <?include ..\..\common\PgmMenuShortcuts.inc ?>\r
 \r
-      <?include ..\..\common\PgmMenuShortcuts.inc ?>\r
+    <?include ..\..\common\Drivers.inc ?>\r
 \r
-      <Directory Id="ProgramFiles64Folder" Name="PFiles">\r
-        <Directory Id="INSTALLDIR" Name="$(var.PID)">\r
+    <DirectoryRef Id="INSTALLDIR">\r
 \r
-          <?include ..\..\common\Docs.inc ?>\r
-          <?include ..\..\common\Tools.inc ?>\r
-          <?include ..\..\common\OpenSM_service.inc ?>\r
+      <?include ..\..\common\Docs.inc ?>\r
+      <?include ..\..\common\Tools.inc ?>\r
+      <?include ..\..\common\OpenSM_service.inc ?>\r
 \r
-          <Directory Id="DriversDir" Name="Drivers">\r
-              <?include ..\..\common\IBcore.inc ?>\r
-              <?include ..\..\common\ipoib.inc ?>\r
-              <?include ..\..\common\qlgc_vnic.inc ?>\r
-              <?include ..\..\common\srp.inc ?>\r
-          </Directory>\r
+      <?include ..\..\common\checked.inc ?>\r
+      <?include ..\..\common\winverbs_OFED.inc ?>\r
 \r
-          <?include ..\..\common\checked.inc ?>\r
-          <?include ..\..\common\winverbs_OFED.inc ?>\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="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
+      <Component Id="cNetworkDirect" KeyPath="yes"\r
+                 Guid="F3BA9E15-E532-4b8c-BB0C-E8C1CC0EEF3F">\r
+      </Component>\r
 \r
-          <Component Id="cNetworkDirect" KeyPath="yes"\r
-                     Guid="F3BA9E15-E532-4b8c-BB0C-E8C1CC0EEF3F">\r
-          </Component>\r
+      <?include ..\..\common\dapl_rt.inc ?>\r
 \r
-          <?include ..\..\common\dapl_rt.inc ?>\r
+    </DirectoryRef>\r
 \r
-        </Directory>\r
-      </Directory>\r
+    <DirectoryRef Id="WINROOT">\r
 \r
-      <Directory Id="WINROOT" Name="WinRoot">\r
+      <?include ..\..\common\DAT_config.inc ?>\r
 \r
-        <?include ..\..\common\DAT_config.inc ?>\r
+      <?include ..\..\common\ib_sdk.inc ?>\r
 \r
-        <?include ..\..\common\ib_sdk.inc ?>\r
+    </DirectoryRef>\r
 \r
-      </Directory>\r
+    <?include ..\..\common\system32_files.inc ?>\r
 \r
-    </Directory> <!-- End TARGETDIR -->\r
+    <!-- End of installed Files -->\r
 \r
     <?include ..\..\common\arp.inc ?>\r
 \r

diff --git a/trunk/OFED/WIX/wnet/x86/ofed.wxs b/trunk/OFED/WIX/wnet/x86/ofed.wxs
index 32ec67daab6c2d32482ff694954cef75629d478e..fc7682d3b7287e58d56d5611ec7b13da7530fb1f 100644 (file)
--- a/trunk/OFED/WIX/wnet/x86/ofed.wxs
+++ b/trunk/OFED/WIX/wnet/x86/ofed.wxs
@@ -3,9 +3,13 @@
    OpenFabrics Enterprise Distribution for x86 Windows Server 2003\r
 -->\r
 \r
-<?define ARCH=x86 ?>\r
-<?define ARCHP=x86 ?>\r
-<?define OS=wnet ?>\r
+<?define OS=wnet?>\r
+<?define ARCH=x86?>\r
+<?define ARCHP=x86?>\r
+<?define SysNative=SystemFolder?>\r
+<?define ProgramFilesNative=ProgramFilesFolder?>\r
+<?define Win64=no?>\r
+\r
 <?include ..\..\common\Config.inc ?>\r
 \r
 <Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'\r
@@ -35,52 +39,47 @@
 \r
     <?include ..\..\common\requirements.inc ?>\r
 \r
-    <Directory Id="TARGETDIR" Name="SourceDir">\r
+    <?include ..\..\common\directory_structure.inc ?>\r
+\r
+    <?include ..\..\common\PgmMenuShortcuts.inc ?>\r
 \r
-      <?include ..\..\common\PgmMenuShortcuts.inc ?>\r
+    <?include ..\..\common\Drivers.inc ?>\r
 \r
-      <Directory Id="ProgramFilesFolder" Name="PFiles">\r
-        <Directory Id="INSTALLDIR" Name="$(var.PID)">\r
+    <DirectoryRef Id="INSTALLDIR">\r
 \r
-          <?include ..\..\common\Docs.inc ?>\r
-          <?include ..\..\common\Tools.inc ?>\r
-          <?include ..\..\common\OpenSM_service.inc ?>\r
+      <?include ..\..\common\Docs.inc ?>\r
+      <?include ..\..\common\Tools.inc ?>\r
+      <?include ..\..\common\OpenSM_service.inc ?>\r
 \r
-          <Directory Id="DriversDir" Name="Drivers">\r
-              <?include ..\..\common\IBcore.inc ?>\r
-              <?include ..\..\common\ipoib.inc ?>\r
-              <?include ..\..\common\qlgc_vnic.inc ?>\r
-              <?include ..\..\common\srp.inc ?>\r
-          </Directory>\r
+      <?include ..\..\common\checked.inc ?>\r
+      <?include ..\..\common\winverbs_OFED.inc ?>\r
 \r
-          <?include ..\..\common\checked.inc ?>\r
-          <?include ..\..\common\winverbs_OFED.inc ?>\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="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
+      <Component Id="cNetworkDirect" KeyPath="yes"\r
+                 Guid="F3BA9E15-E532-4b8c-BB0C-E8C1CC0EEF3F">\r
+      </Component>\r
 \r
-          <Component Id="cNetworkDirect" KeyPath="yes"\r
-                     Guid="F3BA9E15-E532-4b8c-BB0C-E8C1CC0EEF3F">\r
-          </Component>\r
+      <?include ..\..\common\dapl_rt.inc ?>\r
 \r
-          <?include ..\..\common\dapl_rt.inc ?>\r
+    </DirectoryRef>\r
 \r
-        </Directory>\r
-      </Directory>\r
+    <DirectoryRef Id="WINROOT">\r
 \r
-      <Directory Id="WINROOT" Name="WinRoot">\r
+      <?include ..\..\common\DAT_config.inc ?>\r
 \r
-        <?include ..\..\common\DAT_config.inc ?>\r
+      <?include ..\..\common\ib_sdk.inc ?>\r
 \r
-        <?include ..\..\common\ib_sdk.inc ?>\r
+    </DirectoryRef>\r
 \r
-      </Directory>\r
+    <?include ..\..\common\system32_files.inc ?>\r
 \r
-    </Directory> <!-- End TARGETDIR -->\r
+    <!-- End of installed Files -->\r
 \r
     <?include ..\..\common\arp.inc ?>\r
 \r

diff --git a/trunk/OFED/WIX/wxp/x86/ofed.wxs b/trunk/OFED/WIX/wxp/x86/ofed.wxs
index 2e7bcc28f3097e9a2d7255cd883437a36a9b0879..2be54192562c0302ea442ed20536cf99d086b0fc 100644 (file)
--- a/trunk/OFED/WIX/wxp/x86/ofed.wxs
+++ b/trunk/OFED/WIX/wxp/x86/ofed.wxs
@@ -3,9 +3,13 @@
    OpenFabrics Enterprise Distribution for x86 XP only.\r
 -->\r
 \r
-<?define ARCH=x86 ?>\r
-<?define ARCHP=x86 ?>\r
-<?define OS=XP ?>\r
+<?define OS=XP?>\r
+<?define ARCH=x86?>\r
+<?define ARCHP=x86?>\r
+<?define SysNative=SystemFolder?>\r
+<?define ProgramFilesNative=ProgramFilesFolder?>\r
+<?define Win64=no?>\r
+\r
 <?include ..\..\common\Config.inc ?>\r
 \r
 <Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'\r
@@ -35,55 +39,47 @@
 \r
     <?include ..\..\common\requirements.inc ?>\r
 \r
-    <Directory Id="TARGETDIR" Name="SourceDir">\r
-\r
-      <?include ..\..\common\PgmMenuShortcuts.inc ?>\r
+    <?include ..\..\common\directory_structure.inc ?>\r
 \r
-      <Directory Id="ProgramFilesFolder" Name="PFiles">\r
-        <Directory Id="INSTALLDIR" Name="$(var.PID)">\r
+    <?include ..\..\common\PgmMenuShortcuts.inc ?>\r
 \r
-          <?include ..\..\common\Docs.inc ?>\r
-          <?include ..\..\common\Tools.inc ?>\r
-          <?include ..\..\common\OpenSM_service.inc ?>\r
+    <?include ..\..\common\Drivers.inc ?>\r
 \r
-          <Directory Id="DriversDir" Name="Drivers">\r
-              <?include ..\..\common\IBcore.inc ?>\r
-              <?include ..\..\common\ipoib.inc ?>\r
-              <?include ..\..\common\qlgc_vnic.inc ?>\r
-<!-- Skip SRP on XP/32\r
-              <?include ..\..\common\srp.inc ?>\r
--->\r
-          </Directory>\r
+    <DirectoryRef Id="INSTALLDIR">\r
 \r
-          <?include ..\..\common\checked.inc ?>\r
-          <?include ..\..\common\winverbs_OFED.inc ?>\r
+      <?include ..\..\common\Docs.inc ?>\r
+      <?include ..\..\common\Tools.inc ?>\r
+      <?include ..\..\common\OpenSM_service.inc ?>\r
 \r
+      <?include ..\..\common\checked.inc ?>\r
+      <?include ..\..\common\winverbs_OFED.inc ?>\r
 <!-- XP does not support WSD\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
+      <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" KeyPath="yes"\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
-          <?include ..\..\common\dapl_rt.inc ?>\r
+    </DirectoryRef>\r
 \r
-        </Directory>\r
-      </Directory>\r
+    <DirectoryRef Id="WINROOT">\r
 \r
-      <Directory Id="WINROOT" Name="WinRoot">\r
+      <?include ..\..\common\DAT_config.inc ?>\r
 \r
-        <?include ..\..\common\DAT_config.inc ?>\r
+      <?include ..\..\common\ib_sdk.inc ?>\r
 \r
-        <?include ..\..\common\ib_sdk.inc ?>\r
+    </DirectoryRef>\r
 \r
-      </Directory>\r
+    <?include ..\..\common\system32_files.inc ?>\r
 \r
-    </Directory> <!-- End TARGETDIR -->\r
+    <!-- End of installed Files -->\r
 \r
     <?include ..\..\common\arp.inc ?>\r
 \r