<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
<HTML><HEAD><TITLE></TITLE>
<META http-equiv=Content-Type content="text/html; charset=us-ascii">
<META content="MSHTML 6.00.2900.5512" name=GENERATOR></HEAD>
<BODY>
<DIV><FONT face=Tahoma>Hi,</FONT></DIV>
<DIV><FONT face=Tahoma></FONT> </DIV>
<DIV><FONT face=Tahoma>Client of ours is interested in evaluation of ND alone
and I believe there are more like him. This patch separates ND from
WSD.</FONT></DIV>
<DIV><FONT face=Tahoma></FONT> </DIV>
<DIV><FONT face=Tahoma>Thanks,</FONT></DIV>
<DIV><FONT face=Tahoma>Anatoly.</FONT></DIV>
<DIV><FONT face=Tahoma></FONT> </DIV>
<DIV><FONT face=Tahoma>Index:
WIX/CustomActions.vbs<BR>===================================================================<BR>---
WIX/CustomActions.vbs (revision 1479)<BR>+++
WIX/CustomActions.vbs (working copy)<BR>@@ -1041,9 +1041,6 @@<BR> '
Enable WSD if installsp.exe was installed (feature Winsock direct
selected).<BR> ' For Windows XP, this CustomAction should not be called as
WSD is not<BR> ' supported on XP.<BR>-' ND (Network Direct) is closely
bound to WSD and follows the same support<BR>-' rules. If the WSD feature is
selected (default is selected, except for XP)<BR>-' then installsp.exe &
ndinstall.exe will be present. Enable WSD & ND.<BR> <BR> Sub
WSDEnable()<BR> Dim sInstalldir, WshShell,
fso<BR>@@ -1060,10 +1057,23 @@<BR> End
If<BR> If Err Then
ShowError<BR> <BR>- ' Start the Network
Direct Service.<BR>+End Sub<BR>+<BR>+' Enable NetworkDirect if ndinstall.exe was
installed (feature NetworkDirect selected).<BR>+' For Windows XP, this
CustomAction should not be called as ND is not<BR>+' supported on
XP.<BR>+<BR>+Sub NDEnable()<BR>+ Dim sInstalldir,
WshShell, fso<BR>+<BR>+ sInstalldir =
Session.Property("INSTALLDIR")<BR>+<BR>+ Set
WshShell = CreateObject("WScript.Shell")<BR>+ Set
fso =
CreateObject("Scripting.FileSystemObject")<BR>+<BR>
If fso.FileExists(sInstalldir & "ndinstall.exe")
Then<BR>- ' install the
Network Direct Service<BR>- Return =
WshShell.Run ("cmd.exe /c cd " & sInstalldir
_<BR>+ ' install the
Network Direct
provider<BR>+ Return =
WshShell.Run ("cmd.exe /c cd " & sInstalldir
_<BR>
& " & ndinstall.exe -i", 0,
true)<BR> End
If<BR> If Err Then ShowError<BR>Index:
WIX/wlh/x64/wof.wxs<BR>===================================================================<BR>---
WIX/wlh/x64/wof.wxs (revision 1479)<BR>+++
WIX/wlh/x64/wof.wxs (working copy)<BR>@@ -474,6 +474,10
@@<BR>
<File Id="installsp.exe" Compressed="yes"
DiskId="1"<BR>
LongName="installsp.exe"
Name="INSTALL.EXE"<BR>
Source="..\bin\net\amd64\installsp.exe"
/><BR>+
</Component><BR>+<BR>+
<Component
Id="NetworkDirect"<BR>+
Guid="1B211282-6CE6-4f1f-BD0C-5D7541514A44"><BR>
<File Id="ndinstall.exe" Compressed="yes"
DiskId="1"<BR>
LongName="ndinstall.exe"
Name="NDINSTAL.EXE"<BR>
Source="..\bin\net\amd64\ndinstall.exe" /><BR>@@ -1174,6 +1178,15
@@<BR> <ComponentRef Id="IPoIB"
/><BR>
</Feature><BR> <BR>+ <Feature Id="fND"
Title="NetworkDirect" Description="NetworkDirect
Enabled"<BR>+ Display="expand"
Level="1"
ConfigurableDirectory="INSTALLDIR"<BR>+
AllowAdvertise="no" InstallDefault="local"
Absent="allow"><BR>+
<!-- skip ND on Windows XP or ia64
--><BR>+ <Condition
Level="200"><![CDATA[VersionNT=501]] AND
![CDATA[Intel64]]></Condition><BR>+
<Condition Level="201"> IPOIB_EXISTS
</Condition><BR>+
<ComponentRef Id="NetworkDirect" /><BR>+
</Feature><BR>+<BR> <Feature Id="fWSD"
Title="WSD" Description="Winsock Direct
Enabled"<BR> Display="expand" Level="1"
ConfigurableDirectory="INSTALLDIR"<BR>
AllowAdvertise='no' InstallDefault='local' Absent='allow'><BR>@@ -1289,6
+1302,9 @@<BR> <CustomAction Id='WSD_start'
BinaryKey='CA'<BR>
VBScriptCall='WSDEnable' Return='check' /><BR> <BR>+
<CustomAction Id="ND_start"
BinaryKey="CA"<BR>+
VBScriptCall="NDEnable" Return="check" /><BR>+<BR>
<CustomAction Id="OpenSM_start"
BinaryKey="CA"<BR>
VBScriptCall="OpenSM_StartMeUp" Return="check" /><BR> <BR>@@ -1315,6
+1331,9 @@<BR> <Custom
Action="WSD_start"
After='InstallFinalize'><BR>
Not Installed</Custom><BR> <BR>+
<Custom Action="ND_start"
After="InstallFinalize"><BR>+
Not Installed</Custom><BR>+<BR>
<Custom Action="OpenSM_start"
After="WSD_start"><BR>
($OpenSM_Service_enabled = 3) AND Not Installed
</Custom><BR> <BR>Index:
WIX/wlh/x86/wof.wxs<BR>===================================================================<BR>---
WIX/wlh/x86/wof.wxs (revision 1479)<BR>+++
WIX/wlh/x86/wof.wxs (working copy)<BR>@@ -416,6 +416,10
@@<BR>
<File Id="installsp.exe" Compressed="yes"
DiskId="1"<BR>
LongName="installsp.exe"
Name="INSTALL.EXE"<BR>
Source="..\bin\net\x86\installsp.exe"
/><BR>+
</Component><BR>+<BR>+
<Component
Id="NetworkDirect"<BR>+
Guid="A6C66EAA-1D57-41ba-8F8E-B7A85CE51A81"><BR>
<File Id="ndinstall.exe" Compressed="yes"
DiskId="1"<BR>
LongName="ndinstall.exe"
Name="NDINSTAL.EXE"<BR>
Source="..\bin\net\x86\ndinstall.exe" /><BR>@@ -1064,6 +1068,14
@@<BR> <ComponentRef
Id="IPoIB" /><BR>
</Feature><BR> <BR>+ <Feature Id="fND"
Title="NetworkDirect" Description="NetworkDirect
Enabled"<BR>+ Display="expand"
Level="1"
ConfigurableDirectory="INSTALLDIR"<BR>+
AllowAdvertise="no" InstallDefault="local"
Absent="allow"><BR>+
<!-- skip ND on Windows XP or ia64
--><BR>+ <Condition
Level="0"><![CDATA[VersionNT=501]] AND
![CDATA[Intel64]]></Condition><BR>+
<ComponentRef Id="NetworkDirect" /><BR>+
</Feature><BR>+<BR> <Feature Id="fWSD"
Title="WSD" Description="Winsock Direct
Enabled"<BR> Display="expand"
Level="1"
ConfigurableDirectory="INSTALLDIR"<BR>
AllowAdvertise="no" InstallDefault="local" Absent="allow"><BR>@@ -1182,6
+1194,9 @@<BR> <CustomAction Id="WSD_start"
BinaryKey="CA"<BR>
VBScriptCall="WSDEnable" Return="check" /><BR> <BR>+
<CustomAction Id="ND_start"
BinaryKey="CA"<BR>+
VBScriptCall="NDEnable" Return="check" /><BR>+<BR>
<CustomAction Id="OpenSM_start"
BinaryKey="CA"<BR>
VBScriptCall="OpenSM_StartMeUp" Return="check" /><BR> <BR>@@ -1207,6
+1222,9 @@<BR> <Custom
Action="WSD_start"
After="InstallFinalize"><BR>
Not Installed</Custom><BR> <BR>+
<Custom Action="ND_start"
After="InstallFinalize"><BR>+
Not Installed</Custom><BR>+<BR>
<Custom Action="OpenSM_start"
After="WSD_start"><BR>
($OpenSM_Service_enabled = 3) AND Not Installed
</Custom><BR> <BR>Index:
WIX/wnet/x64/wof.wxs<BR>===================================================================<BR>---
WIX/wnet/x64/wof.wxs (revision 1479)<BR>+++
WIX/wnet/x64/wof.wxs (working copy)<BR>@@ -474,8 +474,12
@@<BR>
<File Id="installsp.exe" Compressed="yes"
DiskId="1"<BR>
LongName="installsp.exe"
Name="INSTALL.EXE"<BR>
Source="..\bin\net\amd64\installsp.exe"
/><BR>+
</Component><BR>+<BR>+
<Component
Id="NetworkDirect"<BR>+
Guid="941B5314-5D7C-461d-A5EF-20E797C1DA96"><BR>
<File Id="ndinstall.exe" Compressed="yes"
DiskId="1"<BR>-
LongName="ndinstall.exe"
Name="INSTALL.EXE"<BR>+
LongName="ndinstall.exe"
Name="NDINSTAL.EXE"<BR>
Source="..\bin\net\amd64\ndinstall.exe"
/><BR>
</Component><BR> <BR>@@ -1183,6 +1187,15
@@<BR> <ComponentRef Id="WinsockDirect"
/><BR>
</Feature><BR> <BR>+ <Feature Id="fND"
Title="NetworkDirect" Description="NetworkDirect
Enabled"<BR>+ Display="expand"
Level="1"
ConfigurableDirectory="INSTALLDIR"<BR>+
AllowAdvertise="no" InstallDefault="local"
Absent="allow"><BR>+
<!-- skip ND on Windows XP or ia64
--><BR>+ <Condition
Level="200"><![CDATA[VersionNT=501]] AND
![CDATA[Intel64]]></Condition><BR>+
<Condition Level="201"> IPOIB_EXISTS
</Condition><BR>+
<ComponentRef Id="NetworkDirect" /><BR>+
</Feature><BR>+<BR> <Feature Id="fDAPL"
Title="DAPL" Description="DAT+DAPL over
InfiniBand"<BR>
Display="collapse" Level="1"
ConfigurableDirectory="INSTALLDIR"<BR>
AllowAdvertise='no' InstallDefault='local' Absent='allow'><BR>@@ -1289,6
+1302,9 @@<BR> <CustomAction Id='WSD_start'
BinaryKey='CA'<BR>
VBScriptCall='WSDEnable' Return='check' /><BR> <BR>+
<CustomAction Id="ND_start"
BinaryKey="CA"<BR>+
VBScriptCall="NDEnable" Return="check" /><BR>+<BR>
<CustomAction Id="OpenSM_start"
BinaryKey="CA"<BR>
VBScriptCall="OpenSM_StartMeUp" Return="check" /><BR> <BR>@@ -1315,6
+1331,9 @@<BR> <Custom
Action="WSD_start"
After='InstallFinalize'><BR>
Not Installed</Custom><BR> <BR>+
<Custom Action="ND_start"
After="InstallFinalize"><BR>+
Not Installed</Custom><BR>+<BR>
<Custom Action="OpenSM_start"
After="WSD_start"><BR>
($OpenSM_Service_enabled = 3) AND Not Installed
</Custom><BR> <BR>Index:
WIX/wnet/x86/wof.wxs<BR>===================================================================<BR>---
WIX/wnet/x86/wof.wxs (revision 1479)<BR>+++
WIX/wnet/x86/wof.wxs (working copy)<BR>@@ -416,6 +416,10
@@<BR>
<File Id="installsp.exe" Compressed="yes"
DiskId="1"<BR>
LongName="installsp.exe"
Name="INSTALL.EXE"<BR>
Source="..\bin\net\x86\installsp.exe"
/><BR>+
</Component><BR>+<BR>+
<Component
Id="NetworkDirect"<BR>+
Guid="99CD501B-8982-4b5f-A1E8-90A1C3C05AF7"><BR>
<File Id="ndinstall.exe" Compressed="yes"
DiskId="1"<BR>
LongName="ndinstall.exe"
Name="NDINSTAL.EXE"<BR>
Source="..\bin\net\x86\ndinstall.exe" /><BR>@@ -1064,6 +1068,14
@@<BR> <ComponentRef
Id="IPoIB" /><BR>
</Feature><BR> <BR>+ <Feature Id="fND"
Title="NetworkDirect" Description="NetworkDirect
Enabled"<BR>+ Display="expand"
Level="1"
ConfigurableDirectory="INSTALLDIR"<BR>+
AllowAdvertise="no" InstallDefault="local"
Absent="allow"><BR>+ <!-- skip
ND on Windows XP or ia64 --><BR>+
<Condition Level="0"><![CDATA[VersionNT=501]] AND
![CDATA[Intel64]]></Condition><BR>+
<ComponentRef Id="NetworkDirect" /><BR>+
</Feature><BR>+<BR> <Feature Id="fWSD"
Title="WSD" Description="Winsock Direct
Enabled"<BR> Display="expand"
Level="1"
ConfigurableDirectory="INSTALLDIR"<BR>
AllowAdvertise="no" InstallDefault="local" Absent="allow"><BR>@@ -1182,6
+1194,9 @@<BR> <CustomAction Id="WSD_start"
BinaryKey="CA"<BR>
VBScriptCall="WSDEnable" Return="check" /><BR> <BR>+
<CustomAction Id="ND_start"
BinaryKey="CA"<BR>+
VBScriptCall="NDEnable" Return="check" /><BR>+<BR>
<CustomAction Id="OpenSM_start"
BinaryKey="CA"<BR>
VBScriptCall="OpenSM_StartMeUp" Return="check" /><BR> <BR>@@ -1207,6
+1222,9 @@<BR> <Custom
Action="WSD_start"
After="InstallFinalize"><BR>
Not Installed</Custom><BR> <BR>+
<Custom Action="ND_start"
After="InstallFinalize"><BR>+
Not Installed</Custom><BR>+<BR>
<Custom Action="OpenSM_start"
After="WSD_start"><BR>
($OpenSM_Service_enabled = 3) AND Not Installed
</Custom><BR> <BR></FONT></DIV></BODY></HTML>