CWS-TOOLING: integrate CWS jl123

2009-08-04 12:34:31 +0200 jl  r274615 : #i103742# added note regarding Berkeley update
2009-07-27 11:24:49 +0200 jl  r274351 : #i100916# applying tono's patch
2009-07-22 16:29:54 +0200 jl  r274248 : CWS-TOOLING: rebase CWS jl123 to trunk@274203 (milestone: DEV300:m53)
2009-07-21 11:49:45 +0200 jl  r274172 : #100916# syncing data base with fcntl( F_FULLSYNC) failed with an unexpected error on Mac when buiding on NFS. Although there is a fallback using fsync, it was not used because of the unexpected error
2009-07-20 09:35:42 +0200 jl  r274107 : #i100916# Applied tono's second patch
2009-07-16 16:41:24 +0200 jl  r274062 : i100916
2009-07-13 14:47:32 +0200 jl  r273936 : #i100916# deliver libdb-47.lib
2009-07-13 11:03:26 +0200 jl  r273921 : #i100916# applied tono's patches for mingw
2009-07-10 14:34:22 +0200 jl  r273895 : #i100916# renamed mingw patch
2009-07-10 14:33:36 +0200 jl  r273894 : #i100916# renamed mingw patch
2009-07-10 14:04:39 +0200 jl  r273890 : #i100916# new patch
2009-07-10 11:39:54 +0200 jl  r273882 : #i100916# updating berkeleydb
2009-07-10 11:03:16 +0200 jl  r273880 : #i100916# updating berkeleydb
2009-07-02 12:52:53 +0200 jl  r273638 : CWS-TOOLING: rebase CWS jl127 to trunk@273468 (milestone: DEV300:m51)
2009-04-08 13:32:52 +0200 jl  r270642 : #i100916#
2009-04-08 13:25:15 +0200 jl  r270639 : #i100916# new version of berkeleydb
2009-04-08 12:37:14 +0200 jl  r270634 : #i100916# changes for version 4.7.25
2009-04-08 12:36:08 +0200 jl  r270633 : #i100916# new patch file for version 4.7.25 (no encryption)

1 files changed, 43 insertions, 22 deletions

diff --git a/berkeleydb/makefile.mk b/berkeleydb/makefile.mk
index b3cf36e6365d..5c8f5905248e 100644
--- a/berkeleydb/makefile.mk
+++ b/berkeleydb/makefile.mk
@@ -46,25 +46,26 @@ all:
 
 # --- Files --------------------------------------------------------
 
-TARFILE_NAME=db-4.2.52.NC-custom
-TARFILE_ROOTDIR=db-4.2.52.NC
+TARFILE_NAME=db-4.7.25.NC-custom
+TARFILE_ROOTDIR=db-4.7.25.NC
 
-ADDITIONAL_FILES=    \
-    makefile.mk btree$/makefile.mk clib$/makefile.mk common$/makefile.mk  \
-    cxx$/makefile.mk db$/makefile.mk dbm$/makefile.mk dbreg$/makefile.mk  \
-    db_printlog$/makefile.mk env$/makefile.mk fileops$/makefile.mk hash$/makefile.mk  \
-    hmac$/makefile.mk hsearch$/makefile.mk lock$/makefile.mk  \
-    log$/makefile.mk mp$/makefile.mk mutex$/makefile.mk os$/makefile.mk  \
-    os_win32$/makefile.mk qam$/makefile.mk rep$/makefile.mk txn$/makefile.mk  \
-    xa$/makefile.mk libdb42.dxp db_4_2_gcc3.map
+ADDITIONAL_FILES= \
+    makefile.mk btree$/makefile.mk clib$/makefile.mk common$/makefile.mk \
+    cxx$/makefile.mk db$/makefile.mk dbm$/makefile.mk dbreg$/makefile.mk \
+    env$/makefile.mk fileops$/makefile.mk hash$/makefile.mk hmac$/makefile.mk \
+    hsearch$/makefile.mk lock$/makefile.mk log$/makefile.mk mp$/makefile.mk \
+    mutex$/makefile.mk os$/makefile.mk os_windows$/makefile.mk \
+    qam$/makefile.mk rep$/makefile.mk repmgr$/makefile.mk \
+    sequence$/makefile.mk txn$/makefile.mk xa$/makefile.mk \
+    db_4_7_gcc4.map
 
 
 
 # not needed for win32. comment out when causing problems...
 .IF "$(GUI)$(COM)"=="WNTGCC"
