[WIX]

  Allow Svr2008 installer to install on Svr2008 R2.
  Win7 only installs on Win7 -or- Svr2008 R2.
  signDrivers.bat - update error message: signtool.exe path

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

diff --git a/trunk/WinOF/WIX/README_release.txt b/trunk/WinOF/WIX/README_release.txt
index 2ae77a5b6092ad970a42b5014cb5c00acae2c06e..adf1d8994bc804c5c18c93f99f371a65ad72aef6 100644 (file)
--- a/trunk/WinOF/WIX/README_release.txt
+++ b/trunk/WinOF/WIX/README_release.txt
@@ -10,7 +10,7 @@ WinOF 2.1 Summary Changes
 1) The WinOF 2.1 release is based on openib-windows source svn revision\r
    (branches\WOF2-1 svn.xxxx).\r
 \r
-   Last WinOF release (2.0.1) based on svn 1932.\r
+   Last WinOF release (2.0.1) based on svn.1932.\r
 \r
 2) Bug fixes in\r
 \r
@@ -25,10 +25,23 @@ WinOF 2.1 Summary Changes
 \r
 3) New Functionality\r
 \r
-  A) Connected mode IPoIB ensures higher performance IPoIB transfers in\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 diagnostic utilities are available.\r
+       ibstat - display HCA information.\r
+       ibnetdiscover - generate a fabric topology.\r
+       portinfo - display InfiniBand port specific information.\r
+       saquery - SA (Subnet Administrator) query test.\r
+\r
+  - Connected mode IPoIB ensures higher performance IPoIB transfers in\r
      addition to OFED (Linux) IPoIB compatibility.\r
 \r
-  B) Windows Server 2008/Vista WinOF installs now utilize Windows Plug-n-Play\r
+  - Windows Server 2008/Vista WinOF installs now utilize Windows Plug-n-Play\r
      (PNP) to install the correct HCA driver(s). Selection of a specific HCA\r
      device type is no longer required for Server 2008/Vista/HPC.\r
 \r
@@ -54,7 +67,7 @@ WinOF 2.1 Summary Changes
          start/wait msiexec /X WinOF_wlh_x64.msi /passive\r
 \r
 \r
-  C) Server 2008-HPC install support has been enhanced to provide a no-drivers\r
+  - Server 2008-HPC install support has been enhanced to provide a no-drivers\r
      installed mode. Device driver '.inf' files are not processed during the\r
      WinOF install.\r
      The base assumption is that a WDM node provisioning template will install\r
@@ -77,26 +90,15 @@ WinOF 2.1 Summary Changes
         unattended uninstall with auto-reboot:\r
           start/wait msiexec /X WOF.msi /passive\r
 \r
-  D) SRP and VNIC drivers are command line selectable:\r
+  - SRP and VNIC drivers are command line selectable:\r
         start/wait msiexec /I WOF.msi /passive SRP=1\r
         start/wait msiexec /I WOF.msi /passive VNIC=1\r
 \r
-  E) Subnet Management started as a local Windows Service from a command line:\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
-  F) HCA drivers load WinVerbs and WinMad filter drivers by default.\r
+  - HCA drivers load WinVerbs and WinMad filter drivers by default.\r
 \r
-  G) 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
-\r
-  H) OFED fabric diagnostic utilities are available.\r
-       ibstat - display HCA information.\r
-       ibnetdiscover - generate a fabric topology.\r
-       portinfo - display InfiniBand port specific information.\r
-       saquery - SA (Subnet Administrator) query test.\r
 \r
 \r
 Note on Vista installs Only:\r

diff --git a/trunk/WinOF/WIX/Release_notes.htm b/trunk/WinOF/WIX/Release_notes.htm
index 0b9cdd1dbb96b72706d4493038807279048d8557..d2243fdbf08b3ade925fce4f4941e636c01b8898 100644 (file)
--- a/trunk/WinOF/WIX/Release_notes.htm
+++ b/trunk/WinOF/WIX/Release_notes.htm
@@ -92,7 +92,7 @@ src=openfabrics.gif></h1>
 <h1 align=center style='text-align:center'><a name="1.1_Release_Notes">2.1 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 -->03/09/2009<!--webbot bot="Timestamp" endspan i-checksum="12644" --></h3>\r
