Skip to content
Projeler
Gruplar
Parçacıklar
Yardım
Yükleniyor...
Oturum aç / Kaydol
Gezinmeyi değiştir
C
core
Proje
Proje
Ayrıntılar
Etkinlik
Cycle Analytics
Depo (repository)
Depo (repository)
Dosyalar
Kayıtlar (commit)
Dallar (branch)
Etiketler
Katkıda bulunanlar
Grafik
Karşılaştır
Grafikler
Konular (issue)
0
Konular (issue)
0
Liste
Pano
Etiketler
Kilometre Taşları
Birleştirme (merge) Talepleri
0
Birleştirme (merge) Talepleri
0
CI / CD
CI / CD
İş akışları (pipeline)
İşler
Zamanlamalar
Grafikler
Paketler
Paketler
Wiki
Wiki
Parçacıklar
Parçacıklar
Üyeler
Üyeler
Collapse sidebar
Close sidebar
Etkinlik
Grafik
Grafikler
Yeni bir konu (issue) oluştur
İşler
Kayıtlar (commit)
Konu (issue) Panoları
Kenar çubuğunu aç
LibreOffice
core
Commits
c16bc826
Kaydet (Commit)
c16bc826
authored
Şub 27, 2012
tarafından
Tor Lillqvist
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
s/interpreters/scripting/
üst
7b348b9f
Hide whitespace changes
Inline
Side-by-side
Showing
13 changed files
with
30 additions
and
30 deletions
+30
-30
Makefile
Makefile
+3
-3
RepositoryFixes.mk
RepositoryFixes.mk
+1
-1
Module_basctl.mk
basctl/Module_basctl.mk
+1
-1
Module_basic.mk
basic/Module_basic.mk
+1
-1
config_host.mk.in
config_host.mk.in
+1
-1
configure.in
configure.in
+15
-15
makefile.mk
postprocess/packcomponents/makefile.mk
+1
-1
Module_sc.mk
sc/Module_sc.mk
+1
-1
Module_scripting.mk
scripting/Module_scripting.mk
+1
-1
CppunitTest.mk
solenv/gbuild/CppunitTest.mk
+1
-1
gbuild.mk
solenv/gbuild/gbuild.mk
+2
-2
Module_sw.mk
sw/Module_sw.mk
+1
-1
Module_vbahelper.mk
vbahelper/Module_vbahelper.mk
+1
-1
No files found.
Makefile
Dosyayı görüntüle @
c16bc826
...
@@ -382,12 +382,12 @@ bootstrap: $(WORKDIR_BOOTSTRAP)
...
@@ -382,12 +382,12 @@ bootstrap: $(WORKDIR_BOOTSTRAP)
# Build
# Build
#
#
build
:
bootstrap fetch $(if $(filter $(INPATH)
,
$(INPATH_FOR_BUILD))
,,
cross-toolset)
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
# 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
# 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
# something. And we still do include those headers always even if the
# libs aren't built in the --disable-
interpreters
case. (Ifdefs for
# libs aren't built in the --disable-
scripting
case. (Ifdefs for
# DISABLE_
INTERPRETERS
will be added to the code later as necessary.)
# DISABLE_
SCRIPTING
will be added to the code later as necessary.)
$(GNUMAKE)
basic
vbahelper
$(GNUMAKE)
basic
vbahelper
endif
endif
ifeq
($(DISABLE_DBCONNECTIVITY),TRUE)
ifeq
($(DISABLE_DBCONNECTIVITY),TRUE)
...
...
RepositoryFixes.mk
Dosyayı görüntüle @
c16bc826
...
@@ -130,7 +130,7 @@ endif # ifeq ($(COM),GCC)
...
@@ -130,7 +130,7 @@ endif # ifeq ($(COM),GCC)
endif # ifeq ($(OS),WNT)
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 sb:libsb%,,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst vbahelper:libvbahelper%,,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst vbahelper:libvbahelper%,,$(gb_Library_FILENAMES))
...
...
basctl/Module_basctl.mk
Dosyayı görüntüle @
c16bc826
...
@@ -28,7 +28,7 @@
...
@@ -28,7 +28,7 @@
$(eval $(call gb_Module_Module,basctl))
$(eval $(call gb_Module_Module,basctl))
ifneq ($(DISABLE_
INTERPRETERS
),TRUE)
ifneq ($(DISABLE_
SCRIPTING
),TRUE)
$(eval $(call gb_Module_add_targets,basctl,\
$(eval $(call gb_Module_add_targets,basctl,\
AllLangResTarget_basctl \
AllLangResTarget_basctl \
...
...
basic/Module_basic.mk
Dosyayı görüntüle @
c16bc826
...
@@ -28,7 +28,7 @@
...
@@ -28,7 +28,7 @@
$(eval $(call gb_Module_Module,basic))
$(eval $(call gb_Module_Module,basic))
ifneq ($(DISABLE_
INTERPRETERS
),TRUE)
ifneq ($(DISABLE_
SCRIPTING
),TRUE)
$(eval $(call gb_Module_add_targets,basic,\
$(eval $(call gb_Module_add_targets,basic,\
AllLangResTarget_sb \
AllLangResTarget_sb \
...
...
config_host.mk.in
Dosyayı görüntüle @
c16bc826
...
@@ -79,7 +79,7 @@ export DIRECTXSDK_LIB=@DIRECTXSDK_LIB@
...
@@ -79,7 +79,7 @@ export DIRECTXSDK_LIB=@DIRECTXSDK_LIB@
export DISABLE_ACTIVEX=@DISABLE_ACTIVEX@
export DISABLE_ACTIVEX=@DISABLE_ACTIVEX@
export DISABLE_ATL=@DISABLE_ATL@
export DISABLE_ATL=@DISABLE_ATL@
export DISABLE_DBCONNECTIVITY=@DISABLE_DBCONNECTIVITY@
export DISABLE_DBCONNECTIVITY=@DISABLE_DBCONNECTIVITY@
export DISABLE_
INTERPRETERS=@DISABLE_INTERPRETERS
@
export DISABLE_
SCRIPTING=@DISABLE_SCRIPTING
@
export DISABLE_LINKOO=@DISABLE_LINKOO@
export DISABLE_LINKOO=@DISABLE_LINKOO@
export DISABLE_NEON=@DISABLE_NEON@
export DISABLE_NEON=@DISABLE_NEON@
export DISABLE_PYTHON=@DISABLE_PYTHON@
export DISABLE_PYTHON=@DISABLE_PYTHON@
...
...
configure.in
Dosyayı görüntüle @
c16bc826
...
@@ -393,8 +393,8 @@ AC_ARG_ENABLE(database-connectivity,
...
@@ -393,8 +393,8 @@ AC_ARG_ENABLE(database-connectivity,
[Disable various database connectivity. Work in progress, use only if you are hacking on it.])
[Disable various database connectivity. Work in progress, use only if you are hacking on it.])
)
)
AC_ARG_ENABLE(
interpreters
,
AC_ARG_ENABLE(
scripting
,
AS_HELP_STRING([--disable-
interpreters
],
AS_HELP_STRING([--disable-
scripting
],
[Disable BASIC, Java and Python. Work in progress, use only if you are hacking on it.])
[Disable BASIC, Java and Python. Work in progress, use only if you are hacking on it.])
)
)
...
@@ -2042,21 +2042,21 @@ else
...
@@ -2042,21 +2042,21 @@ else
fi
fi
AC_SUBST(DISABLE_DBCONNECTIVITY)
AC_SUBST(DISABLE_DBCONNECTIVITY)
if test -z "$enable_
interpreters
"; then
if test -z "$enable_
scripting
"; then
# Disable
interpreters
for iOS unless specifically overridden
# Disable
scripting
for iOS unless specifically overridden
# with --enable-
interpreters
.
# with --enable-
scripting
.
if test $_os != iOS; then
if test $_os != iOS; then
enable_
interpreters
=yes
enable_
scripting
=yes
fi
fi
fi
fi
DISABLE_
INTERPRETERS
=''
DISABLE_
SCRIPTING
=''
if test "$enable_
interpreters
" = yes; then
if test "$enable_
scripting
" = yes; then
BUILD_TYPE="$BUILD_TYPE
INTERPRETERS
"
BUILD_TYPE="$BUILD_TYPE
SCRIPTING
"
else
else
DISABLE_
INTERPRETERS
='TRUE'
DISABLE_
SCRIPTING
='TRUE'
fi
fi
AC_SUBST(DISABLE_
INTERPRETERS
)
AC_SUBST(DISABLE_
SCRIPTING
)
dnl ===================================================================
dnl ===================================================================
dnl Extra check for Windows. Cygwin builds need gcc to build dmake
dnl Extra check for Windows. Cygwin builds need gcc to build dmake
...
@@ -4535,8 +4535,8 @@ dnl Java support enable
...
@@ -4535,8 +4535,8 @@ dnl Java support enable
dnl ===================================================================
dnl ===================================================================
AC_MSG_CHECKING([whether to build with Java support])
AC_MSG_CHECKING([whether to build with Java support])
if test "$with_java" != "no"; then
if test "$with_java" != "no"; then
if test "$DISABLE_
INTERPRETERS
" = TRUE; then
if test "$DISABLE_
SCRIPTING
" = TRUE; then
AC_MSG_RESULT([no, overridden by --disable-
interpreters
])
AC_MSG_RESULT([no, overridden by --disable-
scripting
])
SOLAR_JAVA=""
SOLAR_JAVA=""
else
else
AC_MSG_RESULT([yes])
AC_MSG_RESULT([yes])
...
@@ -5953,8 +5953,8 @@ no|disable)
...
@@ -5953,8 +5953,8 @@ no|disable)
DISABLE_PYTHON=TRUE
DISABLE_PYTHON=TRUE
;;
;;
""|yes|auto)
""|yes|auto)
if test "$DISABLE_
INTERPRETERS
" = TRUE; then
if test "$DISABLE_
SCRIPTING
" = TRUE; then
AC_MSG_RESULT([no, overridden by --disable-
interpreters
])
AC_MSG_RESULT([no, overridden by --disable-
scripting
])
enable_python=no
enable_python=no
DISABLE_PYTHON=TRUE
DISABLE_PYTHON=TRUE
elif test $build_os = cygwin; then
elif test $build_os = cygwin; then
...
...
postprocess/packcomponents/makefile.mk
Dosyayı görüntüle @
c16bc826
...
@@ -177,7 +177,7 @@ my_components += \
...
@@ -177,7 +177,7 @@ my_components += \
.ENDIF
.ENDIF
.IF
"$(DISABLE_
INTERPRETERS
)"
!=
"TRUE"
.IF
"$(DISABLE_
SCRIPTING
)"
!=
"TRUE"
my_components
+=
\
my_components
+=
\
component/basctl/util/basctl
\
component/basctl/util/basctl
\
...
...
sc/Module_sc.mk
Dosyayı görüntüle @
c16bc826
...
@@ -33,7 +33,7 @@ $(eval $(call gb_Module_add_targets,sc,\
...
@@ -33,7 +33,7 @@ $(eval $(call gb_Module_add_targets,sc,\
Package_xml \
Package_xml \
))
))
ifneq ($(DISABLE_
INTERPRETERS
),TRUE)
ifneq ($(DISABLE_
SCRIPTING
),TRUE)
$(eval $(call gb_Module_add_targets,sc,\
$(eval $(call gb_Module_add_targets,sc,\
Library_vbaobj \
Library_vbaobj \
...
...
scripting/Module_scripting.mk
Dosyayı görüntüle @
c16bc826
...
@@ -28,7 +28,7 @@
...
@@ -28,7 +28,7 @@
$(eval
$(call
gb_Module_Module,scripting))
$(eval
$(call
gb_Module_Module,scripting))
ifneq
($(DISABLE_
INTERPRETERS
),TRUE)
ifneq
($(DISABLE_
SCRIPTING
),TRUE)
$(eval
$(call
gb_Module_add_targets,scripting,\
$(eval
$(call
gb_Module_add_targets,scripting,\
$(if
$(SOLAR_JAVA),\
$(if
$(SOLAR_JAVA),\
...
...
solenv/gbuild/CppunitTest.mk
Dosyayı görüntüle @
c16bc826
...
@@ -182,7 +182,7 @@ endef
...
@@ -182,7 +182,7 @@ endef
# to libraries not built in this configuration.
# to libraries not built in this configuration.
define gb_CppunitTest__filter_not_built_components
define gb_CppunitTest__filter_not_built_components
$(filter-out \
$(filter-out \
$(if $(filter
INTERPRETERS
,$(BUILD_TYPE)),, \
$(if $(filter
SCRIPTING
,$(BUILD_TYPE)),, \
basic/util/sb \
basic/util/sb \
sw/util/vbaswobj \
sw/util/vbaswobj \
scripting/source/basprov/basprov \
scripting/source/basprov/basprov \
...
...
solenv/gbuild/gbuild.mk
Dosyayı görüntüle @
c16bc826
...
@@ -236,8 +236,8 @@ ifeq ($(strip $(DISABLE_DBCONNECTIVITY)),TRUE)
...
@@ -236,8 +236,8 @@ ifeq ($(strip $(DISABLE_DBCONNECTIVITY)),TRUE)
gb_GLOBALDEFS += -DDISABLE_DBCONNECTIVITY
gb_GLOBALDEFS += -DDISABLE_DBCONNECTIVITY
endif
endif
ifeq ($(strip $(DISABLE_
INTERPRETERS
)),TRUE)
ifeq ($(strip $(DISABLE_
SCRIPTING
)),TRUE)
gb_GLOBALDEFS += -DDISABLE_
INTERPRETERS
gb_GLOBALDEFS += -DDISABLE_
SCRIPTING
endif
endif
ifeq ($(HAVE_THREADSAFE_STATICS),TRUE)
ifeq ($(HAVE_THREADSAFE_STATICS),TRUE)
...
...
sw/Module_sw.mk
Dosyayı görüntüle @
c16bc826
...
@@ -39,7 +39,7 @@ $(eval $(call gb_Module_add_targets,sw,\
...
@@ -39,7 +39,7 @@ $(eval $(call gb_Module_add_targets,sw,\
Package_xml \
Package_xml \
))
))
ifneq ($(DISABLE_
INTERPRETERS
),TRUE)
ifneq ($(DISABLE_
SCRIPTING
),TRUE)
$(eval $(call gb_Module_add_targets,sw,\
$(eval $(call gb_Module_add_targets,sw,\
Library_vbaswobj \
Library_vbaswobj \
...
...
vbahelper/Module_vbahelper.mk
Dosyayı görüntüle @
c16bc826
...
@@ -28,7 +28,7 @@
...
@@ -28,7 +28,7 @@
$(eval $(call gb_Module_Module,vbahelper))
$(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
# the targets to be inserted are their file names without .mk extension
$(eval $(call gb_Module_add_targets,vbahelper,\
$(eval $(call gb_Module_add_targets,vbahelper,\
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment