[ofw] Network Direct IB Provider source build enabled as part of std build.

[James Yang]

Hi Stan,

You might want to remove these definitions in SOURCES and set them under
DOS environment. Hardcoded inside SOURCES file will fail the build if
others have different install path for SDK and HPC SDK.

ND_INC_S=C:\PROGRA~1\MICROS~4\NetworkDirect\Include
PLATFORM_SDK_PATH_S=C:\PROGRA~1\MICROS~3\Windows\v6.1

Thanks,
James

-----Original Message-----
From: ofw-bounces at lists.openfabrics.org
[mailto:ofw-bounces at lists.openfabrics.org] On Behalf Of Smith, Stan
Sent: Thursday, April 23, 2009 10:35 AM
To: Fab Tillier
Cc: ofw at lists.openfabrics.org
Subject: [ofw] Network Direct IB Provider source build enabled as part
of std build.


Hello,
  Network Direct IB provider src build has arrived.

Stan.


Revision: 2118
Author: stansmith
Date: 9:30:58 AM, Thursday, April 23, 2009
Message:
[NetworkDirect] Enable Network Direct IB provider builds.

if Server 2008 HPC SDK installed (ND_INC env defined) then build ND for
x86 & x64.
No IA64 ND support until ND over Winverbs.
In addition to the Server 2008 HPC SDK requirement, MS Windows SDK
'v6.1' also required.

if !HPC SDK installed, skip ND provider build for all architectures.

----
Modified : /gen1/trunk/ulp/nd/user/NdProv.rc
Modified : /gen1/trunk/ulp/nd/user/SOURCES
Modified : /gen1/trunk/ulp/nd/user/makefile


Index: NdProv.rc
===================================================================
--- NdProv.rc   (revision 2117)
+++ NdProv.rc   (revision 2118)
@@ -36,11 +36,11 @@
 #define VER_FILESUBTYPE                                VFT2_UNKNOWN

 #ifdef _DEBUG_
-#define VER_FILEDESCRIPTION_STR                "OpenFabrics Network
Direct Provider (Debug)"
+#define VER_FILEDESCRIPTION_STR                "OpenFabrics Network
Direct Infiniband Provider (Debug)"
 #define VER_INTERNALNAME_STR           "ibndprov.dll"
 #define VER_ORIGINALFILENAME_STR       "ibndprov.dll"
 #else
-#define VER_FILEDESCRIPTION_STR                "OpenFabrics Network
Direct Provider"
+#define VER_FILEDESCRIPTION_STR                "OpenFabrics Network
Direct Infiniband Provider"
 #define VER_INTERNALNAME_STR           "ibndprov.dll"
 #define VER_ORIGINALFILENAME_STR       "ibndprov.dll"
 #endif

Index: SOURCES
===================================================================
--- C:/Documents and Settings/scsmith/My
Documents/openIB-windows/SVN/gen1/trunk/ulp/nd/user/SOURCES.2087
Thu Apr 23 10:15:32 2009
+++ C:/Documents and Settings/scsmith/My
Documents/openIB-windows/SVN/gen1/trunk/ulp/nd/user/SOURCES    Thu Apr
23 10:16:24 2009
@@ -2,7 +2,7 @@

 TARGETPATH=..\..\..\bin\user\obj$(BUILD_ALT_DIR)
 TARGETTYPE=DYNLINK
-DLLDEF=NdProv.def
+DLLDEF = $(OBJ_PATH)\$O\NdProv.def
 DLLENTRY=DllMain

 !if $(FREEBUILD)
@@ -13,7 +13,12 @@

 USE_NTDLL=1

-SOURCES=\
+# 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                   \
        NdCq.cpp                                \
@@ -25,7 +30,7 @@
        NdConnector.cpp


-INCLUDES=$(SDK_INC_PATH);..;..\..\..\inc;..\..\..\inc\user;..\..\..\cor
e\al;..\..\..\core\al\user;$(ND_INC);$(PLATFORM_SDK_PATH)\Include
+INCLUDES=$(SDK_INC_PATH);..;..\..\..\inc;..\..\..\inc\user;..\..\..\cor
e\al;..\..\..\core\al\user;$(ND_INC_S);$(PLATFORM_SDK_PATH_S)\Include

 USER_C_FLAGS=$(USER_C_FLAGS) -DEXPORT_AL_SYMBOLS -DCL_NO_TRACK_MEM
-DWPP_OLDCC


Index: makefile
===================================================================
--- makefile    (revision 2117)
+++ makefile    (revision 2118)
@@ -4,8 +4,16 @@
 # that is shared by all the driver components of the OpenIB Windows
project.
 #

-# ND Provider not supported on IA64
+# 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
+DDK_BLOCK_ON_X86=1
+DDK_BLOCK_ON_AMD64=1
+!ENDIF

 !INCLUDE ..\..\..\inc\openib.def
_______________________________________________
ofw mailing list
ofw at lists.openfabrics.org
http://lists.openfabrics.org/cgi-bin/mailman/listinfo/ofw