+<!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%m/%d/%Y" startspan -->04/02/2009<!--webbot bot="Timestamp" endspan i-checksum="12534" --></h3>\r
 \r
 <div class=MsoNormal align=center style='text-align:center'>\r
 \r
@@ -255,6 +255,14 @@ supported devices below</span></font></li>
        Server 2008</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
+       </li>\r
+       <li>\r
+       <p style='margin-left:.5in;text-indent:-.25in'><font face="Arial">Windows 7 \r
+       (Server/Ultimate/Professional)</font></p>\r
+       </li>\r
+       <li>\r
        <p style='margin-left:.5in;text-indent:-.25in'><font face="Arial"><span dir="LTR">Vista</span></font></p>\r
        </li>\r
        <li>\r

diff --git a/trunk/WinOF/WIX/win7/ia64/wof.wxs b/trunk/WinOF/WIX/win7/ia64/wof.wxs
index a6decfdb1460b17820238315aed95dd662039ab7..986308f94ba22d570416372c0fff88789b37341e 100644 (file)
--- a/trunk/WinOF/WIX/win7/ia64/wof.wxs
+++ b/trunk/WinOF/WIX/win7/ia64/wof.wxs
@@ -37,8 +37,8 @@
         <![CDATA[VersionNT64]]>\r
     </Condition>\r
 \r
-    <Condition Message="[ProductName] requires Windows Server 2008 to install.">\r
-         <![CDATA[(VersionNT=600)]]>\r
+    <Condition Message="[ProductName] requires Windows 7 or Server 2008 R2 to install.">\r
+         <![CDATA[(VersionNT=601)]]>\r
     </Condition>\r
 \r
     <?include ..\..\common\requirements.inc ?>\r

diff --git a/trunk/WinOF/WIX/win7/signDrivers.bat b/trunk/WinOF/WIX/win7/signDrivers.bat
index a27c83ea30f3a922dd970347022146eeda6fc5c5..9afc1e90a5a065bd6e35a65cb45ad35c62aecb8c 100644 (file)
--- a/trunk/WinOF/WIX/win7/signDrivers.bat
+++ b/trunk/WinOF/WIX/win7/signDrivers.bat
@@ -59,7 +59,7 @@ rem make sure signtool is accessible in our path
 path > jnk.txt\r
 findstr /c:"SelfSign" jnk.txt > jnk1.txt\r
 if %errorlevel% EQU 1 (\r
-    path "%PATH%;C:\WinDDK\6001.18001\bin\SelfSign"\r
+    path "%PATH%;C:\WinDDK\xxx\bin\SelfSign"\r
 )\r
 if exist jnk1.txt  del /Q /F jnk1.txt\r
 if exist jnk.txt  del /Q /F jnk.txt\r

diff --git a/trunk/WinOF/WIX/win7/x64/wof.wxs b/trunk/WinOF/WIX/win7/x64/wof.wxs
index f4a51162b676ee7dbba44f37bfd1d96e1419d77a..14b3909a30548c5dc646a39a17d1ffbc365bdde8 100644 (file)
--- a/trunk/WinOF/WIX/win7/x64/wof.wxs
+++ b/trunk/WinOF/WIX/win7/x64/wof.wxs
@@ -37,8 +37,8 @@
         <![CDATA[Msix64]]>\r
     </Condition>\r
 \r
-    <Condition Message="[ProductName] requires Windows Server 2008 or Vista to install.">\r
-         <![CDATA[(VersionNT=600)]]>\r
+    <Condition Message="[ProductName] requires Windows 7 or Server 2008 R2 to install.">\r
+         <![CDATA[(VersionNT=601)]]>\r
     </Condition>\r
 \r
     <?include ..\..\common\requirements.inc ?>\r

