You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by hd...@apache.org on 2011/12/12 12:25:38 UTC
svn commit: r1213190 - in /incubator/ooo/trunk/main: ./ berkeleydb/
helpcontent2/ helpcontent2/util/ postprocess/rebase/ scp2/source/ooo/
solenv/inc/ toolkit/src2xml/
Author: hdu
Date: Mon Dec 12 11:25:37 2011
New Revision: 1213190
URL: http://svn.apache.org/viewvc?rev=1213190&view=rev
Log:
#i118662# remove remainders of berkeleyDB handling (author=orwitt)
Removed:
incubator/ooo/trunk/main/berkeleydb/
Modified:
incubator/ooo/trunk/main/configure.in
incubator/ooo/trunk/main/helpcontent2/settings.pmk
incubator/ooo/trunk/main/helpcontent2/util/target.pmk
incubator/ooo/trunk/main/ooo.lst
incubator/ooo/trunk/main/postprocess/rebase/coffbase.txt
incubator/ooo/trunk/main/scp2/source/ooo/file_library_ooo.scp
incubator/ooo/trunk/main/scp2/source/ooo/makefile.mk
incubator/ooo/trunk/main/set_soenv.in
incubator/ooo/trunk/main/solenv/inc/extension_helplink.mk
incubator/ooo/trunk/main/solenv/inc/libs.mk
incubator/ooo/trunk/main/toolkit/src2xml/include.lst
Modified: incubator/ooo/trunk/main/configure.in
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/configure.in?rev=1213190&r1=1213189&r2=1213190&view=diff
==============================================================================
--- incubator/ooo/trunk/main/configure.in (original)
+++ incubator/ooo/trunk/main/configure.in Mon Dec 12 11:25:37 2011
@@ -370,9 +370,6 @@ AC_ARG_WITH(system-icu,
AC_ARG_WITH(system-poppler,
[ --with-system-poppler Use poppler already on system
],,)
-AC_ARG_WITH(system-db,
-[ --with-system-db Use berkeley db already on system
-],,)
AC_ARG_WITH(system-lucene,
[ --with-system-lucene Use lucene already on system
],,)
@@ -3895,44 +3892,6 @@ HOME=`echo $HOME | sed 's:\\\\:/:g'`
AC_SUBST(HOME)
dnl ===================================================================
-dnl Check for system berkley db
-dnl ===================================================================
-AC_MSG_CHECKING([which db to use])
-if test -n "$with_system_db" -o -n "$with_system_libs" && \
- test "$with_system_db" != "no"; then
- SYSTEM_DB=YES
- AC_MSG_RESULT([external])
- AC_CHECK_HEADER(db.h, [ DB_INCLUDES=/usr/include ],
- [
- CFLAGS=-I/usr/include/db4
- AC_CHECK_HEADER(db4/db.h,
- [ DB_INCLUDES=/usr/include/db4 ],
- [ AC_MSG_ERROR(no. install the db4 libraries) ], []+ )
- ], []
- )
- AC_MSG_CHECKING([whether db is at least 4.1])
- AC_TRY_RUN([
-#include <db.h>
-
-int main(int argc, char **argv) {
- if(DB_VERSION_MAJOR > 4 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1)) return 0;
- else return 1;
-}
- ], [AC_MSG_RESULT([yes])], [AC_MSG_ERROR([no. you need at least db 4.1])])
- AC_HAVE_LIBRARY(db, [],
- [AC_MSG_ERROR([db not installed or functional])], [])
- SCPDEFS="$SCPDEFS -DSYSTEM_DB"
-else
- AC_MSG_RESULT([internal])
- SYSTEM_DB=NO
- BUILD_TYPE="$BUILD_TYPE BERKELEYDB"
-fi
-AC_SUBST(SYSTEM_DB)
-AC_SUBST(DB_VERSION)
-AC_SUBST(DB_INCLUDES)
-AC_SUBST(DB_JAR)
-
-dnl ===================================================================
dnl Check for system lucene
dnl ===================================================================
AC_MSG_CHECKING([which lucene to use])
Modified: incubator/ooo/trunk/main/helpcontent2/settings.pmk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/helpcontent2/settings.pmk?rev=1213190&r1=1213189&r2=1213190&view=diff
==============================================================================
--- incubator/ooo/trunk/main/helpcontent2/settings.pmk (original)
+++ incubator/ooo/trunk/main/helpcontent2/settings.pmk Mon Dec 12 11:25:37 2011
@@ -8,8 +8,4 @@ my_cp!:=$(my_cp)$(PATH_SEPERATOR)$(LUCEN
my_cp!:=$(my_cp)$(PATH_SEPERATOR)$(SOLARBINDIR)/lucene-core-2.3.jar$(PATH_SEPERATOR)$(SOLARBINDIR)/lucene-analyzers-2.3.jar
.ENDIF
-.IF "$(SYSTEM_DB)" != "YES"
-JAVA_LIBRARY_PATH= -Djava.library.path=$(SOLARSHAREDBIN)
-.ENDIF
-
aux_alllangiso:=$(foreach,i,$(alllangiso) $(foreach,j,$(aux_langdirs) $(eq,$i,$j $i $(NULL))))
Modified: incubator/ooo/trunk/main/helpcontent2/util/target.pmk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/helpcontent2/util/target.pmk?rev=1213190&r1=1213189&r2=1213190&view=diff
==============================================================================
--- incubator/ooo/trunk/main/helpcontent2/util/target.pmk (original)
+++ incubator/ooo/trunk/main/helpcontent2/util/target.pmk Mon Dec 12 11:25:37 2011
@@ -30,10 +30,6 @@ LINKALLADDEDDEPS=$(foreach,i,$(aux_allla
ALLTAR : $(LINKALLTARGETS)
-.IF "$(SYSTEM_DB)" != "YES"
-JAVA_LIBRARY_PATH= -Djava.library.path=$(SOLARSHAREDBIN)
-.ENDIF
-
XSL_DIR*:=$(SOLARBINDIR)
$(LINKALLTARGETS) : $(foreach,i,$(LINKLINKFILES) $(COMMONMISC)$/$$(@:b:s/_/./:e:s/.//)/$i) $(subst,LANGUAGE,$$(@:b:s/_/./:e:s/.//) $(LINKADDEDDEPS)) $(COMMONMISC)$/xhp_changed.flag
Modified: incubator/ooo/trunk/main/ooo.lst
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/ooo.lst?rev=1213190&r1=1213189&r2=1213190&view=diff
==============================================================================
--- incubator/ooo/trunk/main/ooo.lst (original)
+++ incubator/ooo/trunk/main/ooo.lst Mon Dec 12 11:25:37 2011
@@ -40,8 +40,6 @@ c441926f3a552ed3e5b274b62e86af16-STLport
ca66e26082cab8bb817185a116db809b-redland-1.0.8.tar.gz
377a60170e5185eb63d3ed2fae98e621-README_silgraphite-2.3.1.txt
d35724900f6a4105550293686688bbb3-silgraphite-2.3.1.tar.gz
-d70951c80dabecc2892c919ff5d07172-db-4.7.25.NC-custom.tar.gz
-e0707ff896045731ff99e99799606441-README_db-4.7.25.NC-custom.txt
e81c2f0953aa60f8062c05a4673f2be0-Python-2.6.1.tar.bz2
e61d0364a30146aaa3001296f853b2b9-libxslt-1.1.26.tar.gz
ea570af93c284aa9e5621cd563f54f4d-bsh-2.0b1-src.tar.gz
@@ -61,6 +59,4 @@ c735eab2d659a96e5a594c9e8541ad63-zlib-1.
# Temporary
http://hg.services.openoffice.org/binaries/
-d70951c80dabecc2892c919ff5d07172-db-4.7.25.NC-custom.tar.gz
-e0707ff896045731ff99e99799606441-README_db-4.7.25.NC-custom.txt
35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
Modified: incubator/ooo/trunk/main/postprocess/rebase/coffbase.txt
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/postprocess/rebase/coffbase.txt?rev=1213190&r1=1213189&r2=1213190&view=diff
==============================================================================
--- incubator/ooo/trunk/main/postprocess/rebase/coffbase.txt (original)
+++ incubator/ooo/trunk/main/postprocess/rebase/coffbase.txt Mon Dec 12 11:25:37 2011
@@ -159,7 +159,6 @@ jvmfwk3.dll 0x0000000062330000 0x00
ldapbe2.uno.dll 0x0000000062300000 0x00020000
legacy_binfiltersmi.dll 0x00000000622d0000 0x00020000
libcurl.dll 0x0000000062290000 0x00030000
-libdb47.dll 0x00000000621f0000 0x00090000
libeay32.dll 0x00000000620d0000 0x00110000
libexslt.dll 0x00000000620a0000 0x00020000
librdf.dll 0x0000000062070000 0x00020000
Modified: incubator/ooo/trunk/main/scp2/source/ooo/file_library_ooo.scp
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/scp2/source/ooo/file_library_ooo.scp?rev=1213190&r1=1213189&r2=1213190&view=diff
==============================================================================
--- incubator/ooo/trunk/main/scp2/source/ooo/file_library_ooo.scp (original)
+++ incubator/ooo/trunk/main/scp2/source/ooo/file_library_ooo.scp Mon Dec 12 11:25:37 2011
@@ -193,21 +193,6 @@ End
#endif
-#ifndef SYSTEM_DB
-
-File gid_File_Lib_Db
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = SCP2_OOO_BIN_DIR;
- #ifdef UNX
- Name = STRING(CONCAT2(libdb-4.7,UNXSUFFIX));
- #else
- Name = "libdb47.dll";
- #endif
-End
-
-#endif
-
#ifdef UNX
#ifdef ENABLE_GTK
#ifdef ENABLE_SYSTRAY_GTK
Modified: incubator/ooo/trunk/main/scp2/source/ooo/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/scp2/source/ooo/makefile.mk?rev=1213190&r1=1213189&r2=1213190&view=diff
==============================================================================
--- incubator/ooo/trunk/main/scp2/source/ooo/makefile.mk (original)
+++ incubator/ooo/trunk/main/scp2/source/ooo/makefile.mk Mon Dec 12 11:25:37 2011
@@ -120,10 +120,6 @@ SCPDEFS+=-DSYSTEM_LIBXSLT
SCPDEFS+=-DLIBXSLT_MAJOR=$(LIBXSLT_MAJOR)
.ENDIF
-.IF "$(SYSTEM_DB)" == "YES"
-SCPDEFS+=-DSYSTEM_DB
-.ENDIF
-
.IF "$(USE_SYSTEM_STL)" == "YES" || "$(STLPORT4)" != "NO_STLPORT4"
SCPDEFS+=-DUSE_SYSTEM_STL
.ENDIF
Modified: incubator/ooo/trunk/main/set_soenv.in
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/set_soenv.in?rev=1213190&r1=1213189&r2=1213190&view=diff
==============================================================================
--- incubator/ooo/trunk/main/set_soenv.in (original)
+++ incubator/ooo/trunk/main/set_soenv.in Mon Dec 12 11:25:37 2011
@@ -1929,9 +1929,6 @@ ToFile( "USE_FT_EMBOLDEN", "@USE_FT_EM
ToFile( "LIBXML_CFLAGS", "@LIBXML_CFLAGS@", "e" );
ToFile( "LIBXML_LIBS", "@LIBXML_LIBS@", "e" );
ToFile( "SYSTEM_EXPAT", "@SYSTEM_EXPAT@", "e" );
-ToFile( "SYSTEM_DB", "@SYSTEM_DB@", "e" );
-ToFile( "DB_VERSION", "@DB_VERSION@", "e" );
-ToFile( "DB_INCLUDES", "@DB_INCLUDES@", "e" );
ToFile( "ENABLE_MYSQLC", "@ENABLE_MYSQLC@", "e" );
ToFile( "SYSTEM_MYSQL", "@SYSTEM_MYSQL@", "e" );
ToFile( "SYSTEM_MYSQL_CPPCONN","@SYSTEM_MYSQL_CPPCONN@","e" );
Modified: incubator/ooo/trunk/main/solenv/inc/extension_helplink.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/solenv/inc/extension_helplink.mk?rev=1213190&r1=1213189&r2=1213190&view=diff
==============================================================================
--- incubator/ooo/trunk/main/solenv/inc/extension_helplink.mk (original)
+++ incubator/ooo/trunk/main/solenv/inc/extension_helplink.mk Mon Dec 12 11:25:37 2011
@@ -33,10 +33,6 @@ my_cp!:=$(my_cp)$(PATH_SEPERATOR)$(LUCEN
my_cp!:=$(my_cp)$(PATH_SEPERATOR)$(SOLARBINDIR)/lucene-core-2.3.jar$(PATH_SEPERATOR)$(SOLARBINDIR)/lucene-analyzers-2.3.jar
.ENDIF
-.IF "$(SYSTEM_DB)" != "YES"
-JAVA_LIBRARY_PATH= -Djava.library.path=$(SOLARSHAREDBIN)
-.ENDIF
-
#aux_alllangiso*:=$(foreach,i,$(alllangiso) $(foreach,j,$(aux_langdirs) $(eq,$i,$j $i $(NULL))))
aux_alllangiso*:=$(alllangiso)
@@ -48,10 +44,6 @@ HELPLINKALLADDEDDEPS=$(foreach,i,$(aux_a
ALLTAR : $(HELPLINKALLTARGETS)
-.IF "$(SYSTEM_DB)" != "YES"
-JAVA_LIBRARY_PATH= -Djava.library.path=$(SOLARSHAREDBIN)
-.ENDIF
-
XSL_DIR*:=$(SOLARBINDIR)
XHPLINKSRC*:=$(XHPDEST)
STY_SWITCH:= -sty $(XSL_DIR)/embed.xsl
Modified: incubator/ooo/trunk/main/solenv/inc/libs.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/solenv/inc/libs.mk?rev=1213190&r1=1213189&r2=1213190&view=diff
==============================================================================
--- incubator/ooo/trunk/main/solenv/inc/libs.mk (original)
+++ incubator/ooo/trunk/main/solenv/inc/libs.mk Mon Dec 12 11:25:37 2011
@@ -224,11 +224,6 @@ NEON3RDLIB=$(SOLARLIBDIR)/libneon.dylib
.ELSE
NEON3RDLIB=-lneon
.ENDIF
-.IF "$(SYSTEM_DB)" == "YES"
-BERKELEYLIB=-ldb
-.ELSE
-BERKELEYLIB=-ldb-4.7
-.ENDIF
CURLLIB=-lcurl
SFX2LIB=-lsfx$(DLLPOSTFIX)
SFXLIB=-lsfx$(DLLPOSTFIX)
@@ -449,7 +444,6 @@ EXPATASCII3RDLIB=expat_xmltok.lib ascii_
ZLIB3RDLIB=zlib.lib
JPEG3RDLIB=jpeglib.lib
NEON3RDLIB=ineon.lib
-BERKELEYLIB=libdb47.lib
CURLLIB=libcurl.lib
CHAOSLIB=ichaos.lib
UUILIB=iuui.lib
Modified: incubator/ooo/trunk/main/toolkit/src2xml/include.lst
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/toolkit/src2xml/include.lst?rev=1213190&r1=1213189&r2=1213190&view=diff
==============================================================================
--- incubator/ooo/trunk/main/toolkit/src2xml/include.lst (original)
+++ incubator/ooo/trunk/main/toolkit/src2xml/include.lst Mon Dec 12 11:25:37 2011
@@ -224,7 +224,6 @@
../../regexp/unxlngi6.pro/inc
../../ucbhelper/inc
../../ucbhelper/unxlngi6.pro/inc
-../../berkeleydb/unxlngi6.pro/inc
../../UnoControls/inc
../../UnoControls/source/inc
../../UnoControls/unxlngi6.pro/inc