diff options
105 files changed, 240 insertions, 220 deletions
diff --git a/Library_merged.mk b/Library_merged.mk index 26dbb5c0c071..1e961111f30c 100644 --- a/Library_merged.mk +++ b/Library_merged.mk @@ -20,7 +20,7 @@ $(eval $(call gb_Library_use_libraries,merged,\ cppu \ cppuhelper \ i18nlangtag \ - $(if $(filter TRUE,$(SOLAR_JAVA)), \ + $(if $(ENABLE_JAVA), \ jvmaccess \ jvmfwk) \ sal \ diff --git a/Repository.mk b/Repository.mk index 398396e83009..ba0f2912a066 100644 --- a/Repository.mk +++ b/Repository.mk @@ -118,7 +118,7 @@ $(eval $(call gb_Helper_register_executables,OOO, \ )) $(eval $(call gb_Helper_register_executables_for_install,UREBIN,ure,\ - $(if $(and $(SOLAR_JAVA),$(filter-out MACOSX WNT,$(OS)),$(filter DESKTOP,$(BUILD_TYPE))),javaldx) \ + $(if $(and $(ENABLE_JAVA),$(filter-out MACOSX WNT,$(OS)),$(filter DESKTOP,$(BUILD_TYPE))),javaldx) \ regmerge \ regview \ $(if $(filter DESKTOP,$(BUILD_TYPE)),uno) \ @@ -282,7 +282,7 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \ ira \ itg \ iti \ - $(if $(SOLAR_JAVA),jdbc) \ + $(if $(ENABLE_JAVA),jdbc) \ $(if $(ENABLE_KAB),kab1) \ $(if $(ENABLE_KAB),kabdrv1) \ ldapbe2 \ @@ -438,16 +438,16 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_NONE, \ $(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_URE,ure, \ affine_uno \ - $(if $(SOLAR_JAVA),java_uno) \ - $(if $(SOLAR_JAVA),juh) \ - $(if $(SOLAR_JAVA),juhx) \ - $(if $(SOLAR_JAVA),jvmaccess) \ - $(if $(SOLAR_JAVA),jvmfwk) \ + $(if $(ENABLE_JAVA),java_uno) \ + $(if $(ENABLE_JAVA),juh) \ + $(if $(ENABLE_JAVA),juhx) \ + $(if $(ENABLE_JAVA),jvmaccess) \ + $(if $(ENABLE_JAVA),jvmfwk) \ log_uno \ reg \ sal_textenc \ store \ - $(if $(SOLAR_JAVA),sunjavaplugin) \ + $(if $(ENABLE_JAVA),sunjavaplugin) \ unoidl \ unsafe_uno \ $(if $(URELIBS),urelibs) \ @@ -463,8 +463,8 @@ $(eval $(call gb_Helper_register_libraries_for_install,UNOLIBS_URE,ure, \ introspection \ invocadapt \ invocation \ - $(if $(SOLAR_JAVA),javaloader) \ - $(if $(SOLAR_JAVA),javavm) \ + $(if $(ENABLE_JAVA),javaloader) \ + $(if $(ENABLE_JAVA),javavm) \ namingservice \ proxyfac \ reflection \ @@ -498,7 +498,7 @@ $(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooo, \ dict_zh \ embobj \ fileacc \ - $(if $(SOLAR_JAVA),hsqldb) \ + $(if $(ENABLE_JAVA),hsqldb) \ i18nlangtag \ i18nutil \ index_data \ diff --git a/accessibility/Module_accessibility.mk b/accessibility/Module_accessibility.mk index 2e6fa019155c..f6615b8ce1c7 100644 --- a/accessibility/Module_accessibility.mk +++ b/accessibility/Module_accessibility.mk @@ -14,7 +14,7 @@ $(eval $(call gb_Module_add_targets,accessibility,\ Library_acc \ )) -ifneq ($(SOLAR_JAVA),) +ifneq ($(ENABLE_JAVA),) ifeq ($(OS),WNT) $(eval $(call gb_Module_add_targets,accessibility,\ CustomTarget_bridge \ diff --git a/apache-commons/Module_apache-commons.mk b/apache-commons/Module_apache-commons.mk index b58834414147..0361597bd7e4 100644 --- a/apache-commons/Module_apache-commons.mk +++ b/apache-commons/Module_apache-commons.mk @@ -9,7 +9,7 @@ $(eval $(call gb_Module_Module,apache-commons)) -ifneq ($(SOLAR_JAVA),) +ifneq ($(ENABLE_JAVA),) ifneq ($(filter APACHE_COMMONS,$(BUILD_TYPE)),) $(eval $(call gb_Module_add_targets,apache-commons,\ ExternalPackage_apache_commons_logging \ diff --git a/bean/Module_bean.mk b/bean/Module_bean.mk index 3b0debcf7e91..30302083ecf2 100644 --- a/bean/Module_bean.mk +++ b/bean/Module_bean.mk @@ -10,7 +10,7 @@ $(eval $(call gb_Module_Module,bean)) -ifneq ($(SOLAR_JAVA),) +ifneq ($(ENABLE_JAVA),) ifneq ($(OS),MACOSX) ifneq ($(OS),ANDROID) diff --git a/beanshell/Module_beanshell.mk b/beanshell/Module_beanshell.mk index 035529aa4dec..e5f04092c659 100644 --- a/beanshell/Module_beanshell.mk +++ b/beanshell/Module_beanshell.mk @@ -9,7 +9,7 @@ $(eval $(call gb_Module_Module,beanshell)) -ifneq ($(SOLAR_JAVA),) +ifneq ($(ENABLE_JAVA),) ifneq ($(filter BSH,$(BUILD_TYPE)),) $(eval $(call gb_Module_add_targets,beanshell,\ ExternalPackage_beanshell \ diff --git a/bridges/Module_bridges.mk b/bridges/Module_bridges.mk index b71e14277bf1..e5600a63cb82 100644 --- a/bridges/Module_bridges.mk +++ b/bridges/Module_bridges.mk @@ -11,7 +11,7 @@ $(eval $(call gb_Module_Module,bridges)) $(eval $(call gb_Module_add_targets,bridges,\ Library_cpp_uno \ - $(if $(filter TRUE,$(SOLAR_JAVA)),\ + $(if $(ENABLE_JAVA),\ Jar_java_uno \ Library_java_uno \ ) \ diff --git a/config_host.mk.in b/config_host.mk.in index a5452eee690f..a6f6b3d1ffb0 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -128,6 +128,7 @@ export ENABLE_GTK3=@ENABLE_GTK3@ export ENABLE_GTK=@ENABLE_GTK@ export ENABLE_GTK_PRINT=@ENABLE_GTK_PRINT@ export ENABLE_HEADLESS=@ENABLE_HEADLESS@ +export ENABLE_JAVA=@ENABLE_JAVA@ export ENABLE_KAB=@ENABLE_KAB@ export ENABLE_KDE4=@ENABLE_KDE4@ export ENABLE_KDE=@ENABLE_KDE@ @@ -458,7 +459,6 @@ export SOLARINC=@SOLARINC@ export SOLARLIB=@SOLARLIB@ export SOLARVER=@SOLARVER@ export SOLARVERSION=@SOLARVER@ -export SOLAR_JAVA=@SOLAR_JAVA@ export SPLIT_APP_MODULES=@SPLIT_APP_MODULES@ export SPLIT_OPT_FEATURES=@SPLIT_OPT_FEATURES@ export SRCDIR=@SRC_ROOT@ diff --git a/config_host/config_features.h.in b/config_host/config_features.h.in index 7d045df4c43b..1c42ff014a12 100644 --- a/config_host/config_features.h.in +++ b/config_host/config_features.h.in @@ -7,6 +7,14 @@ #ifndef CONFIG_FEATURES_H #define CONFIG_FEATURES_H +/* JAVA + * + * Whether we have support for Java extensions, and use own Java + * functionality). + */ + +#define HAVE_FEATURE_JAVA 0 + /* DESKTOP - Whether we have a "normal" desktop UI or not. * * Non-DESKTOP in practice means touch-based mobile devices, Android diff --git a/configure.ac b/configure.ac index f995a98e32fc..b0514a03d499 100644 --- a/configure.ac +++ b/configure.ac @@ -2439,35 +2439,29 @@ fi AC_SUBST(ENABLE_LTO) dnl =================================================================== -dnl Java support enable +dnl Java support dnl =================================================================== AC_MSG_CHECKING([whether to build with Java support]) if test "$with_java" != "no"; then if test "$DISABLE_SCRIPTING" = TRUE; then AC_MSG_RESULT([no, overridden by --disable-scripting]) - SOLAR_JAVA="" + ENABLE_JAVA="" with_java=no else AC_MSG_RESULT([yes]) - SOLAR_JAVA="TRUE" + ENABLE_JAVA="TRUE" + AC_DEFINE(HAVE_FEATURE_JAVA) fi else AC_MSG_RESULT([no]) - SOLAR_JAVA="" + ENABLE_JAVA="" fi -AC_SUBST(SOLAR_JAVA) +AC_SUBST(ENABLE_JAVA) -dnl SOLAR_JAVA="YES" (yes, silly name, should rename) indicates whether we -dnl want there to be *run-time* (and build-time) support for Java extensions in the -dnl built LibreOffice. +dnl ENABLE_JAVA="TRUE" if we want there to be *run-time* (and build-time) support for Java -dnl SOLAR_JAVA="BUILD" is claimed to indicate build-time only support -dnl (no runtime support). It doesn't seem to ever be set to this -dnl value, though, and everywhere SOLAR_JAVA is only checked for being -dnl empty or non-empty. - -dnl SOLAR_JAVA="" indicate no java support at all +dnl ENABLE_JAVA="" indicate no Java support at all dnl =================================================================== dnl Test the Solaris compiler version @@ -2770,7 +2764,7 @@ if test $_os = Darwin; then if test -z "$MACOSX_CODESIGNING_IDENTITY" -a "$enable_macosx_sandbox" = yes; then AC_MSG_ERROR([OS X sandboxing requires code signing]) - elif test -n "$SOLAR_JAVA" -a "$enable_macosx_sandbox" = yes; then + elif test -n "$ENABLE_JAVA" -a "$enable_macosx_sandbox" = yes; then AC_MSG_ERROR([OS X sandboxing (actually App Store rules) disallows use of Java]) elif test -n "$MACOSX_CODESIGNING_IDENTITY" -a "$enable_macosx_sandbox" = yes; then ENABLE_MACOSX_SANDBOX=YES @@ -6498,7 +6492,7 @@ AC_SUBST(MERGE_MODULES) dnl =================================================================== dnl Checks for Java dnl =================================================================== -if test "$SOLAR_JAVA" != ""; then +if test "$ENABLE_JAVA" != ""; then # Windows-specific tests if test "$build_os" = "cygwin"; then @@ -6584,7 +6578,7 @@ dnl =================================================================== # JAVA_HOME. Whether all the complexity here actually is needed any # more or not, no idea. -if test "$SOLAR_JAVA" != ""; then +if test "$ENABLE_JAVA" != ""; then _gij_longver=0 AC_MSG_CHECKING([the installed JDK]) if test -n "$JAVAINTERPRETER"; then @@ -6650,7 +6644,7 @@ fi dnl =================================================================== dnl Set target Java bytecode version dnl =================================================================== -if test "$SOLAR_JAVA" != ""; then +if test "$ENABLE_JAVA" != ""; then _java_target_ver="1.5" JAVA_SOURCE_VER="$_java_target_ver" @@ -6660,7 +6654,7 @@ fi dnl =================================================================== dnl Checks for javac dnl =================================================================== -if test "$SOLAR_JAVA" != ""; then +if test "$ENABLE_JAVA" != ""; then if test "$JDK" = "gcj"; then javacompiler=`echo $with_java | $SED -e "s/gij/gcj/g" | $SED -e "s/java/javac/g"` else @@ -6698,7 +6692,7 @@ JAVACISGCJ="" dnl =================================================================== dnl Checks that javac is gcj dnl =================================================================== -if test "$SOLAR_JAVA" != ""; then +if test "$ENABLE_JAVA" != ""; then if test `$JAVACOMPILER --version 2>&1 | $GREP -c "GCC"` -gt 0; then JAVACISGCJ="yes" fi @@ -6708,7 +6702,7 @@ AC_SUBST(JAVACISGCJ) dnl =================================================================== dnl Checks for javadoc dnl =================================================================== -if test "$SOLAR_JAVA" != ""; then +if test "$ENABLE_JAVA" != ""; then if test -z "$with_jdk_home"; then AC_PATH_PROG(JAVADOC, javadoc) else @@ -6737,7 +6731,7 @@ if test "$SOLAR_JAVA" != ""; then fi AC_SUBST(JAVADOCISGJDOC) -if test "$SOLAR_JAVA" != ""; then +if test "$ENABLE_JAVA" != ""; then # check if JAVA_HOME was (maybe incorrectly?) set automatically to /usr if test "$JAVA_HOME" = "/usr" -a "x$with_jdk_home" = "x"; then if basename $(readlink $(readlink $JAVACOMPILER)) >/dev/null 2>/dev/null; then @@ -6841,7 +6835,7 @@ fi AWTLIB= -if test "$SOLAR_JAVA" != ""; then +if test "$ENABLE_JAVA" != ""; then AC_MSG_CHECKING([for jawt lib name]) if test "$JDK" = "gcj"; then save_CFLAGS=$CFLAGS @@ -6891,7 +6885,7 @@ if test "$SOLAR_JAVA" != ""; then fi -if test -n "$SOLAR_JAVA" -a \( -z "$JAVALIB" -o -z "$JAVAINC" \); then +if test -n "$ENABLE_JAVA" -a \( -z "$JAVALIB" -o -z "$JAVAINC" \); then # # Determine JAVALIB # If your platform follow the common pattern @@ -7167,7 +7161,7 @@ if test -n "$SOLAR_JAVA" -a \( -z "$JAVALIB" -o -z "$JAVAINC" \); then test -d "$JRE_BASE_DIR/$JAVA_TOOLKIT" && JAVALIB="$JAVALIB -L$JRE_BASE_DIR/$JAVA_TOOLKIT" test -d "$JRE_BASE_DIR/native_thread" && JAVALIB="$JAVALIB -L$JRE_BASE_DIR/native_thread" fi -elif test -z "$SOLAR_JAVA"; then +elif test -z "$ENABLE_JAVA"; then x_JAVALIB=[\#] x_JDKLIB=[\#] fi @@ -11640,7 +11634,7 @@ libo_CHECK_SYSTEM_MODULE([libpng],[LIBPNG],[libpng],["-I${WORKDIR}/UnpackedTarba dnl =================================================================== dnl Check for runtime JVM search path dnl =================================================================== -if test "$SOLAR_JAVA" != ""; then +if test "$ENABLE_JAVA" != ""; then AC_MSG_CHECKING([whether to use specific JVM search path at runtime]) if test -n "$with_jvm_path" -a "$with_jvm_path" != "no"; then AC_MSG_RESULT([yes]) @@ -11661,7 +11655,7 @@ dnl =================================================================== dnl Test for the presence of Ant and that it works dnl =================================================================== -if test "$SOLAR_JAVA" != ""; then +if test "$ENABLE_JAVA" != ""; then ANT_HOME=; export ANT_HOME WITH_ANT_HOME=; export WITH_ANT_HOME if test -z "$with_ant_home"; then @@ -11845,7 +11839,7 @@ EOF fi OOO_JUNIT_JAR= -if test "$SOLAR_JAVA" != "" -a "$with_junit" != "no"; then +if test "$ENABLE_JAVA" != "" -a "$with_junit" != "no"; then AC_MSG_CHECKING([for JUnit 4]) if test "$with_junit" = "yes"; then if test -e /usr/share/java/junit4.jar; then @@ -12478,7 +12472,7 @@ else case "$host_os" in aix*|dragonfly*|freebsd*|linux-gnu*|*netbsd*|openbsd*) - if test "$SOLAR_JAVA" != "" -a "$JDK"!="gcj"; then + if test "$ENABLE_JAVA" != "" -a "$JDK"!="gcj"; then pathmunge "$JAVA_HOME/bin" "after" fi ;; @@ -12498,7 +12492,7 @@ else pathmunge "$COMPATH/bin" "before" pathmunge "$WINDOWS_SDK_HOME/bin/x86" "before" fi - if test "$SOLAR_JAVA" != "" -a "$JDK"!="gcj"; then + if test "$ENABLE_JAVA" != "" -a "$JDK"!="gcj"; then if test -d "$JAVA_HOME/jre/bin/client"; then pathmunge "$JAVA_HOME/jre/bin/client" "before" fi @@ -12511,7 +12505,7 @@ else solaris*) pathmunge "/usr/css/bin" "before" - if test "$SOLAR_JAVA" != "" -a "$JDK"!="gcj"; then + if test "$ENABLE_JAVA" != "" -a "$JDK"!="gcj"; then pathmunge "$JAVA_HOME/bin" "after" fi ;; diff --git a/connectivity/CppunitTest_connectivity_commontools.mk b/connectivity/CppunitTest_connectivity_commontools.mk index 4c2e77ed0bcf..1fbcee4c3cb7 100644 --- a/connectivity/CppunitTest_connectivity_commontools.mk +++ b/connectivity/CppunitTest_connectivity_commontools.mk @@ -45,7 +45,7 @@ $(eval $(call gb_CppunitTest_use_libraries,connectivity_commontools, \ cppu \ cppuhelper \ i18nlangtag \ - $(if $(filter TRUE,$(SOLAR_JAVA)), \ + $(if $(ENABLE_JAVA), \ jvmaccess) \ sal \ salhelper \ diff --git a/connectivity/Library_dbtools.mk b/connectivity/Library_dbtools.mk index dd5718556693..22d58333736f 100644 --- a/connectivity/Library_dbtools.mk +++ b/connectivity/Library_dbtools.mk @@ -31,7 +31,7 @@ $(eval $(call gb_Library_use_libraries,dbtools,\ cppuhelper \ sal \ salhelper \ - $(if $(filter TRUE,$(SOLAR_JAVA)), \ + $(if $(ENABLE_JAVA), \ jvmaccess) \ utl \ tl \ diff --git a/connectivity/Module_connectivity.mk b/connectivity/Module_connectivity.mk index f8fdd0f2277c..4b8e93199aaf 100644 --- a/connectivity/Module_connectivity.mk +++ b/connectivity/Module_connectivity.mk @@ -32,7 +32,7 @@ $(eval $(call gb_Module_add_targets,connectivity,\ Library_sdbc2 \ )) -ifneq ($(SOLAR_JAVA),) +ifneq ($(ENABLE_JAVA),) $(eval $(call gb_Module_add_targets,connectivity,\ Configuration_hsqldb \ Configuration_jdbc \ diff --git a/connectivity/source/commontools/CommonTools.cxx b/connectivity/source/commontools/CommonTools.cxx index 414987ee56b7..85459bcc9c2f 100644 --- a/connectivity/source/commontools/CommonTools.cxx +++ b/connectivity/source/commontools/CommonTools.cxx @@ -17,6 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <config_features.h> #include <stdio.h> #include "connectivity/CommonTools.hxx" @@ -31,7 +32,7 @@ #include "TConnection.hxx" #include <comphelper/types.hxx> #include <com/sun/star/java/JavaVirtualMachine.hpp> -#ifdef SOLAR_JAVA +#if HAVE_FEATURE_JAVA #include <jvmaccess/virtualmachine.hxx> #endif #include <rtl/process.h> @@ -111,7 +112,7 @@ namespace connectivity return ( *pStr == 0 ) && ( *pWild == 0 ); } //------------------------------------------------------------------ -#ifdef SOLAR_JAVA +#if HAVE_FEATURE_JAVA ::rtl::Reference< jvmaccess::VirtualMachine > getJavaVM(const Reference<XComponentContext >& _rxContext) { ::rtl::Reference< jvmaccess::VirtualMachine > aRet; diff --git a/cppu/source/uno/lbenv.cxx b/cppu/source/uno/lbenv.cxx index 27a1027c9a6a..79cec37a3637 100644 --- a/cppu/source/uno/lbenv.cxx +++ b/cppu/source/uno/lbenv.cxx @@ -17,6 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <config_features.h> #include "cppu/EnvDcp.hxx" @@ -1056,7 +1057,7 @@ static bool loadEnv(OUString const & cLibStem, if ( cLibStem == CPPU_CURRENT_LANGUAGE_BINDING_NAME "_uno" ) fpInit = CPPU_ENV_uno_initEnvironment; -#ifdef SOLAR_JAVA +#if HAVE_FEATURE_JAVA else if ( cLibStem == "java_uno" ) fpInit = java_uno_initEnvironment; #endif diff --git a/cppu/source/uno/lbmap.cxx b/cppu/source/uno/lbmap.cxx index 65d47760d6ee..6b8e152b4b53 100644 --- a/cppu/source/uno/lbmap.cxx +++ b/cppu/source/uno/lbmap.cxx @@ -17,6 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <config_features.h> #include "IdentityMapping.hxx" @@ -327,7 +328,7 @@ static uno_ext_getMappingFunc selectMapFunc( const OUString & rBridgeName ) { if (rBridgeName.equalsAscii( CPPU_CURRENT_LANGUAGE_BINDING_NAME "_uno" )) return CPPU_ENV_uno_ext_getMapping; -#ifdef SOLAR_JAVA +#if HAVE_FEATURE_JAVA if (rBridgeName.equalsAscii( "java" "_uno" )) return java_uno_ext_getMapping; #endif diff --git a/cui/Library_cui.mk b/cui/Library_cui.mk index 035eb0d4f2a1..aafede3945e6 100644 --- a/cui/Library_cui.mk +++ b/cui/Library_cui.mk @@ -41,7 +41,7 @@ $(eval $(call gb_Library_use_libraries,cui,\ drawinglayer \ editeng \ i18nlangtag \ - $(if $(filter TRUE,$(SOLAR_JAVA)), \ + $(if $(ENABLE_JAVA), \ jvmfwk) \ lng \ sal \ diff --git a/cui/source/options/optjava.cxx b/cui/source/options/optjava.cxx index 8d5248e5ac34..ea8c391c15de 100644 --- a/cui/source/options/optjava.cxx +++ b/cui/source/options/optjava.cxx @@ -17,6 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <config_features.h> + #include "optjava.hxx" #include <dialmgr.hxx> @@ -43,7 +45,7 @@ #include <com/sun/star/ui/dialogs/TemplateDescription.hpp> #include <com/sun/star/ui/dialogs/FolderPicker.hpp> #include <com/sun/star/ucb/XContentProvider.hpp> -#ifdef SOLAR_JAVA +#if HAVE_FEATURE_JAVA #include <jvmfwk/framework.h> #endif @@ -131,7 +133,7 @@ SvxJavaOptionsPage::SvxJavaOptionsPage( Window* pParent, const SfxItemSet& rSet : SfxTabPage(pParent, "OptAdvancedPage", "cui/ui/optadvancedpage.ui", rSet) , m_pParamDlg(NULL) , m_pPathDlg(NULL) -#ifdef SOLAR_JAVA +#if HAVE_FEATURE_JAVA , m_parJavaInfo(NULL) , m_parParameters(NULL) , m_pClassPath(NULL) @@ -184,7 +186,7 @@ SvxJavaOptionsPage::SvxJavaOptionsPage( Window* pParent, const SfxItemSet& rSet xDialogListener->SetDialogClosedLink( LINK( this, SvxJavaOptionsPage, DialogClosedHdl ) ); EnableHdl_Impl(m_pJavaEnableCB); -#ifdef SOLAR_JAVA +#if HAVE_FEATURE_JAVA jfw_lock(); #else get<Window>("javaframe")->Disable(); @@ -199,7 +201,7 @@ SvxJavaOptionsPage::~SvxJavaOptionsPage() delete m_pParamDlg; delete m_pPathDlg; ClearJavaInfo(); -#ifdef SOLAR_JAVA +#if HAVE_FEATURE_JAVA std::vector< JavaInfo* >::iterator pIter; for ( pIter = m_aAddedInfos.begin(); pIter != m_aAddedInfos.end(); ++pIter ) { @@ -279,7 +281,7 @@ IMPL_LINK_NOARG(SvxJavaOptionsPage, AddHdl_Impl) IMPL_LINK_NOARG(SvxJavaOptionsPage, ParameterHdl_Impl) { -#ifdef SOLAR_JAVA +#if HAVE_FEATURE_JAVA Sequence< OUString > aParameterList; if ( !m_pParamDlg ) { @@ -328,7 +330,7 @@ IMPL_LINK_NOARG(SvxJavaOptionsPage, ParameterHdl_Impl) IMPL_LINK_NOARG(SvxJavaOptionsPage, ClassPathHdl_Impl) { -#ifdef SOLAR_JAVA +#if HAVE_FEATURE_JAVA String sClassPath; if ( !m_pPathDlg ) @@ -414,7 +416,7 @@ IMPL_LINK( SvxJavaOptionsPage, DialogClosedHdl, DialogClosedEvent*, pEvt ) void SvxJavaOptionsPage::ClearJavaInfo() { -#ifdef SOLAR_JAVA +#if HAVE_FEATURE_JAVA if ( m_parJavaInfo ) { JavaInfo** parInfo = m_parJavaInfo; @@ -449,7 +451,7 @@ void SvxJavaOptionsPage::ClearJavaList() void SvxJavaOptionsPage::LoadJREs() { -#ifdef SOLAR_JAVA +#if HAVE_FEATURE_JAVA WaitObject aWaitObj(m_pJavaList); javaFrameworkError eErr = jfw_findAllJREs( &m_parJavaInfo, &m_nInfoSize ); if ( JFW_E_NONE == eErr && m_parJavaInfo ) @@ -495,7 +497,7 @@ void SvxJavaOptionsPage::LoadJREs() void SvxJavaOptionsPage::AddJRE( JavaInfo* _pInfo ) { -#ifdef SOLAR_JAVA +#if HAVE_FEATURE_JAVA OUStringBuffer sEntry; sEntry.append('\t'); sEntry.append(_pInfo->sVendor); @@ -539,7 +541,7 @@ void SvxJavaOptionsPage::HandleCheckEntry( SvTreeListEntry* _pEntry ) void SvxJavaOptionsPage::AddFolder( const OUString& _rFolder ) { -#ifdef SOLAR_JAVA +#if HAVE_FEATURE_JAVA bool bStartAgain = true; JavaInfo* pInfo = NULL; javaFrameworkError eErr = jfw_getJavaInfoByPath( _rFolder.pData, &pInfo ); @@ -649,7 +651,7 @@ sal_Bool SvxJavaOptionsPage::FillItemSet( SfxItemSet& /*rCoreSet*/ ) bModified = sal_True; } -#ifdef SOLAR_JAVA +#if HAVE_FEATURE_JAVA javaFrameworkError eErr = JFW_E_NONE; if ( m_pParamDlg ) { @@ -745,7 +747,7 @@ void SvxJavaOptionsPage::Reset( const SfxItemSet& /*rSet*/ ) SvtMiscOptions aMiscOpt; -#ifdef SOLAR_JAVA +#if HAVE_FEATURE_JAVA sal_Bool bEnabled = sal_False; javaFrameworkError eErr = jfw_getEnabled( &bEnabled ); if ( eErr != JFW_E_NONE ) diff --git a/cui/source/options/optjava.hxx b/cui/source/options/optjava.hxx index 11c5424fd033..7509082eda2f 100644 --- a/cui/source/options/optjava.hxx +++ b/cui/source/options/optjava.hxx @@ -19,6 +19,8 @@ #ifndef _SVX_OPTJAVA_HXX #define _SVX_OPTJAVA_HXX +#include <config_features.h> + #include <vector> #include <ucbhelper/content.hxx> #include <vcl/button.hxx> @@ -33,7 +35,7 @@ // forward --------------------------------------------------------------- -#ifdef SOLAR_JAVA +#if HAVE_FEATURE_JAVA typedef struct _JavaInfo JavaInfo; #else typedef void* JavaInfo; @@ -59,7 +61,7 @@ private: SvxJavaParameterDlg* m_pParamDlg; SvxJavaClassPathDlg* m_pPathDlg; -#ifdef SOLAR_JAVA +#if HAVE_FEATURE_JAVA JavaInfo** m_parJavaInfo; rtl_uString** m_parParameters; rtl_uString* m_pClassPath; diff --git a/dbaccess/source/filter/xml/xmlfilter.cxx b/dbaccess/source/filter/xml/xmlfilter.cxx index 3460427a7a45..915d597c7d47 100644 --- a/dbaccess/source/filter/xml/xmlfilter.cxx +++ b/dbaccess/source/filter/xml/xmlfilter.cxx @@ -17,12 +17,13 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <config_features.h> #include <com/sun/star/util/MeasureUnit.hpp> #include <com/sun/star/packages/zip/ZipIOException.hpp> #include <com/sun/star/embed/ElementModes.hpp> #include <com/sun/star/sdb/XOfficeDatabaseDocument.hpp> -#ifdef SOLAR_JAVA +#if HAVE_FEATURE_JAVA #include <jvmaccess/virtualmachine.hxx> #endif #include "xmlfilter.hxx" @@ -105,7 +106,7 @@ namespace dbaxml { if ( m_eWhat == E_JAVA ) { -#ifdef SOLAR_JAVA +#if HAVE_FEATURE_JAVA static bool s_bFirstTime = true; if ( s_bFirstTime ) { @@ -190,7 +191,7 @@ namespace dbaxml if ( m_aTypeCollection.needsJVM(sURL) ) { -#ifdef SOLAR_JAVA +#if HAVE_FEATURE_JAVA pCreatorThread = new FastLoader(m_xContext, FastLoader::E_JAVA); #endif } diff --git a/dbaccess/source/ui/dlg/ConnectionPage.cxx b/dbaccess/source/ui/dlg/ConnectionPage.cxx index 77504d9d3d03..0f679b908027 100644 --- a/dbaccess/source/ui/dlg/ConnectionPage.cxx +++ b/dbaccess/source/ui/dlg/ConnectionPage.cxx @@ -17,12 +17,13 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <config_features.h> #include "ConnectionPage.hxx" #include "ConnectionPage.hrc" #include "dbu_dlg.hrc" #include "dsmeta.hxx" -#ifdef SOLAR_JAVA +#if HAVE_FEATURE_JAVA #include <jvmaccess/virtualmachine.hxx> #endif #include <svl/itemset.hxx> @@ -317,7 +318,7 @@ namespace dbaui { OSL_ENSURE(m_pAdminDialog,"No Admin dialog set! ->GPF"); sal_Bool bSuccess = sal_False; -#ifdef SOLAR_JAVA +#if HAVE_FEATURE_JAVA try { if ( !m_aJavaDriver.GetText().isEmpty() ) diff --git a/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx b/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx index d46a3504bb8d..6564699e3cf8 100644 --- a/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx +++ b/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx @@ -17,6 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <config_features.h> + #include "DBSetupConnectionPages.hxx" #include "sqlmessage.hxx" #include "dbu_resource.hrc" @@ -33,7 +35,7 @@ #include <vcl/msgbox.hxx> #include <vcl/mnemonic.hxx> #include <svl/cjkoptions.hxx> -#ifdef SOLAR_JAVA +#if HAVE_FEATURE_JAVA #include <jvmaccess/virtualmachine.hxx> #endif #include <connectivity/CommonTools.hxx> @@ -554,7 +556,7 @@ DBG_NAME(OMySQLIntroPageSetup) OSL_ENSURE(m_pAdminDialog,"No Admin dialog set! ->GPF"); sal_Bool bSuccess = sal_False; -#ifdef SOLAR_JAVA +#if HAVE_FEATURE_JAVA try { if ( !m_aETDriverClass.GetText().isEmpty() ) @@ -675,7 +677,7 @@ DBG_NAME(OMySQLIntroPageSetup) { OSL_ENSURE(m_pAdminDialog,"No Admin dialog set! ->GPF"); sal_Bool bSuccess = sal_False; -#ifdef SOLAR_JAVA +#if HAVE_FEATURE_JAVA try { if ( !m_aETDriverClass.GetText().isEmpty() ) diff --git a/dbaccess/source/ui/dlg/TextConnectionHelper.cxx b/dbaccess/source/ui/dlg/TextConnectionHelper.cxx index 05b6bd961bce..8010d06f3852 100644 --- a/dbaccess/source/ui/dlg/TextConnectionHelper.cxx +++ b/dbaccess/source/ui/dlg/TextConnectionHelper.cxx @@ -17,6 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <config_features.h> + #include "moduledbu.hxx" #include "TextConnectionHelper.hxx" #include "sqlmessage.hxx" @@ -34,7 +36,7 @@ #include <vcl/msgbox.hxx> #include <vcl/mnemonic.hxx> #include <svl/cjkoptions.hxx> -#ifdef SOLAR_JAVA +#if HAVE_FEATURE_JAVA #include <jvmaccess/virtualmachine.hxx> #endif #include <connectivity/CommonTools.hxx> diff --git a/dbaccess/source/ui/dlg/detailpages.cxx b/dbaccess/source/ui/dlg/detailpages.cxx index b396360b702d..c822b6de009e 100644 --- a/dbaccess/source/ui/dlg/detailpages.cxx +++ b/dbaccess/source/ui/dlg/detailpages.cxx @@ -17,6 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <config_features.h> #include "detailpages.hxx" #include "sqlmessage.hxx" @@ -39,7 +40,7 @@ #include <vcl/msgbox.hxx> #include <vcl/mnemonic.hxx> #include <svl/cjkoptions.hxx> -#ifdef SOLAR_JAVA +#if HAVE_FEATURE_JAVA #include <jvmaccess/virtualmachine.hxx> #endif #include <connectivity/CommonTools.hxx> @@ -624,7 +625,7 @@ namespace dbaui OSL_ENSURE(m_bUseClass,"Who called me?"); sal_Bool bSuccess = sal_False; -#ifdef SOLAR_JAVA +#if HAVE_FEATURE_JAVA try { if ( !m_aEDDriverClass.GetText().isEmpty() ) diff --git a/desktop/Library_migrationoo2.mk b/desktop/Library_migrationoo2.mk index c13485998d2f..e6ea8cf597d0 100644 --- a/desktop/Library_migrationoo2.mk +++ b/desktop/Library_migrationoo2.mk @@ -17,7 +17,7 @@ $(eval $(call gb_Library_use_libraries,migrationoo2,\ cppu \ cppuhelper \ i18nlangtag \ - $(if $(filter TRUE,$(SOLAR_JAVA)), \ + $(if $(ENABLE_JAVA), \ jvmfwk) \ sal \ tl \ @@ -30,7 +30,7 @@ $(eval $(call gb_Library_set_componentfile,migrationoo2,desktop/source/migration $(eval $(call gb_Library_add_exception_objects,migrationoo2,\ desktop/source/migration/services/basicmigration \ desktop/source/migration/services/cexports \ - $(if $(filter TRUE,$(SOLAR_JAVA)), \ + $(if $(ENABLE_JAVA), \ desktop/source/migration/services/jvmfwk) \ desktop/source/migration/services/wordbookmigration \ )) diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx index c11909f9edd9..d75b35238b49 100644 --- a/desktop/source/app/app.cxx +++ b/desktop/source/app/app.cxx @@ -1689,7 +1689,7 @@ int Desktop::Main() try { -#ifdef SOLAR_JAVA +#if HAVE_FEATURE_JAVA // The JavaContext contains an interaction handler which is used when // the creation of a Java Virtual Machine fails com::sun::star::uno::ContextLayer layer2( diff --git a/desktop/source/app/desktopcontext.cxx b/desktop/source/app/desktopcontext.cxx index 63ff6e1acd85..912314bbd3ec 100644 --- a/desktop/source/app/desktopcontext.cxx +++ b/desktop/source/app/desktopcontext.cxx @@ -17,6 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <config_features.h> + #include "desktopcontext.hxx" #include <vcl/svapp.hxx> @@ -40,7 +42,7 @@ Any SAL_CALL DesktopContext::getValueByName( const OUString& Name) throw (Runtim if ( Name == JAVA_INTERACTION_HANDLER_NAME ) { -#ifdef SOLAR_JAVA +#if HAVE_FEATURE_JAVA retVal = makeAny( Reference< XInteractionHandler >( new svt::JavaInteractionHandler()) ); #endif } diff --git a/desktop/test/deployment/active/makefile.mk b/desktop/test/deployment/active/makefile.mk index 1c4fbbaaa7d9..baa79381e371 100644 --- a/desktop/test/deployment/active/makefile.mk +++ b/desktop/test/deployment/active/makefile.mk @@ -41,7 +41,7 @@ DEF1NAME = $(SHL1TARGET) .INCLUDE: target.mk -.IF "$(SOLAR_JAVA)" != "" +.IF "$(ENABLE_JAVA)" != "" ALLTAR : $(MISC)/active.oxt diff --git a/desktop/unx/source/start.c b/desktop/unx/source/start.c index a488f955a319..645cae6844b0 100644 --- a/desktop/unx/source/start.c +++ b/desktop/unx/source/start.c @@ -6,6 +6,9 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ + +#include <config_features.h> + #include <signal.h> #include <unistd.h> #include <limits.h> @@ -636,7 +639,7 @@ exec_pagein (Args *args) free (argv[1]); } -#if defined SOLAR_JAVA +#if HAVE_FEATURE_JAVA static void extend_library_path (const char *new_element) { @@ -868,7 +871,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS( argc, argv ) exec_pagein (args); /* javaldx */ -#ifdef SOLAR_JAVA +#if HAVE_FEATURE_JAVA if (!args->bInhibitJavaLdx) exec_javaldx (args); #endif diff --git a/extensions/Library_pl.mk b/extensions/Library_pl.mk index 102217a50fe2..040a47a32989 100644 --- a/extensions/Library_pl.mk +++ b/extensions/Library_pl.mk @@ -25,12 +25,12 @@ $(eval $(call gb_Library_set_include,pl,\ $(eval $(call gb_Library_use_sdk_api,pl)) -ifeq ($(SOLAR_JAVA),TRUE) +ifeq ($(ENABLE_JAVA),TRUE) $(eval $(call gb_Library_add_defs,pl,\ -DOJI \ )) -endif # SOLAR_JAVA=YES +endif # ENABLE_JAVA=YES ifeq ($(SYSTEM_MOZILLA),YES) $(eval $(call gb_Library_add_defs,pl,\ diff --git a/extensions/StaticLibrary_plugcon.mk b/extensions/StaticLibrary_plugcon.mk index 13d2c057ff30..3547593841e8 100644 --- a/extensions/StaticLibrary_plugcon.mk +++ b/extensions/StaticLibrary_plugcon.mk @@ -29,12 +29,12 @@ $(eval $(call gb_StaticLibrary_use_api,plugcon,\ udkapi \ )) -ifeq ($(SOLAR_JAVA),TRUE) +ifeq ($(ENABLE_JAVA),TRUE) $(eval $(call gb_StaticLibrary_add_defs,plugcon,\ -DOJI \ )) -endif # SOLAR_JAVA=YES +endif # ENABLE_JAVA=YES ifeq ($(SYSTEM_MOZILLA),YES) $(eval $(call gb_StaticLibrary_add_defs,plugcon,\ diff --git a/hsqldb/Module_hsqldb.mk b/hsqldb/Module_hsqldb.mk index 87726211f514..7bf4da1bc68a 100644 --- a/hsqldb/Module_hsqldb.mk +++ b/hsqldb/Module_hsqldb.mk @@ -9,7 +9,7 @@ $(eval $(call gb_Module_Module,hsqldb)) -ifneq ($(SOLAR_JAVA),) +ifneq ($(ENABLE_JAVA),) $(eval $(call gb_Module_add_targets,hsqldb,\ ExternalPackage_hsqldb \ ExternalProject_hsqldb \ diff --git a/include/connectivity/CommonTools.hxx b/include/connectivity/CommonTools.hxx index 294ec3f0a3a8..46ced87c8931 100644 --- a/include/connectivity/CommonTools.hxx +++ b/include/connectivity/CommonTools.hxx @@ -19,6 +19,8 @@ #ifndef _CONNECTIVITY_COMMONTOOLS_HXX_ #define _CONNECTIVITY_COMMONTOOLS_HXX_ +#include <config_features.h> + #include <rtl/ref.hxx> #include <rtl/ustring.hxx> #include <com/sun/star/lang/DisposedException.hpp> @@ -41,7 +43,7 @@ namespace com { namespace sun { namespace star { namespace util { } }}} -#ifdef SOLAR_JAVA +#if HAVE_FEATURE_JAVA namespace jvmaccess { class VirtualMachine; } #endif @@ -155,7 +157,7 @@ namespace connectivity OOO_DLLPUBLIC_DBTOOLS void checkDisposed(sal_Bool _bThrow) throw ( ::com::sun::star::lang::DisposedException ); -#ifdef SOLAR_JAVA +#if HAVE_FEATURE_JAVA /** creates a java virtual machine @param _rxContext The ORB. diff --git a/include/uno/environment.h b/include/uno/environment.h index e76ed2fc7ba6..35933ef956f5 100644 --- a/include/uno/environment.h +++ b/include/uno/environment.h @@ -261,12 +261,11 @@ typedef void (SAL_CALL * uno_initEnvironmentFunc)( uno_Environment * pEnv ); /* We link statically and have just the C++ environment */ void SAL_CALL CPPU_ENV_uno_initEnvironment( uno_Environment * Env ) SAL_THROW_EXTERN_C(); -#ifdef SOLAR_JAVA -/* We also have the Java environment */ + +/* We might also have the Java environment */ void SAL_CALL java_uno_initEnvironment( uno_Environment * Env ) SAL_THROW_EXTERN_C(); #endif -#endif /** Gets a specific environment. If the specified environment does not exist, then a default one is created and registered. The environment revokes itself on last release() call. diff --git a/include/uno/mapping.h b/include/uno/mapping.h index 179f41f869c9..fd6c4527c058 100644 --- a/include/uno/mapping.h +++ b/include/uno/mapping.h @@ -194,14 +194,12 @@ void SAL_CALL CPPU_ENV_uno_ext_getMapping( struct _uno_Environment * pTo ) SAL_THROW_EXTERN_C(); -#ifdef SOLAR_JAVA /* This is the uno_ext_getMapping function in the Java/UNO bridge */ void SAL_CALL java_uno_ext_getMapping( struct _uno_Mapping ** ppMapping, struct _uno_Environment * pFrom, struct _uno_Environment * pTo ) SAL_THROW_EXTERN_C(); -#endif #endif diff --git a/instsetoo_native/Package_rdb.mk b/instsetoo_native/Package_rdb.mk index 6bbfd3b1dc28..44c7bddc9b7a 100644 --- a/instsetoo_native/Package_rdb.mk +++ b/instsetoo_native/Package_rdb.mk @@ -15,7 +15,7 @@ $(eval $(call gb_Package_add_files,instsetoo_native_rdb,$(gb_PROGRAMDIRNAME)/ser xml/services.rdb \ $(call gb_Helper_optional,POSTGRESQL,$(if $(filter YES,$(BUILD_POSTGRESQL_SDBC)),xml/postgresql-sdbc.rdb)) \ $(if $(filter TRUE,$(DISABLE_SCRIPTING)),,\ - $(if $(SOLAR_JAVA),\ + $(if $(ENABLE_JAVA),\ $(if $(filter $(ENABLE_SCRIPTING_BEANSHELL),YES),xml/scriptproviderforbeanshell.rdb) \ $(if $(filter $(ENABLE_SCRIPTING_JAVASCRIPT),YES),xml/scriptproviderforjavascript.rdb) \ ) \ diff --git a/javaunohelper/Module_javaunohelper.mk b/javaunohelper/Module_javaunohelper.mk index 0f6e812dea19..8c74dbe1b963 100644 --- a/javaunohelper/Module_javaunohelper.mk +++ b/javaunohelper/Module_javaunohelper.mk @@ -9,7 +9,7 @@ $(eval $(call gb_Module_Module,javaunohelper)) -ifneq ($(SOLAR_JAVA),) +ifneq ($(ENABLE_JAVA),) $(eval $(call gb_Module_add_targets,javaunohelper,\ Library_juh \ diff --git a/jfreereport/Module_jfreereport.mk b/jfreereport/Module_jfreereport.mk index 4390ad00117e..f2a40f91c15a 100644 --- a/jfreereport/Module_jfreereport.mk +++ b/jfreereport/Module_jfreereport.mk @@ -9,7 +9,7 @@ $(eval $(call gb_Module_Module,jfreereport)) -ifneq ($(SOLAR_JAVA),) +ifneq ($(ENABLE_JAVA),) ifneq ($(filter JFREEREPORT,$(BUILD_TYPE)),) $(eval $(call gb_Module_add_targets,jfreereport,\ ExternalPackage_jfreereport_flow_engine \ diff --git a/jurt/Module_jurt.mk b/jurt/Module_jurt.mk index 86f560cc4234..92b870fa882c 100644 --- a/jurt/Module_jurt.mk +++ b/jurt/Module_jurt.mk @@ -9,7 +9,7 @@ $(eval $(call gb_Module_Module,jurt)) -ifneq ($(SOLAR_JAVA),) +ifneq ($(ENABLE_JAVA),) $(eval $(call gb_Module_add_targets,jurt,\ Jar_jurt \ diff --git a/jvmaccess/Module_jvmaccess.mk b/jvmaccess/Module_jvmaccess.mk index 67e18f65e3b1..f0a1705a8bdd 100644 --- a/jvmaccess/Module_jvmaccess.mk +++ b/jvmaccess/Module_jvmaccess.mk @@ -9,7 +9,7 @@ $(eval $(call gb_Module_Module,jvmaccess)) -ifeq ($(SOLAR_JAVA),TRUE) +ifeq ($(ENABLE_JAVA),TRUE) $(eval $(call gb_Module_add_targets,jvmaccess,\ )) diff --git a/jvmfwk/Module_jvmfwk.mk b/jvmfwk/Module_jvmfwk.mk index 75fdc3f0371f..511448701794 100644 --- a/jvmfwk/Module_jvmfwk.mk +++ b/jvmfwk/Module_jvmfwk.mk @@ -9,7 +9,7 @@ $(eval $(call gb_Module_Module,jvmfwk)) -ifeq ($(SOLAR_JAVA),TRUE) +ifeq ($(ENABLE_JAVA),TRUE) $(eval $(call gb_Module_add_targets,jvmfwk,\ Library_jvmfwk \ diff --git a/languagetool/Module_languagetool.mk b/languagetool/Module_languagetool.mk index f869d493baaf..bc430c0368dd 100644 --- a/languagetool/Module_languagetool.mk +++ b/languagetool/Module_languagetool.mk @@ -9,7 +9,7 @@ $(eval $(call gb_Module_Module,languagetool)) -ifneq ($(SOLAR_JAVA),) +ifneq ($(ENABLE_JAVA),) ifneq ($(filter LANGUAGETOOL,$(BUILD_TYPE)),) $(eval $(call gb_Module_add_targets,languagetool,\ ExternalProject_languagetool \ diff --git a/nlpsolver/Module_nlpsolver.mk b/nlpsolver/Module_nlpsolver.mk index 130c40f6d7f9..6cb9e821bd8c 100644 --- a/nlpsolver/Module_nlpsolver.mk +++ b/nlpsolver/Module_nlpsolver.mk @@ -19,7 +19,7 @@ $(eval $(call gb_Module_Module,nlpsolver)) -ifeq ($(SOLAR_JAVA),TRUE) +ifeq ($(ENABLE_JAVA),TRUE) $(eval $(call gb_Module_add_targets,nlpsolver,\ Jar_EvolutionarySolver \ Jar_nlpsolver \ diff --git a/odk/CustomTarget_check.mk b/odk/CustomTarget_check.mk index 1ea17a1c8ec5..ab6573e8bedb 100644 --- a/odk/CustomTarget_check.mk +++ b/odk/CustomTarget_check.mk @@ -37,13 +37,13 @@ $(call gb_CustomTarget_get_workdir,odk/check)/checkbin : \ ) \ $(call gb_Package_get_target,odk_docs) \ $(call gb_Package_get_target,odk_html) \ - $(if $(SOLAR_JAVA),$(call gb_Package_get_target,odk_javadoc)) \ + $(if $(ENABLE_JAVA),$(call gb_Package_get_target,odk_javadoc)) \ $(call gb_Package_get_target,odk_lib) \ $(if $(filter MACOSX,$(OS)),$(call gb_Package_get_target,odk_macosx)) \ $(call gb_Package_get_target,odk_settings) \ $(call gb_Package_get_target,odk_settings_generated) \ $(call gb_Package_get_target,odk_uno_loader_classes) \ - $(if $(SOLAR_JAVA),$(call gb_Package_get_target,odk_unowinreg)) + $(if $(ENABLE_JAVA),$(call gb_Package_get_target,odk_unowinreg)) $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),CHK,1) $(call gb_Helper_print_on_error,\ $(PERL) $< \ diff --git a/odk/CustomTarget_html.mk b/odk/CustomTarget_html.mk index a00bb2a14517..bcbf954a8fe2 100644 --- a/odk/CustomTarget_html.mk +++ b/odk/CustomTarget_html.mk @@ -23,8 +23,8 @@ $(call gb_CustomTarget_get_workdir,odk/html)/%.html : $(SRCDIR)/odk/%.html -e 's|%DOXYGEN_PREFIX0%|$(if $(DOXYGEN),.,http://api.libreoffice.org)|g' \ -e 's|%DOXYGEN_PREFIX1%|$(if $(DOXYGEN),..,http://api.libreoffice.org)|g' \ -e 's|%DOXYGEN_PREFIX2%|$(if $(DOXYGEN),../..,http://api.libreoffice.org)|g' \ - -e 's|%JAVADOC_PREFIX0%|$(if $(SOLAR_JAVA),.,http://api.libreoffice.org)|g' \ - -e 's|%JAVADOC_PREFIX1%|$(if $(SOLAR_JAVA),..,http://api.libreoffice.org)|g' \ + -e 's|%JAVADOC_PREFIX0%|$(if $(ENABLE_JAVA),.,http://api.libreoffice.org)|g' \ + -e 's|%JAVADOC_PREFIX1%|$(if $(ENABLE_JAVA),..,http://api.libreoffice.org)|g' \ < $< > $@ # vim: set noet sw=4 ts=4: diff --git a/odk/Module_odk.mk b/odk/Module_odk.mk index 6b35409746c5..6908f2c05eaa 100644 --- a/odk/Module_odk.mk +++ b/odk/Module_odk.mk @@ -48,7 +48,7 @@ $(eval $(call gb_Module_add_targets,odk,\ )) endif -ifneq ($(SOLAR_JAVA),) +ifneq ($(ENABLE_JAVA),) $(eval $(call gb_Module_add_targets,odk,\ $(if $(filter YESGCC,$(BUILD_UNOWINREG)$(COM)),CustomTarget_unowinreg) \ CustomTarget_classes \ diff --git a/odk/util/check.pl b/odk/util/check.pl index 0cab1118e678..31c857a66f6b 100644 --- a/odk/util/check.pl +++ b/odk/util/check.pl @@ -190,7 +190,7 @@ if (-d "$SdkDir") { #check java docu, it is only a first and simple check # improvement required - my $solar_java = $ENV{"SOLAR_JAVA"}; + my $solar_java = $ENV{"ENABLE_JAVA"}; my $JDK = $ENV{"JDK"}; if (defined($solar_java) && $solar_java ne "" && (!defined($JDK) || $JDK ne "gcj")) { print "check java docu: "; diff --git a/postprocess/CustomTarget_images.mk b/postprocess/CustomTarget_images.mk index 2e16ad8aad7d..8c2963d0a50e 100644 --- a/postprocess/CustomTarget_images.mk +++ b/postprocess/CustomTarget_images.mk @@ -31,7 +31,7 @@ $(packimages_DIR)/%.zip : \ $(packimages_DIR)/sorted.lst \ $(packimages_DIR)/commandimagelist.ilst \ $(call gb_Helper_optional,HELP,$(helpimages_DIR)/helpimg.ilst) \ - $(call gb_Helper_optional,DBCONNECTIVITY,$(if $(SOLAR_JAVA),$(SRCDIR)/connectivity/source/drivers/hsqldb/hsqlui.ilst)) \ + $(call gb_Helper_optional,DBCONNECTIVITY,$(if $(ENABLE_JAVA),$(SRCDIR)/connectivity/source/drivers/hsqldb/hsqlui.ilst)) \ $(call gb_Postprocess_get_target,AllResources) \ $(call gb_Postprocess_get_target,AllUIConfigs) $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),PRL,2) @@ -48,7 +48,7 @@ $(packimages_DIR)/%.zip : \ -l $(dir $(call gb_ResTarget_get_imagelist_target)) \ -l $(dir $(call gb_UIConfig_get_imagelist_target)) \ -l $(dir $(call gb_UIConfig_get_imagelist_target,modules/)) \ - $(call gb_Helper_optional,DBCONNECTIVITY,$(if $(SOLAR_JAVA),-l $(SRCDIR)/connectivity/source/drivers/hsqldb)) \ + $(call gb_Helper_optional,DBCONNECTIVITY,$(if $(ENABLE_JAVA),-l $(SRCDIR)/connectivity/source/drivers/hsqldb)) \ $(call gb_Helper_optional,DBCONNECTIVITY,$(if $(ENABLE_FIREBIRD_SDBC),-l $(SRCDIR)/connectivity/source/drivers/firebird)) \ -s $< -o $@ \ $(if $(findstring s,$(MAKEFLAGS)),> /dev/null)) diff --git a/postprocess/CustomTarget_registry.mk b/postprocess/CustomTarget_registry.mk index 08e2e6e9bde7..c05072e06759 100644 --- a/postprocess/CustomTarget_registry.mk +++ b/postprocess/CustomTarget_registry.mk @@ -333,7 +333,7 @@ postprocess_FILES_main += $(postprocess_MOD)/org/openoffice/Office/DataAccess/Dr postprocess_FILES_main += $(postprocess_MOD)/org/openoffice/Office/DataAccess-evoab2.xcu postprocess_DRIVERS += evoab endif -ifeq ($(SOLAR_JAVA),TRUE) +ifeq ($(ENABLE_JAVA),TRUE) postprocess_FILES_main += \ $(postprocess_MOD)/org/openoffice/Office/DataAccess/Drivers-hsqldb.xcu \ $(postprocess_MOD)/org/openoffice/Office/DataAccess/Drivers-jdbc.xcu diff --git a/postprocess/Rdb_services.mk b/postprocess/Rdb_services.mk index 337575ad42f1..5374b101398a 100644 --- a/postprocess/Rdb_services.mk +++ b/postprocess/Rdb_services.mk @@ -139,7 +139,7 @@ $(eval $(call gb_Rdb_add_components,services,\ shell/source/win32/simplemail/smplmail \ shell/source/win32/syssh \ vcl/vcl.windows \ - $(if $(SOLAR_JAVA), \ + $(if $(ENABLE_JAVA), \ accessibility/bridge/org/openoffice/accessibility/java_uno_accessbridge \ ) \ ) \ @@ -229,7 +229,7 @@ $(eval $(call gb_Rdb_add_components,services,\ $(if $(ENABLE_TDEAB), \ connectivity/source/drivers/kab/tdeab1 \ ) \ - $(if $(SOLAR_JAVA), \ + $(if $(ENABLE_JAVA), \ xmerge/source/bridge/XMergeBridge \ scripting/java/ScriptFramework \ scripting/java/ScriptProviderForJava \ diff --git a/qadevOOo/Module_qadevOOo.mk b/qadevOOo/Module_qadevOOo.mk index dba2ea75c466..142d2d04d917 100644 --- a/qadevOOo/Module_qadevOOo.mk +++ b/qadevOOo/Module_qadevOOo.mk @@ -9,7 +9,7 @@ $(eval $(call gb_Module_Module,qadevOOo)) -ifeq ($(SOLAR_JAVA),TRUE) +ifeq ($(ENABLE_JAVA),TRUE) $(eval $(call gb_Module_add_targets,qadevOOo,\ Jar_OOoRunnerLight \ Jar_OOoRunner \ diff --git a/rhino/Module_rhino.mk b/rhino/Module_rhino.mk index d63ee3f3e973..201d3ba9fc90 100644 --- a/rhino/Module_rhino.mk +++ b/rhino/Module_rhino.mk @@ -9,7 +9,7 @@ $(eval $(call gb_Module_Module,rhino)) -ifneq ($(SOLAR_JAVA),) +ifneq ($(ENABLE_JAVA),) ifneq ($(filter RHINO,$(BUILD_TYPE)),) $(eval $(call gb_Module_add_targets,rhino,\ ExternalPackage_rhino \ diff --git a/ridljar/Module_ridljar.mk b/ridljar/Module_ridljar.mk index 6da8bed9508d..e4497ebb1293 100644 --- a/ridljar/Module_ridljar.mk +++ b/ridljar/Module_ridljar.mk @@ -9,7 +9,7 @@ $(eval $(call gb_Module_Module,ridljar)) -ifneq ($(SOLAR_JAVA),) +ifneq ($(ENABLE_JAVA),) $(eval $(call gb_Module_add_targets,ridljar,\ CustomTarget_javamaker \ Jar_ridl \ diff --git a/sal/qa/rtl/bootstrap/rtl_Bootstrap.cxx b/sal/qa/rtl/bootstrap/rtl_Bootstrap.cxx index b7b164043564..2e6c2fef0c67 100644 --- a/sal/qa/rtl/bootstrap/rtl_Bootstrap.cxx +++ b/sal/qa/rtl/bootstrap/rtl_Bootstrap.cxx @@ -202,10 +202,10 @@ namespace rtl_Bootstrap { Bootstrap aBootstrap; rtl::OUString suValue; - rtl::OUString suValuename ("SOLAR_JAVA"); + rtl::OUString suValuename ("ENABLE_JAVA"); //aBootstrap.getFrom( suValuename, suValue ); aBootstrap.getFrom( suValuename, suValue ); - sal_Char * pStr = getenv("SOLAR_JAVA"); + sal_Char * pStr = getenv("ENABLE_JAVA"); // printUString( suGetname ); CPPUNIT_ASSERT_MESSAGE("get the value of environment variable.", suValue.compareToAscii( pStr ) == 0 ); } diff --git a/scp2/source/extensions/file_extensions.scp b/scp2/source/extensions/file_extensions.scp index df0f5d2cb316..29ecc21e0b32 100644 --- a/scp2/source/extensions/file_extensions.scp +++ b/scp2/source/extensions/file_extensions.scp @@ -224,7 +224,7 @@ End /* ** Script provider for BeanShell ** */ -#if defined SOLAR_JAVA && !defined WITHOUT_SCRIPTING_BEANSHELL +#if defined ENABLE_JAVA && !defined WITHOUT_SCRIPTING_BEANSHELL #if !defined SYSTEM_BSH STD_JAR_FILE( gid_File_Jar_Bsh, bsh ) @@ -243,7 +243,7 @@ End /* ** Script provider for JavaScript ** */ -#if defined SOLAR_JAVA && !defined WITHOUT_SCRIPTING_JAVASCRIPT +#if defined ENABLE_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 edff735aecc1..1c7c7c7cd19e 100644 --- a/scp2/source/extensions/module_extensions.scp +++ b/scp2/source/extensions/module_extensions.scp @@ -255,7 +255,7 @@ End /* ** Script provider for BeanShell ** */ -#if defined SOLAR_JAVA && !defined WITHOUT_SCRIPTING_BEANSHELL +#if defined ENABLE_JAVA && !defined WITHOUT_SCRIPTING_BEANSHELL Module gid_Module_Optional_Extensions_Script_Provider_For_BS PackageInfo = "packinfo_extensions.txt"; @@ -274,7 +274,7 @@ End /* ** Script provider for JavaScript ** */ -#if defined SOLAR_JAVA && !defined WITHOUT_SCRIPTING_JAVASCRIPT +#if defined ENABLE_JAVA && !defined WITHOUT_SCRIPTING_JAVASCRIPT Module gid_Module_Optional_Extensions_Script_Provider_For_JS PackageInfo = "packinfo_extensions.txt"; diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp index c53de33e7bf8..2e370c5fd6ed 100644 --- a/scp2/source/ooo/file_library_ooo.scp +++ b/scp2/source/ooo/file_library_ooo.scp @@ -26,7 +26,7 @@ ************************************************************************/ #include "macros.inc" -#if defined SOLAR_JAVA && defined WNT +#if defined ENABLE_JAVA && defined WNT File gid_File_Lib_Accessbridge PACKED_LIB_FILE_BODY; Name = "java_uno_accessbridge.dll"; @@ -346,7 +346,7 @@ SPECIAL_LIB_FILE(gid_File_Lib_Mozbootstrap,mozbootstrap) #endif -#ifdef SOLAR_JAVA +#ifdef ENABLE_JAVA #ifndef MACOSX File gid_File_Lib_Officebean diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp index 8972d34f4f3f..4bb5ea489e90 100644 --- a/scp2/source/ooo/file_ooo.scp +++ b/scp2/source/ooo/file_ooo.scp @@ -282,7 +282,7 @@ End #endif -#ifdef SOLAR_JAVA +#ifdef ENABLE_JAVA #ifndef MACOSX @@ -298,7 +298,7 @@ End #endif -#ifdef SOLAR_JAVA +#ifdef ENABLE_JAVA STD_JAR_FILE( gid_File_Jar_Report, report ) STD_JAR_FILE( gid_File_Jar_Smoketest, smoketest ) STD_JAR_FILE( gid_File_Jar_Table, table ) @@ -308,18 +308,18 @@ STD_JAR_FILE( gid_File_Jar_Xmerge, xmerge ) STD_JAR_FILE( gid_File_Jar_Xmergebridge, XMergeBridge ) #endif -#if defined SOLAR_JAVA && defined WNT +#if defined ENABLE_JAVA && defined WNT STD_JAR_FILE( gid_File_Jar_Accessbridge, java_uno_accessbridge ) #endif -#ifdef SOLAR_JAVA +#ifdef ENABLE_JAVA #ifndef SYSTEM_HSQLDB STD_JAR_FILE( gid_File_Jar_Hsqldb, hsqldb ) #endif STD_JAR_FILE( gid_File_Jar_Hsqldb_Sdbc, sdbc_hsqldb ) #endif -#ifdef SOLAR_JAVA +#ifdef ENABLE_JAVA File gid_File_Jar_Commonwizards TXT_FILE_BODY; Name = JARFILENAME(commonwizards); @@ -328,12 +328,12 @@ File gid_File_Jar_Commonwizards End #endif -#ifdef SOLAR_JAVA +#ifdef ENABLE_JAVA STD_JAR_FILE( gid_File_Jar_Scriptframework, ScriptFramework ) STD_JAR_FILE( gid_File_Jar_Scriptproviderforjava, ScriptProviderForJava ) #endif -#ifdef SOLAR_JAVA +#ifdef ENABLE_JAVA File gid_File_Jar_Unoil TXT_FILE_BODY; @@ -526,7 +526,7 @@ File gid_File_Share_Registry_Ctlseqcheck_Xcd Name (th) = "ctlseqcheck.xcd"; End -#ifdef SOLAR_JAVA +#ifdef ENABLE_JAVA File gid_File_Scripts_Java Dir = FILELIST_DIR; TXT_FILE_BODY; diff --git a/scp2/source/ooo/shortcut_ooo.scp b/scp2/source/ooo/shortcut_ooo.scp index 2df138ab3e7d..7a204dfbc8b5 100644 --- a/scp2/source/ooo/shortcut_ooo.scp +++ b/scp2/source/ooo/shortcut_ooo.scp @@ -60,7 +60,7 @@ End #ifdef MACOSX -#ifdef SOLAR_JAVA +#ifdef ENABLE_JAVA // auto_ooo_lib_hsqldb defined in gbuild ($(WORKDIR)/AutoInstall/ooo) Shortcut gid_Shortcut_Lib_Hsqldb_2 diff --git a/scp2/source/ooo/ure.scp b/scp2/source/ooo/ure.scp index 0086d6cef507..0ae8e0a2d2cd 100644 --- a/scp2/source/ooo/ure.scp +++ b/scp2/source/ooo/ure.scp @@ -53,7 +53,7 @@ Directory gid_Dir_Ure_Share End #endif -#if defined SOLAR_JAVA +#if defined ENABLE_JAVA Directory gid_Dir_Ure_Java ParentID = SCP2_URE_SHARE_DIR; DosName = "java"; @@ -280,7 +280,7 @@ Unixlink gid_Unixlink_File_Dl_Store Target = SCP2_URE_DL_VER("store", "3"); End -#if defined SOLAR_JAVA +#if defined ENABLE_JAVA Unixlink gid_Unixlink_File_Dl_Jvmaccess BIN_FILE_BODY; @@ -312,7 +312,7 @@ File gid_File_Dl_Profile_Jvmfwk3rc End -#if defined SOLAR_JAVA +#if defined ENABLE_JAVA File gid_File_Dl_JrepropertiesClass TXT_FILE_BODY; Dir = SCP2_URE_DL_DIR; @@ -322,7 +322,7 @@ File gid_File_Dl_JrepropertiesClass End #endif -#if defined SOLAR_JAVA && defined MACOSX +#if defined ENABLE_JAVA && defined MACOSX Unixlink gid_Unixlink_Dl_JavaUno BIN_FILE_BODY; Dir = SCP2_URE_DL_DIR; @@ -480,7 +480,7 @@ End #endif -#if defined SOLAR_JAVA +#if defined ENABLE_JAVA File gid_File_Dl_Jpipe LIB_FILE_BODY; Dir = SCP2_URE_DL_DIR; @@ -490,7 +490,7 @@ File gid_File_Dl_Jpipe End #endif -#if defined SOLAR_JAVA && defined WNT +#if defined ENABLE_JAVA && defined WNT File gid_File_Dl_Jpipx LIB_FILE_BODY; Dir = SCP2_URE_DL_DIR; @@ -567,7 +567,7 @@ End // Public JARs: -#if defined SOLAR_JAVA +#if defined ENABLE_JAVA File gid_File_Java_UnoloaderJar TXT_FILE_BODY; Dir = GID_DIR_URE_JAVA; @@ -577,7 +577,7 @@ File gid_File_Java_UnoloaderJar End #endif -#if defined SOLAR_JAVA +#if defined ENABLE_JAVA File gid_File_Java_JuhJar TXT_FILE_BODY; Dir = GID_DIR_URE_JAVA; @@ -587,7 +587,7 @@ File gid_File_Java_JuhJar End #endif -#if defined SOLAR_JAVA +#if defined ENABLE_JAVA File gid_File_Java_JurtJar TXT_FILE_BODY; Dir = GID_DIR_URE_JAVA; @@ -597,7 +597,7 @@ File gid_File_Java_JurtJar End #endif -#if defined SOLAR_JAVA +#if defined ENABLE_JAVA File gid_File_Java_RidlJar TXT_FILE_BODY; Dir = GID_DIR_URE_JAVA; @@ -609,7 +609,7 @@ End // Private JARs: -#if defined SOLAR_JAVA +#if defined ENABLE_JAVA File gid_File_Java_JavaUnoJar TXT_FILE_BODY; Dir = GID_DIR_URE_JAVA; @@ -639,7 +639,7 @@ End // Private Miscellaneous Files: -#if defined SOLAR_JAVA +#if defined ENABLE_JAVA File gid_File_Misc_JavavendorsXml TXT_FILE_BODY; Dir = GID_DIR_URE_SHARE_MISC; diff --git a/scp2/source/sdkoo/sdkoo.scp b/scp2/source/sdkoo/sdkoo.scp index 84fe0de9fa6c..83be8fee1605 100644 --- a/scp2/source/sdkoo/sdkoo.scp +++ b/scp2/source/sdkoo/sdkoo.scp @@ -160,7 +160,7 @@ File gid_File_Package_odk_html Styles = (FILELIST,USE_INTERNAL_RIGHTS); End -#if defined(SOLAR_JAVA) +#if defined(ENABLE_JAVA) File gid_File_Package_odk_javadoc TXT_FILE_BODY; Dir = FILELIST_SDK_DIR; @@ -199,7 +199,7 @@ File gid_File_Package_odk_settings_generated Styles = (FILELIST,USE_INTERNAL_RIGHTS); End -#if defined(SOLAR_JAVA) +#if defined(ENABLE_JAVA) File gid_File_Package_odk_unowinreg TXT_FILE_BODY; Dir = FILELIST_SDK_DIR; @@ -245,7 +245,7 @@ File gid_File_Zip_Odkheaders Styles = (FILELIST,USE_INTERNAL_RIGHTS); End -#if defined(SOLAR_JAVA) +#if defined(ENABLE_JAVA) File gid_File_Zip_uno_loader_classes TXT_FILE_BODY; Dir = FILELIST_SDK_DIR; diff --git a/scripting/Module_scripting.mk b/scripting/Module_scripting.mk index bfe5702f48e2..c08b9cfc8b42 100644 --- a/scripting/Module_scripting.mk +++ b/scripting/Module_scripting.mk @@ -12,7 +12,7 @@ $(eval $(call gb_Module_Module,scripting)) ifneq ($(DISABLE_SCRIPTING),TRUE) $(eval $(call gb_Module_add_targets,scripting,\ - $(if $(SOLAR_JAVA),\ + $(if $(ENABLE_JAVA),\ Jar_HelloWorld \ Jar_Highlight \ Jar_MemoryUsage \ diff --git a/sfx2/Module_sfx2.mk b/sfx2/Module_sfx2.mk index 16742d29c416..5666825bf68a 100644 --- a/sfx2/Module_sfx2.mk +++ b/sfx2/Module_sfx2.mk @@ -29,7 +29,7 @@ $(eval $(call gb_Module_add_check_targets,sfx2,\ CppunitTest_sfx2_metadatable \ )) -ifneq ($(SOLAR_JAVA),) +ifneq ($(ENABLE_JAVA),) $(eval $(call gb_Module_add_subsequentcheck_targets,sfx2,\ JunitTest_sfx2_complex \ JunitTest_sfx2_unoapi \ diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx index d7a60bfc9969..a8f1c8c6739e 100644 --- a/sfx2/source/control/unoctitm.cxx +++ b/sfx2/source/control/unoctitm.cxx @@ -17,6 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <config_features.h> #include <tools/debug.hxx> #include <svl/eitem.hxx> @@ -344,7 +345,7 @@ void SAL_CALL SfxOfficeDispatch::dispatch( const ::com::sun::star::util::URL& aU // ControllerItem is the Impl class if ( pControllerItem ) { -#ifdef SOLAR_JAVA +#if HAVE_FEATURE_JAVA // The JavaContext contains an interaction handler which is used when // the creation of a Java Virtual Machine fails. The second parameter // indicates, that there shall only be one user notification (message box) @@ -366,7 +367,7 @@ void SAL_CALL SfxOfficeDispatch::dispatchWithNotification( const ::com::sun::sta // ControllerItem is the Impl class if ( pControllerItem ) { -#ifdef SOLAR_JAVA +#if HAVE_FEATURE_JAVA // see comment for SfxOfficeDispatch::dispatch com::sun::star::uno::ContextLayer layer( new svt::JavaContext( com::sun::star::uno::getCurrentContext(), diff --git a/smoketest/Module_smoketest.mk b/smoketest/Module_smoketest.mk index 6f10900f3035..52962a2b8eae 100644 --- a/smoketest/Module_smoketest.mk +++ b/smoketest/Module_smoketest.mk @@ -19,7 +19,7 @@ $(eval $(call gb_Module_add_targets,smoketest,\ Zip_smoketestdoc \ )) -ifneq ($(SOLAR_JAVA),) +ifneq ($(ENABLE_JAVA),) $(eval $(call gb_Module_add_targets,smoketest,\ Extension_TestExtension \ Jar_TestExtension \ @@ -40,7 +40,7 @@ endif endif -ifneq ($(SOLAR_JAVA),) +ifneq ($(ENABLE_JAVA),) $(eval $(call gb_Module_add_targets,smoketest,\ Jar_smoketest \ )) diff --git a/smoketest/data/Basic/Standard/Global.xml b/smoketest/data/Basic/Standard/Global.xml index 64e6a3d1bf4e..16947bab2570 100644 --- a/smoketest/data/Basic/Standard/Global.xml +++ b/smoketest/data/Basic/Standard/Global.xml @@ -613,7 +613,7 @@ Sub SetDefaultOptions bMakeHTMLTest = true bMakeMathTest = true bMakeChartTest = true - if Environ("SOLAR_JAVA") = "" then + if Environ("ENABLE_JAVA") = "" then bMakeJavaTest = false bMakeDBTest = false bMakeExtensionTest = false diff --git a/solenv/gbuild/InstallModuleTarget.mk b/solenv/gbuild/InstallModuleTarget.mk index d8bc254d58d9..91e652146d3e 100644 --- a/solenv/gbuild/InstallModuleTarget.mk +++ b/solenv/gbuild/InstallModuleTarget.mk @@ -70,6 +70,7 @@ $(call gb_Helper_abbreviate_dirs,\ -+ -P \ $(SCPDEFS) $(SCP_DEFS) -DDLLPOSTFIX=$(gb_Library_DLLPOSTFIX) \ $(SCP_INCLUDE) $(SCP_TEMPLATE_INCLUDE) \ + $(if $(ENABLE_JAVA),-DENABLE_JAVA) \ $(SCP_SOURCE) > $(1) \ ) endef diff --git a/solenv/gbuild/extensions/pre_MergedLibsList.mk b/solenv/gbuild/extensions/pre_MergedLibsList.mk index 496a402fcaaf..2dea0b2f4aba 100644 --- a/solenv/gbuild/extensions/pre_MergedLibsList.mk +++ b/solenv/gbuild/extensions/pre_MergedLibsList.mk @@ -46,7 +46,7 @@ gb_EXTRAMERGEDLIBS := \ fwm \ graphicfilter \ guesslang \ - $(if $(filter TRUE,$(SOLAR_JAVA)),hsqldb) \ + $(if $(ENABLE_JAVA),hsqldb) \ hyphen \ icd \ icg \ @@ -60,7 +60,7 @@ gb_EXTRAMERGEDLIBS := \ ira \ itg \ iti \ - $(if $(filter TRUE,$(SOLAR_JAVA)),jdbc) \ + $(if $(ENABLE_JAVA),jdbc) \ $(if $(filter-out ANDROID IOS,$(OS)),ldapbe2) \ lnth \ $(if $(filter-out ANDROID IOS,$(OS)),log) \ @@ -166,8 +166,8 @@ gb_URELIBS := \ cppu \ cppuhelper \ introspection \ - $(if $(filter TRUE,$(SOLAR_JAVA)),jvmaccess) \ - $(if $(filter TRUE,$(SOLAR_JAVA)),jvmfwk) \ + $(if $(ENABLE_JAVA),jvmaccess) \ + $(if $(ENABLE_JAVA),jvmfwk) \ reflection \ reg \ sal \ diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk index b320cf4cc403..1c5dcfaf51a9 100644 --- a/solenv/gbuild/gbuild.mk +++ b/solenv/gbuild/gbuild.mk @@ -225,10 +225,6 @@ gb_GLOBALDEFS += -D_DEBUG endif endif -ifneq ($(strip $(SOLAR_JAVA)),) -gb_GLOBALDEFS += -DSOLAR_JAVA -endif - ifeq ($(gb_TIMELOG),1) gb_GLOBALDEFS += -DTIMELOG \ diff --git a/solenv/gbuild/platform/IOS_ARM_GCC.mk b/solenv/gbuild/platform/IOS_ARM_GCC.mk index 33217b4c2546..a2511781c47a 100644 --- a/solenv/gbuild/platform/IOS_ARM_GCC.mk +++ b/solenv/gbuild/platform/IOS_ARM_GCC.mk @@ -229,7 +229,6 @@ $(call gb_InstallModuleTarget_add_defs,$(1),\ $(gb_OSDEFS) \ -DCOMID=gcc3 \ -D_gcc3 \ - $(if $(filter TRUE,$(SOLAR_JAVA)),-DSOLAR_JAVA) \ ) endef diff --git a/solenv/gbuild/platform/com_MSC_class.mk b/solenv/gbuild/platform/com_MSC_class.mk index 3d3791501ed5..f5d299faf362 100644 --- a/solenv/gbuild/platform/com_MSC_class.mk +++ b/solenv/gbuild/platform/com_MSC_class.mk @@ -510,7 +510,6 @@ $(call gb_InstallModuleTarget_add_defs,$(1),\ $(gb_CPUDEFS) \ $(gb_OSDEFS) \ -DCOMID=MSC \ - $(if $(filter TRUE,$(SOLAR_JAVA)),-DSOLAR_JAVA) \ ) endef diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk index 893c203b11a4..6035c673dee7 100644 --- a/solenv/gbuild/platform/macosx.mk +++ b/solenv/gbuild/platform/macosx.mk @@ -334,7 +334,6 @@ $(call gb_InstallModuleTarget_add_defs,$(1),\ $(gb_OSDEFS) \ -DCOMID=gcc3 \ -D_gcc3 \ - $(if $(filter TRUE,$(SOLAR_JAVA)),-DSOLAR_JAVA) \ ) endef diff --git a/solenv/gbuild/platform/mingw.mk b/solenv/gbuild/platform/mingw.mk index d0bbc71a3164..7cc710a72c1c 100644 --- a/solenv/gbuild/platform/mingw.mk +++ b/solenv/gbuild/platform/mingw.mk @@ -342,7 +342,6 @@ $(call gb_InstallModuleTarget_add_defs,$(1),\ $(gb_OSDEFS) \ -DCOMID=gcc3 \ -D_gcc3 \ - $(if $(filter TRUE,$(SOLAR_JAVA)),-DSOLAR_JAVA) \ ) endef diff --git a/solenv/gbuild/platform/solaris.mk b/solenv/gbuild/platform/solaris.mk index 3c633c1718d9..26a1c699686f 100644 --- a/solenv/gbuild/platform/solaris.mk +++ b/solenv/gbuild/platform/solaris.mk @@ -364,7 +364,6 @@ $(call gb_InstallModuleTarget_add_defs,$(1),\ $(gb_CPUDEFS) \ $(gb_OSDEFS) \ -DCOMID=gcc3 \ - $(if $(filter TRUE,$(SOLAR_JAVA)),-DSOLAR_JAVA) \ ) endef diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk index 0a2c53d99f9b..18f2493d8ea1 100644 --- a/solenv/gbuild/platform/unxgcc.mk +++ b/solenv/gbuild/platform/unxgcc.mk @@ -361,7 +361,6 @@ $(call gb_InstallModuleTarget_add_defs,$(1),\ -DSHORTSTDC3=$(gb_SHORTSTDC3) \ -DSHORTSTDCPP3=$(gb_SHORTSTDCPP3) \ -D_gcc3 \ - $(if $(filter TRUE,$(SOLAR_JAVA)),-DSOLAR_JAVA) \ ) endef diff --git a/solenv/inc/doxygen.cfg b/solenv/inc/doxygen.cfg index bc01aaf5da03..52d1afa5a076 100644 --- a/solenv/inc/doxygen.cfg +++ b/solenv/inc/doxygen.cfg @@ -1605,7 +1605,6 @@ PREDEFINED = LINUX \ DBG_UTIL \ OSL_DEBUG_LEVEL=2 \ CUI \ - SOLAR_JAVA \ EXCEPTIONS_ON # If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then diff --git a/stoc/Module_stoc.mk b/stoc/Module_stoc.mk index 53c0b36db370..7c77f6b3dc39 100644 --- a/stoc/Module_stoc.mk +++ b/stoc/Module_stoc.mk @@ -20,7 +20,7 @@ $(eval $(call gb_Module_add_targets,stoc,\ Library_stocservices \ )) -ifeq ($(SOLAR_JAVA),TRUE) +ifeq ($(ENABLE_JAVA),TRUE) $(eval $(call gb_Module_add_targets,stoc,\ Library_javaloader \ diff --git a/svl/Library_svl.mk b/svl/Library_svl.mk index fbca2668d064..277be91d2f74 100644 --- a/svl/Library_svl.mk +++ b/svl/Library_svl.mk @@ -45,7 +45,7 @@ $(eval $(call gb_Library_use_libraries,svl,\ cppuhelper \ i18nlangtag \ i18nutil \ - $(if $(filter TRUE,$(SOLAR_JAVA)), \ + $(if $(ENABLE_JAVA), \ jvmfwk) \ sal \ sot \ diff --git a/svtools/AllLangResTarget_svt.mk b/svtools/AllLangResTarget_svt.mk index 9a5e41f1bcdb..3e3b7fb7d747 100644 --- a/svtools/AllLangResTarget_svt.mk +++ b/svtools/AllLangResTarget_svt.mk @@ -46,7 +46,7 @@ $(eval $(call gb_SrsTarget_add_files,svt/res,\ svtools/source/dialogs/formats.src \ svtools/source/dialogs/so3res.src \ svtools/source/dialogs/wizardmachine.src \ - $(if $(filter TRUE,$(SOLAR_JAVA)), \ + $(if $(ENABLE_JAVA), \ svtools/source/java/javaerror.src) \ svtools/source/misc/ehdl.src \ svtools/source/misc/imagemgr.src \ diff --git a/svtools/Library_svt.mk b/svtools/Library_svt.mk index 18fea9bb68f1..e5d3f399d002 100644 --- a/svtools/Library_svt.mk +++ b/svtools/Library_svt.mk @@ -47,7 +47,7 @@ $(eval $(call gb_Library_use_libraries,svt,\ cppuhelper \ i18nlangtag \ i18nutil \ - $(if $(filter TRUE,$(SOLAR_JAVA)), \ + $(if $(ENABLE_JAVA), \ jvmfwk) \ salhelper \ sal \ @@ -159,7 +159,7 @@ $(eval $(call gb_Library_add_exception_objects,svt,\ svtools/source/graphic/provider \ svtools/source/graphic/renderer \ svtools/source/graphic/transformer \ - $(if $(filter TRUE,$(SOLAR_JAVA)), \ + $(if $(ENABLE_JAVA), \ svtools/source/java/javacontext \ svtools/source/java/javainteractionhandler) \ svtools/source/misc/acceleratorexecute \ diff --git a/sw/inc/SwAppletImpl.hxx b/sw/inc/SwAppletImpl.hxx index 70579083fe2a..1fe6f9795900 100644 --- a/sw/inc/SwAppletImpl.hxx +++ b/sw/inc/SwAppletImpl.hxx @@ -20,6 +20,8 @@ #ifndef _SW_APPLET_IMPL_HXX #define _SW_APPLET_IMPL_HXX +#include <config_features.h> + #define SWHTML_OPTTYPE_IGNORE 0 #define SWHTML_OPTTYPE_TAG 1 #define SWHTML_OPTTYPE_PARAM 2 @@ -55,7 +57,7 @@ public: void CreateApplet( const OUString& rCode, const OUString& rName, sal_Bool bMayScript, const OUString& rCodeBase, const OUString& rBaseURL ); -#ifdef SOLAR_JAVA +#if HAVE_FEATURE_JAVA sal_Bool CreateApplet( const OUString& rBaseURL ); void AppendParam( const OUString& rName, const OUString& rValue ); #endif diff --git a/sw/source/filter/html/SwAppletImpl.cxx b/sw/source/filter/html/SwAppletImpl.cxx index a70bbce6e49c..6584f1eddc32 100644 --- a/sw/source/filter/html/SwAppletImpl.cxx +++ b/sw/source/filter/html/SwAppletImpl.cxx @@ -147,7 +147,7 @@ void SwApplet_Impl::CreateApplet( const OUString& rCode, const OUString& rName, xSet->setPropertyValue("AppletCodeBase", uno::makeAny( sDocBase ) ); } } -#ifdef SOLAR_JAVA +#if HAVE_FEATURE_JAVA sal_Bool SwApplet_Impl::CreateApplet( const OUString& rBaseURL ) { OUString aCode, aName, aCodeBase; @@ -189,7 +189,7 @@ void SwApplet_Impl::FinishApplet() } } -#ifdef SOLAR_JAVA +#if HAVE_FEATURE_JAVA void SwApplet_Impl::AppendParam( const OUString& rName, const OUString& rValue ) { aCommandList.Append( rName, rValue ); diff --git a/sw/source/filter/html/htmlplug.cxx b/sw/source/filter/html/htmlplug.cxx index cdbb4711cbab..e47c6d11cb1b 100644 --- a/sw/source/filter/html/htmlplug.cxx +++ b/sw/source/filter/html/htmlplug.cxx @@ -17,6 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <config_features.h> + #include "hintids.hxx" #include <rtl/strbuf.hxx> #include <svl/urihelper.hxx> @@ -484,7 +486,7 @@ void SwHTMLParser::InsertEmbed() } -#ifdef SOLAR_JAVA +#if HAVE_FEATURE_JAVA void SwHTMLParser::NewObject() { String aClassID, aName, aStandBy, aId, aStyle, aClass; @@ -624,7 +626,7 @@ void SwHTMLParser::NewObject() void SwHTMLParser::EndObject() { -#ifdef SOLAR_JAVA +#if HAVE_FEATURE_JAVA if( !pAppletImpl ) return; if( pAppletImpl->CreateApplet( sBaseURL ) ) @@ -654,7 +656,7 @@ void SwHTMLParser::EndObject() #endif } -#ifdef SOLAR_JAVA +#if HAVE_FEATURE_JAVA void SwHTMLParser::InsertApplet() { String aCodeBase, aCode, aName, aAlt, aId, aStyle, aClass; @@ -757,7 +759,7 @@ void SwHTMLParser::InsertApplet() void SwHTMLParser::EndApplet() { -#ifdef SOLAR_JAVA +#if HAVE_FEATURE_JAVA if( !pAppletImpl ) return; @@ -787,7 +789,7 @@ void SwHTMLParser::EndApplet() void SwHTMLParser::InsertParam() { -#ifdef SOLAR_JAVA +#if HAVE_FEATURE_JAVA if( !pAppletImpl ) return; @@ -968,7 +970,7 @@ sal_uInt16 SwHTMLWriter::GuessOLENodeFrmType( const SwNode& rNode ) { eType = HTML_FRMTYPE_IFRAME; } -#ifdef SOLAR_JAVA +#if HAVE_FEATURE_JAVA else if( aClass == SvGlobalName( SO3_APPLET_CLASSID ) ) { eType = HTML_FRMTYPE_APPLET; diff --git a/sw/source/filter/html/swhtml.cxx b/sw/source/filter/html/swhtml.cxx index 1f88229c5641..7fd0a1e27b67 100644 --- a/sw/source/filter/html/swhtml.cxx +++ b/sw/source/filter/html/swhtml.cxx @@ -17,6 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <config_features.h> + #include <com/sun/star/document/XDocumentPropertiesSupplier.hpp> #include <com/sun/star/document/XDocumentProperties.hpp> @@ -1374,14 +1376,14 @@ void SwHTMLParser::NextToken( int nToken ) break; case HTML_OBJECT_ON: -#ifdef SOLAR_JAVA +#if HAVE_FEATURE_JAVA NewObject(); bCallNextToken = pAppletImpl!=0 && pTable!=0; #endif break; case HTML_APPLET_ON: -#ifdef SOLAR_JAVA +#if HAVE_FEATURE_JAVA InsertApplet(); bCallNextToken = pAppletImpl!=0 && pTable!=0; #endif diff --git a/sw/source/filter/html/swhtml.hxx b/sw/source/filter/html/swhtml.hxx index bb0ffb951e6e..f6e03fd2ced5 100644 --- a/sw/source/filter/html/swhtml.hxx +++ b/sw/source/filter/html/swhtml.hxx @@ -19,6 +19,8 @@ #ifndef _SWHTML_HXX #define _SWHTML_HXX +#include <config_features.h> + #include <sfx2/sfxhtml.hxx> #include <svl/macitem.hxx> #include <editeng/svxenum.hxx> @@ -705,11 +707,11 @@ private: void InsertImage(); // htmlgrin.cxx void InsertEmbed(); // htmlplug.cxx -#ifdef SOLAR_JAVA +#if HAVE_FEATURE_JAVA void NewObject(); // htmlplug.cxx #endif void EndObject(); // CommandLine mit Applet verkn. (htmlplug.cxx) -#ifdef SOLAR_JAVA +#if HAVE_FEATURE_JAVA void InsertApplet(); // htmlplug.cxx #endif void EndApplet(); // CommandLine mit Applet verkn. (htmlplug.cxx) diff --git a/testtools/CustomTarget_bridgetest.mk b/testtools/CustomTarget_bridgetest.mk index d461850ede46..e51601bc851f 100644 --- a/testtools/CustomTarget_bridgetest.mk +++ b/testtools/CustomTarget_bridgetest.mk @@ -20,7 +20,7 @@ endif $(call gb_CustomTarget_get_target,testtools/bridgetest) : \ $(testtools_BRIDGEDIR)/bridgetest_server$(testtools_BATCHSUFFIX) \ $(testtools_BRIDGEDIR)/bridgetest_client$(testtools_BATCHSUFFIX) \ - $(if $(SOLAR_JAVA),\ + $(if $(ENABLE_JAVA),\ $(testtools_BRIDGEDIR)/bridgetest_javaserver$(testtools_BATCHSUFFIX) \ $(testtools_BRIDGEDIR)/bridgetest_inprocess_java$(testtools_BATCHSUFFIX)) diff --git a/testtools/Module_testtools.mk b/testtools/Module_testtools.mk index 65583e3e23c8..020040578e89 100644 --- a/testtools/Module_testtools.mk +++ b/testtools/Module_testtools.mk @@ -21,7 +21,7 @@ $(eval $(call gb_Module_add_targets,testtools,\ Rdb_uno_services \ )) -ifneq ($(SOLAR_JAVA),) +ifneq ($(ENABLE_JAVA),) $(eval $(call gb_Module_add_targets,testtools,\ Jar_testComponent \ CustomTarget_bridgetest_javamaker \ diff --git a/testtools/Rdb_uno_services.mk b/testtools/Rdb_uno_services.mk index ec85cb9facf0..b2ff7d9c73a7 100644 --- a/testtools/Rdb_uno_services.mk +++ b/testtools/Rdb_uno_services.mk @@ -15,7 +15,7 @@ $(eval $(call gb_Rdb_add_components,uno_services,\ testtools/source/bridgetest/bridgetest \ )) -ifneq ($(SOLAR_JAVA),) +ifneq ($(ENABLE_JAVA),) $(eval $(call gb_Rdb_add_components,uno_services,\ testtools/source/bridgetest/testComponent \ )) diff --git a/testtools/com/sun/star/comp/bridge/makefile.mk b/testtools/com/sun/star/comp/bridge/makefile.mk index 7e6480c5c8ab..2d872ea57d8c 100644 --- a/testtools/com/sun/star/comp/bridge/makefile.mk +++ b/testtools/com/sun/star/comp/bridge/makefile.mk @@ -27,7 +27,7 @@ TARGET=com_sun_star_comp_bridge # ------------------------------------------------------------------ -.IF "$(SOLAR_JAVA)" != "" +.IF "$(ENABLE_JAVA)" != "" JARFILES = ridl.jar jurt.jar juh.jar diff --git a/tomcat/Module_tomcat.mk b/tomcat/Module_tomcat.mk index ffe909089a3a..05865738ee93 100644 --- a/tomcat/Module_tomcat.mk +++ b/tomcat/Module_tomcat.mk @@ -9,7 +9,7 @@ $(eval $(call gb_Module_Module,tomcat)) -ifneq ($(SOLAR_JAVA),) +ifneq ($(ENABLE_JAVA),) ifneq ($(filter TOMCAT,$(BUILD_TYPE)),) $(eval $(call gb_Module_add_targets,tomcat,\ ExternalProject_tomcat \ diff --git a/unoil/Module_unoil.mk b/unoil/Module_unoil.mk index 946ee176ad8d..e8cdbe933da7 100644 --- a/unoil/Module_unoil.mk +++ b/unoil/Module_unoil.mk @@ -13,7 +13,7 @@ $(eval $(call gb_Module_add_targets,unoil,\ Package_clioootypesversion \ )) -ifneq ($(SOLAR_JAVA),) +ifneq ($(ENABLE_JAVA),) $(eval $(call gb_Module_add_targets,unoil,\ CustomTarget_javamaker \ Jar_unoil \ diff --git a/unotest/Module_unotest.mk b/unotest/Module_unotest.mk index 1296f497c917..a47ca5d4b694 100644 --- a/unotest/Module_unotest.mk +++ b/unotest/Module_unotest.mk @@ -18,7 +18,7 @@ $(eval $(call gb_Module_add_targets,unotest,\ )) endif -ifneq ($(SOLAR_JAVA),) +ifneq ($(ENABLE_JAVA),) $(eval $(call gb_Module_add_targets,unotest,\ Jar_test-tools \ )) diff --git a/ure/Rdb_ure.mk b/ure/Rdb_ure.mk index 1428923c521c..bc88139013c4 100644 --- a/ure/Rdb_ure.mk +++ b/ure/Rdb_ure.mk @@ -28,7 +28,7 @@ $(eval $(call gb_Rdb_add_components,ure/services,\ remotebridges/source/unourl_resolver/uuresolver \ )) -ifneq ($(SOLAR_JAVA),) +ifneq ($(ENABLE_JAVA),) $(eval $(call gb_Rdb_add_components,ure/services,\ stoc/source/javaloader/javaloader \ stoc/source/javavm/javavm \ diff --git a/vcl/Library_desktop_detector.mk b/vcl/Library_desktop_detector.mk index 132615108acd..6baf4abcb346 100644 --- a/vcl/Library_desktop_detector.mk +++ b/vcl/Library_desktop_detector.mk @@ -41,7 +41,7 @@ $(eval $(call gb_Library_use_libraries,desktop_detector,\ cppuhelper \ i18nlangtag \ i18nutil \ - $(if $(filter TRUE,$(SOLAR_JAVA)), \ + $(if $(ENABLE_JAVA), \ jvmaccess) \ cppu \ sal \ diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk index 9dc7e7ec119f..363f82a6303d 100644 --- a/vcl/Library_vcl.mk +++ b/vcl/Library_vcl.mk @@ -84,7 +84,7 @@ $(eval $(call gb_Library_add_libs,vcl,\ )) endif -ifeq ($(SOLAR_JAVA),TRUE) +ifeq ($(ENABLE_JAVA),TRUE) $(eval $(call gb_Library_use_libraries,vcl,\ jvmaccess \ )) diff --git a/vcl/Library_vclplug_gen.mk b/vcl/Library_vclplug_gen.mk index c32b3f46ee30..64d2c0175606 100644 --- a/vcl/Library_vclplug_gen.mk +++ b/vcl/Library_vclplug_gen.mk @@ -37,7 +37,7 @@ $(eval $(call gb_Library_use_libraries,vclplug_gen,\ cppuhelper \ i18nlangtag \ i18nutil \ - $(if $(filter TRUE,$(SOLAR_JAVA)), \ + $(if $(ENABLE_JAVA), \ jvmaccess) \ cppu \ sal \ diff --git a/vcl/Library_vclplug_gtk.mk b/vcl/Library_vclplug_gtk.mk index e870d0611181..db2dd21c3eb8 100644 --- a/vcl/Library_vclplug_gtk.mk +++ b/vcl/Library_vclplug_gtk.mk @@ -54,7 +54,7 @@ $(eval $(call gb_Library_use_libraries,vclplug_gtk,\ cppuhelper \ i18nlangtag \ i18nutil \ - $(if $(filter TRUE,$(SOLAR_JAVA)), \ + $(if $(ENABLE_JAVA), \ jvmaccess) \ cppu \ sal \ diff --git a/vcl/Library_vclplug_gtk3.mk b/vcl/Library_vclplug_gtk3.mk index 5cd310f50603..6b35be09fbf0 100644 --- a/vcl/Library_vclplug_gtk3.mk +++ b/vcl/Library_vclplug_gtk3.mk @@ -64,7 +64,7 @@ $(eval $(call gb_Library_use_libraries,vclplug_gtk3,\ cppuhelper \ i18nlangtag \ i18nutil \ - $(if $(filter TRUE,$(SOLAR_JAVA)), \ + $(if $(ENABLE_JAVA), \ jvmaccess) \ cppu \ sal \ diff --git a/vcl/Library_vclplug_kde.mk b/vcl/Library_vclplug_kde.mk index 7ebfdc75a713..40b5800db635 100644 --- a/vcl/Library_vclplug_kde.mk +++ b/vcl/Library_vclplug_kde.mk @@ -42,7 +42,7 @@ $(eval $(call gb_Library_use_libraries,vclplug_kde,\ cppuhelper \ i18nlangtag \ i18nutil \ - $(if $(filter TRUE,$(SOLAR_JAVA)), \ + $(if $(ENABLE_JAVA), \ jvmaccess) \ cppu \ sal \ diff --git a/vcl/Library_vclplug_kde4.mk b/vcl/Library_vclplug_kde4.mk index a192987bb9ca..c72fe004d727 100644 --- a/vcl/Library_vclplug_kde4.mk +++ b/vcl/Library_vclplug_kde4.mk @@ -44,7 +44,7 @@ $(eval $(call gb_Library_use_libraries,vclplug_kde4,\ cppuhelper \ i18nlangtag \ i18nutil \ - $(if $(filter TRUE,$(SOLAR_JAVA)), \ + $(if $(ENABLE_JAVA), \ jvmaccess) \ cppu \ sal \ diff --git a/vcl/Library_vclplug_svp.mk b/vcl/Library_vclplug_svp.mk index 43a311d9a690..08f5c0892404 100644 --- a/vcl/Library_vclplug_svp.mk +++ b/vcl/Library_vclplug_svp.mk @@ -42,7 +42,7 @@ $(eval $(call gb_Library_use_libraries,vclplug_svp,\ cppuhelper \ i18nlangtag \ i18nutil \ - $(if $(filter TRUE,$(SOLAR_JAVA)), \ + $(if $(ENABLE_JAVA), \ jvmaccess) \ cppu \ sal \ diff --git a/vcl/Library_vclplug_tde.mk b/vcl/Library_vclplug_tde.mk index 0480978a66a0..74551bdee907 100644 --- a/vcl/Library_vclplug_tde.mk +++ b/vcl/Library_vclplug_tde.mk @@ -49,7 +49,7 @@ $(eval $(call gb_Library_use_libraries,vclplug_tde,\ cppuhelper \ i18nlangtag \ i18nutil \ - $(if $(filter TRUE,$(SOLAR_JAVA)), \ + $(if $(ENABLE_JAVA), \ jvmaccess) \ cppu \ sal \ diff --git a/vcl/source/window/syschild.cxx b/vcl/source/window/syschild.cxx index 0a98fc2f4b57..9f328b6298b7 100644 --- a/vcl/source/window/syschild.cxx +++ b/vcl/source/window/syschild.cxx @@ -17,6 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <config_features.h> #include <rtl/process.h> #include <rtl/ref.hxx> @@ -37,13 +38,13 @@ #include <salobj.hxx> #include <svdata.hxx> -#ifdef SOLAR_JAVA +#if HAVE_FEATURE_JAVA #include <jni.h> #endif #include <comphelper/processfactory.hxx> -#ifdef SOLAR_JAVA +#if HAVE_FEATURE_JAVA #include <jvmaccess/virtualmachine.hxx> #include <com/sun/star/java/JavaVirtualMachine.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> @@ -176,7 +177,7 @@ void SystemChildWindow::EnableEraseBackground( sal_Bool bEnable ) void SystemChildWindow::ImplTestJavaException( void* pEnv ) { -#ifdef SOLAR_JAVA +#if HAVE_FEATURE_JAVA JNIEnv* pJavaEnv = reinterpret_cast< JNIEnv* >( pEnv ); jthrowable jtThrowable = pJavaEnv->ExceptionOccurred(); @@ -203,7 +204,7 @@ void SystemChildWindow::ImplTestJavaException( void* pEnv ) } #else (void)pEnv; -#endif // SOLAR_JAVA +#endif // HAVE_FEATURE_JAVA } void SystemChildWindow::SetForwardKey( sal_Bool bEnable ) @@ -233,7 +234,7 @@ sal_IntPtr SystemChildWindow::GetParentWindowHandle( sal_Bool bUseJava ) { nRet = (sal_IntPtr) GetSystemData()->aWindow; } -#ifdef SOLAR_JAVA +#if HAVE_FEATURE_JAVA else { uno::Reference< uno::XComponentContext > xContext( comphelper::getProcessComponentContext() ); @@ -313,7 +314,7 @@ sal_IntPtr SystemChildWindow::GetParentWindowHandle( sal_Bool bUseJava ) } } } -#endif // SOLAR_JAVA +#endif // HAVE_FEATURE_JAVA #endif return nRet; diff --git a/wizards/Module_wizards.mk b/wizards/Module_wizards.mk index ef95c9e7bd01..fd05f39d9243 100644 --- a/wizards/Module_wizards.mk +++ b/wizards/Module_wizards.mk @@ -43,7 +43,7 @@ $(eval $(call gb_Module_add_targets,wizards,\ Pyuno_commonwizards \ )) -ifeq ($(SOLAR_JAVA),TRUE) +ifeq ($(ENABLE_JAVA),TRUE) $(eval $(call gb_Module_add_targets,wizards,\ Jar_commonwizards \ Jar_form \ diff --git a/xmerge/Module_xmerge.mk b/xmerge/Module_xmerge.mk index 380df59d31f0..e92da2ae9cb5 100644 --- a/xmerge/Module_xmerge.mk +++ b/xmerge/Module_xmerge.mk @@ -10,7 +10,7 @@ $(eval $(call gb_Module_Module,xmerge)) $(eval $(call gb_Module_add_targets,xmerge,\ - $(if $(SOLAR_JAVA), \ + $(if $(ENABLE_JAVA), \ Jar_xmerge \ Jar_XMergeBridge \ ) \ |