Library_merged.mk | 4 -
RepositoryModule_host.mk | 27 +++++++++---
liborcus/ExternalProject_liborcus.mk | 3 +
sd/source/ui/inc/ViewShell.hxx | 4 -
sd/source/ui/view/viewshe2.cxx | 6 --
solenv/Package_gdb.mk | 13 ++++-
solenv/bin/install-gdb-printers | 28 +++++++++---
solenv/gbuild/LinkTarget.mk | 2
solenv/gbuild/extensions/pre_MergedLibsList.mk | 56 +++----------------------
solenv/gdb/autoload.template | 6 +-
10 files changed, 72 insertions(+), 77 deletions(-)
New commits:
commit a28a70cdd6a3a28f902f153f725da3bae042c181
Author: Peter Foley <pefol...@verizon.net>
Date: Sat Apr 13 20:17:07 2013 -0400
make mergelibs=all not crash
Change-Id: Ie9a7b6c293a16ebf8773b7868de61ea5601000da
diff --git a/solenv/gbuild/extensions/pre_MergedLibsList.mk
b/solenv/gbuild/extensions/pre_MergedLibsList.mk
index edc728c..b0cb22f 100644
--- a/solenv/gbuild/extensions/pre_MergedLibsList.mk
+++ b/solenv/gbuild/extensions/pre_MergedLibsList.mk
@@ -41,9 +41,7 @@ gb_EXTRAMERGEDLIBS := \
oox \
$(call gb_Helper_optional,PYUNO,pyuno) \
$(call gb_Helper_optional,DBCONNECTIVITY,rpt) \
- sc \
sd \
- sw \
swd \
test \
unotest \
@@ -52,52 +50,9 @@ gb_EXTRAMERGEDLIBS := \
# 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,dbase) \
- embobj \
- evtatt \
- fastsax \
- $(call gb_Helper_optional,DBCONNECTIVITY,flat) \
- $(call gb_Helper_optional,DBCONNECTIVITY,frm) \
- fwm \
- hwp \
- hyphen \
- $(if $(filter TRUE,$(SOLAR_JAVA)),javaloader) \
- $(if $(filter TRUE,$(SOLAR_JAVA)),javavm) \
- $(if $(filter TRUE,$(SOLAR_JAVA)),java_uno) \
- $(if $(filter TRUE,$(SOLAR_JAVA)),juh) \
- $(if $(filter-out IOS,$(OS)),jvmaccess) \
- jvmfwk \
- lnth \
- localedata_en \
- localedata_es \
- localedata_euro \
- localedata_others \
- $(if $(filter-out ANDROID IOS,$(OS)),odbc) \
- pricing \
- $(call gb_Helper_optional,PYUNO,pythonloader) \
- $(call gb_Helper_optional,DBCONNECTIVITY,rptui) \
- $(call gb_Helper_optional,DBCONNECTIVITY,rptxml) \
- $(if $(DISABLE_SCRIPTING),,scriptframe) \
- scui \
- scfilt \
- sdui \
- $(if $(filter-out IOS,$(OS)),solver) \
- spell \
- $(if $(DISABLE_SCRIPTING),,stringresource) \
- subsequenttest \
- swui \
- textfd \
- ucpcmis1 \
- $(if $(filter-out IOS,$(OS)),wpftdraw) \
- $(if $(filter-out IOS,$(OS)),wpftwriter) \
- writerfilter \
- xmlfa \
- xmlfd \
+ sc \
+ sw \
+
# we link all object files from these libraries into one, merged library
gb_MERGEDLIBS := \
@@ -159,7 +114,7 @@ gb_URELIBS := \
salhelper \
store \
unoidl \
- xmlreader \
+ xmlreader
endif
commit ffe09728cb829016dbbe24ffc5ed10cfc15cfd5c
Author: Peter Foley <pefol...@verizon.net>
Date: Sat Apr 13 17:11:26 2013 -0400
adapt gdb pretty-printers to libmerged
Change-Id: I80236f3c69abe713ddfa8111e8ff76f83954def4
diff --git a/solenv/Package_gdb.mk b/solenv/Package_gdb.mk
index 946bc07..1f2f5b8 100644
--- a/solenv/Package_gdb.mk
+++ b/solenv/Package_gdb.mk
@@ -28,11 +28,16 @@
$(eval $(call gb_Package_Package,solenv_gdb,$(call
gb_CustomTarget_get_workdir,solenv/gdb)))
$(eval $(call gb_Package_add_files,solenv_gdb,lib,\
- $(call gb_Library_get_runtime_filename,cppu).3-gdb.py \
- $(call gb_Library_get_runtime_filename,sal).3-gdb.py \
+ $(if $(MERGELIBS), \
+ $(if $(filter ALL,$(MERGELIBS)), \
+ $(call gb_Library_get_runtime_filename,urelibs)-gdb.py, \
+ $(call gb_Library_get_runtime_filename,cppu).3-gdb.py \
+ $(call gb_Library_get_runtime_filename,sal).3-gdb.py \
+ $(call gb_Library_get_runtime_filename,sw)-gdb.py \
+ ) \
+ $(call gb_Library_get_runtime_filename,merged)-gdb.py, \
$(call gb_Library_get_runtime_filename,svl)-gdb.py \
- $(call gb_Library_get_runtime_filename,sw)-gdb.py \
- $(call gb_Library_get_runtime_filename,tl)-gdb.py \
+ $(call gb_Library_get_runtime_filename,tl)-gdb.py) \
))
$(eval $(call gb_Package_use_custom_target,solenv_gdb,solenv/gdb))
diff --git a/solenv/bin/install-gdb-printers b/solenv/bin/install-gdb-printers
index c478929..9f94d10f 100755
--- a/solenv/bin/install-gdb-printers
+++ b/solenv/bin/install-gdb-printers
@@ -84,6 +84,7 @@ make_autoload() {
local dir="${DESTDIR}${autoloaddir}"
${flat} || dir="${dir}/$2"
local lib="${dir}/$3"
+ local merged="$4"
if ! ${flat}; then
local resolved="$(readlink "${DESTDIR}${installdir}/$2/$3")"
@@ -103,8 +104,13 @@ make_autoload() {
fi
else
[[ -f ${lib}-gdb.py ]] && rm -f "${lib}-gdb.py"
- sed -e "s!%PYTHONDIR%!${pythondir}!" -e "s!%MODULE%!libreoffice.$1!" \
- "${GDBDIR}/autoload.template" > "${lib}-gdb.py"
+ if [[ -n "${merged}" ]]; then
+ sed -e "s!%PYTHONDIR%!${pythondir}!" -e "s!%MODULES%!${*:5}!" \
+ "${GDBDIR}/autoload.template" > "${lib}-gdb.py"
+ else
+ sed -e "s!%PYTHONDIR%!${pythondir}!" -e "s!%MODULES%!$1!" \
+ "${GDBDIR}/autoload.template" > "${lib}-gdb.py"
+ fi
fi
}
@@ -168,10 +174,18 @@ if [[ ${DESTDIR}${pythondir} != ${GDBDIR} ]]; then
cp -pr "${GDBDIR}/libreoffice" "${DESTDIR}${pythondir}"
fi
-make_autoload cppu ure-link/lib libuno_cppu."$DYLIB".3
-make_autoload sal ure-link/lib libuno_sal."$DYLIB".3
-make_autoload svl program libsvllo."$DYLIB"
-make_autoload sw program libswlo."$DYLIB"
-make_autoload tl program libtllo."$DYLIB"
+if [[ -n "${MERGELIBS}" ]]; then
+ make_autoload merged program libmergedlo."$DYLIB" merge svl tl `[[
${MERGELIBS} == "ALL" ]] && echo sw`
+ if [[ ${MERGELIBS} == "ALL" ]]; then
+ make_autoload urelibs ure-link/lib liburelibs."$DYLIB" merge cppu sal
+ else
+ make_autoload cppu ure-link/lib libuno_cppu."$DYLIB".3
+ make_autoload sal ure-link/lib libuno_sal."$DYLIB".3
+ make_autoload sw program libswlo."$DYLIB"
+ fi
+else
+ make_autoload svl program libsvllo."$DYLIB"
+ make_autoload tl program libtllo."$DYLIB"
+fi
# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/solenv/gdb/autoload.template b/solenv/gdb/autoload.template
index 2dbfa0a..f6d5e7a 100644
--- a/solenv/gdb/autoload.template
+++ b/solenv/gdb/autoload.template
@@ -27,6 +27,7 @@
import os.path
import sys
+import importlib
import gdb
@@ -36,8 +37,9 @@ if gdb.current_objfile():
if pythondir not in sys.path:
sys.path.insert(0, pythondir)
-from %MODULE% import register_pretty_printers
-register_pretty_printers(gdb.current_objfile())
+for mod in str.split("%MODULES%"):
+ module=importlib.import_module("libreoffice."+mod)
+ module.register_pretty_printers(gdb.current_objfile())
try:
import boost
commit fd3a23ce33bdec454273ba2bb3ea307b8420bcc0
Author: Peter Foley <pefol...@verizon.net>
Date: Sat Apr 13 12:23:27 2013 -0400
update the list of serialized libs
Change-Id: I2227de962c3af3f729e3476b3dd1d110ed10afce
diff --git a/RepositoryModule_host.mk b/RepositoryModule_host.mk
index f163ac2..3b425d0 100644
--- a/RepositoryModule_host.mk
+++ b/RepositoryModule_host.mk
@@ -260,15 +260,30 @@ $(if $(strip $(1)),\
$(call repositorymodule_serialize,$(wordlist 2,$(words $(1)),$(1))))
endef
+# this list consists of libraries above the arbitrary cut-off of 30M
+# on a --enable-debug linux build
ifeq (all,$(filter all,$(MAKECMDGOALS)))
$(eval $(call repositorymodule_serialize,\
+ chartcore \
+ chartcontroller \
+ cui \
+ $(call gb_Helper_optional,DBCONNECTIVITY,dbu) \
+ fwk \
+ $(if $(MERGELIBS),merged) \
+ msword \
+ oox \
+ sc \
scfilt \
- $(if $(filter SCRIPTING,$(BUILD_TYPE)),vbaobj) \
- sc msword swui sw sd \
- $(if $(filter DBCONNECTIVITY,$(BUILD_TYPE)),dbu) \
- writerfilter cui chartcontroller oox \
- $(if $(MERGELIBS),merged,svxcore) \
- xo vcl \
+ sd \
+ sfx \
+ svt \
+ svx \
+ svxcore \
+ sw \
+ swui \
+ vcl \
+ writerfilter \
+ xo \
))
endif
commit b8dd30682b78ee1256b3ca9346caf47930c7f950
Author: Peter Foley <pefol...@verizon.net>
Date: Sat Apr 13 10:08:48 2013 -0400
add purpenvhelper to liburelibs
Change-Id: Idc7d4f57b83e9df844bd49718d25df62dbccfe39
diff --git a/solenv/gbuild/extensions/pre_MergedLibsList.mk
b/solenv/gbuild/extensions/pre_MergedLibsList.mk
index 3cf052f..edc728c 100644
--- a/solenv/gbuild/extensions/pre_MergedLibsList.mk
+++ b/solenv/gbuild/extensions/pre_MergedLibsList.mk
@@ -153,6 +153,7 @@ gb_URELIBS := \
cppuhelper \
$(if $(filter TRUE,$(SOLAR_JAVA)),jvmaccess) \
$(if $(filter TRUE,$(SOLAR_JAVA)),jvmfwk) \
+ purpenvhelper \
reg \
sal \
salhelper \
commit e7d4e621055b2eda658cf6a92d24f7119a9dae30
Author: Peter Foley <pefol...@verizon.net>
Date: Sat Apr 13 10:08:19 2013 -0400
add tl and basegfx to libmerged
Change-Id: Ie16a3208dd6cc6f0d4fe8e3017b2bf7abc192ecd
diff --git a/Library_merged.mk b/Library_merged.mk
index 2c4257a..009cfb2 100644
--- a/Library_merged.mk
+++ b/Library_merged.mk
@@ -29,7 +29,6 @@ $(eval $(call gb_Library_use_library_objects,merged,\
))
$(eval $(call gb_Library_use_libraries,merged,\
- basegfx \
comphelper \
cppu \
cppuhelper \
@@ -39,7 +38,6 @@ $(eval $(call gb_Library_use_libraries,merged,\
jvmfwk) \
sal \
salhelper \
- tl \
ucbhelper \
xmlreader \
$(gb_UWINAPI) \
diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk
index 811f298..98964d7 100644
--- a/solenv/gbuild/LinkTarget.mk
+++ b/solenv/gbuild/LinkTarget.mk
@@ -837,7 +837,7 @@ $(call gb_LinkTarget_get_external_headers_target,$(1)) : \
endef
define gb_Linktarget__is_build_tool
-$(if $(filter $(1),$(addprefix Executable/,cppumaker idlc regcompare
regmerge)),$(true),$(false))
+$(if $(filter $(1),$(addprefix Executable/,cppumaker idlc regcompare regmerge
rsc svidl)),$(true),$(false))
endef
define gb_LinkTarget_use_libraries
diff --git a/solenv/gbuild/extensions/pre_MergedLibsList.mk
b/solenv/gbuild/extensions/pre_MergedLibsList.mk
index 115e261..3cf052f 100644
--- a/solenv/gbuild/extensions/pre_MergedLibsList.mk
+++ b/solenv/gbuild/extensions/pre_MergedLibsList.mk
@@ -102,6 +102,7 @@ gb_EXTRAMERGEDLIBS := \
# we link all object files from these libraries into one, merged library
gb_MERGEDLIBS := \
avmedia \
+ basegfx \
canvastools \
configmgr \
cppcanvas \
@@ -134,6 +135,7 @@ gb_MERGEDLIBS := \
svx \
svxcore \
tk \
+ tl \
$(if $(filter TRUE,$(ENABLE_TELEPATHY)),tubes) \
ucb1 \
ucpfile1 \
commit 952153274151aa8af53a8b52a5eba0eb7267e8d6
Author: Peter Foley <pefol...@verizon.net>
Date: Sat Apr 13 10:07:34 2013 -0400
fix liborcus w/ system boost
Change-Id: Ia461382ffc2025d7fdf368ad68a258aa626ad59a
diff --git a/liborcus/ExternalProject_liborcus.mk
b/liborcus/ExternalProject_liborcus.mk
index 5d18234..b4592de 100644
--- a/liborcus/ExternalProject_liborcus.mk
+++ b/liborcus/ExternalProject_liborcus.mk
@@ -64,6 +64,9 @@ liborcus_LIBS=
ifeq ($(SYSTEM_ZLIB),YES)
liborcus_LIBS+=-lz
endif
+ifeq ($(SYSTEM_BOOST),YES)
+liborcus_LIBS+=$(BOOST_SYSTEM_LIB)
+endif
ifeq ($(OS),ANDROID)
liborcus_LIBS+=-lgnustl_shared -lm
endif
commit 54ad562ff57e5a7293ad017e6664bcfedaef09af
Author: Peter Foley <pefol...@verizon.net>
Date: Sat Apr 13 09:22:11 2013 -0400
fix mergelibs=all
Change-Id: I267ebf8842ceefdaae3729364dcb75ab66c62e1c
diff --git a/Library_merged.mk b/Library_merged.mk
index 59edec1..2c4257a 100644
--- a/Library_merged.mk
+++ b/Library_merged.mk
@@ -48,6 +48,7 @@ $(eval $(call gb_Library_use_libraries,merged,\
$(eval $(call gb_Library_use_externals,merged,\
boostdatetime \
$(call gb_Helper_optional,DESKTOP,clucene) \
+ cppunit \
cups \
curl \
expat \
@@ -62,6 +63,7 @@ $(eval $(call gb_Library_use_externals,merged,\
$(if $(filter-out IOS,$(OS)),lpsolve) \
mythes \
nss3 \
+ $(call gb_Helper_optional,PYUNO,python) \
zlib \
))
diff --git a/sd/source/ui/inc/ViewShell.hxx b/sd/source/ui/inc/ViewShell.hxx
index 60ccfca..6239501 100644
--- a/sd/source/ui/inc/ViewShell.hxx
+++ b/sd/source/ui/inc/ViewShell.hxx
@@ -44,8 +44,6 @@ class ScrollBarBox;
class SdDrawDocument;
class ScrollBar;
-extern const String aEmptyStr;
-
namespace com { namespace sun { namespace star {
namespace embed {
class XEmbeddedObject;
@@ -53,6 +51,8 @@ namespace embed {
namespace sd {
+extern const String aEmptyStr;
+
class DrawDocShell;
class FrameView;
class LayerTabBar;
diff --git a/sd/source/ui/view/viewshe2.cxx b/sd/source/ui/view/viewshe2.cxx
index 16410c0..31dcf37 100644
--- a/sd/source/ui/view/viewshe2.cxx
+++ b/sd/source/ui/view/viewshe2.cxx
@@ -72,12 +72,10 @@
using namespace com::sun::star;
-#if !defined(DISABLE_DYNLOADING) // otherwise use the one in sw...
-const String aEmptyStr;
-#endif
-
namespace sd {
+const String aEmptyStr;
+
/**
* adjust Thumbpos and VisibleSize
*/
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
