configure.in | 34 +++++++++++++++++++-------- scp2/source/extensions/file_extensions.scp | 4 +-- scp2/source/extensions/module_extensions.scp | 4 +-- scp2/source/ooo/file_ooo.scp | 4 +-- 4 files changed, 30 insertions(+), 16 deletions(-)
New commits: commit d4214aab9c093dab321e6deaeaf5f7e86af1381c Author: Michael Stahl <[email protected]> Date: Mon Oct 8 13:12:15 2012 +0200 scp2: rename misleading WITHOUT_EXTENSION_SCRIPTING_BEANSHELL/JAVSCRIPT Change-Id: Id8524bcfa3d593584afbad0b5dcc1cc48aa377d7 diff --git a/configure.in b/configure.in index 3c32481..169d994 100644 --- a/configure.in +++ b/configure.in @@ -10217,7 +10217,7 @@ if test "${enable_scripting_beanshell}" != "no" -a "x$with_java" != "xno"; then else AC_MSG_RESULT([no]) ENABLE_SCRIPTING_BEANSHELL=NO - SCPDEFS="$SCPDEFS -DWITHOUT_EXTENSION_SCRIPTING_BEANSHELL" + SCPDEFS="$SCPDEFS -DWITHOUT_SCRIPTING_BEANSHELL" fi AC_SUBST(ENABLE_SCRIPTING_BEANSHELL) AC_SUBST(SYSTEM_BSH) @@ -10251,7 +10251,7 @@ if test "${enable_scripting_javascript}" != "no" -a "x$with_java" != "xno"; then else AC_MSG_RESULT([no]) ENABLE_SCRIPTING_JAVASCRIPT=NO - SCPDEFS="$SCPDEFS -DWITHOUT_EXTENSION_SCRIPTING_JAVASCRIPT" + SCPDEFS="$SCPDEFS -DWITHOUT_SCRIPTING_JAVASCRIPT" fi AC_SUBST(ENABLE_SCRIPTING_JAVASCRIPT) AC_SUBST(SYSTEM_RHINO) diff --git a/scp2/source/extensions/file_extensions.scp b/scp2/source/extensions/file_extensions.scp index 7253295..90e9987 100644 --- a/scp2/source/extensions/file_extensions.scp +++ b/scp2/source/extensions/file_extensions.scp @@ -287,7 +287,7 @@ End /* ** Script provider for BeanShell ** */ -#if defined SOLAR_JAVA && !defined WITHOUT_EXTENSION_SCRIPTING_BEANSHELL +#if defined SOLAR_JAVA && !defined WITHOUT_SCRIPTING_BEANSHELL #if !defined SYSTEM_BSH STD_JAR_FILE( gid_File_Jar_Bsh, bsh ) @@ -306,7 +306,7 @@ End /* ** Script provider for JavaScript ** */ -#if defined SOLAR_JAVA && !defined WITHOUT_EXTENSION_SCRIPTING_JAVASCRIPT +#if defined SOLAR_JAVA && !defined WITHOUT_SCRIPTING_JAVASCRIPT STD_JAR_FILE( gid_File_Jar_Js, js ) diff --git a/scp2/source/extensions/module_extensions.scp b/scp2/source/extensions/module_extensions.scp index 01d773c..91853ea 100644 --- a/scp2/source/extensions/module_extensions.scp +++ b/scp2/source/extensions/module_extensions.scp @@ -326,7 +326,7 @@ End /* ** Script provider for BeanShell ** */ -#if defined SOLAR_JAVA && !defined WITHOUT_EXTENSION_SCRIPTING_BEANSHELL +#if defined SOLAR_JAVA && !defined WITHOUT_SCRIPTING_BEANSHELL Module gid_Module_Optional_Extensions_Script_Provider_For_Beanshell PackageInfo = "packinfo_extensions.txt"; @@ -345,7 +345,7 @@ End /* ** Script provider for JavaScript ** */ -#if defined SOLAR_JAVA && !defined WITHOUT_EXTENSION_SCRIPTING_JAVASCRIPT +#if defined SOLAR_JAVA && !defined WITHOUT_SCRIPTING_JAVASCRIPT Module gid_Module_Optional_Extensions_Script_Provider_For_Javascript PackageInfo = "packinfo_extensions.txt"; diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp index a42f683..ea102c3 100644 --- a/scp2/source/ooo/file_ooo.scp +++ b/scp2/source/ooo/file_ooo.scp @@ -723,7 +723,7 @@ File gid_File_Scripts_Java Name = "ScriptsJava.zip"; End -#ifndef WITHOUT_EXTENSION_SCRIPTING_BEANSHELL +#ifndef WITHOUT_SCRIPTING_BEANSHELL File gid_File_Scripts_Beanshell Dir = gid_Dir_Share_Scripts; ARCHIVE_TXT_FILE_BODY; @@ -731,7 +731,7 @@ File gid_File_Scripts_Beanshell End #endif -#ifndef WITHOUT_EXTENSION_SCRIPTING_JAVASCRIPT +#ifndef WITHOUT_SCRIPTING_JAVASCRIPT File gid_File_Scripts_Javascript Dir = gid_Dir_Share_Scripts; ARCHIVE_TXT_FILE_BODY; commit 4c5589a397b05515ba4aec0c494f43fb9f750975 Author: Michael Stahl <[email protected]> Date: Mon Oct 8 13:04:22 2012 +0200 configure: adjust beanshell/javascript options to the changes in a72a7dc500ffd57662e8b9be61e4676266861c33. Change-Id: I79fba4dbe8a72b65625a9ed11fa0b3cebdf80426 diff --git a/configure.in b/configure.in index cc8524f..3c32481 100644 --- a/configure.in +++ b/configure.in @@ -637,12 +637,14 @@ AC_ARG_ENABLE(ext-report-builder, AC_ARG_ENABLE(ext-scripting-beanshell, AS_HELP_STRING([--enable-ext-scripting-beanshell], - [Enable support for scripts in BeanShell.]) + [DEPRECATED: use --enable-scripting-beanshell instead.]) +,AC_MSG_ERROR([--enable-ext-scripting-beanshell is no longer supported.]) ) AC_ARG_ENABLE(ext-scripting-javascript, AS_HELP_STRING([--enable-ext-scripting-javascript], - [Enable support for scripts in JavaScript.]) + [DEPRECATED: use --enable-scripting-javascript instead.]) +,AC_MSG_ERROR([--enable-ext-scripting-javascript is no longer supported.]) ) AC_ARG_ENABLE(ext-typo, @@ -1455,6 +1457,12 @@ AC_ARG_WITH(hsqldb-jar, [Specify path to jarfile manually.]), HSQLDB_JAR=$withval) +AC_ARG_ENABLE(scripting-beanshell, + AS_HELP_STRING([--disable-scripting-beanshell], + [Disable support for scripts in BeanShell.]), +, +) + AC_ARG_WITH(system-beanshell, AS_HELP_STRING([--with-system-beanshell], [Use beanshell already on system.]),, @@ -1465,6 +1473,12 @@ AC_ARG_WITH(beanshell-jar, [Specify path to jarfile manually.]), BSH_JAR=$withval) +AC_ARG_ENABLE(scripting-javascript, + AS_HELP_STRING([--disable-scripting-javascript], + [Disable support for scripts in JavaScript.]), +, +) + AC_ARG_WITH(system-rhino, AS_HELP_STRING([--with-system-rhino], [Use rhino already on system.]),,) @@ -10176,9 +10190,9 @@ AC_SUBST(COMMONS_HTTPCLIENT_JAR) AC_SUBST(COMMONS_LOGGING_JAR) AC_SUBST(TOMCAT_TARBALL) -# scripting provider for BeanShell extension? -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 +# scripting provider for BeanShell? +AC_MSG_CHECKING([whether to build support for scripts in BeanShell]) +if test "${enable_scripting_beanshell}" != "no" -a "x$with_java" != "xno"; then AC_MSG_RESULT([yes]) ENABLE_SCRIPTING_BEANSHELL=YES @@ -10210,9 +10224,9 @@ AC_SUBST(SYSTEM_BSH) AC_SUBST(BSH_JAR) AC_SUBST(BSH_TARBALL) -# 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 +# scripting provider for JavaScript? +AC_MSG_CHECKING([whether to build support for scripts in JavaScript]) +if test "${enable_scripting_javascript}" != "no" -a "x$with_java" != "xno"; then AC_MSG_RESULT([yes]) ENABLE_SCRIPTING_JAVASCRIPT=YES _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
