[WinOF] remove redundant 'root' folder specifications as TARGETDIR is the %SysVolume...
authorstansmith <stansmith@ad392aa1-c5ef-ae45-8dd8-e69d62a5ef86>
Tue, 15 Sep 2009 23:40:42 +0000 (23:40 +0000)
committerstansmith <stansmith@ad392aa1-c5ef-ae45-8dd8-e69d62a5ef86>
Tue, 15 Sep 2009 23:40:42 +0000 (23:40 +0000)
git-svn-id: svn://openib.tc.cornell.edu/gen1/trunk@2437 ad392aa1-c5ef-ae45-8dd8-e69d62a5ef86

WinOF/WIX/win7/ia64/wof.wxs
WinOF/WIX/win7/x64/wof.wxs
WinOF/WIX/win7/x86/wof.wxs
WinOF/WIX/wlh/ia64/wof.wxs
WinOF/WIX/wlh/signDrivers.bat
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 886ed36..ce2e8db 100644 (file)
@@ -23,7 +23,8 @@
      Description="WinOF Installer"\r
      Comments="Windows OpenFabrics Alliance InfiniBand stack"\r
      Manufacturer="OpenFabrics Alliance" InstallerVersion="200"\r
-     Languages="1033" Compressed="yes" SummaryCodepage="1252" />\r
+     Platforms="Intel64" Languages="1033"\r
+     Compressed="yes" SummaryCodepage="1252" />\r
 \r
     <Condition Message="Administrator required to install [ProductName].">\r
      AdminUser\r
@@ -49,7 +50,7 @@
                    Name="WinOF" />\r
       </Directory>\r
       <Directory Id="DesktopFolder" Name="Desktop" />\r
-      <Directory Id="ProgramFilesFolder" Name="PFiles">\r
+      <Directory Id="ProgramFiles64Folder" Name="PFiles">\r
         <Directory Id="INSTALLDIR" Name="WinOF">\r
 \r
           <?include ..\..\common\Docs.inc ?>\r
         </Directory>\r
       </Directory>\r
 \r
-      <Directory Id="WindowsVolume" Name="Root" SourceName="WinRoot">\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
-\r
-        <Directory Id="IBSDK" Name="IBSDK">\r
-          <?include ..\..\common\ib_sdk.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
+\r
     </Directory> <!-- End TARGETDIR -->\r
 \r
     <?include ..\..\common\arp.inc ?>\r
index 2ff84e1..15a5c5d 100644 (file)
@@ -23,7 +23,8 @@
      Description="WinOF Installer"\r
      Comments="Windows OpenFabrics Alliance InfiniBand stack"\r
      Manufacturer="OpenFabrics Alliance" InstallerVersion="200"\r
-     Languages="1033" Compressed="yes" SummaryCodepage="1252" />\r
+     Platforms="x64" Languages="1033"\r
+     Compressed="yes" SummaryCodepage="1252" />\r
 \r
     <Condition Message="Administrator required to install [ProductName].">\r
      Privileged\r
@@ -49,7 +50,7 @@
                    Name="WinOF" />\r
       </Directory>\r
       <Directory Id="DesktopFolder" Name="Desktop" />\r
-      <Directory Id="ProgramFilesFolder" Name="PFiles">\r
+      <Directory Id="ProgramFiles64Folder" Name="PFiles">\r
         <Directory Id="INSTALLDIR" Name="WinOF">\r
 \r
           <?include ..\..\common\Docs.inc ?>\r
 \r
           <?include ..\..\common\dapl_rt.inc ?>\r
 \r
-          <Component Id="cCertPush"\r
-                     Guid="8B3AEC30-CFED-4d90-A48E-AD2C8C55FEFD">\r
-            <File Id="cert_add.bat" Compressed="yes" DiskId="1"\r
-                     LongName="cert-add.bat" Name="cert-add.bat"\r
-                     Source="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
-                     Source="rem-cert-add.bat" />\r
-          </Component>\r
+          <?include ..\..\HPC\HPC.inc ?>\r
 \r
         </Directory>\r
       </Directory>\r
 \r
