[ofw] RFC - ConnectX branch patches to build user-mode .dlls [ibal, complib, dapl & dapl2].

Stan C. Smith stan.smith at intel.com
Tue Mar 25 11:09:18 PDT 2008


Signed-off by Stan Smith (stan.smith at intel.com)

==============================
Build for DDK -or- WDK

diff C3 C:/Documents and Settings/scsmith/My Documents/openIB-windows/SVN/gen1/branches/ConnectX/core/al/user/SOURCES
C:/Documents and Settings/scsmith/My Documents/openIB-windows/SVN/gen1/branches/ConnectX/core/al/user/SOURCESX
*** C:/Documents and Settings/scsmith/My Documents/openIB-windows/SVN/gen1/branches/ConnectX/core/al/user/SOURCES
Tue Mar 25 11:02:47 2008
--- C:/Documents and Settings/scsmith/My Documents/openIB-windows/SVN/gen1/branches/ConnectX/core/al/user/SOURCESX
Tue Mar 25 10:15:12 2008
***************
*** 9,24 ****
  DLLENTRY=DllMain
  
  
- 
  !if $(FREEBUILD)
  ENABLE_EVENT_TRACING=1
  #!else
  #ENABLE_EVENT_TRACING=1
  !endif
  
! 
! 
  DLLDEF=$O\al_exports.def
  USE_NTDLL=1
  
  SOURCES=\
--- 9,28 ----
  DLLENTRY=DllMain
  
  
  !if $(FREEBUILD)
  ENABLE_EVENT_TRACING=1
  #!else
  #ENABLE_EVENT_TRACING=1
  !endif
  
! !if $(_NT_TOOLS_VERSION) == 0x700
! # DDK
  DLLDEF=$O\al_exports.def
+ !else
+ # WDK
+ DLLDEF=$(OBJ_PATH)\$O\al_exports.def
+ !endif
+ 
  USE_NTDLL=1
  
  SOURCES=\


==============================
Build for DDK -or- WDK

diff C3 Y:/Documents and Settings/scsmith/My
Documents/openIB-windows/SVN/gen1/branches/ConnectX/core/complib/user/SOURCES
D:/openIB-windows-svn/955/gen1/branches/ConnectX/core/complib/user/SOURCES
*** Y:/Documents and Settings/scsmith/My Documents/openIB-windows/SVN/gen1/branches/ConnectX/core/complib/user/SOURCES
Mon Mar 24 13:59:51 2008
--- D:/openIB-windows-svn/955/gen1/branches/ConnectX/core/complib/user/SOURCES	Tue Mar 25 10:13:46 2008
***************
*** 6,12 ****
--- 6,20 ----
  TARGETPATH=..\..\..\bin\user\obj$(BUILD_ALT_DIR)
  TARGETTYPE=DYNLINK
  DLLENTRY=DllMain
+ 
+ !if $(_NT_TOOLS_VERSION) == 0x700
+ # DDK
  DLLDEF=$O\complib.def
+ !else
+ # WDK
+ DLLDEF=$(OBJ_PATH)\$O\complib.def
+ !endif
+ 
  USE_NTDLL=1
  
  SOURCES=\

==============================
Build for DDK -or- WDK

diff C3 Y:/Documents and Settings/scsmith/My
Documents/openIB-windows/SVN/gen1/branches/ConnectX/ulp/dapl/dapl/udapl/SOURCES
D:/openIB-windows-svn/955/gen1/branches/ConnectX/ulp/dapl/dapl/udapl/SOURCES
*** Y:/Documents and Settings/scsmith/My Documents/openIB-windows/SVN/gen1/branches/ConnectX/ulp/dapl/dapl/udapl/SOURCES
Mon Mar 24 13:57:51 2008
--- D:/openIB-windows-svn/955/gen1/branches/ConnectX/ulp/dapl/dapl/udapl/SOURCES	Tue Mar 25 10:06:56 2008
***************
*** 6,13 ****
  TARGETPATH=..\..\..\..\bin\user\obj$(BUILD_ALT_DIR)
  TARGETTYPE=DYNLINK
  DLLENTRY=_DllMainCRTStartup
  DLLDEF=$O\udapl_exports.def
