[Libreoffice-commits] core.git: 5 commits - Library_merged.mk sal/osl sfx2/source solenv/gbuild vcl/unx
Peter Foley
pefoley2 at verizon.net
Sun Mar 31 08:34:05 PDT 2013
Library_merged.mk | 3 ---
sal/osl/unx/module.cxx | 2 +-
sfx2/source/appl/appinit.cxx | 6 +++++-
solenv/gbuild/AllLangResTarget.mk | 2 +-
solenv/gbuild/LinkTarget.mk | 2 +-
solenv/gbuild/extensions/pre_MergedLibsList.mk | 1 -
vcl/unx/generic/plugadapt/salplug.cxx | 6 +++++-
7 files changed, 13 insertions(+), 9 deletions(-)
New commits:
commit 0b78f2b9dc17dfa88d72d6ee27e3e0e0ca6a152f
Author: Peter Foley <pefoley2 at verizon.net>
Date: Sun Mar 31 11:16:32 2013 -0400
fix sfx2 with Library_merged
Change-Id: I53d64b9023be816d0179eed21920beed3660909c
diff --git a/sfx2/source/appl/appinit.cxx b/sfx2/source/appl/appinit.cxx
index 935d00a..cef12aa 100644
--- a/sfx2/source/appl/appinit.cxx
+++ b/sfx2/source/appl/appinit.cxx
@@ -186,7 +186,11 @@ String GetSpecialCharsForEdit(Window* pParent, const Font& rFont)
bDetermineFunction = true;
#ifndef DISABLE_DYNLOADING
- static ::rtl::OUString aLibName( SVLIBRARY( "cui" ) );
+ #ifdef LIBO_MERGEDLIBS
+ static OUString aLibName( SVLIBRARY( "merged" ) );
+ #else
+ static OUString aLibName( SVLIBRARY( "cui" ) );
+ #endif
oslModule handleMod = osl_loadModuleRelative(
&thisModule, aLibName.pData, 0 );
commit 04f02faea3c4cdf1d9f0f3312c24afd3ad6f71f2
Author: Peter Foley <pefoley2 at verizon.net>
Date: Sun Mar 31 11:14:12 2013 -0400
Make sure merged libs are 0 bytes long.
If you build with --disable-mergelibs and then enable
--enable-mergelibs the existing library has its timestamp updated
but it retains its outdated contents.
Change-Id: I46899bcf3fe4f360fb12e8de8842c6ac12c6bf75
diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk
index cd3f39b..5be9d6e 100644
--- a/solenv/gbuild/LinkTarget.mk
+++ b/solenv/gbuild/LinkTarget.mk
@@ -445,7 +445,7 @@ endef
# If object files from this library are merged, create just empty file
$(call gb_LinkTarget_get_target,%) : $(call gb_LinkTarget_get_headers_target,%) $(gb_Helper_MISCDUMMY)
$(if $(filter $*,$(foreach lib,$(gb_MERGEDLIBS),$(call gb_Library_get_linktargetname,$(lib)))), \
- touch $@, $(call gb_LinkTarget__command,$@,$*))
+ echo > $@, $(call gb_LinkTarget__command,$@,$*))
$(call gb_LinkTarget__command_objectlist,$@,$*)
ifeq ($(gb_FULLDEPS),$(true))
commit a2747d0721eb5183d8e92b45626361a21d38c270
Author: Peter Foley <pefoley2 at verizon.net>
Date: Sat Mar 30 19:38:13 2013 -0400
fix vcl with Library_merged
Change-Id: Ie85ba53c59eda5586b70527a518e3f80223fc49e
diff --git a/Library_merged.mk b/Library_merged.mk
index d712028..fb29c94 100644
--- a/Library_merged.mk
+++ b/Library_merged.mk
@@ -103,9 +103,6 @@ $(eval $(call gb_Library_add_libs,merged,\
-lSM \
-lICE \
))
-$(eval $(call gb_Library_use_static_libraries,merged,\
- headless \
-))
endif
ifeq ($(OS),LINUX)
diff --git a/solenv/gbuild/extensions/pre_MergedLibsList.mk b/solenv/gbuild/extensions/pre_MergedLibsList.mk
index a8acf37..cbccd67 100644
--- a/solenv/gbuild/extensions/pre_MergedLibsList.mk
+++ b/solenv/gbuild/extensions/pre_MergedLibsList.mk
@@ -129,7 +129,6 @@ gb_MERGEDLIBS := \
uui \
$(if $(DISABLE_SCRIPTING),,vbahelper) \
vcl \
- $(if $(filter unx,$(GUIBASE)),vclplug_svp) \
$(if $(filter-out IOS,$(OS)),wpftdraw) \
$(if $(filter-out IOS,$(OS)),wpftwriter) \
writerfilter \
diff --git a/vcl/unx/generic/plugadapt/salplug.cxx b/vcl/unx/generic/plugadapt/salplug.cxx
index dc8b586..e8a2eeb 100644
--- a/vcl/unx/generic/plugadapt/salplug.cxx
+++ b/vcl/unx/generic/plugadapt/salplug.cxx
@@ -118,7 +118,11 @@ static SalInstance* tryInstance( const OUString& rModuleBase, bool bForce = fals
static DesktopType get_desktop_environment()
{
OUStringBuffer aModName( 128 );
- aModName.appendAscii( SAL_DLLPREFIX"desktop_detector" );
+ #ifdef LIBO_MERGELIBS
+ aModName.appendAscii( SAL_DLLPREFIX"merged" );
+ #else
+ aModName.appendAscii( SAL_DLLPREFIX"desktop_detector" );
+ #endif
aModName.appendAscii( SAL_DLLPOSTFIX );
OUString aModule = aModName.makeStringAndClear();
commit 8b561c0012546aabbaff33b32a79833997aa8902
Author: Peter Foley <pefoley2 at verizon.net>
Date: Sat Mar 30 19:12:22 2013 -0400
If you can't load a shared library it should be a warning
This has bitten me more than once when working on Library_merged.
Change-Id: I829f5d010b6df2935fd191bdec9bac04bb003f16
diff --git a/sal/osl/unx/module.cxx b/sal/osl/unx/module.cxx
index 9169768..43ff2a4e 100644
--- a/sal/osl/unx/module.cxx
+++ b/sal/osl/unx/module.cxx
@@ -160,7 +160,7 @@ oslModule SAL_CALL osl_loadModuleAscii(const sal_Char *pModuleName, sal_Int32 nR
((nRtldMode & SAL_LOADMODULE_GLOBAL) ? RTLD_GLOBAL : RTLD_LOCAL);
void* pLib = dlopen(pModuleName, rtld_mode);
- SAL_INFO_IF(
+ SAL_WARN_IF(
pLib == 0, "sal.osl",
"dlopen(" << pModuleName << ", " << rtld_mode << "): "
<< dlerror());
commit 570b827e4cacae44987be39d0b381d2fd472f28a
Author: Peter Foley <pefoley2 at verizon.net>
Date: Sat Mar 30 17:08:58 2013 -0400
cleanup srs gbuild output
Change-Id: I69fbf910cf2eb579cc8bf7dc76c69432b810b194
diff --git a/solenv/gbuild/AllLangResTarget.mk b/solenv/gbuild/AllLangResTarget.mk
index 73002af..629c310 100644
--- a/solenv/gbuild/AllLangResTarget.mk
+++ b/solenv/gbuild/AllLangResTarget.mk
@@ -51,7 +51,6 @@ gb_SrsPartMergeTarget_TRANSEXDEPS := $(call gb_Executable_get_runtime_dependenci
gb_SrsPartMergeTarget_TRANSEXCOMMAND := $(call gb_Executable_get_command,transex3)
define gb_SrsPartMergeTarget__command
-$(call gb_Output_announce,$(3),$(true),SRS,1)
MERGEINPUT=`$(gb_MKTEMP)` && \
echo $(POFILES) > $${MERGEINPUT} && \
$(call gb_Helper_abbreviate_dirs,\
@@ -66,6 +65,7 @@ rm -rf $${MERGEINPUT}
endef
$(call gb_SrsPartMergeTarget_get_target,%) : $(SRCDIR)/% $(gb_Helper_MISCDUMMY) $(gb_SrsPartMergeTarget_TRANSEXDEPS)
+ $(call gb_Output_announce,$*,$(true),SRS,1)
$(if $(filter $(words $(POFILES)),$(words $(wildcard $(POFILES)))),\
$(call gb_SrsPartMergeTarget__command,$@,$*,$<),\
mkdir -p $(dir $@) && cp $< $@)
More information about the Libreoffice-commits
mailing list