-      <Directory Id="WindowsVolume" Name="Root" SourceName="WinRoot">\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
-\r
-        <Directory Id="IBSDK" Name="IBSDK">\r
-          <?include ..\..\common\ib_sdk.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
+\r
     </Directory> <!-- End TARGETDIR -->\r
 \r
     <?include ..\..\common\arp.inc ?>\r
index 0bf3c94..beb7ac2 100644 (file)
         </Directory>\r
       </Directory>\r
 \r
-      <Directory Id="WindowsVolume" Name="Root" SourceName="WinRoot">\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
-\r
-        <Directory Id="IBSDK" Name="IBSDK">\r
-          <?include ..\..\common\ib_sdk.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
+\r
     </Directory> <!-- End TARGETDIR -->\r
 \r
     <?include ..\..\common\arp.inc ?>\r
index 3089a99..560c05d 100644 (file)
@@ -23,7 +23,8 @@
      Description="WinOF Installer"\r
      Comments="Windows OpenFabrics Alliance InfiniBand stack"\r
      Manufacturer="OpenFabrics Alliance" InstallerVersion="200"\r
-     Languages="1033" Compressed="yes" SummaryCodepage="1252" />\r
+     Platforms="Intel64" Languages="1033"\r
+     Compressed="yes" SummaryCodepage="1252" />\r
 \r
     <Condition Message="Administrator required to install [ProductName].">\r
      AdminUser\r
@@ -50,7 +51,7 @@
                    Name="WinOF" />\r
       </Directory>\r
       <Directory Id="DesktopFolder" Name="Desktop" />\r
-      <Directory Id="ProgramFilesFolder" Name="PFiles">\r
+      <Directory Id="ProgramFiles64Folder" Name="PFiles">\r
         <Directory Id="INSTALLDIR" Name="WinOF">\r
 \r
           <?include ..\..\common\Docs.inc ?>\r
         </Directory>\r
       </Directory>\r
 \r
-      <Directory Id="WindowsVolume" Name="Root" SourceName="WinRoot">\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
-\r
-        <Directory Id="IBSDK" Name="IBSDK">\r
-          <?include ..\..\common\ib_sdk.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
+\r
     </Directory> <!-- End TARGETDIR -->\r
 \r
     <?include ..\..\common\arp.inc ?>\r
index 8927b3b..03a1576 100644 (file)
@@ -85,6 +85,7 @@ for %%d in (amd64 x86 ia64) do (
             if exist %%f del /F /Q %%f\r
         )\r
 \r
+        rem set OS type for inf2cat\r
         if "%%d" == "amd64" set OEA=%OE%_X64,Vista_X64\r
                if "%%d" == "x86"   set OEA=%OE%_X86,Vista_X86\r
                if "%%d" == "ia64"  set OEA=%OE%_IA64\r
index ea2583e..4f939f8 100644 (file)
@@ -23,7 +23,8 @@
      Description="WinOF Installer"\r
      Comments="Windows OpenFabrics Alliance InfiniBand stack"\r
      Manufacturer="OpenFabrics Alliance" InstallerVersion="200"\r
-     Languages="1033" Compressed="yes" SummaryCodepage="1252" />\r
+     Platforms="x64" Languages="1033"\r
+     Compressed="yes" SummaryCodepage="1252" />\r
 \r
     <Condition Message="Administrator required to install [ProductName].">\r
      Privileged\r
@@ -50,7 +51,7 @@
                    Name="WinOF" />\r
       </Directory>\r
       <Directory Id="DesktopFolder" Name="Desktop" />\r
-      <Directory Id="ProgramFilesFolder" Name="PFiles">\r
+      <Directory Id="ProgramFiles64Folder" Name="PFiles">\r
         <Directory Id="INSTALLDIR" Name="WinOF">\r
 \r
           <?include ..\..\common\Docs.inc ?>\r
         </Directory>\r
       </Directory>\r
 \r
-      <Directory Id="WindowsVolume" Name="Root" SourceName="WinRoot">\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
-\r
-        <Directory Id="IBSDK" Name="IBSDK">\r
-          <?include ..\..\common\ib_sdk.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
+\r
     </Directory> <!-- End TARGETDIR -->\r
 \r
     <?include ..\..\common\arp.inc ?>\r
index c9aa20c..fbce033 100644 (file)
         </Directory>\r
       </Directory>\r
 \r