! USE_MSVCRT=1
  
  SOURCES=udapl.rc		\
  	dapl_init.c			\
--- 6,19 ----
  TARGETPATH=..\..\..\..\bin\user\obj$(BUILD_ALT_DIR)
  TARGETTYPE=DYNLINK
  DLLENTRY=_DllMainCRTStartup
+ !if $(_NT_TOOLS_VERSION) == 0x700
+ # DDK
  DLLDEF=$O\udapl_exports.def
! !else
! # WDK
! DLLDEF=$(OBJ_PATH)\$O\udapl_exports.def
! !endif
! USE_LIBCMT=1
  
  SOURCES=udapl.rc		\
  	dapl_init.c			\

==============================
Build for DDK -or- WDK

diff C3 Y:/Documents and Settings/scsmith/My
Documents/openIB-windows/SVN/gen1/branches/ConnectX/ulp/dapl/dat/udat/SOURCES
D:/openIB-windows-svn/955/gen1/branches/ConnectX/ulp/dapl/dat/udat/SOURCES
*** Y:/Documents and Settings/scsmith/My Documents/openIB-windows/SVN/gen1/branches/ConnectX/ulp/dapl/dat/udat/SOURCES
Mon Mar 24 13:58:08 2008
--- D:/openIB-windows-svn/955/gen1/branches/ConnectX/ulp/dapl/dat/udat/SOURCES	Tue Mar 25 10:08:13 2008
***************
*** 6,13 ****
  TARGETPATH=..\..\..\..\bin\user\obj$(BUILD_ALT_DIR)
  TARGETTYPE=DYNLINK
  DLLENTRY=_DllMainCRTStartup
  DLLDEF=$O\udat_exports.def
! USE_MSVCRT=1
  
  SOURCES=udat.rc			\
  	udat.c				\
--- 6,19 ----
  TARGETPATH=..\..\..\..\bin\user\obj$(BUILD_ALT_DIR)
  TARGETTYPE=DYNLINK
  DLLENTRY=_DllMainCRTStartup
+ !if $(_NT_TOOLS_VERSION) == 0x700
+ # DDK
  DLLDEF=$O\udat_exports.def
! !else
! # WDK
! DLLDEF=$(OBJ_PATH)\$O\udat_exports.def
! !endif
! USE_LIBCMT=1
  
  SOURCES=udat.rc			\
  	udat.c				\

==============================
Build for DDK -or- WDK

diff C3 Y:/Documents and Settings/scsmith/My
Documents/openIB-windows/SVN/gen1/branches/ConnectX/ulp/dapl2/dapl/udapl/SOURCES
D:/openIB-windows-svn/955/gen1/branches/ConnectX/ulp/dapl2/dapl/udapl/SOURCES
*** Y:/Documents and Settings/scsmith/My
Documents/openIB-windows/SVN/gen1/branches/ConnectX/ulp/dapl2/dapl/udapl/SOURCES	Mon Mar 24 13:59:08 2008
--- D:/openIB-windows-svn/955/gen1/branches/ConnectX/ulp/dapl2/dapl/udapl/SOURCES	Tue Mar 25 09:57:52 2008
***************
*** 3,13 ****
  !else
  TARGETNAME=dapl2d
  !endif
  TARGETPATH=..\..\..\..\bin\user\obj$(BUILD_ALT_DIR)
  TARGETTYPE=DYNLINK
  DLLENTRY=_DllMainCRTStartup
  DLLDEF=$O\udapl_exports.def
! USE_MSVCRT=1
  
  # pickup local files, then via udapl_sources.c get common files
  
--- 3,18 ----
  !else
  TARGETNAME=dapl2d
  !endif
