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
db52fd71
Kaydet (Commit)
db52fd71
authored
Nis 23, 2013
tarafından
Michael Meeks
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
Add license filtering to configure.
Change-Id: Icd53c6ccfcca25d828d79ad62d1e075869998850
üst
16385c4d
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
45 additions
and
4 deletions
+45
-4
Repository.mk
Repository.mk
+1
-1
config_host.mk.in
config_host.mk.in
+2
-0
configure.ac
configure.ac
+34
-1
Module_lotuswordpro.mk
lotuswordpro/Module_lotuswordpro.mk
+4
-0
Rdb_services.mk
postprocess/Rdb_services.mk
+3
-1
pre_MergedLibsList.mk
solenv/gbuild/extensions/pre_MergedLibsList.mk
+1
-1
No files found.
Repository.mk
Dosyayı görüntüle @
db52fd71
...
@@ -276,7 +276,7 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,OOO, \
...
@@ -276,7 +276,7 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,OOO, \
$(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,WRITER, \
$(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,WRITER, \
hwp \
hwp \
lwpft
\
$(if $(ENABLE_LWP),lwpft)
\
msword \
msword \
swd \
swd \
swui \
swui \
...
...
config_host.mk.in
Dosyayı görüntüle @
db52fd71
...
@@ -135,6 +135,7 @@ export ENABLE_KDE=@ENABLE_KDE@
...
@@ -135,6 +135,7 @@ export ENABLE_KDE=@ENABLE_KDE@
export ENABLE_LIBLANGTAG=@ENABLE_LIBLANGTAG@
export ENABLE_LIBLANGTAG=@ENABLE_LIBLANGTAG@
export ENABLE_LOCKDOWN=@ENABLE_LOCKDOWN@
export ENABLE_LOCKDOWN=@ENABLE_LOCKDOWN@
export ENABLE_LTO=@ENABLE_LTO@
export ENABLE_LTO=@ENABLE_LTO@
export ENABLE_LWP=@ENABLE_LWP@
export ENABLE_MACOSX_SANDBOX=@ENABLE_MACOSX_SANDBOX@
export ENABLE_MACOSX_SANDBOX=@ENABLE_MACOSX_SANDBOX@
export ENABLE_MEDIAWIKI=@ENABLE_MEDIAWIKI@
export ENABLE_MEDIAWIKI=@ENABLE_MEDIAWIKI@
export ENABLE_MINIMIZER=@ENABLE_MINIMIZER@
export ENABLE_MINIMIZER=@ENABLE_MINIMIZER@
...
@@ -352,6 +353,7 @@ export MKDEPENDSOLVER=TRUE
...
@@ -352,6 +353,7 @@ export MKDEPENDSOLVER=TRUE
export ML_EXE=@ML_EXE@
export ML_EXE=@ML_EXE@
export MOC4=@MOC4@
export MOC4=@MOC4@
export MOC=@MOC@
export MOC=@MOC@
export MPL_SUBSET=@MPL_SUBSET@
export MSM_PATH=@MSM_PATH@
export MSM_PATH=@MSM_PATH@
export MSPUB_CFLAGS=$(gb_SPACE)@MSPUB_CFLAGS@
export MSPUB_CFLAGS=$(gb_SPACE)@MSPUB_CFLAGS@
export MSPUB_LIBS=$(gb_SPACE)@MSPUB_LIBS@
export MSPUB_LIBS=$(gb_SPACE)@MSPUB_LIBS@
...
...
configure.ac
Dosyayı görüntüle @
db52fd71
...
@@ -747,7 +747,7 @@ AC_ARG_ENABLE(pch,
...
@@ -747,7 +747,7 @@ AC_ARG_ENABLE(pch,
AC_ARG_ENABLE(win-mozab-driver,
AC_ARG_ENABLE(win-mozab-driver,
AS_HELP_STRING([--enable-win-mozab-driver],
AS_HELP_STRING([--enable-win-mozab-driver],
[LibreOffice includes a driver to connect to Mozilla
[LibreOffice includes a driver to connect to Mozilla
address books under Windows, to build with this version, use this option.])
address books under Windows, to build with this version, use this option.])
)
)
...
@@ -763,6 +763,11 @@ AC_ARG_ENABLE(odk,
...
@@ -763,6 +763,11 @@ AC_ARG_ENABLE(odk,
wish to build without.])
wish to build without.])
)
)
AC_ARG_ENABLE(mpl-subset,
AS_HELP_STRING([--enable-mpl-subset],
[Don't compile any pieces which are not MPL or more liberrally licensed])
)
AC_ARG_ENABLE(mathmldtd,
AC_ARG_ENABLE(mathmldtd,
AS_HELP_STRING([--enable-mathmldtd],
AS_HELP_STRING([--enable-mathmldtd],
[Enable bundling of (modified) MathML 1.01 DTD.])
[Enable bundling of (modified) MathML 1.01 DTD.])
...
@@ -1152,6 +1157,11 @@ AC_ARG_ENABLE(postgresql-sdbc,
...
@@ -1152,6 +1157,11 @@ AC_ARG_ENABLE(postgresql-sdbc,
[Disable the build of the PostgreSQL-SDBC driver.])
[Disable the build of the PostgreSQL-SDBC driver.])
)
)
AC_ARG_ENABLE(lotuswordpro,
AS_HELP_STRING([--disable-lotuswordpro],
[Disable the build of the Lotus Word Pro filter.]),
,enable_lotuswordpro=yes)
AC_ARG_ENABLE(coretext,
AC_ARG_ENABLE(coretext,
AS_HELP_STRING([--enable-coretext],
AS_HELP_STRING([--enable-coretext],
[Use CoreText framework on Mac (instead of ATSU).
[Use CoreText framework on Mac (instead of ATSU).
...
@@ -6923,6 +6933,29 @@ printf ("hello world\n");
...
@@ -6923,6 +6933,29 @@ printf ("hello world\n");
fi
fi
AC_SUBST(WINEGCC)
AC_SUBST(WINEGCC)
ENABLE_LWP=
if test "$enable_lotuswordpro" = "yes"; then
ENABLE_LWP="TRUE"
SCPDEFS="$SCPDEFS -DDISABLE_LWP"
fi
AC_SUBST(ENABLE_LWP)
AC_MSG_CHECKING([MPL subset])
MPL_SUBSET=
if test "$enable_mpl_subset" = "yes"; then
if test "x$enable_postgresql_sdbc" != "xno"; then
AC_MSG_ERROR([need to --disable-postgresql-sdbc.])
fi
if test "$enable_lotuswordpro" = "yes"; then
AC_MSG_ERROR([need to --disable-lotuswordpro.])
fi
MPL_SUBSET="TRUE"
AC_MSG_RESULT([only])
else
AC_MSG_RESULT([no restrictions])
fi
AC_SUBST(MPL_SUBSET)
dnl ===================================================================
dnl ===================================================================
dnl Check for gperf
dnl Check for gperf
dnl ===================================================================
dnl ===================================================================
...
...
lotuswordpro/Module_lotuswordpro.mk
Dosyayı görüntüle @
db52fd71
...
@@ -9,6 +9,8 @@
...
@@ -9,6 +9,8 @@
$(eval $(call gb_Module_Module,lotuswordpro))
$(eval $(call gb_Module_Module,lotuswordpro))
ifeq ($(ENABLE_LWP),TRUE)
$(eval $(call gb_Module_add_targets,lotuswordpro,\
$(eval $(call gb_Module_add_targets,lotuswordpro,\
Library_lwpft \
Library_lwpft \
))
))
...
@@ -17,4 +19,6 @@ $(eval $(call gb_Module_add_check_targets,lotuswordpro,\
...
@@ -17,4 +19,6 @@ $(eval $(call gb_Module_add_check_targets,lotuswordpro,\
CppunitTest_lotuswordpro_test_lotuswordpro \
CppunitTest_lotuswordpro_test_lotuswordpro \
))
))
endif
# vim: set noet sw=4 ts=4:
# vim: set noet sw=4 ts=4:
postprocess/Rdb_services.mk
Dosyayı görüntüle @
db52fd71
...
@@ -55,7 +55,9 @@ $(eval $(call gb_Rdb_add_components,services,\
...
@@ -55,7 +55,9 @@ $(eval $(call gb_Rdb_add_components,services,\
lingucomponent/source/spellcheck/spell/spell \
lingucomponent/source/spellcheck/spell/spell \
lingucomponent/source/thesaurus/libnth/lnth \
lingucomponent/source/thesaurus/libnth/lnth \
linguistic/source/lng \
linguistic/source/lng \
lotuswordpro/util/lwpfilter \
$(if $(ENABLE_LWP), \
lotuswordpro/util/lwpfilter \
) \
oox/util/oox \
oox/util/oox \
package/source/xstor/xstor \
package/source/xstor/xstor \
package/util/package2 \
package/util/package2 \
...
...
solenv/gbuild/extensions/pre_MergedLibsList.mk
Dosyayı görüntüle @
db52fd71
...
@@ -81,7 +81,7 @@ gb_EXTRAMERGEDLIBS := \
...
@@ -81,7 +81,7 @@ gb_EXTRAMERGEDLIBS := \
$
(
if
$
(
filter-out ANDROID IOS,
$(OS)
)
,ldapbe2
)
\
$
(
if
$
(
filter-out ANDROID IOS,
$(OS)
)
,ldapbe2
)
\
lnth
\
lnth
\
$
(
if
$
(
filter-out ANDROID IOS,
$(OS)
)
,log
)
\
$
(
if
$
(
filter-out ANDROID IOS,
$(OS)
)
,log
)
\
lwpft
\
$
(
if
$(ENABLE_LWP)
,lwpft
)
\
$
(
call gb_Helper_optional,DESKTOP,migrationoo2
)
\
$
(
call gb_Helper_optional,DESKTOP,migrationoo2
)
\
$
(
call gb_Helper_optional,DESKTOP,migrationoo3
)
\
$
(
call gb_Helper_optional,DESKTOP,migrationoo3
)
\
$
(
call gb_Helper_optional,DBCONNECTIVITY,mork
)
\
$
(
call gb_Helper_optional,DBCONNECTIVITY,mork
)
\
...
...
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