Repository.mk | 2 +-
accessibility/Library_acc.mk | 13 +++++++++----
accessibility/source/helper/acc_factory.cxx | 6 ++++++
configure.ac | 6 +++---
dbaccess/Module_dbaccess.mk | 2 ++
sc/Module_sc.mk | 2 ++
sccomp/Module_sccomp.mk | 2 +-
scripting/Module_scripting.mk | 2 +-
unotest/source/cpp/bootstrapfixturebase.cxx | 4 +++-
9 files changed, 28 insertions(+), 11 deletions(-)
New commits:
commit fb308c193bc9f0d07ad2cccd5a0b239f86cbe442
Author: Jan-Marek Glogowski <glo...@fbihome.de>
AuthorDate: Wed May 19 12:16:42 2021 +0200
Commit: Jan-Marek Glogowski <glo...@fbihome.de>
CommitDate: Fri Dec 3 06:46:24 2021 +0100
Fix --disable-scripting for DESKTOP build
Unfortunatly we cannot add --disable-scripting to
sub_conf_defaults, because Java currently has no
equivalent to the PYTHON_FOR_BUILD setting.
Change-Id: I89938a17307a363f5de808200914940503312829
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126186
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski <glo...@fbihome.de>
diff --git a/Repository.mk b/Repository.mk
index 5b867ca478bc..ee6c60fb33d0 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -956,7 +956,7 @@ $(eval $(call gb_Helper_register_packages_for_install,ooo,\
$(if $(ENABLE_SCRIPTING_BEANSHELL),scripting_ScriptsBeanShell) \
$(if
$(ENABLE_SCRIPTING_JAVASCRIPT),scripting_ScriptsJavaScript) \
) \
- $(if $(DISABLE_SCRIPTING),,scripting_scriptbindinglib) \
+ $(call gb_Helper_optional,SCRIPTING,scripting_scriptbindinglib) \
$(if $(filter $(OS),MACOSX),sysui_osxicons) \
wizards_basicshare \
wizards_basicsrvaccess2base \
diff --git a/accessibility/Library_acc.mk b/accessibility/Library_acc.mk
index 815e2a88bd70..0926fee97e5d 100644
--- a/accessibility/Library_acc.mk
+++ b/accessibility/Library_acc.mk
@@ -64,10 +64,6 @@ $(eval $(call gb_Library_add_exception_objects,acc,\
accessibility/source/extended/accessibleiconchoicectrlentry \
accessibility/source/extended/accessiblelistbox \
accessibility/source/extended/accessiblelistboxentry \
- accessibility/source/extended/accessibletabbar \
- accessibility/source/extended/accessibletabbarbase \
- accessibility/source/extended/accessibletabbarpage \
- accessibility/source/extended/accessibletabbarpagelist \
accessibility/source/extended/accessibletablistbox \
accessibility/source/extended/accessibletablistboxtable \
accessibility/source/extended/textwindowaccessibility \
@@ -112,4 +108,13 @@ $(eval $(call gb_Library_add_exception_objects,acc,\
accessibility/source/standard/vclxaccessibletoolboxitem \
))
+ifneq ($(filter SCRIPTING,$(BUILD_TYPE)),)
+$(eval $(call gb_Library_add_exception_objects,acc,\
+ accessibility/source/extended/accessibletabbar \
+ accessibility/source/extended/accessibletabbarbase \
+ accessibility/source/extended/accessibletabbarpage \
+ accessibility/source/extended/accessibletabbarpagelist \
+))
+endif
+
# vim:set noet sw=4 ts=4:
diff --git a/accessibility/source/helper/acc_factory.cxx
b/accessibility/source/helper/acc_factory.cxx
index 51adeaca8d21..53ed173c15b2 100644
--- a/accessibility/source/helper/acc_factory.cxx
+++ b/accessibility/source/helper/acc_factory.cxx
@@ -17,6 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#include <config_features.h>
#include <config_feature_desktop.h>
#include <toolkit/awt/vclxwindows.hxx>
@@ -386,7 +387,12 @@ Reference< XAccessible >
AccessibleFactory::createAccessibleIconChoiceCtrl(
Reference< XAccessible > AccessibleFactory::createAccessibleTabBar( TabBar&
_rTabBar ) const
{
+#if HAVE_FEATURE_SCRIPTING
return new AccessibleTabBar( &_rTabBar );
+#else
+ (void)_rTabBar;
+ return nullptr;
+#endif
}
Reference< XAccessibleContext >
AccessibleFactory::createAccessibleTextWindowContext(
diff --git a/configure.ac b/configure.ac
index e7ea00ef8cb3..80ce42b33fcd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5482,9 +5482,10 @@ if test "$cross_compiling" = "yes"; then
test -n "$enable_ccache" && sub_conf_opts="$sub_conf_opts
--enable-ccache=$enable_ccache"
test -n "$with_ant_home" && sub_conf_opts="$sub_conf_opts
--with-ant-home=$with_ant_home"
test "$with_junit" = "no" && sub_conf_opts="$sub_conf_opts --without-junit"
+ # While we don't need scripting support, we don't have a PYTHON_FOR_BUILD
Java equivalent, so must enable scripting for Java
if test -n "$ENABLE_JAVA"; then
case "$_os" in
- iOS) sub_conf_opts="$sub_conf_opts --without-java" ;; # force it off,
like it used to be
+ iOS) sub_conf_opts="$sub_conf_opts --disable-scripting" ;; # force it
off, as it used to be
Android)
# Hack for Android - the build doesn't need a host JDK, so just
forward to build for convenience
test -n "$with_jdk_home" && sub_conf_opts="$sub_conf_opts
--with-jdk-home=$with_jdk_home"
@@ -5496,7 +5497,7 @@ if test "$cross_compiling" = "yes"; then
;;
esac
else
- sub_conf_opts="$sub_conf_opts --without-java"
+ sub_conf_opts="$sub_conf_opts --disable-scripting"
fi
test -n "$TARFILE_LOCATION" && sub_conf_opts="$sub_conf_opts
--with-external-tar=$TARFILE_LOCATION"
test "$with_system_icu_for_build" = "yes" -o "$with_system_icu_for_build"
= "force" && sub_conf_opts="$sub_conf_opts --with-system-icu"
@@ -5573,7 +5574,6 @@ if test "$cross_compiling" = "yes"; then
OPENSSL
ORCUS
PYTHON
- SCRIPTING
ZLIB
"
# converts BUILD_TYPE and PERMITTED_BUILD_TARGETS into non-whitespace,
diff --git a/dbaccess/Module_dbaccess.mk b/dbaccess/Module_dbaccess.mk
index 2d2c9ae31c1b..436f591c7a07 100644
--- a/dbaccess/Module_dbaccess.mk
+++ b/dbaccess/Module_dbaccess.mk
@@ -47,6 +47,7 @@ $(eval $(call gb_Module_add_check_targets,dbaccess,\
))
endif
+ifneq ($(filter SCRIPTING,$(BUILD_TYPE)),)
$(eval $(call gb_Module_add_check_targets,dbaccess,\
CppunitTest_dbaccess_dialog_save \
CppunitTest_dbaccess_empty_stdlib_save \
@@ -54,6 +55,7 @@ $(eval $(call gb_Module_add_check_targets,dbaccess,\
CppunitTest_dbaccess_macros_test \
CppunitTest_dbaccess_hsqlschema_import \
))
+endif
# this test fails 50% of the time on the mac jenkins buildbots
ifeq ($(ENABLE_JAVA),TRUE)
diff --git a/sc/Module_sc.mk b/sc/Module_sc.mk
index 4a5d7055db29..e25367cfc146 100644
--- a/sc/Module_sc.mk
+++ b/sc/Module_sc.mk
@@ -37,6 +37,7 @@ $(eval $(call gb_Module_add_targets,sc,\
endif
ifneq ($(OS),iOS)
+ifneq ($(filter SCRIPTING,$(BUILD_TYPE)),)
$(eval $(call gb_Module_add_check_targets,sc,\
Library_scqahelper \
$(if $(and $(filter $(COM),MSC),$(MERGELIBS)),, \
@@ -58,6 +59,7 @@ $(eval $(call gb_Module_add_check_targets,sc,\
CppunitTest_sc_cache_test \
CppunitTest_sc_shapetest \
))
+endif
ifneq ($(DISABLE_GUI),TRUE)
ifeq ($(OS),LINUX)
diff --git a/sccomp/Module_sccomp.mk b/sccomp/Module_sccomp.mk
index 8babadc3e41e..e211ee26f958 100644
--- a/sccomp/Module_sccomp.mk
+++ b/sccomp/Module_sccomp.mk
@@ -29,7 +29,7 @@ $(eval $(call gb_Module_add_l10n_targets,sccomp,\
$(eval $(call gb_Module_add_check_targets,sccomp,\
CppunitTest_sccomp_solver \
- $(if $(and $(filter INTEL,$(CPUNAME)),$(filter
-fsanitize=%,$(gb_CXX))),,CppunitTest_sccomp_swarmsolvertest) \
+ $(if $(and $(filter INTEL,$(CPUNAME)),$(filter
-fsanitize=%,$(gb_CXX))),,$(if $(filter
SCRIPTING,$(BUILD_TYPE)),CppunitTest_sccomp_swarmsolvertest)) \
))
# vim: set noet sw=4 ts=4:
diff --git a/scripting/Module_scripting.mk b/scripting/Module_scripting.mk
index 1d603d585a11..1d974e8e7c26 100644
--- a/scripting/Module_scripting.mk
+++ b/scripting/Module_scripting.mk
@@ -31,7 +31,7 @@ $(eval $(call gb_Module_add_targets,scripting,\
$(if $(ENABLE_SCRIPTING_BEANSHELL),Package_ScriptsBeanShell) \
$(if $(ENABLE_SCRIPTING_JAVASCRIPT),Package_ScriptsJavaScript) \
) \
- $(if $(DISABLE_SCRIPTING),,Package_scriptbindinglib) \
+ Package_scriptbindinglib \
$(if $(DISABLE_PYTHON),,\
Package_scriptproviderforpython \
Package_ScriptsPython \
diff --git a/unotest/source/cpp/bootstrapfixturebase.cxx
b/unotest/source/cpp/bootstrapfixturebase.cxx
index aec7d4f820dd..dd92d3822f90 100644
--- a/unotest/source/cpp/bootstrapfixturebase.cxx
+++ b/unotest/source/cpp/bootstrapfixturebase.cxx
@@ -8,11 +8,13 @@
*/
#include <sal/config.h>
+#include <config_features.h>
#include <unotest/bootstrapfixturebase.hxx>
#include <comphelper/processfactory.hxx>
+#if HAVE_FEATURE_SCRIPTING
#include <basic/sbstar.hxx>
-#include <config_features.h>
+#endif
using namespace ::com::sun::star;
