[Libreoffice-commits] .: basctl/Module_basctl.mk basic/Module_basic.mk config_host.mk.in configure.in Makefile postprocess/packcomponents RepositoryFixes.mk sc/Module_sc.mk scripting/Module_scripting.mk solenv/gbuild sw/Module_sw.mk vbahelper/Module_vbahelper.mk
Tor Lillqvist
tml at kemper.freedesktop.org
Mon Feb 27 06:52:19 PST 2012
Makefile | 6 +++---
RepositoryFixes.mk | 2 +-
basctl/Module_basctl.mk | 2 +-
basic/Module_basic.mk | 2 +-
config_host.mk.in | 2 +-
configure.in | 30 +++++++++++++++---------------
postprocess/packcomponents/makefile.mk | 2 +-
sc/Module_sc.mk | 2 +-
scripting/Module_scripting.mk | 2 +-
solenv/gbuild/CppunitTest.mk | 2 +-
solenv/gbuild/gbuild.mk | 4 ++--
sw/Module_sw.mk | 2 +-
vbahelper/Module_vbahelper.mk | 2 +-
13 files changed, 30 insertions(+), 30 deletions(-)
New commits:
commit c16bc826379b2e70fe517d608055ef167c5a5c9e
Author: Tor Lillqvist <tml at iki.fi>
Date: Mon Feb 27 16:31:42 2012 +0200
s/interpreters/scripting/
diff --git a/Makefile b/Makefile
index c2c6cbe..4bdd183 100644
--- a/Makefile
+++ b/Makefile
@@ -382,12 +382,12 @@ bootstrap: $(WORKDIR_BOOTSTRAP)
# Build
#
build: bootstrap fetch $(if $(filter $(INPATH),$(INPATH_FOR_BUILD)),,cross-toolset)
-ifeq ($(DISABLE_INTERPRETERS),TRUE)
+ifeq ($(DISABLE_SCRIPTING),TRUE)
# We must get the headers from basic and vbahelper "delivered" because
# as we don't link to any libs from those they won't otherwise be, or
# something. And we still do include those headers always even if the
-# libs aren't built in the --disable-interpreters case. (Ifdefs for
-# DISABLE_INTERPRETERS will be added to the code later as necessary.)
+# libs aren't built in the --disable-scripting case. (Ifdefs for
+# DISABLE_SCRIPTING will be added to the code later as necessary.)
$(GNUMAKE) basic vbahelper
endif
ifeq ($(DISABLE_DBCONNECTIVITY),TRUE)
diff --git a/RepositoryFixes.mk b/RepositoryFixes.mk
index 57946ad..ef2b957 100644
--- a/RepositoryFixes.mk
+++ b/RepositoryFixes.mk
@@ -130,7 +130,7 @@ endif # ifeq ($(COM),GCC)
endif # ifeq ($(OS),WNT)
-ifeq (,$(filter INTERPRETERS,$(BUILD_TYPE)))
+ifeq (,$(filter SCRIPTING,$(BUILD_TYPE)))
gb_Library_FILENAMES := $(patsubst sb:libsb%,,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst vbahelper:libvbahelper%,,$(gb_Library_FILENAMES))
diff --git a/basctl/Module_basctl.mk b/basctl/Module_basctl.mk
index 68178ae..bda9d32 100644
--- a/basctl/Module_basctl.mk
+++ b/basctl/Module_basctl.mk
@@ -28,7 +28,7 @@
$(eval $(call gb_Module_Module,basctl))
-ifneq ($(DISABLE_INTERPRETERS),TRUE)
+ifneq ($(DISABLE_SCRIPTING),TRUE)
$(eval $(call gb_Module_add_targets,basctl,\
AllLangResTarget_basctl \
diff --git a/basic/Module_basic.mk b/basic/Module_basic.mk
index 261f6e6..bbd9b61 100644
--- a/basic/Module_basic.mk
+++ b/basic/Module_basic.mk
@@ -28,7 +28,7 @@
$(eval $(call gb_Module_Module,basic))
-ifneq ($(DISABLE_INTERPRETERS),TRUE)
+ifneq ($(DISABLE_SCRIPTING),TRUE)
$(eval $(call gb_Module_add_targets,basic,\
AllLangResTarget_sb \
diff --git a/config_host.mk.in b/config_host.mk.in
index 535b25b..5cc0b86 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -79,7 +79,7 @@ export DIRECTXSDK_LIB=@DIRECTXSDK_LIB@
export DISABLE_ACTIVEX=@DISABLE_ACTIVEX@
export DISABLE_ATL=@DISABLE_ATL@
export DISABLE_DBCONNECTIVITY=@DISABLE_DBCONNECTIVITY@
-export DISABLE_INTERPRETERS=@DISABLE_INTERPRETERS@
+export DISABLE_SCRIPTING=@DISABLE_SCRIPTING@
export DISABLE_LINKOO=@DISABLE_LINKOO@
export DISABLE_NEON=@DISABLE_NEON@
export DISABLE_PYTHON=@DISABLE_PYTHON@
diff --git a/configure.in b/configure.in
index d7681d6..914e8cf 100644
--- a/configure.in
+++ b/configure.in
@@ -393,8 +393,8 @@ AC_ARG_ENABLE(database-connectivity,
[Disable various database connectivity. Work in progress, use only if you are hacking on it.])
)
-AC_ARG_ENABLE(interpreters,
- AS_HELP_STRING([--disable-interpreters],
+AC_ARG_ENABLE(scripting,
+ AS_HELP_STRING([--disable-scripting],
[Disable BASIC, Java and Python. Work in progress, use only if you are hacking on it.])
)
@@ -2042,21 +2042,21 @@ else
fi
AC_SUBST(DISABLE_DBCONNECTIVITY)
-if test -z "$enable_interpreters"; then
- # Disable interpreters for iOS unless specifically overridden
- # with --enable-interpreters.
+if test -z "$enable_scripting"; then
+ # Disable scripting for iOS unless specifically overridden
+ # with --enable-scripting.
if test $_os != iOS; then
- enable_interpreters=yes
+ enable_scripting=yes
fi
fi
-DISABLE_INTERPRETERS=''
-if test "$enable_interpreters" = yes; then
- BUILD_TYPE="$BUILD_TYPE INTERPRETERS"
+DISABLE_SCRIPTING=''
+if test "$enable_scripting" = yes; then
+ BUILD_TYPE="$BUILD_TYPE SCRIPTING"
else
- DISABLE_INTERPRETERS='TRUE'
+ DISABLE_SCRIPTING='TRUE'
fi
-AC_SUBST(DISABLE_INTERPRETERS)
+AC_SUBST(DISABLE_SCRIPTING)
dnl ===================================================================
dnl Extra check for Windows. Cygwin builds need gcc to build dmake
@@ -4535,8 +4535,8 @@ dnl Java support enable
dnl ===================================================================
AC_MSG_CHECKING([whether to build with Java support])
if test "$with_java" != "no"; then
- if test "$DISABLE_INTERPRETERS" = TRUE; then
- AC_MSG_RESULT([no, overridden by --disable-interpreters])
+ if test "$DISABLE_SCRIPTING" = TRUE; then
+ AC_MSG_RESULT([no, overridden by --disable-scripting])
SOLAR_JAVA=""
else
AC_MSG_RESULT([yes])
@@ -5953,8 +5953,8 @@ no|disable)
DISABLE_PYTHON=TRUE
;;
""|yes|auto)
- if test "$DISABLE_INTERPRETERS" = TRUE; then
- AC_MSG_RESULT([no, overridden by --disable-interpreters])
+ if test "$DISABLE_SCRIPTING" = TRUE; then
+ AC_MSG_RESULT([no, overridden by --disable-scripting])
enable_python=no
DISABLE_PYTHON=TRUE
elif test $build_os = cygwin; then
diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk
index ae463cc..2e85057 100644
--- a/postprocess/packcomponents/makefile.mk
+++ b/postprocess/packcomponents/makefile.mk
@@ -177,7 +177,7 @@ my_components += \
.ENDIF
-.IF "$(DISABLE_INTERPRETERS)" != "TRUE"
+.IF "$(DISABLE_SCRIPTING)" != "TRUE"
my_components += \
component/basctl/util/basctl \
diff --git a/sc/Module_sc.mk b/sc/Module_sc.mk
index c4a3e6e..8f51646 100644
--- a/sc/Module_sc.mk
+++ b/sc/Module_sc.mk
@@ -33,7 +33,7 @@ $(eval $(call gb_Module_add_targets,sc,\
Package_xml \
))
-ifneq ($(DISABLE_INTERPRETERS),TRUE)
+ifneq ($(DISABLE_SCRIPTING),TRUE)
$(eval $(call gb_Module_add_targets,sc,\
Library_vbaobj \
diff --git a/scripting/Module_scripting.mk b/scripting/Module_scripting.mk
index 0ae160f..7312f51 100644
--- a/scripting/Module_scripting.mk
+++ b/scripting/Module_scripting.mk
@@ -28,7 +28,7 @@
$(eval $(call gb_Module_Module,scripting))
-ifneq ($(DISABLE_INTERPRETERS),TRUE)
+ifneq ($(DISABLE_SCRIPTING),TRUE)
$(eval $(call gb_Module_add_targets,scripting,\
$(if $(SOLAR_JAVA),\
diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk
index 30f1021..9a5adcf 100644
--- a/solenv/gbuild/CppunitTest.mk
+++ b/solenv/gbuild/CppunitTest.mk
@@ -182,7 +182,7 @@ endef
# to libraries not built in this configuration.
define gb_CppunitTest__filter_not_built_components
$(filter-out \
- $(if $(filter INTERPRETERS,$(BUILD_TYPE)),, \
+ $(if $(filter SCRIPTING,$(BUILD_TYPE)),, \
basic/util/sb \
sw/util/vbaswobj \
scripting/source/basprov/basprov \
diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk
index b35d73a..e38137e 100644
--- a/solenv/gbuild/gbuild.mk
+++ b/solenv/gbuild/gbuild.mk
@@ -236,8 +236,8 @@ ifeq ($(strip $(DISABLE_DBCONNECTIVITY)),TRUE)
gb_GLOBALDEFS += -DDISABLE_DBCONNECTIVITY
endif
-ifeq ($(strip $(DISABLE_INTERPRETERS)),TRUE)
-gb_GLOBALDEFS += -DDISABLE_INTERPRETERS
+ifeq ($(strip $(DISABLE_SCRIPTING)),TRUE)
+gb_GLOBALDEFS += -DDISABLE_SCRIPTING
endif
ifeq ($(HAVE_THREADSAFE_STATICS),TRUE)
diff --git a/sw/Module_sw.mk b/sw/Module_sw.mk
index 27aa061..6ecc588 100644
--- a/sw/Module_sw.mk
+++ b/sw/Module_sw.mk
@@ -39,7 +39,7 @@ $(eval $(call gb_Module_add_targets,sw,\
Package_xml \
))
-ifneq ($(DISABLE_INTERPRETERS),TRUE)
+ifneq ($(DISABLE_SCRIPTING),TRUE)
$(eval $(call gb_Module_add_targets,sw,\
Library_vbaswobj \
diff --git a/vbahelper/Module_vbahelper.mk b/vbahelper/Module_vbahelper.mk
index c9c68c8..4783771 100644
--- a/vbahelper/Module_vbahelper.mk
+++ b/vbahelper/Module_vbahelper.mk
@@ -28,7 +28,7 @@
$(eval $(call gb_Module_Module,vbahelper))
-ifneq ($(DISABLE_INTERPRETERS),TRUE)
+ifneq ($(DISABLE_SCRIPTING),TRUE)
# the targets to be inserted are their file names without .mk extension
$(eval $(call gb_Module_add_targets,vbahelper,\
More information about the Libreoffice-commits
mailing list