[ofw] [PATCH] ND: fixup build

[Sean Hefty]

Update the build.txt document for building ulp/nd.

Replace use of ND_INC and ND_INC_S variables with a single, user defined
ND_SDK_PATH environment variable.  The change makes it consistent
with the existing PLATFORM_SDK_PATH variable.

The makefile checks for ND_SDK_PATH, rather than ND_INC when determining if ND
should be built.  ND_INC indicates that the SDK has been installed, but is not
useful for building in the WDK.

The hard-coded paths in the ND sources file are removed, since those paths are
specific to individual installations.  PLATFORM_SDK_PATH_S is replaced with
the existing PLATFORM_SDK_PATH variable.

Signed-off-by: Sean Hefty <sean.hefty at intel.com>
---
Here's the full updated patch.  Unless there are objections, I will commit
this.


Index: docs/build.txt
===================================================================
--- build.txt	(revision 2138)
+++ build.txt	(working copy)
@@ -1,13 +1,14 @@
 To build the WinOF tree, you need to have the following installed:
 
 WDK version 6001.18001
-Windows Platform SDK (multiple versions work)
+Windows Platform SDK for Windows Server 2008 and .NET Framework 3.5 (v6.1)
 
 The WinOF tree (kernel drivers and userspace libraries) is built from the WDK
 build environment.  You need to set the following environment variables:
 
 OPENIB_REV		(example set OPENIB_REV=0)
-PLATFORM_SDK_PATH	(example set PLATFORM_SDK_PATH=c:\progra~1\mi2578~1)
+PLATFORM_SDK_PATH	(example set
PLATFORM_SDK_PATH=c:\progra~1\mi2578~1\windows\v6.1)
+ND_SDK_PATH		(example set ND_SDK_PATH=c:\progra~1\mi3029~1\networ~1)
 
 The OPENIB_REV variable can be set to the SVN revision number of the code.
 
@@ -15,6 +16,10 @@
 (no spaces).  You can use 'dir /x' to obtain the correct 8.3 notation for a
 given directory.
 
+The ND_SDK_PATH variable must reference the NetworkDirect directory of the
+HPC SDK, using 8.3 notation (no spaces).  You can use 'dir /x' to obtain the
+correct 8.3 notation for a given directory.
+
 Environment variables may be set by using the 'set' command in a command prompt
 window.  Or by selecting Control Panel -> Performance and Maintenance -> System
->
 Advanced -> Environment Variables.

Index: ulp/nd/user/makefile
===================================================================
--- user/makefile	(revision 2138)
+++ user/makefile	(working copy)
@@ -7,11 +7,9 @@
 # If ND SDK installed then Defeat IA64 builds
 # Otherwise, default all builds.
 
-!IFDEF ND_INC
 DDK_BLOCK_ON_IA64=1
-!ELSE
-!MESSAGE Skipping ibndprov.dll build: HPC SDK not installed.
-DDK_BLOCK_ON_IA64=1
+!IFNDEF ND_SDK_PATH
+!MESSAGE Skipping ibndprov.dll build: ND_SD_PATH not set.
 DDK_BLOCK_ON_X86=1
 DDK_BLOCK_ON_AMD64=1
 !ENDIF

Index: ulp/nd/user/SOURCES
===================================================================
--- user/SOURCES	(revision 2138)
+++ user/SOURCES	(working copy)
@@ -13,11 +13,6 @@
 
 USE_NTDLL=1
 
-# MS HPC 2008 SDK required to build!
-# ND IB Provider is skipped if not installed - see makefile
-ND_INC_S=C:\PROGRA~1\MICROS~4\NetworkDirect\Include
-PLATFORM_SDK_PATH_S=C:\PROGRA~1\MICROS~3\Windows\v6.1
-
 SOURCES= \
 	NdProv.rc				\
 	NdAdapter.cpp			\
@@ -30,7 +25,9 @@
 	NdConnector.cpp
 
 
-INCLUDES=$(SDK_INC_PATH);..;..\..\..\inc;..\..\..\inc\user;..\..\..\core\al;..\
..\..\core\al\user;$(ND_INC_S);$(PLATFORM_SDK_PATH_S)\Include
+INCLUDES=$(SDK_INC_PATH);..\..\..\inc;..\..\..\inc\user;..\..\..\core\al;\
+		  ..\..\..\core\al\user;$(ND_SDK_PATH)\include;\
+		  $(PLATFORM_SDK_PATH)\include
 
 USER_C_FLAGS=$(USER_C_FLAGS) -DEXPORT_AL_SYMBOLS -DCL_NO_TRACK_MEM -DWPP_OLDCC