+ 
  TARGETPATH=..\..\..\..\bin\user\obj$(BUILD_ALT_DIR)
  TARGETTYPE=DYNLINK
  DLLENTRY=_DllMainCRTStartup
+ !if $(_NT_TOOLS_VERSION) == 0x700
  DLLDEF=$O\udapl_exports.def
! !else
! DLLDEF=$(OBJ_PATH)\$O\udapl_exports.def
! !endif
! USE_LIBCMT=1
  
  # pickup local files, then via udapl_sources.c get common files
  
***************
*** 29,35 ****
  	dapl_lmr_create.c		\
  	udapl_sources.c
  
! INCLUDES=..\include;..\common;windows;..\ibal;..\..\dat\include;\
  		..\..\..\..\inc;..\..\..\..\inc\user;
  
  DAPL_OPTS= -DEXPORT_DAPL_SYMBOLS -D_VENDOR_IBAL_ -DDAPL_MERGE_CM_DTO
--- 34,40 ----
  	dapl_lmr_create.c		\
  	udapl_sources.c
  
! INCLUDES=$(INCLUDES);..\include;..\common;windows;..\ibal;..\..\dat\include;\
  		..\..\..\..\inc;..\..\..\..\inc\user;
  
  DAPL_OPTS= -DEXPORT_DAPL_SYMBOLS -D_VENDOR_IBAL_ -DDAPL_MERGE_CM_DTO


==============================
Build for DDK -or- WDK

diff C3 Y:/Documents and Settings/scsmith/My
Documents/openIB-windows/SVN/gen1/branches/ConnectX/ulp/dapl2/dapl/udapl_scm/SOURCES
D:/openIB-windows-svn/955/gen1/branches/ConnectX/ulp/dapl2/dapl/udapl_scm/SOURCES
*** Y:/Documents and Settings/scsmith/My
Documents/openIB-windows/SVN/gen1/branches/ConnectX/ulp/dapl2/dapl/udapl_scm/SOURCES	Mon Mar 24 13:59:10 2008
--- D:/openIB-windows-svn/955/gen1/branches/ConnectX/ulp/dapl2/dapl/udapl_scm/SOURCES	Tue Mar 25 10:02:59 2008
***************
*** 6,13 ****
  TARGETPATH=..\..\..\..\bin\user\obj$(BUILD_ALT_DIR)
  TARGETTYPE=DYNLINK
  DLLENTRY=_DllMainCRTStartup
  DLLDEF=$O\udapl_scm_exports.def
! USE_MSVCRT=1
  
  # pickup local files, then via udapl_sources.c get common files
  
--- 6,17 ----
  TARGETPATH=..\..\..\..\bin\user\obj$(BUILD_ALT_DIR)
  TARGETTYPE=DYNLINK
  DLLENTRY=_DllMainCRTStartup
+ !if $(_NT_TOOLS_VERSION) == 0x700
  DLLDEF=$O\udapl_scm_exports.def
! !else
! DLLDEF=$(OBJ_PATH)\$O\udapl_scm_exports.def
! !endif
! USE_LIBCMT=1
  
  # pickup local files, then via udapl_sources.c get common files
  

==============================
Build for DDK -or- WDK

diff C3 Y:/Documents and Settings/scsmith/My
Documents/openIB-windows/SVN/gen1/branches/ConnectX/ulp/dapl2/dat/udat/SOURCES
D:/openIB-windows-svn/955/gen1/branches/ConnectX/ulp/dapl2/dat/udat/SOURCES
*** Y:/Documents and Settings/scsmith/My Documents/openIB-windows/SVN/gen1/branches/ConnectX/ulp/dapl2/dat/udat/SOURCES
Mon Mar 24 13:59:29 2008
--- D:/openIB-windows-svn/955/gen1/branches/ConnectX/ulp/dapl2/dat/udat/SOURCES	Tue Mar 25 10:04:18 2008
***************
*** 6,13 ****
  TARGETPATH=..\..\..\..\bin\user\obj$(BUILD_ALT_DIR)
  TARGETTYPE=DYNLINK
  DLLENTRY=_DllMainCRTStartup
  DLLDEF=$O\udat_exports.def
