[Core,DAPL]

  make user mode .dll libraries build
  cleanup DAPL and getpid() missing from documented MS libs.

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

diff --git a/branches/ConnectX/core/al/user/SOURCES b/branches/ConnectX/core/al/user/SOURCES
index bd1cfbf85e034f9bb2ac794bdb6b021259d89e22..85774fa67270b2726204b8be0f595c48c9e95b12 100644 (file)
--- a/branches/ConnectX/core/al/user/SOURCES
+++ b/branches/ConnectX/core/al/user/SOURCES
@@ -9,16 +9,20 @@ TARGETTYPE=DYNLINK
 DLLENTRY=DllMain\r
 \r
 \r
-\r
 !if $(FREEBUILD)\r
 ENABLE_EVENT_TRACING=1\r
 #!else\r
 #ENABLE_EVENT_TRACING=1\r
 !endif\r
 \r
-\r
-\r
+!if $(_NT_TOOLS_VERSION) == 0x700\r
+# DDK\r
 DLLDEF=$O\al_exports.def\r
+!else\r
+# WDK\r
+DLLDEF=$(OBJ_PATH)\$O\al_exports.def\r
+!endif\r
+\r
 USE_NTDLL=1\r
 \r
 SOURCES=\\r

diff --git a/branches/ConnectX/core/complib/user/SOURCES b/branches/ConnectX/core/complib/user/SOURCES
index 64725a8d5b52285d0d936d6bd42ef3de8782fcdc..1a636edc11b063ca0d9b56464e9aab4206efa487 100644 (file)
--- a/branches/ConnectX/core/complib/user/SOURCES
+++ b/branches/ConnectX/core/complib/user/SOURCES
@@ -6,7 +6,15 @@ TARGETNAME=complibd
 TARGETPATH=..\..\..\bin\user\obj$(BUILD_ALT_DIR)\r
 TARGETTYPE=DYNLINK\r
 DLLENTRY=DllMain\r
+\r
+!if $(_NT_TOOLS_VERSION) == 0x700\r
+# DDK\r
 DLLDEF=$O\complib.def\r
+!else\r
+# WDK\r
+DLLDEF=$(OBJ_PATH)\$O\complib.def\r
+!endif\r
+\r
 USE_NTDLL=1\r
 \r
 SOURCES=\\r

diff --git a/branches/ConnectX/ulp/dapl/dapl/udapl/SOURCES b/branches/ConnectX/ulp/dapl/dapl/udapl/SOURCES
index f7aa65c9e0c52bc91c00c8254e20c7aebc4c5e15..712ba5b464bf54cddd59ed54f63f2ac479b6c571 100644 (file)
--- a/branches/ConnectX/ulp/dapl/dapl/udapl/SOURCES
+++ b/branches/ConnectX/ulp/dapl/dapl/udapl/SOURCES
@@ -6,8 +6,14 @@ TARGETNAME=dapld
 TARGETPATH=..\..\..\..\bin\user\obj$(BUILD_ALT_DIR)\r
 TARGETTYPE=DYNLINK\r
 DLLENTRY=_DllMainCRTStartup\r
+!if $(_NT_TOOLS_VERSION) == 0x700\r
+# DDK\r
 DLLDEF=$O\udapl_exports.def\r
-USE_MSVCRT=1\r
+!else\r
+# WDK\r
+DLLDEF=$(OBJ_PATH)\$O\udapl_exports.def\r
+!endif\r
+USE_LIBCMT=1\r
 \r
 SOURCES=udapl.rc               \\r
        dapl_init.c                     \\r

diff --git a/branches/ConnectX/ulp/dapl/dat/udat/SOURCES b/branches/ConnectX/ulp/dapl/dat/udat/SOURCES
index 425cbbebfca9292bc678a027952d152cc1f548e6..e236853783703e376ccf4697ee93c80a581ab2eb 100644 (file)
--- a/branches/ConnectX/ulp/dapl/dat/udat/SOURCES
+++ b/branches/ConnectX/ulp/dapl/dat/udat/SOURCES
@@ -6,8 +6,14 @@ TARGETNAME=datd
 TARGETPATH=..\..\..\..\bin\user\obj$(BUILD_ALT_DIR)\r
 TARGETTYPE=DYNLINK\r
 DLLENTRY=_DllMainCRTStartup\r
+!if $(_NT_TOOLS_VERSION) == 0x700\r
+# DDK\r
 DLLDEF=$O\udat_exports.def\r
-USE_MSVCRT=1\r
+!else\r
+# WDK\r
+DLLDEF=$(OBJ_PATH)\$O\udat_exports.def\r
+!endif\r
+USE_LIBCMT=1\r
 \r
 SOURCES=udat.rc                        \\r
        udat.c                          \\r