diff --git a/trunk/WinOF/WIX/win7/x86/wof.wxs b/trunk/WinOF/WIX/win7/x86/wof.wxs
index a859b15febc5c028e6b32b77fbe6c6dc2a935df6..a4d1297f0a0bae324fe86f676d48757d07044191 100644 (file)
--- a/trunk/WinOF/WIX/win7/x86/wof.wxs
+++ b/trunk/WinOF/WIX/win7/x86/wof.wxs
@@ -32,8 +32,8 @@
     <Condition Message="This package can be installed on x86 systems only">\r
      <![CDATA[(Not Intel64) And (Not Msix64)]]></Condition>\r
 \r
-    <Condition Message="[ProductName] requires Windows Server 2008 or Vista to install.">\r
-     <![CDATA[(VersionNT=600)]]></Condition>\r
+    <Condition Message="[ProductName] requires Windows 7 or Server 2008 R2 to install.">\r
+     <![CDATA[(VersionNT=601)]]></Condition>\r
 \r
     <?include ..\..\common\requirements.inc ?>\r
 \r

diff --git a/trunk/WinOF/WIX/wlh/ia64/wof.wxs b/trunk/WinOF/WIX/wlh/ia64/wof.wxs
index e82dbc5c3c950f836d51bdc775060fceb4daebe0..a18a044b454ec9df6b614cdb6055289ec8a114a5 100644 (file)
--- a/trunk/WinOF/WIX/wlh/ia64/wof.wxs
+++ b/trunk/WinOF/WIX/wlh/ia64/wof.wxs
@@ -37,8 +37,9 @@
         <![CDATA[VersionNT64]]>\r
     </Condition>\r
 \r
-    <Condition Message="[ProductName] requires Windows Server 2008 to install.">\r
-         <![CDATA[(VersionNT=600)]]>\r
+    <Condition\r
+      Message="[ProductName] requires Windows Server 2008 to install.">\r
+      <![CDATA[(VersionNT=600 OR VersionNT=601)]]>\r
     </Condition>\r
 \r
     <?include ..\..\common\requirements.inc ?>\r
@@ -162,7 +163,7 @@
         Display="expand" Level="2" ConfigurableDirectory="INSTALLDIR"\r
         AllowAdvertise="no" InstallDefault="local" Absent="allow">\r
         <ComponentRef Id="cNetworkDirect" />\r
-        <Condition Level="201"> IPOIB_EXISTS </Condition> \r
+        <Condition Level="201"> IPOIB_EXISTS </Condition>\r
     </Feature>\r
 -->\r
     <Feature Id="fOSMS" Title="OpenSM Service Started" Level="5"\r
@@ -221,8 +222,8 @@
     </Feature>\r
 \r
     <Feature Id="fSRP" Title="SRP" Level="5" Description="SCSI over RDMA"\r
-         Display="expand" ConfigurableDirectory="INSTALLDIR"\r
-         AllowAdvertise='no' InstallDefault='local' Absent='allow'>\r
+        Display="expand" ConfigurableDirectory="INSTALLDIR"\r
+        AllowAdvertise="no" InstallDefault="local" Absent="allow">\r
       <ComponentRef Id="cSRP_driver_installed" />\r
     </Feature>\r
 \r

diff --git a/trunk/WinOF/WIX/wlh/signDrivers.bat b/trunk/WinOF/WIX/wlh/signDrivers.bat
index 930812939115244fcaf1cf4248c03bd5b2aab70f..7cb70ebdedb0186f857558e6011ddb4e58b1ce67 100644 (file)
--- a/trunk/WinOF/WIX/wlh/signDrivers.bat
+++ b/trunk/WinOF/WIX/wlh/signDrivers.bat
@@ -59,7 +59,7 @@ rem make sure signtool is accessible in our path
 path > jnk.txt\r
 findstr /c:"SelfSign" jnk.txt > jnk1.txt\r
 if %errorlevel% EQU 1 (\r
-    path "%PATH%;C:\WinDDK\6001.18001\bin\SelfSign"\r
+    path "%PATH%;C:\WinDDK\xxx\bin\SelfSign"\r
 )\r
 if exist jnk1.txt  del /Q /F jnk1.txt\r
 if exist jnk.txt  del /Q /F jnk.txt\r