! USE_MSVCRT=1
  
  SOURCES=udat.rc			\
  	udat.c			\
--- 6,17 ----
  TARGETPATH=..\..\..\..\bin\user\obj$(BUILD_ALT_DIR)
  TARGETTYPE=DYNLINK
  DLLENTRY=_DllMainCRTStartup
+ !if $(_NT_TOOLS_VERSION) == 0x700
  DLLDEF=$O\udat_exports.def
! !else
! DLLDEF=$(OBJ_PATH)\$O\udat_exports.def
! !endif
! USE_LIBCMT=1
  
  SOURCES=udat.rc			\
  	udat.c			\

==============================
Build Multi-threaded runtime library

diff C3 Y:/Documents and Settings/scsmith/My
Documents/openIB-windows/SVN/gen1/branches/ConnectX/ulp/dapl2/test/dapltest/SOURCES
D:/openIB-windows-svn/955/gen1/branches/ConnectX/ulp/dapl2/test/dapltest/SOURCES
*** Y:/Documents and Settings/scsmith/My
Documents/openIB-windows/SVN/gen1/branches/ConnectX/ulp/dapl2/test/dapltest/SOURCES	Mon Mar 24 13:59:06 2008
--- D:/openIB-windows-svn/955/gen1/branches/ConnectX/ulp/dapl2/test/dapltest/SOURCES	Tue Mar 25 10:31:38 2008
***************
*** 6,12 ****
  TARGETPATH=..\..\..\..\bin\user\obj$(BUILD_ALT_DIR)
  TARGETTYPE=PROGRAM
  UMTYPE=console
! USE_MSVCRT=1
  
  SOURCES=dapltest.rc	\
  	dt_cmd.c	\
--- 6,12 ----
  TARGETPATH=..\..\..\..\bin\user\obj$(BUILD_ALT_DIR)
  TARGETTYPE=PROGRAM
  UMTYPE=console
! USE_LIBCMT=1
  
  SOURCES=dapltest.rc	\
  	dt_cmd.c	\

==============================
Build with multithreaded library, removed SDK_PATH_INC as it's no longer needed

diff C3 Y:/Documents and Settings/scsmith/My
Documents/openIB-windows/SVN/gen1/branches/ConnectX/ulp/dapl2/test/dtest/SOURCES
D:/openIB-windows-svn/955/gen1/branches/ConnectX/ulp/dapl2/test/dtest/SOURCES
*** Y:/Documents and Settings/scsmith/My
Documents/openIB-windows/SVN/gen1/branches/ConnectX/ulp/dapl2/test/dtest/SOURCES	Mon Mar 24 13:59:07 2008
--- D:/openIB-windows-svn/955/gen1/branches/ConnectX/ulp/dapl2/test/dtest/SOURCES	Tue Mar 25 08:50:19 2008
***************
*** 6,20 ****
  TARGETPATH=..\..\..\..\bin\user\obj$(BUILD_ALT_DIR)
  TARGETTYPE=PROGRAM
  UMTYPE=console
! USE_MSVCRT=1
  
  SOURCES=dtest.rc	\
  	dtest.c		\
  	getopt.c
  
! INCLUDES=.;..\..\dat\include;\
! 	../../../../inc;..\..\..\..\inc\user;\
! 	$(SDK_INC_PATH);
  
  RCOPTIONS=/I..\..\..\..\inc;
  
--- 6,18 ----
  TARGETPATH=..\..\..\..\bin\user\obj$(BUILD_ALT_DIR)
  TARGETTYPE=PROGRAM
  UMTYPE=console
! USE_LIBCMT=1
  
  SOURCES=dtest.rc	\
  	dtest.c		\
  	getopt.c
  