diff --git a/branches/ConnectX/ulp/dapl2/dapl/udapl/SOURCES b/branches/ConnectX/ulp/dapl2/dapl/udapl/SOURCES
index fd7aa647bd90d3d685a0aafebb14baaf923f7767..c004a600c0693c6b655e7aa1a21ae872e9604dc1 100644 (file)
--- a/branches/ConnectX/ulp/dapl2/dapl/udapl/SOURCES
+++ b/branches/ConnectX/ulp/dapl2/dapl/udapl/SOURCES
@@ -3,11 +3,16 @@ TARGETNAME=dapl2
 !else\r
 TARGETNAME=dapl2d\r
 !endif\r
+\r
 TARGETPATH=..\..\..\..\bin\user\obj$(BUILD_ALT_DIR)\r
 TARGETTYPE=DYNLINK\r
 DLLENTRY=_DllMainCRTStartup\r
+!if $(_NT_TOOLS_VERSION) == 0x700\r
 DLLDEF=$O\udapl_exports.def\r
-USE_MSVCRT=1\r
+!else\r
+DLLDEF=$(OBJ_PATH)\$O\udapl_exports.def\r
+!endif\r
+USE_LIBCMT=1\r
 \r
 # pickup local files, then via udapl_sources.c get common files\r
 \r
@@ -29,7 +34,7 @@ SOURCES=udapl.rc                      \
        dapl_lmr_create.c               \\r
        udapl_sources.c\r
 \r
-INCLUDES=..\include;..\common;windows;..\ibal;..\..\dat\include;\\r
+INCLUDES=$(INCLUDES);..\include;..\common;windows;..\ibal;..\..\dat\include;\\r
                ..\..\..\..\inc;..\..\..\..\inc\user;\r
 \r
 DAPL_OPTS= -DEXPORT_DAPL_SYMBOLS -D_VENDOR_IBAL_ -DDAPL_MERGE_CM_DTO\r

diff --git a/branches/ConnectX/ulp/dapl2/dapl/udapl_scm/SOURCES b/branches/ConnectX/ulp/dapl2/dapl/udapl_scm/SOURCES
index 25675d6be55277bb66bcc3d87f1838d35e31343a..f25a1d6a3fa5a4327c0a0f8a66090f523d0a04e7 100644 (file)
--- a/branches/ConnectX/ulp/dapl2/dapl/udapl_scm/SOURCES
+++ b/branches/ConnectX/ulp/dapl2/dapl/udapl_scm/SOURCES
@@ -6,8 +6,12 @@ TARGETNAME=dapl2-scmd
 TARGETPATH=..\..\..\..\bin\user\obj$(BUILD_ALT_DIR)\r
 TARGETTYPE=DYNLINK\r
 DLLENTRY=_DllMainCRTStartup\r
+!if $(_NT_TOOLS_VERSION) == 0x700\r
 DLLDEF=$O\udapl_scm_exports.def\r
-USE_MSVCRT=1\r
+!else\r
+DLLDEF=$(OBJ_PATH)\$O\udapl_scm_exports.def\r
+!endif\r
+USE_LIBCMT=1\r
 \r
 # pickup local files, then via udapl_sources.c get common files\r
 \r

diff --git a/branches/ConnectX/ulp/dapl2/dat/udat/SOURCES b/branches/ConnectX/ulp/dapl2/dat/udat/SOURCES
index a55d841cf95c0a76e430120c59fd123fefebf2b4..3e5be99102db607763fff80558c0303f86462deb 100644 (file)
--- a/branches/ConnectX/ulp/dapl2/dat/udat/SOURCES
+++ b/branches/ConnectX/ulp/dapl2/dat/udat/SOURCES
@@ -6,8 +6,12 @@ TARGETNAME=dat2d
 TARGETPATH=..\..\..\..\bin\user\obj$(BUILD_ALT_DIR)\r
 TARGETTYPE=DYNLINK\r
 DLLENTRY=_DllMainCRTStartup\r
+!if $(_NT_TOOLS_VERSION) == 0x700\r
 DLLDEF=$O\udat_exports.def\r
-USE_MSVCRT=1\r
+!else\r
+DLLDEF=$(OBJ_PATH)\$O\udat_exports.def\r
+!endif\r
+USE_LIBCMT=1\r
 \r
 SOURCES=udat.rc                        \\r
        udat.c                  \\r

