[NetworkDirect] Enable Network Direct IB provider builds.
authorstansmith <stansmith@ad392aa1-c5ef-ae45-8dd8-e69d62a5ef86>
Thu, 23 Apr 2009 16:30:58 +0000 (16:30 +0000)
committerstansmith <stansmith@ad392aa1-c5ef-ae45-8dd8-e69d62a5ef86>
Thu, 23 Apr 2009 16:30:58 +0000 (16:30 +0000)
if HPC SDK installed (ND_INC defined) then build for x86 & x64 - no IA64 ND support until ND over Winverbs.
if !HPC SDK installed, skip ND provider build for all architectures.

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

ulp/nd/user/NdProv.rc
ulp/nd/user/SOURCES
ulp/nd/user/makefile

index 6f5908b..782def8 100644 (file)
 #define VER_FILESUBTYPE                                VFT2_UNKNOWN\r
 \r
 #ifdef _DEBUG_\r
-#define VER_FILEDESCRIPTION_STR                "OpenFabrics Network Direct Provider (Debug)"\r
+#define VER_FILEDESCRIPTION_STR                "OpenFabrics Network Direct Infiniband Provider (Debug)"\r
 #define VER_INTERNALNAME_STR           "ibndprov.dll"\r
 #define VER_ORIGINALFILENAME_STR       "ibndprov.dll"\r
 #else\r
-#define VER_FILEDESCRIPTION_STR                "OpenFabrics Network Direct Provider"\r
+#define VER_FILEDESCRIPTION_STR                "OpenFabrics Network Direct Infiniband Provider"\r
 #define VER_INTERNALNAME_STR           "ibndprov.dll"\r
 #define VER_ORIGINALFILENAME_STR       "ibndprov.dll"\r
 #endif\r
index 75d006a..20a7128 100644 (file)
@@ -1,15 +1,67 @@
-TARGETNAME=fake\r
+TARGETNAME=ibndprov\r
+\r
 TARGETPATH=..\..\..\bin\user\obj$(BUILD_ALT_DIR)\r
-TARGETTYPE=PROGRAM\r
-UMTYPE=console\r
-USE_MSVCRT=1\r
+TARGETTYPE=DYNLINK\r
+DLLDEF = $(OBJ_PATH)\$O\NdProv.def\r
+DLLENTRY=DllMain\r
+\r
+!if $(FREEBUILD)\r
+ENABLE_EVENT_TRACING=1\r
+#!else\r
+#ENABLE_EVENT_TRACING=1\r
+!endif\r
+\r
+USE_NTDLL=1\r
+\r
+# MS HPC 2008 SDK required to build!\r
+# ND IB Provider is skipped if not installed - see makefile\r
+ND_INC_S=C:\PROGRA~1\MICROS~4\NetworkDirect\Include\r
+PLATFORM_SDK_PATH_S=C:\PROGRA~1\MICROS~3\Windows\v6.1\r
+\r
+SOURCES= \\r
+       NdProv.rc                               \\r
+       NdAdapter.cpp                   \\r
+       NdCq.cpp                                \\r
+       NdEndpoint.cpp                  \\r
+       NdListen.cpp                    \\r
+       NdMr.cpp                                \\r
+       NdMw.cpp                                \\r
+       NdProv.cpp                              \\r
+       NdConnector.cpp\r
+\r
+\r
+INCLUDES=$(SDK_INC_PATH);..;..\..\..\inc;..\..\..\inc\user;..\..\..\core\al;..\..\..\core\al\user;$(ND_INC_S);$(PLATFORM_SDK_PATH_S)\Include\r
+\r
+USER_C_FLAGS=$(USER_C_FLAGS) -DEXPORT_AL_SYMBOLS -DCL_NO_TRACK_MEM -DWPP_OLDCC\r
+\r
+#/GL\r
+#LINKER_FLAGS=$(LINKER_FLAGS) /LTCG\r
+\r
+TARGETLIBS= \\r
+                       $(SDK_LIB_PATH)\Kernel32.lib\\r
+                       $(SDK_LIB_PATH)\Advapi32.lib\\r
+                       $(SDK_LIB_PATH)\ws2_32.lib \\r
+                       $(SDK_LIB_PATH)\iphlpapi.lib \\r
+                       $(TARGETPATH)\*\ibat.lib \\r
+!if $(FREEBUILD)\r
+                       $(TARGETPATH)\*\complib.lib \\r
+!else\r
+                       $(TARGETPATH)\*\complibd.lib\\r
+!endif\r
+                       $(SDK_LIB_PATH)\uuid.lib\r
+\r
 \r
-SOURCES=fake.c\r
+!IFDEF ENABLE_EVENT_TRACING\r
 \r
-INCLUDES=..;..\..\..\inc;..\..\..\inc\kernel;\r
+C_DEFINES = $(C_DEFINES) -DEVENT_TRACING\r
 \r
-ND_TARGET1=..\..\..\bin\user\$(O)\ibndprov.dll\r
-ND_TARGET2=..\..\..\bin\user\$(O)\ndinstall.exe\r
+RUN_WPP = $(SOURCES) -ext: .c .h .C .H \\r
+       -scan:nddebug.h \\r
+       -func:ND_PRINT(LEVEL,FLAGS,(MSG,...)) \\r
+       -func:ND_PRINT_EXIT(LEVEL,FLAGS,(MSG,...)) \\r
+       -dll\r
+!ENDIF\r
 \r
-NTTARGETFILES=$(ND_TARGET1) $(ND_TARGET2)\r
+BUILD_PRODUCES=NetworkDirect\r
 \r
+MSC_WARNING_LEVEL= /W4\r
index 0a1e87e..3904a63 100644 (file)
@@ -4,8 +4,16 @@
 # that is shared by all the driver components of the OpenIB Windows project.\r
 #\r
 \r
-# ND Provider not supported on IA64\r
+# If ND SDK installed then Defeat IA64 builds\r
+# Otherwise, default all builds.\r
 \r
+!IFDEF ND_INC\r
 DDK_BLOCK_ON_IA64=1\r
+!ELSE\r
+!MESSAGE Skipping ibndprov.dll build: HPC SDK not installed.\r
+DDK_BLOCK_ON_IA64=1\r
+DDK_BLOCK_ON_X86=1\r
+DDK_BLOCK_ON_AMD64=1\r
+!ENDIF\r
 \r
 !INCLUDE ..\..\..\inc\openib.def\r