diff --git a/trunk/WinOF/WIX/wlh/x64/wof.wxs b/trunk/WinOF/WIX/wlh/x64/wof.wxs
index 562238d7726bcf6e8228d8b45ccbd038b48c425f..5d735bb85a6cc9b96bbfbf303a954f945cb9f4f7 100644 (file)
--- a/trunk/WinOF/WIX/wlh/x64/wof.wxs
+++ b/trunk/WinOF/WIX/wlh/x64/wof.wxs
@@ -37,8 +37,9 @@
         <![CDATA[Msix64]]>\r
     </Condition>\r
 \r
-    <Condition Message="[ProductName] requires Windows Server 2008 or Vista to install.">\r
-         <![CDATA[(VersionNT=600)]]>\r
+    <Condition\r
+      Message="[ProductName] requires Windows Server 2008 or Vista to install.">\r
+      <![CDATA[(VersionNT=600 OR VersionNT=601)]]>\r
     </Condition>\r
 \r
     <?include ..\..\common\requirements.inc ?>\r
@@ -148,8 +149,8 @@
     </Feature>\r
 \r
     <Feature Id="fWSD" Title="WSD" Description="Winsock Direct Enabled"\r
-            Display="expand" Level="1" ConfigurableDirectory="INSTALLDIR"\r
-         AllowAdvertise='no' InstallDefault='local' Absent='allow'>\r
+           Display="expand" Level="1" ConfigurableDirectory="INSTALLDIR"\r
+        AllowAdvertise='no' InstallDefault='local' Absent='allow'>\r
       <!-- skip WSD on Windows XP, IPoIB is required for WSD. -->\r
       <Condition Level="200"><![CDATA[VersionNT=501]]></Condition>\r
       <Condition Level="201"> IPOIB_EXISTS </Condition>\r
@@ -220,8 +221,8 @@
     </Feature>\r
 \r
     <Feature Id="fSRP" Title="SRP" Level="5" Description="SCSI over RDMA"\r
-         Display="expand" ConfigurableDirectory="INSTALLDIR"\r
-         AllowAdvertise='no' InstallDefault='local' Absent='allow'>\r
+        Display="expand" ConfigurableDirectory="INSTALLDIR"\r
+        AllowAdvertise="no" InstallDefault="local" Absent="allow">\r
       <ComponentRef Id="cSRP_driver_installed" />\r
     </Feature>\r
 \r

diff --git a/trunk/WinOF/WIX/wlh/x86/wof.wxs b/trunk/WinOF/WIX/wlh/x86/wof.wxs
index e7990176bb9745589d7f5b6b7e7eaff235a34900..7dcceedb06333ea4a2624427f981b421f35b8052 100644 (file)
--- a/trunk/WinOF/WIX/wlh/x86/wof.wxs
+++ b/trunk/WinOF/WIX/wlh/x86/wof.wxs
@@ -30,10 +30,13 @@
     </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 Server 2008 or Vista to install.">\r
-     <![CDATA[(VersionNT=600)]]></Condition>\r
+    <Condition\r
+      Message="[ProductName] requires Windows Server 2008 or Vista to install.">\r
+      <![CDATA[(VersionNT=600 OR VersionNT=601)]]>\r
+    </Condition>\r
 \r
     <?include ..\..\common\requirements.inc ?>\r
 \r
@@ -138,7 +141,7 @@
         Description="Internet Protocols over InfiniBand" Display="expand"\r
         ConfigurableDirectory="INSTALLDIR" AllowAdvertise="no"\r
         InstallDefault="local" Absent="allow">\r
