Index: makefile.mk
===================================================================
RCS file: /cvs/external/beanshell/makefile.mk,v
retrieving revision 1.5
diff -u -r1.5 makefile.mk
--- openoffice.org.orig/beanshell/makefile.mk 7 Sep 2005 22:05:31 -0000 1.5
+++ openoffice.org/beanshell/makefile.mk 22 Nov 2005 16:18:35 -0000
@@ -39,6 +39,13 @@
TARGET=ooo_beanshell
.IF "$(SOLAR_JAVA)"!=""
+
+.IF "$(SYSTEM_BSH)" == "YES"
+all:
+ @echo "An already available installation of beanshell should exist on your system."
+ @echo "Therefore the version provided here does not need to be built in addition."
+.ENDIF
+
# --- Settings -----------------------------------------------------
.INCLUDE : settings.mk
Index: configure.in
===================================================================
RCS file: /cvs/tools/config_office/configure.in,v
retrieving revision 1.139.16.1
diff -u -r1.139.16.1 configure.in
--- openoffice.org.orig/config_office/configure.in 22 Nov 2005 10:15:13 -0000 1.139.16.1
+++ openoffice.org/config_office/configure.in 22 Nov 2005 15:43:38 -0000
@@ -236,6 +236,20 @@
[ --with-db-jar=JARFILE Specify path to jarfile manually ],
[ DB_JAR="$withval"
])
+AC_ARG_WITH(system-hsqldb,
+[ --with-system-hsqldb Use hsqldb already on system
+],,)
+AC_ARG_WITH(hsqldb-jar,
+[ --with-hsqldb-jar=JARFILE Specify path to jarfile manually ],
+[ HSQLDB_JAR="$withval"
+])
+AC_ARG_WITH(system-beanshell,
+[ --with-system-beanshell Use beanshell already on system
+],,)
+AC_ARG_WITH(beanshell-jar,
+[ --with-beanshell-jar=JARFILE Specify path to jarfile manually ],
+[ BSH_JAR="$withval"
+])
AC_ARG_WITH(system-sablot,
[ --with-system-sablot Use sablot already on system
],,)
@@ -2643,6 +2657,63 @@
AC_SUBST(DB_VERSION)
AC_SUBST(DB_INCLUDES)
AC_SUBST(DB_JAR)
+
+dnl ===================================================================
+dnl Check for system hsqldb
+dnl ===================================================================
+AC_MSG_CHECKING([which hsqldb to use])
+if test -n "$with_system_hsqldb" -o -n "$with_system_libs" && \
+ test "$with_system_hsqldb" != "no"; then
+ AC_MSG_RESULT([external])
+ SYSTEM_HSQLDB=YES
+ if test -z $HSQLDB_JAR; then
+ HSQLDB_JAR=/usr/share/java/hsqldb.jar
+ fi
+ AC_CHECK_FILE($HSQLDB_JAR, [],
+ [AC_MSG_ERROR(hsqldb.jar not found.)], [])
+ AC_MSG_CHECKING([whether hsqldb is >= 1.8.0])
+ export HSQLDB_JAR
+ if $PERL -e 'use Archive::Zip;
+ my $file = "$ENV{'HSQLDB_JAR'}";
+ my $zip = Archive::Zip->new( $file );
+ my $mf = $zip->contents ( "META-INF/MANIFEST.MF" );
+ if ( $mf =~ m/Specification-Version: 1.8.*/ ) {
+ exit 0;
+ } else {
+ exit 1;
+ }'; then
+ AC_MSG_RESULT([yes])
+ else
+ AC_MSG_ERROR([no, hsqldb >= 1.8.0 is needed])
+ fi
+else
+ AC_MSG_RESULT([internal])
+ SYSTEM_HSQLDB=NO
+ BUILD_TYPE="$BUILD_TYPE HSQLDB"
+fi
+AC_SUBST(SYSTEM_HSQLDB)
+AC_SUBST(HSQLDB_JAR)
+
+dnl ===================================================================
+dnl Check for system beanshell
+dnl ===================================================================
+AC_MSG_CHECKING([which beanshell to use])
+if test -n "$with_system_beanshell" -o -n "$with_system_libs" && \
+ test "$with_system_beanshell" != "no"; then
+ AC_MSG_RESULT([external])
+ SYSTEM_BSH=YES
+ if test -z $BSH_JAR; then
+ BSH_JAR=/usr/share/java/bsh.jar
+ fi
+ AC_CHECK_FILE($BSH_JAR, [],
+ [AC_MSG_ERROR(bsh.jar not found.)], [])
+else
+ AC_MSG_RESULT([internal])
+ SYSTEM_BSH=NO
+ BUILD_TYPE="$BUILD_TYPE BSH"
+fi
+AC_SUBST(SYSTEM_BSH)
+AC_SUBST(BSH_JAR)
dnl ===================================================================
dnl Check for system sablot
Index: set_soenv.in
===================================================================
RCS file: /cvs/tools/config_office/set_soenv.in,v
retrieving revision 1.78.14.1
diff -u -r1.78.14.1 set_soenv.in
--- openoffice.org.orig/config_office/set_soenv.in 22 Nov 2005 10:15:14 -0000 1.78.14.1
+++ openoffice.org/config_office/set_soenv.in 22 Nov 2005 15:43:40 -0000
@@ -1764,6 +1764,10 @@
ToFile( "DB_VERSION", "@DB_VERSION@", "e" );
ToFile( "DB_INCLUDES", "@DB_INCLUDES@", "e" );
ToFile( "DB_JAR", "@DB_JAR@", "e" );
+ToFile( "SYSTEM_HSQLDB", "@SYSTEM_HSQLDB@", "e" );
+ToFile( "HSQLDB_JAR", "@HSQLDB_JAR@", "e" );
+ToFile( "SYSTEM_BSH", "@SYSTEM_BSH@", "e" );
+ToFile( "BSH_JAR", "@BSH_JAR@", "e" );
ToFile( "SYSTEM_SABLOT", "@SYSTEM_SABLOT@", "e" );
ToFile( "SABLOT_LIBS", "@SABLOT_LIBS@", "e" );
ToFile( "SYSTEM_ODBC_HEADERS","@SYSTEM_ODBC_HEADERS@","e" );
Index: com/sun/star/sdbcx/comp/hsqldb/makefile.mk
===================================================================
RCS file: /cvs/dba/connectivity/com/sun/star/sdbcx/comp/hsqldb/makefile.mk,v
retrieving revision 1.6
diff -u -r1.6 makefile.mk
--- openoffice.org.orig/connectivity/com/sun/star/sdbcx/comp/hsqldb/makefile.mk 8 Sep 2005 04:56:11 -0000 1.6
+++ openoffice.org/connectivity/com/sun/star/sdbcx/comp/hsqldb/makefile.mk 22 Nov 2005 16:19:14 -0000
@@ -43,7 +43,12 @@
# --- Files --------------------------------------------------------
-JARFILES = ridl.jar unoil.jar jurt.jar juh.jar hsqldb.jar
+JARFILES = ridl.jar unoil.jar jurt.jar juh.jar
+.IF "$(SYSTEM_HSQLDB)" == "YES"
+XCLASSPATH!:=$(XCLASSPATH)$(PATH_SEPERATOR)$(HSQLDB_JAR)
+.ELSE
+JARFILES+= hsqldb.jar
+.ENDIF
JAVAFILES =\
NativeInputStreamHelper.java\
NativeOutputStreamHelper.java\
Index: prj/build.lst
===================================================================
RCS file: /cvs/dba/connectivity/prj/build.lst,v
retrieving revision 1.25
diff -u -r1.25 build.lst
--- openoffice.org.orig/connectivity/prj/build.lst 30 Aug 2005 09:32:36 -0000 1.25
+++ openoffice.org/connectivity/prj/build.lst 22 Nov 2005 16:19:14 -0000
@@ -1,4 +1,4 @@
-cn connectivity : comphelper MOZ:moz SO:moz_prebuilt svtools UNIXODBC:unixODBC unoil jurt javaunohelper hsqldb NULL
+cn connectivity : comphelper MOZ:moz SO:moz_prebuilt svtools UNIXODBC:unixODBC unoil jurt javaunohelper HSQLDB:hsqldb NULL
cn connectivity usr1 - all cn_mkout NULL
cn connectivity\com\sun\star\sdbcx\comp\hsqldb nmake - all cn_jhsqldbdb cn_hsqldb NULL
cn connectivity\source\types nmake - all cn_types NULL
Index: makefile.mk
===================================================================
RCS file: /cvs/external/hsqldb/makefile.mk,v
retrieving revision 1.10
diff -u -r1.10 makefile.mk
--- openoffice.org.orig/hsqldb/makefile.mk 7 Sep 2005 16:27:52 -0000 1.10
+++ openoffice.org/hsqldb/makefile.mk 22 Nov 2005 16:17:49 -0000
@@ -44,6 +44,12 @@
.INCLUDE : version.mk
.INCLUDE : minor.mk
+.IF "$(SYSTEM_HSQLDB)" == "YES"
+all:
+ @echo "An already available installation of hsqldb should exist on your system."
+ @echo "Therefore the version provided here does not need to be built in addition."
+.ENDIF
+
.IF "$(SOLAR_JAVA)" != ""
# --- Files --------------------------------------------------------
Index: java/build.xml
===================================================================
RCS file: /cvs/framework/scripting/java/build.xml,v
retrieving revision 1.32
diff -u -r1.32 build.xml
--- openoffice.org.orig/scripting/java/build.xml 9 Sep 2005 01:54:21 -0000 1.32
+++ openoffice.org/scripting/java/build.xml 22 Nov 2005 16:58:02 -0000
@@ -50,6 +50,9 @@
Not needed in default build -->
+
+
+
@@ -58,7 +61,7 @@
-
+
Index: prj/build.lst
===================================================================
RCS file: /cvs/framework/scripting/prj/build.lst,v
retrieving revision 1.13
diff -u -r1.13 build.lst
--- openoffice.org.orig/scripting/prj/build.lst 11 Oct 2004 13:31:56 -0000 1.13
+++ openoffice.org/scripting/prj/build.lst 22 Nov 2005 16:58:14 -0000
@@ -1,4 +1,4 @@
-tc scripting : bridges rdbmaker vcl xmlscript basic sfx2 rhino beanshell javaunohelper NULL
+tc scripting : bridges rdbmaker vcl xmlscript basic sfx2 rhino BSH:beanshell javaunohelper NULL
tc scripting usr1 - all tc_mkout NULL
tc scripting\source\provider nmake - all tc_scriptingprovider NULL
tc scripting\source\basprov nmake - all tc_scriptingbasprov NULL
Index: config/ssrc680.ini
===================================================================
RCS file: /cvs/tools/solenv/config/ssrc680.ini,v
retrieving revision 1.83
diff -u -r1.83 ssrc680.ini
--- openoffice.org.orig/solenv/config/ssrc680.ini 28 Oct 2005 15:04:11 -0000 1.83
+++ openoffice.org/solenv/config/ssrc680.ini 22 Nov 2005 15:48:09 -0000
@@ -108,7 +108,7 @@
BIG_SVX TRUE
BIG_GOODIES TRUE
BMP_WRITES_FLAG TRUE
- BUILD_TYPE SO OOo EXT BINFILTER BITSTREAM_VERA_FONTS CURL DICTIONARIES FREETYPE JPEG LIBXML2 LIBXMLSEC MOZ NAS NEON PYTHON ZLIB SNDFILE PORTAUDIO SANE UNIXODBC X11_EXTENSIONS LIBWPD EPM QADEVOOO ODK MSFONTEXTRACT MATHMLDTD BOOST EXPAT CRASHREP BERKELEYDB SABLOT XALAN SUN
+ BUILD_TYPE SO OOo EXT BSH BINFILTER BITSTREAM_VERA_FONTS CURL DICTIONARIES FREETYPE JPEG LIBXML2 LIBXMLSEC HSQLDB MOZ NAS NEON PYTHON ZLIB SNDFILE PORTAUDIO SANE UNIXODBC X11_EXTENSIONS LIBWPD EPM QADEVOOO ODK MSFONTEXTRACT MATHMLDTD BOOST EXPAT CRASHREP BERKELEYDB SABLOT XALAN SUN
RES_ENUS TRUE
RES_GER TRUE
NO_REC_RES TRUE
Index: source/ooo/file_ooo.scp
===================================================================
RCS file: /cvs/installation/scp2/source/ooo/file_ooo.scp,v
retrieving revision 1.127
diff -u -r1.127 file_ooo.scp
--- openoffice.org.orig/scp2/source/ooo/file_ooo.scp 16 Nov 2005 10:20:12 -0000 1.127
+++ openoffice.org/scp2/source/ooo/file_ooo.scp 23 Nov 2005 14:51:52 -0000
@@ -631,9 +631,9 @@
#endif
#ifdef SOLAR_JAVA
-
+#ifndef SYSTEM_BSH
STD_JAR_FILE( gid_File_Jar_Bsh, bsh )
-
+#endif
#endif
#ifdef SOLAR_JAVA
@@ -729,9 +729,11 @@
#endif
#ifdef SOLAR_JAVA
+#ifndef SYSTEM_HSQLDB
STD_JAR_FILE_PATCH( gid_File_Jar_Hsqldb, hsqldb )
STD_JAR_FILE( gid_File_Jar_Hsqldb_Sdbc, sdbc_hsqldb )
#endif
+#endif
#ifdef SOLAR_JAVA
File gid_File_Jar_Commonwizards
Index: source/ooo/makefile.mk
===================================================================
RCS file: /cvs/installation/scp2/source/ooo/makefile.mk,v
retrieving revision 1.35
diff -u -r1.35 makefile.mk
--- openoffice.org.orig/scp2/source/ooo/makefile.mk 28 Sep 2005 15:47:30 -0000 1.35
+++ openoffice.org/scp2/source/ooo/makefile.mk 23 Nov 2005 14:52:05 -0000
@@ -135,6 +135,14 @@
SCPDEFS+=-DSYSTEM_MYSPELL
.ENDIF
+.IF "$(SYSTEM_BSH)" == "YES"
+SCPDEFS+=-DSYSTEM_BSH -DBSH_JAR=file://$(BSH_JAR)
+.ENDIF
+
+.IF "$(SYSTEM_HSQLDB)" == "YES"
+SCPDEFS+=-DSYSTEM_HSQLDB -DHSQLDB_JAR=file://$(HSQLDB_JAR)
+.ENDIF
+
.IF "$(SYSTEM_XALAN)" == "YES"
SCPDEFS+=-DSYSTEM_XALAN
.ENDIF
Index: source/ooo/profileitem_ooo.scp
===================================================================
RCS file: /cvs/installation/scp2/source/ooo/profileitem_ooo.scp,v
retrieving revision 1.28
diff -u -r1.28 profileitem_ooo.scp
--- openoffice.org.orig/scp2/source/ooo/profileitem_ooo.scp 11 Nov 2005 12:27:37 -0000 1.28
+++ openoffice.org/scp2/source/ooo/profileitem_ooo.scp 23 Nov 2005 14:52:05 -0000
@@ -752,12 +752,18 @@
#endif
End
+#ifndef SYSTEM_BSH
+#define BSH_JAR $ORIGIN/classes/bsh.jar
+#endif
+#ifndef SYSTEM_HSQLDB
+#define HSQLDB_JAR $ORIGIN/classes/hsqldb.jar
+#endif
+
ProfileItem gid_Profileitem_Jvmfwk_Uno_Java_Jfw_Classpath_Urls
ProfileID = gid_Profile_Jvmfwk_Ini;
ModuleID = gid_Module_Root;
Section = "Bootstrap";
Order = 7;
Key = "UNO_JAVA_JFW_CLASSPATH_URLS";
- Value = "${${$ORIGIN/$UNO_SETTINGS:PKG_UserUnoFile}:UNO_JAVA_CLASSPATH} ${${$ORIGIN/$UNO_SETTINGS:PKG_SharedUnoFile}:UNO_JAVA_CLASSPATH} $ORIGIN/classes/jurt.jar $ORIGIN/classes/ridl.jar $ORIGIN/classes/java_uno.jar $ORIGIN/classes/sandbox.jar $ORIGIN/classes/bsh.jar $ORIGIN/classes/classes.jar $ORIGIN/classes/commonwizards.jar $ORIGIN/classes/htmlsoff.jar $ORIGIN/classes/java_uno_accessbridge.jar $ORIGIN/classes/js.jar $ORIGIN/classes/juh.jar $ORIGIN/classes/jut.jar $ORIGIN/classes/letter.jar $ORIGIN/classes/officebean.jar $ORIGIN/classes/query.jar $ORIGIN/classes/report.jar $ORIGIN/classes/ScriptFramework.jar $ORIGIN/classes/ScriptProviderForBeanShell.jar $ORIGIN/classes/ScriptProviderForJava.jar $ORIGIN/classes/ScriptProviderForJavaScript.jar $ORIGIN/classes/tutorial.jar $ORIGIN/classes/unoil.jar $ORIGIN/classes/web.jar $ORIGIN/classes/xmerge.jar $ORIGIN/classes/XMergeBridge.jar $ORIGIN/classes/XSLTFilter.jar $ORIGIN/classes/XSLTValidate.jar $ORIGIN/classes/xt.jar $ORIGIN/classes/activation.jar $ORIGIN/classes/agenda.jar $ORIGIN/classes/aportisdoc.jar $ORIGIN/classes/avmedia.jar $ORIGIN/classes/email.jar $ORIGIN/classes/fax.jar $ORIGIN/classes/pexcel.jar $ORIGIN/classes/pocketword.jar $ORIGIN/classes/mail.jar $ORIGIN/classes/hsqldb.jar $ORIGIN/classes/sdbc_hsqldb.jar";
+ Value = ${${$ORIGIN/$UNO_SETTINGS:PKG_UserUnoFile}:UNO_JAVA_CLASSPATH} ${${$ORIGIN/$UNO_SETTINGS:PKG_SharedUnoFile}:UNO_JAVA_CLASSPATH} $ORIGIN/classes/jurt.jar $ORIGIN/classes/ridl.jar $ORIGIN/classes/java_uno.jar $ORIGIN/classes/sandbox.jar BSH_JAR $ORIGIN/classes/classes.jar $ORIGIN/classes/commonwizards.jar $ORIGIN/classes/htmlsoff.jar $ORIGIN/classes/java_uno_accessbridge.jar $ORIGIN/classes/js.jar $ORIGIN/classes/juh.jar $ORIGIN/classes/jut.jar $ORIGIN/classes/letter.jar $ORIGIN/classes/officebean.jar $ORIGIN/classes/query.jar $ORIGIN/classes/report.jar $ORIGIN/classes/ScriptFramework.jar $ORIGIN/classes/ScriptProviderForBeanShell.jar $ORIGIN/classes/ScriptProviderForJava.jar $ORIGIN/classes/ScriptProviderForJavaScript.jar $ORIGIN/classes/tutorial.jar $ORIGIN/classes/unoil.jar $ORIGIN/classes/web.jar $ORIGIN/classes/xmerge.jar $ORIGIN/classes/XMergeBridge.jar $ORIGIN/classes/XSLTFilter.jar $ORIGIN/classes/XSLTValidate.jar $ORIGIN/classes/xt.jar $ORIGIN/classes/activation.jar $ORIGIN/classes/agenda.jar $ORIGIN/classes/aportisdoc.jar $ORIGIN/classes/avmedia.jar $ORIGIN/classes/email.jar $ORIGIN/classes/fax.jar $ORIGIN/classes/pexcel.jar $ORIGIN/classes/pocketword.jar $ORIGIN/classes/mail.jar HSQLDB_JAR $ORIGIN/classes/sdbc_hsqldb.jar;
End
-