-PATCH_FILES=db-4.2.52-mingw.patch
+PATCH_FILES=db-4.7.25-mingw.patch
 .ELSE
-PATCH_FILES=db-4.2.52.patch
+PATCH_FILES=db-4.7.25.patch
 .ENDIF
 
 # clean compiler flags
@@ -84,7 +85,7 @@ LDFLAGS:=-Wl,-rpath,'$$$$ORIGIN' -Wl,-z,noexecstack
 .EXPORT: LDFLAGS
 #The current dir when linking is unxlngi6.pro/misc/build/db-4.2.52.NC/out
 # the map file is in  unxlngi6.pro/misc/build/db-4.2.52.NC
-LDFLAGSVERSION:= -Wl,--version-script=../db_4_2_gcc3.map
+LDFLAGSVERSION:= -Wl,--version-script=../db_4_7_gcc4.map
 .EXPORT: LDFLAGSVERSION
 .ENDIF                  # "$(OS)$(COM)"=="LINUXGCC"
 .IF "$(OS)$(COM)"=="SOLARISC52"
@@ -95,6 +96,7 @@ LDFLAGSVERSION:= -Wl,--version-script=../db_4_2_gcc3.map
 LDFLAGS:=$(ARCH_FLAGS) -R\''$$$$ORIGIN'\'
 .EXPORT: LDFLAGS
 .ENDIF                  # "$(OS)$(COM)"=="SOLARISC52"
+
 CONFIGURE_DIR=out
 #relative to CONFIGURE_DIR
 CONFIGURE_ACTION= \
@@ -108,6 +110,7 @@ CXXFLAGS+:=$(ARCH_FLAGS)
 
 BUILD_DIR=$(CONFIGURE_DIR)
 BUILD_DIR_OUT=$(CONFIGURE_DIR)
+
 .IF "$(OS)"=="IRIX"
 CONFIGURE_ACTION= $(CONFIG_SHELL) ..$/dist$/configure
 BUILD_ACTION=gmake 
@@ -126,21 +129,39 @@ OUT2INC= \
 CONFIGURE_DIR=out
 #relative to CONFIGURE_DIR
 # TODO needs clean up
-CFLAGS+=-nostdinc -D_MT
-CONFIGURE_ACTION=..$/dist$/configure
-CONFIGURE_FLAGS=--enable-cxx --enable-dynamic --enable-shared --build=i586-pc-mingw32 --host=i586-pc-mingw32 --enable-mingw LN_S=ln NM="$(WRAPCMD) nm" OBJDUMP="$(WRAPCMD) objdump" JAVA="$(WRAPCMD) -env java" JAVAC="$(WRAPCMD) -env javac" CFLAGS="$(CFLAGS)" CPPFLAGS="$(INCLUDE)" LIBS="-lmingwthrd" LIBSO_LIBS="-lmingwthrd" LIBJSO_LIBS="-lmingwthrd" LIBXSO_LIBS="-lmingwthrd $(LIBSTLPORT)"
+CPPFLAGS+=-nostdinc -D_MT
+db_CC=$(CC)
+db_CXX=$(CXX)
+.IF "$(MINGW_SHARED_GCCLIB)"=="YES"
+db_CC+=-shared-libgcc
+db_CXX+=-shared-libgcc
+.ENDIF
+db_LDFLAGS=-no-undefined -L$(SOLARVER)/$(INPATH)/lib -L$(SOLARVER)/$(INPATH)/bin
 .IF "$(USE_MINGW)"=="cygwin"