-        <ComponentRef Id="IPoIB" />\r
+      <ComponentRef Id="IPoIB" />\r
     </Feature>\r
 \r
     <Feature Id="fWSD" Title="WSD" Description="Winsock Direct Enabled"\r
@@ -160,7 +163,7 @@
         Description="Open Subnet Management started as a local Windows Service"\r
         Display="expand" ConfigurableDirectory="INSTALLDIR" AllowAdvertise="no"\r
         InstallDefault="local" Absent="allow">\r
-        <ComponentRef Id="OpenSM_Service_enabled" />\r
+      <ComponentRef Id="OpenSM_Service_enabled" />\r
     </Feature>\r
 \r
     <Feature Id="fDAPL" Title="DAPL" Description="DAT+DAPL over InfiniBand"\r
@@ -212,13 +215,13 @@
     </Feature>\r
 \r
     <Feature Id="fSRP" Title="SRP" Level="5" Description="SCSI over RDMA"\r
-        Display="expand" ConfigurableDirectory="INSTALLDIR" AllowAdvertise="no"\r
-        InstallDefault="local" Absent="allow">\r
+        Display="expand" ConfigurableDirectory="INSTALLDIR"\r
+        AllowAdvertise="no" InstallDefault="local" Absent="allow">\r
         <!-- skip SRP on 32-bit Windows XP -->\r
         <Condition Level="0">\r
           <![CDATA[VersionNT=501 AND (Not Intel64 AND Not Msix64)]]>\r
         </Condition>\r
-        <ComponentRef Id="cSRP_driver_installed" />\r
+      <ComponentRef Id="cSRP_driver_installed" />\r
     </Feature>\r
 \r
     <Feature Id="fVNIC" Title="QLogic-VNIC"\r

diff --git a/trunk/WinOF/WIX/wnet/signDrivers.bat b/trunk/WinOF/WIX/wnet/signDrivers.bat
index 0d46534e51023d77bbbb5fc1cf57abc08d3e8ac3..9d0cdee5c1cca2bebf50c744de20d20b0c2556da 100644 (file)
--- a/trunk/WinOF/WIX/wnet/signDrivers.bat
+++ b/trunk/WinOF/WIX/wnet/signDrivers.bat
@@ -59,7 +59,7 @@ rem make sure signtool is accessible in our path
 path > jnk.txt\r
 findstr /c:"SelfSign" jnk.txt > jnk1.txt\r
 if %errorlevel% EQU 1 (\r
-    path "%PATH%;C:\WinDDK\6001.18001\bin\SelfSign"\r
+    path "%PATH%;C:\WinDDK\xxx\bin\SelfSign"\r
 )\r
 if exist jnk1.txt  del /Q /F jnk1.txt\r
 if exist jnk.txt  del /Q /F jnk.txt\r

diff --git a/trunk/WinOF/WIX/wxp/signDrivers.bat b/trunk/WinOF/WIX/wxp/signDrivers.bat
index 4bd44e1e30aeb7e632864ba7b29965e328c2c743..ac592881bef445c44351777f34487d131b937e19 100644 (file)
--- a/trunk/WinOF/WIX/wxp/signDrivers.bat
+++ b/trunk/WinOF/WIX/wxp/signDrivers.bat
@@ -59,7 +59,7 @@ rem make sure signtool is accessible in our path
 path > jnk.txt\r
 findstr /c:"SelfSign" jnk.txt > jnk1.txt\r
 if %errorlevel% EQU 1 (\r
-    path "%PATH%;C:\WinDDK\6001.18001\bin\SelfSign"\r
+    path "%PATH%;C:\WinDDK\xxx\bin\SelfSign"\r
 )\r
 if exist jnk1.txt  del /Q /F jnk1.txt\r
 if exist jnk.txt  del /Q /F jnk.txt\r