diff options
| -rw-r--r-- | configure.in | 43 | ||||
| -rw-r--r-- | scp2/source/ooo/file_ooo.scp | 14 | ||||
| -rw-r--r-- | scripting/prj/build.lst | 2 | ||||
| -rw-r--r-- | tail_build/prj/build.lst | 2 |
4 files changed, 32 insertions, 29 deletions
diff --git a/configure.in b/configure.in index f10aac1a921e..7978f2fc6dae 100644 --- a/configure.in +++ b/configure.in @@ -6858,28 +6858,6 @@ AC_SUBST(SYSTEM_POSTGRESQL) AC_SUBST(POSTGRESQL_INC) AC_SUBST(POSTGRESQL_LIB) -dnl =================================================================== -dnl Check for system beanshell -dnl =================================================================== -if test "$with_java" != "no"; then -AC_MSG_CHECKING([which beanshell to use]) -if test "$with_system_beanshell" = "yes"; 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 -fi -AC_SUBST(SYSTEM_BSH) -AC_SUBST(BSH_JAR) - dnl =================================================================== dnl Check for system saxon @@ -9185,18 +9163,39 @@ AC_MSG_CHECKING([whether to build extension for support of scripts in BeanShell] if test "x$enable_ext_scripting_beanshell" = "xyes" -a "x$enable_extension_integration" != "xno" -a "x$with_java" != "xno"; then AC_MSG_RESULT([yes]) ENABLE_SCRIPTING_BEANSHELL=YES + + dnl =================================================================== + dnl Check for system beanshell + dnl =================================================================== + AC_MSG_CHECKING([which beanshell to use]) + if test "$with_system_beanshell" = "yes"; 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 else AC_MSG_RESULT([no]) ENABLE_SCRIPTING_BEANSHELL=NO SCPDEFS="$SCPDEFS -DWITHOUT_EXTENSION_SCRIPTING_BEANSHELL" fi AC_SUBST(ENABLE_SCRIPTING_BEANSHELL) +AC_SUBST(SYSTEM_BSH) +AC_SUBST(BSH_JAR) # scripting provider for JavaScript extension? AC_MSG_CHECKING([whether to build extension for support of scripts in JavaScript]) if test "x$enable_ext_scripting_javascript" = "xyes" -a "x$enable_extension_integration" != "xno" -a "x$with_java" != "xno"; then AC_MSG_RESULT([yes]) ENABLE_SCRIPTING_JAVASCRIPT=YES + BUILD_TYPE="$BUILD_TYPE RHINO" else AC_MSG_RESULT([no]) ENABLE_SCRIPTING_JAVASCRIPT=NO diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp index 33279783e9ba..62361e65e11c 100644 --- a/scp2/source/ooo/file_ooo.scp +++ b/scp2/source/ooo/file_ooo.scp @@ -707,25 +707,29 @@ File gid_File_Share_Registry_Ctlseqcheck_Xcd Name (th) = "ctlseqcheck.xcd"; End -File gid_File_Scripts_Beanshell +#ifdef SOLAR_JAVA +File gid_File_Scripts_Java Dir = gid_Dir_Share_Scripts; ARCHIVE_TXT_FILE_BODY; - Name = "ScriptsBeanShell.zip"; + Name = "ScriptsJava.zip"; End -#ifdef SOLAR_JAVA -File gid_File_Scripts_Java +#ifndef WITHOUT_EXTENSION_SCRIPTING_BEANSHELL +File gid_File_Scripts_Beanshell Dir = gid_Dir_Share_Scripts; ARCHIVE_TXT_FILE_BODY; - Name = "ScriptsJava.zip"; + Name = "ScriptsBeanShell.zip"; End #endif +#ifndef WITHOUT_EXTENSION_SCRIPTING_JAVASCRIPT File gid_File_Scripts_Javascript Dir = gid_Dir_Share_Scripts; ARCHIVE_TXT_FILE_BODY; Name = "ScriptsJavaScript.zip"; End +#endif +#endif // new user interface configuration files File gid_File_Share_Config_Sofficecfg_uiconfig_Zip diff --git a/scripting/prj/build.lst b/scripting/prj/build.lst index 2bd4c6139407..f8748983e0f1 100644 --- a/scripting/prj/build.lst +++ b/scripting/prj/build.lst @@ -1,2 +1,2 @@ -tc scripting : filter oovbaapi vbahelper bridges DESKTOP:rdbmaker vcl xmlscript basic sfx2 rhino BSH:beanshell javaunohelper LIBXSLT:libxslt NULL +tc scripting : filter oovbaapi vbahelper bridges DESKTOP:rdbmaker vcl xmlscript basic sfx2 RHINO:rhino BSH:beanshell javaunohelper LIBXSLT:libxslt NULL tc scripting\prj nmake - all tc1_prj NULL diff --git a/tail_build/prj/build.lst b/tail_build/prj/build.lst index a7c399a18022..bb50d8b4ca19 100644 --- a/tail_build/prj/build.lst +++ b/tail_build/prj/build.lst @@ -1,2 +1,2 @@ -tb tail_build : AFMS:afms APACHE_COMMONS:apache-commons BSH:beanshell BERKELEYDB:berkeleydb BOOST:boost CAIRO:cairo DESKTOP:codemaker CURL:curl FONTCONFIG:fontconfig FREETYPE:freetype GRAPHITE:graphite HUNSPELL:hunspell HYPHEN:hyphen ICU:icu DESKTOP:l10ntools JPEG:jpeg LCMS2:lcms2 LIBCDR:libcdr LIBCMIS:libcmis LIBEXTTEXTCAT:libexttextcat LIBXML2:libxml2 LIBXMLSEC:libxmlsec LIBXSLT:libxslt LIBWPG:libwpg LIBWPS:libwps LIBWPD:libwpd LIBVISIO:libvisio LPSOLVE:lpsolve MDDS:mdds MYTHES:mythes NEON:neon NSS:nss OPENSSL:openssl PYTHON:python REDLAND:redland SANE:sane SAXON:saxon TRANSLATIONS:translations TWAIN:twain VIGRA:vigra X11_EXTENSIONS:x11_extensions XPDF:xpdf ZLIB:zlib basegfx bridges comphelper DBCONNECTIVITY:connectivity cppu cppuhelper cpputools i18npool i18nutil icc javaunohelper jurt jvmaccess jvmfwk offapi officecfg oovbaapi QADEVOOO:qadevOOo DESKTOP:rdbmaker readlicense_oo rhino ridljar rsc sal salhelper sax shell solenv soltools sot stoc svl sysui tools ucbhelper udkapi unoil unotest unotools ure xmlreader xsltml NULL +tb tail_build : AFMS:afms APACHE_COMMONS:apache-commons BSH:beanshell BERKELEYDB:berkeleydb BOOST:boost CAIRO:cairo DESKTOP:codemaker CURL:curl FONTCONFIG:fontconfig FREETYPE:freetype GRAPHITE:graphite HUNSPELL:hunspell HYPHEN:hyphen ICU:icu DESKTOP:l10ntools JPEG:jpeg LCMS2:lcms2 LIBCDR:libcdr LIBCMIS:libcmis LIBEXTTEXTCAT:libexttextcat LIBXML2:libxml2 LIBXMLSEC:libxmlsec LIBXSLT:libxslt LIBWPG:libwpg LIBWPS:libwps LIBWPD:libwpd LIBVISIO:libvisio LPSOLVE:lpsolve MDDS:mdds MYTHES:mythes NEON:neon NSS:nss OPENSSL:openssl PYTHON:python REDLAND:redland SANE:sane SAXON:saxon TRANSLATIONS:translations TWAIN:twain VIGRA:vigra X11_EXTENSIONS:x11_extensions XPDF:xpdf ZLIB:zlib basegfx bridges comphelper DBCONNECTIVITY:connectivity cppu cppuhelper cpputools i18npool i18nutil icc javaunohelper jurt jvmaccess jvmfwk offapi officecfg oovbaapi QADEVOOO:qadevOOo DESKTOP:rdbmaker readlicense_oo RHINO:rhino ridljar rsc sal salhelper sax shell solenv soltools sot stoc svl sysui tools ucbhelper udkapi unoil unotest unotools ure xmlreader xsltml NULL tb tail_build\prj nmake - all tb_prj NULL |