diff --git a/branches/ConnectX/ulp/dapl2/test/dapltest/SOURCES b/branches/ConnectX/ulp/dapl2/test/dapltest/SOURCES
index 6f74cff2dad445cc5baad12201cffdc649b6a8a7..dce1d3bd04e1f387e15dd9d65bf16bc32ce0e3c3 100644 (file)
--- a/branches/ConnectX/ulp/dapl2/test/dapltest/SOURCES
+++ b/branches/ConnectX/ulp/dapl2/test/dapltest/SOURCES
@@ -6,7 +6,7 @@ TARGETNAME=dapl2testd
 TARGETPATH=..\..\..\..\bin\user\obj$(BUILD_ALT_DIR)\r
 TARGETTYPE=PROGRAM\r
 UMTYPE=console\r
-USE_MSVCRT=1\r
+USE_LIBCMT=1\r
 \r
 SOURCES=dapltest.rc    \\r
        dt_cmd.c        \\r

diff --git a/branches/ConnectX/ulp/dapl2/test/dtest/SOURCES b/branches/ConnectX/ulp/dapl2/test/dtest/SOURCES
index f6a533097801adf2c6a146e56dc59c62319ba9f6..b8ac53050bb864f769b5a7736178b3201d19fbdc 100644 (file)
--- a/branches/ConnectX/ulp/dapl2/test/dtest/SOURCES
+++ b/branches/ConnectX/ulp/dapl2/test/dtest/SOURCES
@@ -6,15 +6,13 @@ TARGETNAME=dtest2d
 TARGETPATH=..\..\..\..\bin\user\obj$(BUILD_ALT_DIR)\r
 TARGETTYPE=PROGRAM\r
 UMTYPE=console\r
-USE_MSVCRT=1\r
+USE_LIBCMT=1\r
 \r
 SOURCES=dtest.rc       \\r
        dtest.c         \\r
        getopt.c\r
 \r
-INCLUDES=.;..\..\dat\include;\\r
-       ../../../../inc;..\..\..\..\inc\user;\\r
-       $(SDK_INC_PATH);\r
+INCLUDES=.;..\..\dat\include;../../../../inc;..\..\..\..\inc\user;\r
 \r
 RCOPTIONS=/I..\..\..\..\inc;\r
 \r

diff --git a/branches/ConnectX/ulp/dapl2/test/dtestx/SOURCES b/branches/ConnectX/ulp/dapl2/test/dtestx/SOURCES
index 492f3a8fb8421451818abdd291cf11fe162a6ea0..b7fe0a40535d26de7a7b833e775385786c6d839c 100644 (file)
--- a/branches/ConnectX/ulp/dapl2/test/dtestx/SOURCES
+++ b/branches/ConnectX/ulp/dapl2/test/dtestx/SOURCES
@@ -6,14 +6,13 @@ TARGETNAME=dtestxd
 TARGETPATH=..\..\..\..\bin\user\obj$(BUILD_ALT_DIR)\r
 TARGETTYPE=PROGRAM\r
 UMTYPE=console\r
-USE_MSVCRT=1\r
+USE_LIBCMT=1\r
 \r
 SOURCES=dtestx.rc      \\r
                dtestx.c\r
 \r
 INCLUDES=.;..\..\dat\include;\\r
-               ../../../../inc;..\..\..\..\inc\user;\\r
-               $(SDK_INC_PATH);\r
+               ../../../../inc;..\..\..\..\inc\user;\r
 \r
 RCOPTIONS=/I..\..\..\..\inc;\r
 \r
@@ -29,6 +28,7 @@ DATLIB=dat2d.lib
 \r
 TARGETLIBS=$(TARGETPATH)\*\$(DATLIB) $(SDK_LIB_PATH)\ws2_32.lib\r
 \r
+\r
 # XXX do this ASAP - MSC_WARNING_LEVEL= /W3\r
 MSC_WARNING_LEVEL= /W1\r
 \r

diff --git a/branches/ConnectX/ulp/dapl2/test/dtestx/dtestx.c b/branches/ConnectX/ulp/dapl2/test/dtestx/dtestx.c
index 94fe53a6cda8ac4e61d0794842f089caea468f42..2cfc390ad9d5f4033b2797e52b3783c792d57dda 100644 (file)
--- a/branches/ConnectX/ulp/dapl2/test/dtestx/dtestx.c
+++ b/branches/ConnectX/ulp/dapl2/test/dtestx/dtestx.c
@@ -39,11 +39,12 @@
 #include <winsock2.h>\r
 #include <ws2tcpip.h>\r
 #include <io.h>\r
-#include <process.h>\r
 #include <complib/cl_types.h>\r
 #define __BYTE_ORDER __LITTLE_ENDIAN\r
 \r
+#include <process.h>\r
 #define getpid _getpid\r
+\r
 #define F64x "%I64x"\r
 #define DAPL_PROVIDER "ibnic0v2"\r
 #else\r