-CONFIGURE_FLAGS+=LDFLAGS="-no-undefined -L$(SOLARVER)/$(INPATH)/lib -L$(SOLARVER)/$(INPATH)/bin -L$(COMPATH)/lib/mingw -L$(COMPATH)/lib/w32api -L$(COMPATH)/lib"
-.ELSE
-CONFIGURE_FLAGS+=LDFLAGS="-no-undefined -L$(SOLARVER)/$(INPATH)/lib -L$(SOLARVER)/$(INPATH)/bin -L$(COMPATH)/lib"
+db_LDFLAGS+=-L$(COMPATH)/lib/mingw -L$(COMPATH)/lib/w32api
 .ENDIF
+db_LDFLAGS+=-L$(COMPATH)/lib
+.IF "$(MINGW_CLIB_DIR)"!=""
+db_LDFLAGS+=-L$(MINGW_CLIB_DIR)
+.ENDIF
+db_LIBS=-lmingwthrd
+.IF "$(MINGW_SHARED_GXXLIB)"=="YES"
+db_LIBS+=-lstdc++_s
+.ENDIF
+db_LIBXSO_LIBS=$(LIBSTLPORT) $(db_LIBS)
+.IF "$(MINGW_SHARED_GCCLIB)"=="YES"
+db_LIBXSO_LIBS+=-lgcc_s
+.ENDIF
+CONFIGURE_ACTION=..$/dist$/configure
+#CONFIGURE_FLAGS=--enable-cxx --enable-dynamic --enable-shared --build=i586-pc-mingw32 --host=i586-pc-mingw32 --enable-mingw LN_S=ln NM="$(WRAPCMD) nm" OBJDUMP="$(WRAPCMD) objdump" JAVA="$(WRAPCMD) -env java" JAVAC="$(WRAPCMD) -env javac" CFLAGS="$(CFLAGS)" CPPFLAGS="$(INCLUDE)" LIBS="-lmingwthrd" LIBSO_LIBS="-lmingwthrd" LIBJSO_LIBS="-lmingwthrd" LIBXSO_LIBS="-lmingwthrd $(LIBSTLPORT)"
+CONFIGURE_FLAGS=--disable-cxx --enable-dynamic --enable-shared --build=i586-pc-mingw32 --host=i586-pc-mingw32 --enable-mingw CC="$(db_CC)" CXX="$(db_CXX)" LN_S=ln NM="$(WRAPCMD) nm" OBJDUMP="$(WRAPCMD) objdump" JAVA="$(WRAPCMD) -env java" JAVAC="$(WRAPCMD) -env javac" CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS) $(INCLUDE)" LDFLAGS="$(db_LDFLAGS)" LIBS="$(db_LIBS)" LIBSO_LIBS="$(db_LIBS)" LIBJSO_LIBS="$(db_LIBS)" LIBXSO_LIBS="$(db_LIBXSO_LIBS)"
 
 BUILD_DIR=$(CONFIGURE_DIR)
 BUILD_DIR_OUT=$(CONFIGURE_DIR)
 BUILD_ACTION=make
 
-OUT2LIB=$(BUILD_DIR)$/.libs$/libdb*42.a
-OUT2BIN=$(BUILD_DIR)$/.libs$/libdb*42.dll
+OUT2LIB=$(BUILD_DIR)$/.libs$/libdb47.dll.a
+OUT2BIN=$(BUILD_DIR)$/.libs$/libdb47.dll
 
 OUT2INC= \
     $(BUILD_DIR)$/db.h
@@ -160,7 +181,7 @@ BUILD_ACTION_SEP=^
 BUILD_DIR=
 BUILD_ACTION=dmake
 
-BUILD_DIR_OUT=build_win32
+BUILD_DIR_OUT=build_windows
 #OUT2LIB= \
 #	$(BUILD_DIR_OUT)$/Release$/libdb42.lib
 #OUT2BIN=$(BUILD_DIR_OUT)$/Release$/libdb42.dll