! INCLUDES=.;..\..\dat\include;../../../../inc;..\..\..\..\inc\user;
  
  RCOPTIONS=/I..\..\..\..\inc;
  

==============================
Moved getpid() header file include for clarity

diff C3 Y:/Documents and Settings/scsmith/My
Documents/openIB-windows/SVN/gen1/branches/ConnectX/ulp/dapl2/test/dtestx/dtestx.c
D:/openIB-windows-svn/955/gen1/branches/ConnectX/ulp/dapl2/test/dtestx/dtestx.c
*** Y:/Documents and Settings/scsmith/My
Documents/openIB-windows/SVN/gen1/branches/ConnectX/ulp/dapl2/test/dtestx/dtestx.c	Mon Mar 24 13:59:07 2008
--- D:/openIB-windows-svn/955/gen1/branches/ConnectX/ulp/dapl2/test/dtestx/dtestx.c	Mon Mar 24 17:14:04 2008
***************
*** 39,49 ****
  #include <winsock2.h>
  #include <ws2tcpip.h>
  #include <io.h>
- #include <process.h>
  #include <complib/cl_types.h>
  #define __BYTE_ORDER __LITTLE_ENDIAN
  
  #define getpid _getpid
  #define F64x "%I64x"
  #define DAPL_PROVIDER "ibnic0v2"
  #else
--- 39,50 ----
  #include <winsock2.h>
  #include <ws2tcpip.h>
  #include <io.h>
  #include <complib/cl_types.h>
  #define __BYTE_ORDER __LITTLE_ENDIAN
  
+ #include <process.h>
  #define getpid _getpid
+ 
  #define F64x "%I64x"
  #define DAPL_PROVIDER "ibnic0v2"
  #else

==============================
Build with multithreaded library, removed SDK_PATH_INC as it's no longer needed

diff C3 Y:/Documents and Settings/scsmith/My
Documents/openIB-windows/SVN/gen1/branches/ConnectX/ulp/dapl2/test/dtestx/SOURCES
D:/openIB-windows-svn/955/gen1/branches/ConnectX/ulp/dapl2/test/dtestx/SOURCES
*** Y:/Documents and Settings/scsmith/My
Documents/openIB-windows/SVN/gen1/branches/ConnectX/ulp/dapl2/test/dtestx/SOURCES	Mon Mar 24 13:59:07 2008
--- D:/openIB-windows-svn/955/gen1/branches/ConnectX/ulp/dapl2/test/dtestx/SOURCES	Tue Mar 25 10:35:07 2008
***************
*** 6,19 ****
  TARGETPATH=..\..\..\..\bin\user\obj$(BUILD_ALT_DIR)
  TARGETTYPE=PROGRAM
  UMTYPE=console
! USE_MSVCRT=1
  
  SOURCES=dtestx.rc	\
  		dtestx.c
  
  INCLUDES=.;..\..\dat\include;\
! 		../../../../inc;..\..\..\..\inc\user;\
! 		$(SDK_INC_PATH);
  
  RCOPTIONS=/I..\..\..\..\inc;
  
--- 6,18 ----
  TARGETPATH=..\..\..\..\bin\user\obj$(BUILD_ALT_DIR)
  TARGETTYPE=PROGRAM
  UMTYPE=console
! USE_LIBCMT=1
  
  SOURCES=dtestx.rc	\
  		dtestx.c
  
  INCLUDES=.;..\..\dat\include;\
! 		../../../../inc;..\..\..\..\inc\user;
  
  RCOPTIONS=/I..\..\..\..\inc;
  
***************
*** 28,33 ****
--- 27,33 ----
  !endif
  
  TARGETLIBS=$(TARGETPATH)\*\$(DATLIB) $(SDK_LIB_PATH)\ws2_32.lib
+ 
  
  # XXX do this ASAP - MSC_WARNING_LEVEL= /W3
  MSC_WARNING_LEVEL= /W1





More information about the ofw mailing list