RepositoryModule_host.mk | 4 +-
bin/module-deps.pl | 8 +++-
configure.ac | 16 +++++---
solenv/gbuild/extensions/pre_MergedLibsList.mk | 50 +++++++++++++------------
solenv/gbuild/platform/com_GCC_defs.mk | 2 -
solenv/gbuild/platform/com_MSC_defs.mk | 2 -
6 files changed, 47 insertions(+), 35 deletions(-)
New commits:
commit b7bae354aafc3b2c1e579c72443ccfba4d42e4ac
Author: Peter Foley <pefol...@verizon.net>
Date: Thu Apr 11 17:41:38 2013 -0400
add a env variable to keep the libraries w/ module-deps.pl
Change-Id: Id9279b7e0dea2231db12997e571fe13ae240b914
diff --git a/bin/module-deps.pl b/bin/module-deps.pl
index de8022c..2742600 100755
--- a/bin/module-deps.pl
+++ b/bin/module-deps.pl
@@ -159,11 +159,13 @@ sub prune_redundant_deps($)
}
# glob on libo directory
-# note: only works if you stay in main LO dir
sub create_lib_module_map()
{
my %l2m;
+ # hardcode the libs that don't have a directory
$l2m{'merged'} = 'merged';
+ $l2m{'urelibs'} = 'urelibs';
+
for (glob($src_root."/*/Library_*.mk"))
{
/.*\/(.*)\/Library_(.*)\.mk/;
@@ -315,7 +317,9 @@ sub main()
my $tree = clean_tree($deps);
filter_targets($tree);
optimize_tree($tree);
- $tree = collapse_lib_to_module($tree) if !$preserve_libs;
+ if (!$preserve_libs && !defined($ENV{PRESERVE_LIBS})) {
+ $tree = collapse_lib_to_module($tree);
+ }
dump_graphviz($tree);
}
commit 0e5f2ea0de71439fe121da47deaba68585541808
Author: Peter Foley <pefol...@verizon.net>
Date: Wed Apr 10 19:02:44 2013 -0400
create --enable-mergelibs=all option
Support cramming everything into one big merged library as well as
only the libraries depended upon by almost everything.
Change-Id: I69647037dc62840294ba670d5d6c172a4608bf3f
diff --git a/RepositoryModule_host.mk b/RepositoryModule_host.mk
index c67bd61..f163ac2 100644
--- a/RepositoryModule_host.mk
+++ b/RepositoryModule_host.mk
@@ -237,7 +237,7 @@ $(eval $(call gb_Module_add_moduledirs,libreoffice,\
$(call gb_Helper_optional,ZLIB,zlib) \
))
-ifeq ($(MERGELIBS),TRUE)
+ifneq ($(MERGELIBS),)
$(eval $(call gb_Module_add_targets,libreoffice,\
Library_merged \
$(if $(URELIBS),Library_urelibs) \
@@ -267,7 +267,7 @@ $(eval $(call repositorymodule_serialize,\
sc msword swui sw sd \
$(if $(filter DBCONNECTIVITY,$(BUILD_TYPE)),dbu) \
writerfilter cui chartcontroller oox \
- $(if $(filter TRUE,$(MERGELIBS)),merged,svxcore) \
+ $(if $(MERGELIBS),merged,svxcore) \
xo vcl \
))
endif
diff --git a/configure.ac b/configure.ac
index 512db80..96ddaf7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -709,9 +709,10 @@ AC_ARG_ENABLE([hardlink-deliver],
)
AC_ARG_ENABLE(mergelibs,
- AS_HELP_STRING([--enable-mergelibs],
+ AS_HELP_STRING([--enable-mergelibs=<all/yes>],
[Enables linking of big, merged, library. Experimental feature tested
- only on Linux and Android.])
+ only on Linux and Android. All will link a lot more libraries into
libmerged
+ while yes or no argument will simply enable a core set of libraries.])
)
AC_ARG_ENABLE(graphite,
@@ -11632,16 +11633,21 @@ fi
# ===================================================================
AC_MSG_CHECKING([whether to create huge library])
MERGELIBS=
-if test "$enable_mergelibs" = "yes"; then
+if test "$enable_mergelibs" != "no"; then
if test $_os != Linux -a $_os != Android -a $_os != WINNT; then
add_warning "--enable-mergelibs is not tested for this platform"
fi
- MERGELIBS="TRUE"
+ if test "$enable_mergelibs" = "all"; then
+ MERGELIBS="ALL"
+ URELIBS="TRUE"
+ else
+ MERGELIBS="CORE"
+ fi
AC_MSG_RESULT([yes])
else
AC_MSG_RESULT([no])
fi
-AC_SUBST(MERGELIBS)
+AC_SUBST([MERGELIBS])
AC_SUBST([URELIBS])
# ===================================================================
diff --git a/solenv/gbuild/extensions/pre_MergedLibsList.mk
b/solenv/gbuild/extensions/pre_MergedLibsList.mk
index 28558fb..115e261 100644
--- a/solenv/gbuild/extensions/pre_MergedLibsList.mk
+++ b/solenv/gbuild/extensions/pre_MergedLibsList.mk
@@ -25,31 +25,44 @@
# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
# instead of those above.
-ifeq ($(MERGELIBS),TRUE)
-
-# FIXME: just retaining these for now - they currently crash & need thought.
+ifneq ($(MERGELIBS),)
# set of libraries to link even more stuff into one merged library
gb_EXTRAMERGEDLIBS := \
- analysis \
$(if $(filter unx,$(GUIBASE)),basebmp) \
- $(call gb_Helper_optional,DBCONNECTIVITY,calc) \
chartcore \
+ $(call gb_Helper_optional,DBCONNECTIVITY,dba) \
+ $(call gb_Helper_optional,DBCONNECTIVITY,dbtools) \
+ $(call gb_Helper_optional,DBCONNECTIVITY,dbu) \
+ $(call gb_Helper_optional,DBCONNECTIVITY,file) \
+ for \
+ forui \
+ fwl \
+ $(if $(filter-out ANDROID IOS,$(OS)),odbcbase) \
+ oox \
+ $(call gb_Helper_optional,PYUNO,pyuno) \
+ $(call gb_Helper_optional,DBCONNECTIVITY,rpt) \
+ sc \
+ sd \
+ sw \
+ swd \
+ test \
+ unotest \
+ $(if $(DISABLE_SCRIPTING),,vbahelper) \
+ xmlsecurity
+
+# FIXME: just retaining these for now - they currently crash & need thought.
+#gb_EXTRAMERGEDLIBS := \
+ analysis \
+ $(call gb_Helper_optional,DBCONNECTIVITY,calc) \
ctl \
cui \
date \
- $(call gb_Helper_optional,DBCONNECTIVITY,dba) \
$(call gb_Helper_optional,DBCONNECTIVITY,dbase) \
- $(call gb_Helper_optional,DBCONNECTIVITY,dbtools) \
- $(call gb_Helper_optional,DBCONNECTIVITY,dbu) \
embobj \
evtatt \
fastsax \
- $(call gb_Helper_optional,DBCONNECTIVITY,file) \
$(call gb_Helper_optional,DBCONNECTIVITY,flat) \
- for \
- forui \
$(call gb_Helper_optional,DBCONNECTIVITY,frm) \
- fwl \
fwm \
hwp \
hyphen \
@@ -65,38 +78,26 @@ gb_EXTRAMERGEDLIBS := \
localedata_euro \
localedata_others \
$(if $(filter-out ANDROID IOS,$(OS)),odbc) \
- $(if $(filter-out ANDROID IOS,$(OS)),odbcbase) \
- oox \
pricing \
$(call gb_Helper_optional,PYUNO,pythonloader) \
- $(call gb_Helper_optional,PYUNO,pyuno) \
- $(call gb_Helper_optional,DBCONNECTIVITY,rpt) \
$(call gb_Helper_optional,DBCONNECTIVITY,rptui) \
$(call gb_Helper_optional,DBCONNECTIVITY,rptxml) \
- sc \
$(if $(DISABLE_SCRIPTING),,scriptframe) \
scui \
scfilt \
- sd \
sdui \
$(if $(filter-out IOS,$(OS)),solver) \
spell \
$(if $(DISABLE_SCRIPTING),,stringresource) \
subsequenttest \
- sw \
swui \
- swd \
- test \
textfd \
ucpcmis1 \
- unotest \
- $(if $(DISABLE_SCRIPTING),,vbahelper) \
$(if $(filter-out IOS,$(OS)),wpftdraw) \
$(if $(filter-out IOS,$(OS)),wpftwriter) \
writerfilter \
xmlfa \
xmlfd \
- xmlsecurity
# we link all object files from these libraries into one, merged library
gb_MERGEDLIBS := \
@@ -142,6 +143,7 @@ gb_MERGEDLIBS := \
xmlscript \
xo \
xstor \
+ $(if $(filter ALL,$(MERGELIBS)),$(gb_EXTRAMERGEDLIBS))
ifneq (,$(URELIBS))
gb_URELIBS := \
diff --git a/solenv/gbuild/platform/com_GCC_defs.mk
b/solenv/gbuild/platform/com_GCC_defs.mk
index aedd703..2f4b367 100644
--- a/solenv/gbuild/platform/com_GCC_defs.mk
+++ b/solenv/gbuild/platform/com_GCC_defs.mk
@@ -106,7 +106,7 @@ gb_CFLAGS_WERROR := -Werror
gb_CXXFLAGS_WERROR := -Werror
endif
-ifeq ($(MERGELIBS),TRUE)
+ifneq ($(MERGELIBS),)
gb_CFLAGS_COMMON += -DLIBO_MERGELIBS
gb_CXXFLAGS_COMMON += -DLIBO_MERGELIBS
endif
diff --git a/solenv/gbuild/platform/com_MSC_defs.mk
b/solenv/gbuild/platform/com_MSC_defs.mk
index e8488ef..153b2fb 100644
--- a/solenv/gbuild/platform/com_MSC_defs.mk
+++ b/solenv/gbuild/platform/com_MSC_defs.mk
@@ -237,7 +237,7 @@ gb_CFLAGS_WERROR := -WX
gb_CXXFLAGS_WERROR := -WX
endif
-ifeq ($(MERGELIBS),TRUE)
+ifneq ($(MERGELIBS),)
gb_CFLAGS += -DLIBO_MERGELIBS
gb_CXXFLAGS += -DLIBO_MERGELIBS
endif
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