-      <Directory Id="WindowsVolume" Name="Root" SourceName="WinRoot">\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
-\r
-        <Directory Id="IBSDK" Name="IBSDK">\r
-          <?include ..\..\common\ib_sdk.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
+\r
     </Directory> <!-- End TARGETDIR -->\r
 \r
     <?include ..\..\common\arp.inc ?>\r
index f51da3d..9d55886 100644 (file)
@@ -23,7 +23,8 @@
      Description="WinOF Installer"\r
      Comments="Windows OpenFabrics Alliance InfiniBand stack"\r
      Manufacturer="OpenFabrics Alliance" InstallerVersion="200"\r
-     Languages="1033" Compressed="yes" SummaryCodepage="1252" />\r
+     Platforms="Intel64" Languages="1033"\r
+     Compressed="yes" SummaryCodepage="1252" />\r
 \r
     <Condition Message="Administrator required to install [ProductName].">\r
      Privileged\r
@@ -49,7 +50,7 @@
                    Name="WinOF" />\r
       </Directory>\r
       <Directory Id="DesktopFolder" Name="Desktop" />\r
-      <Directory Id="ProgramFilesFolder" Name="PFiles">\r
+      <Directory Id="ProgramFiles64Folder" Name="PFiles">\r
         <Directory Id="INSTALLDIR" Name="WinOF">\r
 \r
           <?include ..\..\common\Docs.inc ?>\r
         </Directory>\r
       </Directory>\r
 \r
-      <Directory Id="WindowsVolume" Name="Root" SourceName="WinRoot">\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
-\r
-        <Directory Id="IBSDK" Name="IBSDK">\r
-          <?include ..\..\common\ib_sdk.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
+\r
     </Directory> <!-- End TARGETDIR -->\r
 \r
     <?include ..\..\common\arp.inc ?>\r
index 093773c..5b40884 100644 (file)
@@ -23,7 +23,8 @@
      Description="WinOF Installer"\r
      Comments="Windows OpenFabrics Alliance InfiniBand stack"\r
      Manufacturer="OpenFabrics Alliance" InstallerVersion="200"\r
-     Languages="1033" Compressed="yes" SummaryCodepage="1252" />\r
+     Platforms="x64" Languages="1033"\r
+     Compressed="yes" SummaryCodepage="1252" />\r
 \r
     <Condition Message="Administrator required to install [ProductName].">\r
      Privileged\r
@@ -49,7 +50,7 @@
                    Name="WinOF" />\r
       </Directory>\r
       <Directory Id="DesktopFolder" Name="Desktop" />\r
-      <Directory Id="ProgramFilesFolder" Name="PFiles">\r
+      <Directory Id="ProgramFiles64Folder" Name="PFiles">\r
         <Directory Id="INSTALLDIR" Name="WinOF">\r
 \r
           <?include ..\..\common\Docs.inc ?>\r
         </Directory>\r
       </Directory>\r
 \r
-      <Directory Id="WindowsVolume" Name="Root" SourceName="WinRoot">\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
-\r
-        <Directory Id="IBSDK" Name="IBSDK">\r
-          <?include ..\..\common\ib_sdk.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
+\r
     </Directory> <!-- End TARGETDIR -->\r
 \r
     <?include ..\..\common\arp.inc ?>\r
index 02b6992..4b48a67 100644 (file)
         </Directory>\r
       </Directory>\r
 \r
-      <Directory Id="WindowsVolume" Name="Root" SourceName="WinRoot">\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
-\r
-        <Directory Id="IBSDK" Name="IBSDK">\r
-          <?include ..\..\common\ib_sdk.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
+\r
     </Directory> <!-- End TARGETDIR -->\r
 \r
     <?include ..\..\common\arp.inc ?>\r
index 82a3b1e..f6f9b87 100644 (file)
         </Directory>\r
       </Directory>\r
 \r
-      <Directory Id="WindowsVolume" Name="Root" SourceName="WinRoot">\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
-\r
-        <Directory Id="IBSDK" Name="IBSDK">\r
-          <?include ..\..\common\ib_sdk.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
+\r
     </Directory> <!-- End TARGETDIR -->\r
 \r
     <?include ..\..\common\arp.inc ?>\r