[Libreoffice-commits] .: 2 commits - solenv/gbuild
solenv/gbuild/UI.mk | 22 --
1 file changed, 8 insertions(+), 14 deletions(-)
New commits:
commit 9c634c95e2939b1cdad5ea61e24cce58da3857b9
Author: David Tardon
Date: Wed Jan 9 06:41:06 2013 +0100
remove workdir too
Change-Id: Ib6d1a21fcc2a4dd6dda1e46a99551b38b5035d1f
diff --git a/solenv/gbuild/UI.mk b/solenv/gbuild/UI.mk
index 6a6d397..2bd07ac 100644
--- a/solenv/gbuild/UI.mk
+++ b/solenv/gbuild/UI.mk
@@ -54,7 +54,7 @@ $(call gb_UILocalizeTarget_get_target,%) :
$(gb_UILocalizeTarget_DEPS)
$(call gb_UILocalizeTarget_get_clean_target,%) :
$(call gb_Output_announce,$*,$(false),UIX,1)
$(call gb_Helper_abbreviate_dirs,\
- rm -f $(call gb_UILocalizeTarget_get_target,$*) \
+ rm -rf $(call gb_UILocalizeTarget_get_target,$*) $(call
gb_UILocalizeTarget_get_workdir,$*) \
)
# Produce translations for one .ui file
commit 2e8fb5803f2c9caed25e7a0a1c4cd1dba69f8cb0
Author: David Tardon
Date: Wed Jan 9 06:39:52 2013 +0100
create dummy translation files to avoid delivery failures
Change-Id: Idf4a12987295e0454d0330d76f251e3dd00c8403
diff --git a/solenv/gbuild/UI.mk b/solenv/gbuild/UI.mk
index 6078df3..6a6d397 100644
--- a/solenv/gbuild/UI.mk
+++ b/solenv/gbuild/UI.mk
@@ -17,17 +17,14 @@ gb_UILocalizeTarget_DEPS := $(call
gb_Executable_get_runtime_dependencies,uiex)
gb_UILocalizeTarget_COMMAND := $(call gb_Executable_get_command,uiex)
# If translatable strings from a .ui file are not merged into the
-# respective .po file yet, the produced translated files are empty (that
-# is, they only contain the root element), but qtz is not created at all
+# respective .po file yet, the produced translated files are empty,
# which breaks delivery. This hack avoids the problem by creating a
# dummy translation file.
-define gb_UILocalizeTarget__fix_missing_qtz
-$(if $(filter qtz,$(gb_WITH_LANG)),\
- && if [ ! -f $(1)/qtz.ui ]; then \
- echo '' > $(1)/qtz.ui; \
- fi \
-)
-endef
+$(call gb_UILocalizeTarget_get_workdir,%).ui :
+ $(if $(wildcard $@) \
+ ,touch $@ \
+ ,echo '' > $@ \
+ )
define gb_UILocalizeTarget__command
$(call gb_Output_announce,$(2),$(true),UIX,1)
@@ -39,7 +36,6 @@ $(call gb_Helper_abbreviate_dirs,\
-o $(call gb_UILocalizeTarget_get_workdir,$(2)) \
-l all \
-m $${MERGEINPUT} \
- $(call gb_UILocalizeTarget__fix_missing_qtz,$(call
gb_UILocalizeTarget_get_workdir,$(2))) \
&& touch $(1) \
) && \
rm -rf $${MERGEINPUT}
@@ -65,7 +61,7 @@ $(call gb_UILocalizeTarget_get_clean_target,%) :
#
# gb_UILocalizeTarget_UILocalizeTarget target
define gb_UILocalizeTarget_UILocalizeTarget
-$(call gb_UILocalizeTarget__UILocalizeTarget_impl,$(1),$(foreach
lang,$(gb_TRANS_LANGS),$(gb_POLOCATION)/$(lang)/$(patsubst %/,%,$(dir
$(1))).po))
+$(call gb_UILocalizeTarget__UILocalizeTarget_impl,$(1),$(wildcard $(foreach
lang,$(gb_TRANS_LANGS),$(gb_POLOCATION)/$(lang)/$(patsubst %/,%,$(dir
$(1))).po)))
endef
@@ -80,8 +76,6 @@ $(call gb_UILocalizeTarget_get_target,$(1)) :| \
$(dir $(call gb_UILocalizeTarget_get_target,$(1))).dir \
$(call gb_UILocalizeTarget_get_workdir,$(1))/.dir
-$(2) :
-
endef
# class UI
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - solenv/gbuild
solenv/gbuild/AllLangResTarget.mk|8 solenv/gbuild/CliUnoApi.mk |4 ++-- solenv/gbuild/Configuration.mk |4 ++-- solenv/gbuild/CppunitTest.mk |4 ++-- solenv/gbuild/Dictionary.mk |4 ++-- solenv/gbuild/Executable.mk | 24 solenv/gbuild/ExtensionTarget.mk | 24 solenv/gbuild/InstallModuleTarget.mk | 12 ++-- solenv/gbuild/SdiTarget.mk |4 ++-- solenv/gbuild/TargetLocations.mk | 30 -- solenv/gbuild/UI.mk |4 ++-- solenv/gbuild/UnoApiTarget.mk| 16 12 files changed, 66 insertions(+), 72 deletions(-) New commits: commit 3204d0383a181766907a5c90ddc1d3cf97fceea2 Author: David Tardon Date: Mon Dec 31 12:23:12 2012 +0100 always set library path Change-Id: Ie3248563815c2558c573e525e79024ef083345b7 diff --git a/solenv/gbuild/Executable.mk b/solenv/gbuild/Executable.mk index b0dc59d..47da186 100644 --- a/solenv/gbuild/Executable.mk +++ b/solenv/gbuild/Executable.mk @@ -184,19 +184,13 @@ $(call gb_Executable_get_runtime_target,$(1)) endef endif -define gb_Executable__get_command -$(if $(filter NONE,$(gb_Executable_VALIDGROUPS)),,$(call gb_Output_error,executable group NONE does not exist!)) -$(if $(filter $(1),$(gb_Executable_NONE)),,$(gb_Helper_set_ld_path)) \ -$(call gb_Executable_get_target_for_build,$(1)) -endef - # Get complete command-line for running the executable # # This includes setting library path, if necessary. # # gb_Executable_get_command executable define gb_Executable_get_command -$(strip $(call gb_Executable__get_command,$(1))) +$(gb_Helper_set_ld_path) $(call gb_Executable_get_target_for_build,$(1)) endef # vim: set noet sw=4: commit ee18b30b0391a443a51d7b97060f118478c202af Author: David Tardon Date: Mon Dec 31 12:22:04 2012 +0100 move gb_Executable_get_command back into Executable.mk Change-Id: Ia556cbfda5c5c3d9e1b2b7b1f488b079ce420367 diff --git a/solenv/gbuild/AllLangResTarget.mk b/solenv/gbuild/AllLangResTarget.mk index c85b612..2af2a2e 100644 --- a/solenv/gbuild/AllLangResTarget.mk +++ b/solenv/gbuild/AllLangResTarget.mk @@ -47,8 +47,8 @@ # SrsPartMergeTarget class -gb_SrsPartMergeTarget_TRANSEXDEPS := $(call gb_Executable_get_runtime_dependencies,transex3) -gb_SrsPartMergeTarget_TRANSEXCOMMAND := $(gb_Helper_set_ld_path) $(call gb_Executable_get_command,transex3) +gb_SrsPartMergeTarget_TRANSEXDEPS = $(call gb_Executable_get_runtime_dependencies,transex3) +gb_SrsPartMergeTarget_TRANSEXCOMMAND = $(call gb_Executable_get_command,transex3) define gb_SrsPartMergeTarget__command $(call gb_Output_announce,$(3),$(true),srs,1) @@ -86,8 +86,8 @@ endef # defined by platform # gb_SrsPartTarget__command_dep -gb_ResTarget_RSCDEPS := $(call gb_Executable_get_runtime_dependencies,rsc) -gb_ResTarget_RSCCOMMAND := SOLARBINDIR=$(OUTDIR_FOR_BUILD)/bin $(gb_Helper_set_ld_path) $(call gb_Executable_get_command,rsc) +gb_ResTarget_RSCDEPS = $(call gb_Executable_get_runtime_dependencies,rsc) +gb_ResTarget_RSCCOMMAND = SOLARBINDIR=$(OUTDIR_FOR_BUILD)/bin $(call gb_Executable_get_command,rsc) define gb_SrsPartTarget__command $(call gb_Helper_abbreviate_dirs,\ diff --git a/solenv/gbuild/CliUnoApi.mk b/solenv/gbuild/CliUnoApi.mk index 92e599c..5690413 100644 --- a/solenv/gbuild/CliUnoApi.mk +++ b/solenv/gbuild/CliUnoApi.mk @@ -11,8 +11,8 @@ gb_CliUnoApiTarget_EXT := $(gb_CliAssembly_POLICYEXT) -gb_CliUnoApiTarget_DEPS := $(call gb_Executable_get_runtime_dependencies,climaker) -gb_CliUnoApiTarget_COMMAND := $(call gb_Executable_get_command,climaker) +gb_CliUnoApiTarget_DEPS = $(call gb_Executable_get_runtime_dependencies,climaker) +gb_CliUnoApiTarget_COMMAND = $(call gb_Executable_get_command,climaker) define gb_CliUnoApiTarget__command $(call gb_Output_announce,$(2),$(true),CLI,4) diff --git a/solenv/gbuild/Configuration.mk b/solenv/gbuild/Configuration.mk index 328c5a8..98f60dd 100644 --- a/solenv/gbuild/Configuration.mk +++ b/solenv/gbuild/Configuration.mk @@ -251,8 +251,8 @@ $(call gb_XcuLangpackTarget_get_outdir_target,%) : # XcuMergeTarget class -gb_XcuMergeTarget_CFGEXDEPS := $(call gb_Executable_get_runtime_dependencies,cfgex) -gb_XcuMergeTarget_CFGEXCOMMAND := $(call gb_Executable_get_command,cfgex) +gb_XcuMergeTarget_CFGEXDEPS = $(call gb_Executable_get_runtime_dependencies,cfgex) +gb_XcuMergeTarget_CFGEXCOMMAND = $(call gb_Executable_get_command,cfgex) # PRJNAME is computed from the stem (parameter $(2)) define gb_XcuMergeTarget__command diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk index 9c145b6..0fec6bf 100644 --- a/solenv/gbuild/CppunitTest.mk +++ b/solenv/gbuild/CppunitTest.mk @@ -52,8 +52,8 @@ endif # gb_CppunitTest_get_filename # DBGSV_ERROR_OUT => in non-product builds, ensure that tools-based assertions do not pop up as message box, but ar
[Libreoffice-commits] .: 2 commits - solenv/gbuild
solenv/gbuild/platform/com_MSC_class.mk |9 ++---
1 file changed, 6 insertions(+), 3 deletions(-)
New commits:
commit e36f556026defbc88b1a5a4400130cd753a46148
Author: Tor Lillqvist
Date: Wed Dec 26 21:05:08 2012 +0200
Cosmetics
Change-Id: Ib7225307f51c8764c4b2b0e4ce45702d7919a017
diff --git a/solenv/gbuild/platform/com_MSC_class.mk
b/solenv/gbuild/platform/com_MSC_class.mk
index b779783..3af4af8 100644
--- a/solenv/gbuild/platform/com_MSC_class.mk
+++ b/solenv/gbuild/platform/com_MSC_class.mk
@@ -194,8 +194,11 @@ $(call gb_Helper_abbreviate_dirs,\
$(if $(filter
Executable,$(TARGETTYPE)),$(gb_Executable_TARGETTYPEFLAGS)) \
$(if $(filter YES,$(LIBRARY_X64)),,$(if $(filter
YES,$(TARGETGUI)), -SUBSYSTEM:WINDOWS$(COMMA)5.01,
-SUBSYSTEM:CONSOLE$(COMMA)5.01)) \
$(if $(filter YES,$(LIBRARY_X64)), -MACHINE:X64) \
- $(if $(filter YES,$(LIBRARY_X64)), -LIBPATH:$(OUTDIR)/lib/x64
-LIBPATH:$(COMPATH)/lib/amd64 -LIBPATH:$(WINDOWS_SDK_HOME)/lib/x64 \
- $(if $(filter
80,$(WINDOWS_SDK_VERSION)),-LIBPATH:$(WINDOWS_SDK_HOME)/lib/win8/um/x64,),) \
+ $(if $(filter YES,$(LIBRARY_X64)), \
+ -LIBPATH:$(OUTDIR)/lib/x64 \
+ -LIBPATH:$(COMPATH)/lib/amd64 \
+ -LIBPATH:$(WINDOWS_SDK_HOME)/lib/x64 \
+ $(if $(filter
80,$(WINDOWS_SDK_VERSION)),-LIBPATH:$(WINDOWS_SDK_HOME)/lib/win8/um/x64)) \
$(T_LDFLAGS) \
@$${RESPONSEFILE} \
$(foreach lib,$(LINKED_LIBS),$(call
gb_Library_get_filename,$(lib))) \
commit 92dfaaa0bfd08de58ccf9387c805ade24c04b41b
Author: Tor Lillqvist
Date: Wed Dec 26 21:02:48 2012 +0200
Subsystem 5.01 is invalid for 64-bit code, says the linker
Change-Id: I77f714bca9ddebffd6241d901661471aa27f03d5
diff --git a/solenv/gbuild/platform/com_MSC_class.mk
b/solenv/gbuild/platform/com_MSC_class.mk
index 2f93937..b779783 100644
--- a/solenv/gbuild/platform/com_MSC_class.mk
+++ b/solenv/gbuild/platform/com_MSC_class.mk
@@ -192,7 +192,7 @@ $(call gb_Helper_abbreviate_dirs,\
$(if $(filter Library
CppunitTest,$(TARGETTYPE)),$(gb_Library_TARGETTYPEFLAGS)) \
$(if $(filter
StaticLibrary,$(TARGETTYPE)),$(gb_StaticLibrary_TARGETTYPEFLAGS)) \
$(if $(filter
Executable,$(TARGETTYPE)),$(gb_Executable_TARGETTYPEFLAGS)) \
- $(if $(filter YES,$(TARGETGUI)),
-SUBSYSTEM:WINDOWS$(COMMA)5.01, -SUBSYSTEM:CONSOLE$(COMMA)5.01) \
+ $(if $(filter YES,$(LIBRARY_X64)),,$(if $(filter
YES,$(TARGETGUI)), -SUBSYSTEM:WINDOWS$(COMMA)5.01,
-SUBSYSTEM:CONSOLE$(COMMA)5.01)) \
$(if $(filter YES,$(LIBRARY_X64)), -MACHINE:X64) \
$(if $(filter YES,$(LIBRARY_X64)), -LIBPATH:$(OUTDIR)/lib/x64
-LIBPATH:$(COMPATH)/lib/amd64 -LIBPATH:$(WINDOWS_SDK_HOME)/lib/x64 \
$(if $(filter
80,$(WINDOWS_SDK_VERSION)),-LIBPATH:$(WINDOWS_SDK_HOME)/lib/win8/um/x64,),) \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - solenv/gbuild
solenv/gbuild/CppunitTest.mk |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 7a3988aca2c649253575bee6a582189f846c80b2 Author: LuboÅ¡ LuÅák Date: Wed Dec 5 11:25:58 2012 +0100 and valgrind leak errors or other info is probably not useful in unittests Change-Id: Id3d899e7e9ef86d0f3a24502af74ec3a554037ea diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk index 03c4523..047cf81 100644 --- a/solenv/gbuild/CppunitTest.mk +++ b/solenv/gbuild/CppunitTest.mk @@ -40,7 +40,7 @@ gb_CppunitTest__interactive := $(true) endif ifneq ($(strip $(VALGRIND)),) -gb_CppunitTest_VALGRINDTOOL := valgrind --tool=$(VALGRIND) --num-callers=50 --error-exitcode=1 +gb_CppunitTest_VALGRINDTOOL := valgrind --tool=$(VALGRIND) --num-callers=50 --error-exitcode=1 --quiet --leak-check=no ifeq ($(strip $(VALGRIND)),memcheck) G_SLICE := always-malloc GLIBCXX_FORCE_NEW := 1 commit b82f2f3b3a38a356ee71beab669d0aef6a941a02 Author: LuboÅ¡ LuÅák Date: Wed Dec 5 11:16:06 2012 +0100 make unittests abort build if valgrind finds any error in them Change-Id: I4b71b82cb426a185c6534f5a6a7c1eef422b2699 diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk index 823b78d..03c4523 100644 --- a/solenv/gbuild/CppunitTest.mk +++ b/solenv/gbuild/CppunitTest.mk @@ -40,7 +40,7 @@ gb_CppunitTest__interactive := $(true) endif ifneq ($(strip $(VALGRIND)),) -gb_CppunitTest_VALGRINDTOOL := valgrind --tool=$(VALGRIND) --num-callers=50 +gb_CppunitTest_VALGRINDTOOL := valgrind --tool=$(VALGRIND) --num-callers=50 --error-exitcode=1 ifeq ($(strip $(VALGRIND)),memcheck) G_SLICE := always-malloc GLIBCXX_FORCE_NEW := 1 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - solenv/gbuild
solenv/gbuild/platform/com_MSC_defs.mk | 129 ++--- 1 file changed, 119 insertions(+), 10 deletions(-) New commits: commit f02ac6e7c8da9e6e3b2263f028637723a8cf4829 Author: Tor Lillqvist Date: Sun Dec 2 11:19:39 2012 +0200 Don't disable warnings that supprted MSVC versions don't generate diff --git a/solenv/gbuild/platform/com_MSC_defs.mk b/solenv/gbuild/platform/com_MSC_defs.mk index 3d96cd3..8e3f249 100644 --- a/solenv/gbuild/platform/com_MSC_defs.mk +++ b/solenv/gbuild/platform/com_MSC_defs.mk @@ -88,10 +88,6 @@ gb_AFLAGS := /c /Cp # C4191: 'operator/operation' : unsafe conversion from 'type of # expression' to 'type required' -# C4217: 'operator' : member template functions cannot be used for -# copy-assignment or copy-construction. FIXME: This warning is not -# listed for VS2008 or later. - # C4242: 'identifier' : conversion from 'type1' to 'type2', possible # loss of data @@ -118,8 +114,6 @@ gb_AFLAGS := /c /Cp # C4290: C++ exception specification ignored except to indicate a # function is not __declspec(nothrow) -# C4294: FIXME: not documented at all - # C4350: behavior change: 'member1' called instead of 'member2' # C4355: 'this' : used in base member initializer list @@ -132,10 +126,6 @@ gb_AFLAGS := /c /Cp # C4365: 'action' : conversion from 'type_1' to 'type_2', # signed/unsigned mismatch -# C4373: FIXME: not documented at all - -# C4435: FIXME: not documented at all - # C4503: 'identifier' : decorated name length exceeded, name was # truncated @@ -169,10 +159,6 @@ gb_AFLAGS := /c /Cp # C4668: 'symbol' is not defined as a preprocessor macro, replacing # with '0' for 'directives' -# C4675: 'function' : resolved overload was found by -# argument-dependent lookup. FIXME: This warning is not listed for -# VS2008 or later. - # C4686: ' user-defined type ' : possible change in behavior, change # in UDT return calling convention @@ -188,8 +174,6 @@ gb_AFLAGS := /c /Cp # C4738: storing 32-bit float result in memory, possible loss of # performance -# C4786: FIXME: Not in supported compiler versions - # C4800: 'type' : forcing value to bool 'true' or 'false' (performance # warning) @@ -217,7 +201,6 @@ gb_CFLAGS := \ -wd4180 \ -wd4189 \ -wd4191 \ - -wd4217 \ -wd4242 \ -wd4244 \ -wd4245 \ @@ -243,14 +226,12 @@ gb_CFLAGS := \ -wd4626 \ -wd4640 \ -wd4668 \ - -wd4675 \ -wd4686 \ -wd4692 \ -wd4706 \ -wd4710 \ -wd4711 \ -wd4738 \ - -wd4786 \ -wd4800 \ -wd4820 \ -wd4826 \ @@ -273,7 +254,6 @@ gb_CXXFLAGS := \ -wd4180 \ -wd4189 \ -wd4191 \ - -wd4217 \ -wd4242 \ -wd4244 \ -wd4245 \ @@ -282,13 +262,10 @@ gb_CXXFLAGS := \ -wd4265 \ -wd4275 \ -wd4290 \ - -wd4294 \ -wd4350 \ -wd4351 \ -wd4355 \ -wd4365 \ - -wd4373 \ - -wd4435 \ -wd4503 \ -wd4505 \ -wd4511 \ @@ -302,14 +279,12 @@ gb_CXXFLAGS := \ -wd4628 \ -wd4640 \ -wd4668 \ - -wd4675 \ -wd4686 \ -wd4692 \ -wd4706 \ -wd4710 \ -wd4711 \ -wd4738 \ - -wd4786 \ -wd4800 \ -wd4820 \ -wd4826 \ commit 018278c51ea514fe8ab96a7061d10fa67754d6a1 Author: Tor Lillqvist Date: Sun Dec 2 11:17:06 2012 +0200 Document the warnings we disable diff --git a/solenv/gbuild/platform/com_MSC_defs.mk b/solenv/gbuild/platform/com_MSC_defs.mk index e867e98..3d96cd3 100644 --- a/solenv/gbuild/platform/com_MSC_defs.mk +++ b/solenv/gbuild/platform/com_MSC_defs.mk @@ -69,6 +69,140 @@ gb_RCFLAGS := \ gb_AFLAGS := /c /Cp +# Do we really need to disable to many warnings? It seems to me that +# many of these warnings are for custructs that we have been actively +# cleaning away from the code, to avoid warnings when building with +# gcc or Clang and -Wall -Werror. + +# C4005: 'identifier' : macro redefinition + +# C4061: enumerator 'identifier' in switch of enum 'enumeration' is +# not explicitly handled by a case label + +# C4127: conditional expression is constant + +# C4180: qualifier applied to function type has no meaning; ignored + +# C4189: 'identifier' : local variable is initialized but not referenced + +# C4191: 'operator/operation' : unsafe conversion from 'type of +# expression' to 'type required' + +# C4217: 'operator' : member template functions cannot be used for +# copy-assignment or copy-construction. FIXME: This warning is not +# listed for VS2008 or later. + +# C4242: 'identifier' : conversion from 'type1' to 'type2', possible +# loss of data + +# C4244: nonstandard extension used : formal parameter 'identifier' +# was previously defined as a type + +# C4245: 'conversion' : conversion from 'type1' to 'type2', +# signed/unsigned mismatch + +#
[Libreoffice-commits] .: 2 commits - solenv/gbuild
solenv/gbuild/Configuration.mk | 10 +- solenv/gbuild/ExtensionTarget.mk|2 +- solenv/gbuild/platform/WNT_INTEL_MSC.mk |6 -- solenv/gbuild/platform/com_GCC_defs.mk |2 -- 4 files changed, 6 insertions(+), 14 deletions(-) New commits: commit 3688466ab127d7801b4cb752ee6205cc04acb2f7 Author: Michael Stahl Date: Wed Oct 24 11:12:32 2012 +0200 Revert "gbuild: add a kludge to get dictionaries to build in cygwin:" This reverts commit 6292b12acf51a816fad3b3ea8073a58eb3c2. Should no longer be necessary after git submodules migration. diff --git a/solenv/gbuild/Configuration.mk b/solenv/gbuild/Configuration.mk index a73888e..1655e44 100644 --- a/solenv/gbuild/Configuration.mk +++ b/solenv/gbuild/Configuration.mk @@ -95,7 +95,7 @@ endef $(call gb_XcsTarget_get_target,%) : \ $(gb_XcsTarget_XSLT_SchemaVal) $(gb_XcsTarget_XSLT_Sanity) \ $(gb_XcsTarget_XSLT_SchemaTrim) $(gb_XcsTarget_DTD_Schema) - $(call gb_XcsTarget__command,$@,$*,$(call gb_Helper_symlinked_native,$(filter %.xcs,$^))) + $(call gb_XcsTarget__command,$@,$*,$(filter %.xcs,$^)) $(call gb_XcsTarget_get_clean_target,%) : $(call gb_Output_announce,$*,$(false),XCS,1) @@ -142,7 +142,7 @@ endef $(call gb_XcuDataTarget_get_target,%) : $(gb_XcuDataTarget_XSLT_DataVal) \ $(gb_XcuTarget_XSLT_AllLang) $(gb_XcuDataTarget_DTD_ComponentUpdate) - $(call gb_XcuDataTarget__command,$@,$*,$(call gb_Helper_symlinked_native,$(filter %.xcu,$^))) + $(call gb_XcuDataTarget__command,$@,$*,$(filter %.xcu,$^)) $(call gb_XcuDataTarget_get_clean_target,%) : $(call gb_Output_announce,$*,$(false),XCU,2) @@ -185,7 +185,7 @@ $(call gb_Helper_abbreviate_dirs,\ endef $(call gb_XcuModuleTarget_get_target,%) : $(gb_XcuTarget_XSLT_AllLang) - $(call gb_XcuModuleTarget__command,$@,$*,$(call gb_Helper_symlinked_native,$(filter %.xcu,$^)),$(filter %.xcs,$^)) + $(call gb_XcuModuleTarget__command,$@,$*,$(filter %.xcu,$^),$(filter %.xcs,$^)) $(call gb_XcuModuleTarget_get_clean_target,%) : $(call gb_Output_announce,$*,$(false),XCU,3) @@ -255,7 +255,7 @@ $(call gb_Helper_abbreviate_dirs,\ mkdir -p $(dir $(1)) && \ $(gb_XcuMergeTarget_CFGEXCOMMAND) \ -p $(firstword $(subst /, ,$(2))) \ - -i $(call gb_Helper_symlinked_native,$(3)) \ + -i $(3) \ -o $(1) \ -m $(SDF) \ -l all) @@ -297,7 +297,7 @@ $(call gb_Helper_abbreviate_dirs,\ endef $(call gb_XcuResTarget_get_target,%) : $(gb_XcuTarget_XSLT_AllLang) - $(call gb_XcuResTarget__command,$@,$*,$(call gb_Helper_symlinked_native,$(filter %.xcu,$^))) + $(call gb_XcuResTarget__command,$@,$*,$(filter %.xcu,$^)) $(call gb_XcuResTarget_get_clean_target,%) : $(call gb_Output_announce,$*,$(false),XCU,6) diff --git a/solenv/gbuild/platform/WNT_INTEL_MSC.mk b/solenv/gbuild/platform/WNT_INTEL_MSC.mk index 617f9c6..1b618aa 100644 --- a/solenv/gbuild/platform/WNT_INTEL_MSC.mk +++ b/solenv/gbuild/platform/WNT_INTEL_MSC.mk @@ -249,12 +249,6 @@ define gb_Helper_make_url file:///$(strip $(1)) endef -# for source files in non-core repositories, the cygwin symlink is not -# understood by native tools, so find the real path to the file -define gb_Helper_symlinked_native -$(shell cygpath -m $(realpath $(1))) -endef - # YaccTarget class define gb_YaccTarget__command diff --git a/solenv/gbuild/platform/com_GCC_defs.mk b/solenv/gbuild/platform/com_GCC_defs.mk index 24082a0..02642ec 100644 --- a/solenv/gbuild/platform/com_GCC_defs.mk +++ b/solenv/gbuild/platform/com_GCC_defs.mk @@ -192,8 +192,6 @@ define gb_Helper_make_url file://$(strip $(1)) endef -gb_Helper_symlinked_native = $(1) - gb_Helper_OUTDIRLIBDIR := $(OUTDIR)/lib gb_Helper_OUTDIR_FOR_BUILDLIBDIR := $(OUTDIR_FOR_BUILD)/lib commit 5e3f7c1db5dd10eca9009a4aea6f489664227724 Author: Michael Stahl Date: Wed Oct 24 11:11:27 2012 +0200 Revert "One more cygwin symlink kludge needed" This reverts commit ff795d058b36707ec65f8b6e159646e5c2c8c8c5. Should no longer be necessary after git submodules migration. diff --git a/solenv/gbuild/ExtensionTarget.mk b/solenv/gbuild/ExtensionTarget.mk index 61d0cec..fd55c51 100644 --- a/solenv/gbuild/ExtensionTarget.mk +++ b/solenv/gbuild/ExtensionTarget.mk @@ -103,7 +103,7 @@ $(call gb_ExtensionTarget_get_workdir,%)/description.xml : $(gb_ExtensionTarget_ mkdir -p $(call gb_ExtensionTarget_get_workdir,$*) && \ $(gb_ExtensionTarget_XRMEXCOMMAND) \ -p $(PRJNAME) \ - -i $(call gb_Helper_symlinked_native,$(filter %.xml,$^)) \ + -i $(filter %.xml,$^) \ -o $@ \ -m $(SDF) \ -l all) ___ Libreoffice-commits mailing l
[Libreoffice-commits] .: 2 commits - solenv/gbuild soltools/Module_soltools.mk
solenv/gbuild/gbuild.mk | 24 soltools/Module_soltools.mk | 14 ++ 2 files changed, 18 insertions(+), 20 deletions(-) New commits: commit dec68c6684298cbcb793651f1221f842efd794e3 Author: David Tardon Date: Sat Sep 29 17:47:33 2012 +0200 the build tools need to know executable extension Change-Id: I44479648dd75142864503650494fb2e3f95fe719 diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk index 74b0368..4afc095 100644 --- a/solenv/gbuild/gbuild.mk +++ b/solenv/gbuild/gbuild.mk @@ -171,6 +171,18 @@ include $(SRCDIR)/Repository.mk include $(SRCDIR)/RepositoryExternal.mk $(eval $(call gb_Helper_collect_libtargets)) +gb_Library_DLLPOSTFIX := lo + +# Include platform/cpu/compiler specific config/definitions +include $(GBUILDDIR)/platform/$(OS)_$(CPUNAME)_$(COM).mk + +ifeq ($(CROSS_COMPILING),YES) +# We can safely Assume all cross-compilation is from Unix systems. +gb_Executable_EXT_for_build := +else +gb_Executable_EXT_for_build := $(gb_Executable_EXT) +endif + # Set up build tools that can be either internal or system. It is # necessary to do it before we start including gbuild class makefiles, # so the classes can add dependencies on them. @@ -217,18 +229,6 @@ else gb_UCPPTARGET := $(call gb_Executable_get_target_for_build,ucpp) endif -gb_Library_DLLPOSTFIX := lo - -# Include platform/cpu/compiler specific config/definitions -include $(GBUILDDIR)/platform/$(OS)_$(CPUNAME)_$(COM).mk - -ifeq ($(CROSS_COMPILING),YES) -# We can safely Assume all cross-compilation is from Unix systems. -gb_Executable_EXT_for_build := -else -gb_Executable_EXT_for_build := $(gb_Executable_EXT) -endif - include $(GBUILDDIR)/Tempfile.mk include $(SRCDIR)/RepositoryFixes.mk commit 093fe6c5ebae2b8b63690d11ba5f3843a374ff4c Author: David Tardon Date: Sat Sep 29 17:44:08 2012 +0200 fix windows build Change-Id: If71b9a162b7deca5cc032bda206a8f580292ab91 diff --git a/soltools/Module_soltools.mk b/soltools/Module_soltools.mk index ebd855a..047e4c0 100644 --- a/soltools/Module_soltools.mk +++ b/soltools/Module_soltools.mk @@ -20,14 +20,6 @@ ifeq ($(GUI),UNX) $(eval $(call gb_Module_add_targets,soltools,\ Executable_checkdll \ )) -# -# the same as the condition outside of ifneq ($(CROSS_COMPILING),YES) -# ifeq ($(GUI)$(COM),WNTMSC) -# -else -$(eval $(call gb_Module_add_targets,soltools,\ -Package_inc \ -)) endif # UNX ifeq ($(OS)$(COM),SOLARISC52) @@ -38,4 +30,10 @@ endif # SOLARISC52 endif # CROSS_COMPILING +ifeq ($(GUI)$(COM),WNTMSC) +$(eval $(call gb_Module_add_targets,soltools,\ +Package_inc \ +)) +endif # WNTMSC + # vim:set shiftwidth=4 softtabstop=4 expandtab: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - solenv/gbuild udm/StaticLibrary_udm.mk
solenv/gbuild/gbuild.mk | 86 +-- udm/StaticLibrary_udm.mk |1 2 files changed, 47 insertions(+), 40 deletions(-) New commits: commit d626b631ff9a796b8d41fab06e4faf209387780d Author: David Tardon Date: Sat Sep 29 11:08:09 2012 +0200 add missing dep on cosv headers Change-Id: I444874a8b59ac82c807087fb1a1d958ab1f75b12 diff --git a/udm/StaticLibrary_udm.mk b/udm/StaticLibrary_udm.mk index 01fe7ee..3901a45 100644 --- a/udm/StaticLibrary_udm.mk +++ b/udm/StaticLibrary_udm.mk @@ -10,6 +10,7 @@ $(eval $(call gb_StaticLibrary_StaticLibrary,udm)) $(eval $(call gb_StaticLibrary_use_packages,udm,\ + cosv_inc \ udm_inc \ )) commit fa140733eeaf59030caa3115be4de11fb210b5b7 Author: David Tardon Date: Sat Sep 29 11:05:17 2012 +0200 fix dep on internal ucpp Change-Id: I42bbb3e53d0e6b7df44ec2def038ac1a31eb diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk index 02f8998..74b0368 100644 --- a/solenv/gbuild/gbuild.mk +++ b/solenv/gbuild/gbuild.mk @@ -171,6 +171,52 @@ include $(SRCDIR)/Repository.mk include $(SRCDIR)/RepositoryExternal.mk $(eval $(call gb_Helper_collect_libtargets)) +# Set up build tools that can be either internal or system. It is +# necessary to do it before we start including gbuild class makefiles, +# so the classes can add dependencies on them. +# +# TODO: As more external modules are converted, we would need more of +# these (e.g., ICU tools). Maybe the definitions should be moved to +# RepositoryExternal.mk ? +ifeq ($(SYSTEM_LIBXSLT_FOR_BUILD),YES) +gb_XSLTPROCTARGET := +gb_XSLTPROC := xsltproc +else +gb_XSLTPROCTARGET := $(call gb_Executable_get_target_for_build,xsltproc) +gb_XSLTPROC := $(gb_Helper_set_ld_path) $(gb_XSLTPROCTARGET) +endif + +ifeq ($(SYSTEM_LIBXML_FOR_BUILD),YES) +gb_XMLLINTTARGET := +gb_XMLLINT := xsltproc +else +gb_XMLLINTTARGET := $(call gb_Executable_get_target_for_build,xsltproc) +gb_XMLLINT := $(gb_Helper_set_ld_path) $(gb_XMLLINTTARGET) +endif + +ifeq ($(SYSTEM_PYTHON),YES) +gb_PYTHONTARGET := +gb_PYTHON := $(PYTHON) +else ifeq ($(OS),MACOSX) +#fixme: remove this MACOSX ifeq branch by filling in gb_PYTHON_PRECOMMAND in +#gbuild/platform/macosx.mk correctly for mac, e.g. PYTHONPATH and PYTHONHOME +#dirs for in-tree internal python +gb_PYTHONTARGET := +gb_PYTHON := $(PYTHON) +else ifeq ($(DISABLE_PYTHON),TRUE) +# Build-time python +gb_PYTHON := python +else +gb_PYTHONTARGET := $(call gb_Executable_get_target_for_build,python) +gb_PYTHON := $(gb_PYTHON_PRECOMMAND) $(gb_PYTHONTARGET) +endif + +ifneq (,$(SYSTEM_UCPP)) +gb_UCPPTARGET := +else +gb_UCPPTARGET := $(call gb_Executable_get_target_for_build,ucpp) +endif + gb_Library_DLLPOSTFIX := lo # Include platform/cpu/compiler specific config/definitions @@ -379,46 +425,6 @@ endif endef - -ifeq ($(SYSTEM_LIBXSLT_FOR_BUILD),YES) -gb_XSLTPROCTARGET := -gb_XSLTPROC := xsltproc -else -gb_XSLTPROCTARGET := $(call gb_Executable_get_target_for_build,xsltproc) -gb_XSLTPROC := $(gb_Helper_set_ld_path) $(gb_XSLTPROCTARGET) -endif - -ifeq ($(SYSTEM_LIBXML_FOR_BUILD),YES) -gb_XMLLINTTARGET := -gb_XMLLINT := xsltproc -else -gb_XMLLINTTARGET := $(call gb_Executable_get_target_for_build,xsltproc) -gb_XMLLINT := $(gb_Helper_set_ld_path) $(gb_XMLLINTTARGET) -endif - -ifeq ($(SYSTEM_PYTHON),YES) -gb_PYTHONTARGET := -gb_PYTHON := $(PYTHON) -else ifeq ($(OS),MACOSX) -#fixme: remove this MACOSX ifeq branch by filling in gb_PYTHON_PRECOMMAND in -#gbuild/platform/macosx.mk correctly for mac, e.g. PYTHONPATH and PYTHONHOME -#dirs for in-tree internal python -gb_PYTHONTARGET := -gb_PYTHON := $(PYTHON) -else ifeq ($(DISABLE_PYTHON),TRUE) -# Build-time python -gb_PYTHON := python -else -gb_PYTHONTARGET := $(call gb_Executable_get_target_for_build,python) -gb_PYTHON := $(gb_PYTHON_PRECOMMAND) $(gb_PYTHONTARGET) -endif - -ifneq (,$(SYSTEM_UCPP)) -gb_UCPPTARGET := -else -gb_UCPPTARGET := $(call gb_Executable_get_target_for_build,ucpp) -endif - .PHONY: help help: @cat $(SRCDIR)/solenv/gbuild/gbuild.help.txt ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - solenv/gbuild
solenv/gbuild/InstallModuleTarget.mk |8 1 file changed, 4 insertions(+), 4 deletions(-) New commits: commit 8d08ebb6c639cb419c97ae745ce626eee1bd4601 Author: David Tardon Date: Wed Sep 26 18:03:33 2012 +0200 drop 'private' from variable defs. Apparently make 3.81 is confused by using private target-specific simply-expanded variable (i.e., initialized with ':='), which in this case leads to //scp2/InstallModule_accessories.mk:30: *** multiple target patterns. Stop. Recursively-expanded variable works fine Anyway, it was just an idea. It seems the time is not ripe for it yet. Change-Id: Ic5582d809530256cad087c3c4fd10f9641d24cbd diff --git a/solenv/gbuild/InstallModuleTarget.mk b/solenv/gbuild/InstallModuleTarget.mk index 6ba3b46..822c5d5 100644 --- a/solenv/gbuild/InstallModuleTarget.mk +++ b/solenv/gbuild/InstallModuleTarget.mk @@ -105,7 +105,7 @@ $(call gb_ScpPreprocessTarget_get_clean_target,%) : # gb_ScpPreprocessTarget_ScpPreprocessTarget() define gb_ScpPreprocessTarget_ScpPreprocessTarget -$(call gb_ScpPreprocessTarget_get_target,$(1)) : private SCP_SOURCE := $(call gb_ScpPreprocessTarget_get_source,$(1)) +$(call gb_ScpPreprocessTarget_get_target,$(1)) : SCP_SOURCE := $(call gb_ScpPreprocessTarget_get_source,$(1)) $(call gb_ScpPreprocessTarget_get_target,$(1)) : $(call gb_ScpPreprocessTarget_get_source,$(1)) $(call gb_ScpPreprocessTarget_get_target,$(1)) :| $(dir $(call gb_ScpPreprocessTarget_get_target,$(1))).dir @@ -138,7 +138,7 @@ $(call gb_ScpMergeTarget_get_clean_target,%) : # gb_ScpMergeTarget_ScpMergeTarget() define gb_ScpMergeTarget_ScpMergeTarget -$(call gb_ScpMergeTarget_get_target,$(1)) : private SCP_SOURCE := $(call gb_ScpMergeTarget_get_source,$(1)) +$(call gb_ScpMergeTarget_get_target,$(1)) : SCP_SOURCE := $(call gb_ScpMergeTarget_get_source,$(1)) $(call gb_ScpMergeTarget_get_target,$(1)) : $(call gb_ScpMergeTarget_get_source,$(1)) $(call gb_ScpMergeTarget_get_target,$(1)) :| $(dir $(call gb_ScpMergeTarget_get_target,$(1))).dir $(call gb_ScpMergeTarget_get_target,$(1)) : SCP_SDF := $(gb_SDFLOCATION)/$(dir $(1))localize.sdf commit b411b87ebf8f8590254527d01f30a878745de76e Author: David Tardon Date: Wed Sep 26 17:58:52 2012 +0200 avoid // in path Change-Id: I3ecd3393ab55c0aadca7432e26f84e69b6a9125c diff --git a/solenv/gbuild/InstallModuleTarget.mk b/solenv/gbuild/InstallModuleTarget.mk index b008bdd..6ba3b46 100644 --- a/solenv/gbuild/InstallModuleTarget.mk +++ b/solenv/gbuild/InstallModuleTarget.mk @@ -141,8 +141,8 @@ define gb_ScpMergeTarget_ScpMergeTarget $(call gb_ScpMergeTarget_get_target,$(1)) : private SCP_SOURCE := $(call gb_ScpMergeTarget_get_source,$(1)) $(call gb_ScpMergeTarget_get_target,$(1)) : $(call gb_ScpMergeTarget_get_source,$(1)) $(call gb_ScpMergeTarget_get_target,$(1)) :| $(dir $(call gb_ScpMergeTarget_get_target,$(1))).dir -$(call gb_ScpMergeTarget_get_target,$(1)) : SCP_SDF := $(gb_SDFLOCATION)/$(dir $(1))/localize.sdf -$(call gb_ScpMergeTarget_get_target,$(1)) : $(gb_SDFLOCATION)/$(dir $(1))/localize.sdf +$(call gb_ScpMergeTarget_get_target,$(1)) : SCP_SDF := $(gb_SDFLOCATION)/$(dir $(1))localize.sdf +$(call gb_ScpMergeTarget_get_target,$(1)) : $(gb_SDFLOCATION)/$(dir $(1))localize.sdf endef ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - solenv/gbuild
solenv/gbuild/Helper.mk |6 ++ solenv/gbuild/Library.mk |1 + solenv/gbuild/StaticLibrary.mk |1 + solenv/gbuild/TargetLocations.mk |8 solenv/gbuild/gbuild.mk |4 ++-- 5 files changed, 14 insertions(+), 6 deletions(-) New commits: commit f5a2c610b11d4c5d073fa33aaa53d55e3c0b879d Author: Michael Stahl Date: Wed Sep 26 15:23:48 2012 +0200 Revert "gbuild: remove gb_Library_TARGETS and ..." This reverts commit 599a94827e2b3957db3abf758d48ff7b3977e2f2. The special handling of PLAINLIBS_NONE breaks the build on MacOSX. Needs further cleanup of PLAINLIBS_NONE abuse first. Conflicts: solenv/gbuild/gbuild.mk Change-Id: I834b623405e7745568ee2422647746631167524b diff --git a/solenv/gbuild/Helper.mk b/solenv/gbuild/Helper.mk index 3771605..a75a6e0 100644 --- a/solenv/gbuild/Helper.mk +++ b/solenv/gbuild/Helper.mk @@ -108,6 +108,12 @@ $$(foreach group,$$(gb_Jar_VALIDGROUPS),$$(eval gb_Jar_$$(group) :=)) endef +define gb_Helper_collect_libtargets +gb_Library_TARGETS := $$(foreach group,$$(gb_Library_VALIDGROUPS),$$(gb_Library_$$(group))) +gb_StaticLibrary_TARGETS := $$(foreach group,$$(gb_StaticLibrary_VALIDGROUPS),$$(gb_StaticLibrary_$$(group))) + +endef + define gb_Helper_collect_knownlibs gb_Library_KNOWNLIBS := $$(foreach group,$$(gb_Library_VALIDGROUPS),$$(gb_Library_$$(group))) gb_StaticLibrary_KNOWNLIBS := $$(foreach group,$$(gb_StaticLibrary_VALIDGROUPS),$$(gb_StaticLibrary_$$(group))) diff --git a/solenv/gbuild/Library.mk b/solenv/gbuild/Library.mk index 5d49d6a..01ee922 100644 --- a/solenv/gbuild/Library.mk +++ b/solenv/gbuild/Library.mk @@ -37,6 +37,7 @@ # gb_Library_DLLFILENAMES # gb_Library_FILENAMES # gb_Library_Library_platform +# gb_Library_TARGETS # doesn't do anything, just used for hooking up component target .PHONY: $(call gb_Library__get_final_target,%) diff --git a/solenv/gbuild/StaticLibrary.mk b/solenv/gbuild/StaticLibrary.mk index a09f720..124b009 100644 --- a/solenv/gbuild/StaticLibrary.mk +++ b/solenv/gbuild/StaticLibrary.mk @@ -33,6 +33,7 @@ # gb_StaticLibrary_OUTDIRLOCATION := $(OUTDIR)/lib # defined by platform # gb_StaticLibrary_FILENAMES +# gb_StaticLibrary_TARGETS # EVIL: gb_StaticLibrary and gb_Library need the same deliver rule because they are indistinguishable on windows diff --git a/solenv/gbuild/TargetLocations.mk b/solenv/gbuild/TargetLocations.mk index b217fd3..fb35d9c 100644 --- a/solenv/gbuild/TargetLocations.mk +++ b/solenv/gbuild/TargetLocations.mk @@ -67,11 +67,11 @@ gb_XcuModuleTarget_get_outdir_target = $(gb_Configuration_registry)/spool/$(1) define gb_Library_get_target -$(if $(filter $(1),$(gb_Library_PLAINLIBS_NONE)),,$(patsubst $(1):%,$(gb_Library_OUTDIRLOCATION)/%,$(filter $(1):%,$(gb_Library_FILENAMES +$(patsubst $(1):%,$(gb_Library_OUTDIRLOCATION)/%,$(filter $(filter $(1),$(gb_Library_TARGETS)):%,$(gb_Library_FILENAMES))) endef define gb_StaticLibrary_get_target -$(patsubst $(1):%,$(gb_StaticLibrary_OUTDIRLOCATION)/%,$(filter $(1):%,$(gb_StaticLibrary_FILENAMES))) +$(patsubst $(1):%,$(gb_StaticLibrary_OUTDIRLOCATION)/%,$(filter $(filter $(1),$(gb_StaticLibrary_TARGETS)):%,$(gb_StaticLibrary_FILENAMES))) endef @@ -194,11 +194,11 @@ gb_Zip_get_final_target = $(WORKDIR)/Zip/$(1).done gb_Library__get_final_target = $(WORKDIR)/Dummy/$(1) define gb_Library_get_external_headers_target -$(if $(filter $(1),$(gb_Library_PLAINLIBS_NONE)),,$(patsubst $(1):%,$(WORKDIR)/ExternalHeaders/Library/%,$(filter $(1):%,$(gb_Library_FILENAMES +$(patsubst $(1):%,$(WORKDIR)/ExternalHeaders/Library/%,$(filter $(1):%,$(gb_Library_FILENAMES))) endef define gb_Library_get_headers_target -$(if $(filter $(1),$(gb_Library_PLAINLIBS_NONE)),,$(patsubst $(1):%,$(WORKDIR)/Headers/Library/%,$(filter $(1):%,$(gb_Library_FILENAMES +$(patsubst $(1):%,$(WORKDIR)/Headers/Library/%,$(filter $(1):%,$(gb_Library_FILENAMES))) endef define gb_StaticLibrary_get_external_headers_target diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk index bb4a3bd..aeb59a8 100644 --- a/solenv/gbuild/gbuild.mk +++ b/solenv/gbuild/gbuild.mk @@ -152,6 +152,7 @@ include $(GBUILDDIR)/TargetLocations.mk $(eval $(call gb_Helper_init_registries)) include $(SRCDIR)/Repository.mk include $(SRCDIR)/RepositoryExternal.mk +$(eval $(call gb_Helper_collect_libtargets)) gb_Library_DLLPOSTFIX := lo commit 2b5ef98ab48799788aa7d26325524ec41ed53fe6 Author: Michael Stahl Date: Wed Sep 26 15:13:33 2012 +0200 gbuild: without multi-repository support ... ... RepositoryExternal.mk is not optional. Change-Id: I8678a2196a037dba1c3be350c8b989f5ba242381 diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk index 9f78a08..bb4a3bd 100644 --- a/solenv/gbuild/gbuild.mk +++ b/solenv/gbuild/gbuild.mk @@ -150,9 +150,8 @@ include $(GBUILDDIR)/Helper.mk include $(GBUILDDIR)/TargetLocations.mk $(eval $(call
[Libreoffice-commits] .: 2 commits - solenv/gbuild
solenv/gbuild/InstallModuleTarget.mk | 17 +++-- 1 file changed, 11 insertions(+), 6 deletions(-) New commits: commit 6ed5e4fe91ecb3bdac7eb2bf070139cfb12867c4 Author: David Tardon Date: Tue Sep 25 16:28:01 2012 +0200 add missing dep on cpp.lcc Change-Id: I3e86ce3ebafd2347164e484d060086beae05430b diff --git a/solenv/gbuild/InstallModuleTarget.mk b/solenv/gbuild/InstallModuleTarget.mk index 34c32a9..53e97e9 100644 --- a/solenv/gbuild/InstallModuleTarget.mk +++ b/solenv/gbuild/InstallModuleTarget.mk @@ -74,24 +74,27 @@ endef # ScpPreprocessTarget class +gb_ScpPreprocessTarget_TARGET := $(call gb_Executable_get_target_for_build,cpp.lcc) +gb_ScpPreprocessTarget_COMMAND := $(gb_Helper_set_ld_path) $(gb_ScpPreprocessTarget_TARGET) + gb_ScpPreprocessTarget_get_source = $(SRCDIR)/$(1).scp define gb_ScpPreprocessTarget__command $(call gb_Output_announce,$(2),$(true),SPP,2) $(call gb_Helper_abbreviate_dirs,\ - $(call gb_Helper_execute,cpp.lcc) \ + $(gb_ScpPreprocessTarget_COMMAND) \ -+ -P \ $(SCPDEFS) $(SCP_DEFS) -DDLLPOSTFIX=$(gb_Library_DLLPOSTFIX) \ $(SCP_INCLUDE) $(SCP_TEMPLATE_INCLUDE) \ - $(3) > $(1) \ + $(SCP_SOURCE) > $(1) \ ) endef $(dir $(call gb_ScpPreprocessTarget_get_target,%))%/.dir : $(if $(wildcard $(dir $@)),,mkdir -p $(dir $@)) -$(call gb_ScpPreprocessTarget_get_target,%) : - $(call gb_ScpPreprocessTarget__command,$@,$*,$<) +$(call gb_ScpPreprocessTarget_get_target,%) : $(gb_ScpPreprocessTarget_TARGET) + $(call gb_ScpPreprocessTarget__command,$@,$*) .PHONY : $(call gb_ScpPreprocessTarget_get_clean_target,%) $(call gb_ScpPreprocessTarget_get_clean_target,%) : @@ -100,6 +103,7 @@ $(call gb_ScpPreprocessTarget_get_clean_target,%) : # gb_ScpPreprocessTarget_ScpPreprocessTarget() define gb_ScpPreprocessTarget_ScpPreprocessTarget +$(call gb_ScpPreprocessTarget_get_target,$(1)) : private SCP_SOURCE := $(call gb_ScpPreprocessTarget_get_source,$(1)) $(call gb_ScpPreprocessTarget_get_target,$(1)) : $(call gb_ScpPreprocessTarget_get_source,$(1)) $(call gb_ScpPreprocessTarget_get_target,$(1)) :| $(dir $(call gb_ScpPreprocessTarget_get_target,$(1))).dir commit 52807a0daac358ca2472b851070653cdcf3a246f Author: David Tardon Date: Tue Sep 25 16:23:19 2012 +0200 fix scp2 build producing garbage Change-Id: Ia295528fea995c5660f9d50c0426d79d60900ebd diff --git a/solenv/gbuild/InstallModuleTarget.mk b/solenv/gbuild/InstallModuleTarget.mk index 8e63132..34c32a9 100644 --- a/solenv/gbuild/InstallModuleTarget.mk +++ b/solenv/gbuild/InstallModuleTarget.mk @@ -115,7 +115,7 @@ gb_ScpMergeTarget_get_source = $(SRCDIR)/$(1).ulf define gb_ScpMergeTarget__command $(call gb_Output_announce,$(2),$(true),SUM,1) $(call gb_Helper_abbreviate_dirs,\ - $(gb_ScpMergeTarget_COMMAND) -p scp2 -i $(3) -o $(1) -m $(SCP_SDF) -l all \ + $(gb_ScpMergeTarget_COMMAND) -p scp2 -i $(SCP_SOURCE) -o $(1) -m $(SCP_SDF) -l all \ ) endef @@ -123,7 +123,7 @@ $(dir $(call gb_ScpMergeTarget_get_target,%))%/.dir : $(if $(wildcard $(dir $@)),,mkdir -p $(dir $@)) $(call gb_ScpMergeTarget_get_target,%) : $(gb_ScpMergeTarget_TARGET) - $(call gb_ScpMergeTarget__command,$@,$*,$<) + $(call gb_ScpMergeTarget__command,$@,$*) .PHONY : $(call gb_ScpMergeTarget_get_clean_target,%) $(call gb_ScpMergeTarget_get_clean_target,%) : @@ -132,6 +132,7 @@ $(call gb_ScpMergeTarget_get_clean_target,%) : # gb_ScpMergeTarget_ScpMergeTarget() define gb_ScpMergeTarget_ScpMergeTarget +$(call gb_ScpMergeTarget_get_target,$(1)) : private SCP_SOURCE := $(call gb_ScpMergeTarget_get_source,$(1)) $(call gb_ScpMergeTarget_get_target,$(1)) : $(call gb_ScpMergeTarget_get_source,$(1)) $(call gb_ScpMergeTarget_get_target,$(1)) :| $(dir $(call gb_ScpMergeTarget_get_target,$(1))).dir $(call gb_ScpMergeTarget_get_target,$(1)) : SCP_SDF := $(gb_SDFLOCATION)/$(dir $(1))/localize.sdf ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - solenv/gbuild svtools/source sw/source
solenv/gbuild/LinkTarget.mk|9 ++---
svtools/source/control/ctrlbox.cxx |4
sw/source/filter/html/htmltab.cxx |3 +--
3 files changed, 11 insertions(+), 5 deletions(-)
New commits:
commit 601bfe2ce3113719b2f8edaba2ccb6b630051a9a
Author: Michael Stahl
Date: Wed Aug 22 00:19:42 2012 +0200
fdo#51777: add a hack for 1 twip DOUBLE borders:
Arguably such annoyingly thin double borders don't make much sense
anyway, because they're essentially 2 hairlines with ~no space between,
but unfortunately older LO versions are able to create them;
since the refactoring in 2d045cdb69176b280812dda0b813371cf1ac72e2,
which changed the BorderWidthImpl::Get* methods to return 0 due to
rounding, they were ignored at least in the HTML import, which is a
regression.
So add a special purpose hack that essentially rounds up the first line
to 1 but not the other lines so the visual result is a hairline single
border.
Change-Id: I20ac4675bcf67ea58a6931a40bff3605390e9c0d
diff --git a/svtools/source/control/ctrlbox.cxx
b/svtools/source/control/ctrlbox.cxx
index ca70c0e..96780a1 100644
--- a/svtools/source/control/ctrlbox.cxx
+++ b/svtools/source/control/ctrlbox.cxx
@@ -328,6 +328,10 @@ long BorderWidthImpl::GetLine1( long nWidth ) const
result = std::max(0,
static_cast((m_nRate1 * nWidth) + 0.5)
- (nConstant2 + nConstantD));
+if (result == 0 && m_nRate1 > 0.0 && nWidth > 0)
+{ // fdo#51777: hack to essentially treat 1 twip DOUBLE border
+result = 1; // as 1 twip SINGLE border
+}
}
return result;
}
diff --git a/sw/source/filter/html/htmltab.cxx
b/sw/source/filter/html/htmltab.cxx
index d23c729..d7e117d 100644
--- a/sw/source/filter/html/htmltab.cxx
+++ b/sw/source/filter/html/htmltab.cxx
@@ -2072,8 +2072,7 @@ void HTMLTable::SetBorders()
sal_uInt16 HTMLTable::GetBorderWidth( const SvxBorderLine& rBLine,
sal_Bool bWithDistance ) const
{
-sal_uInt16 nBorderWidth = rBLine.GetOutWidth() + rBLine.GetInWidth() +
-rBLine.GetDistance();
+sal_uInt16 nBorderWidth = rBLine.GetWidth();
if( bWithDistance )
{
if( nCellPadding )
commit cd0046bca0691fdca45a030903b7cde3bfee544c
Author: Michael Stahl
Date: Tue Aug 21 22:37:03 2012 +0200
fdo#53888: fix YaccTarget/LexTarget dependencies:
These cannot be order only because if the source file is changed the
generated cxx file has to be recompiled as well.
Change-Id: I6c1d8e2d90d98a80ce747f8cd1d118e0a83ed379
diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk
index 7599597..7745316 100644
--- a/solenv/gbuild/LinkTarget.mk
+++ b/solenv/gbuild/LinkTarget.mk
@@ -206,8 +206,10 @@ $(call gb_YaccTarget_get_target,%) : $(call
gb_YaccTarget_get_source,$(SRCDIR),%
$(call gb_YaccTarget__command,$<,$*,$@,$(call
gb_YaccTarget_get_header_target,$*),$(call gb_YaccTarget_get_grammar_target,$*))
define gb_YaccTarget_YaccTarget
-$(call gb_YaccTarget_get_grammar_target,$(1)) :| $(call
gb_YaccTarget_get_target,$(1))
-$(call gb_YaccTarget_get_header_target,$(1)) :| $(call
gb_YaccTarget_get_target,$(1))
+$(call gb_YaccTarget_get_grammar_target,$(1)) : $(call
gb_YaccTarget_get_target,$(1))
+ touch $$@
+$(call gb_YaccTarget_get_header_target,$(1)) : $(call
gb_YaccTarget_get_target,$(1))
+ touch $$@
endef
@@ -229,7 +231,8 @@ $(call gb_LexTarget_get_target,%) : $(call
gb_LexTarget_get_source,$(SRCDIR),%)
# gb_LexTarget_LexTarget(scanner-file)
define gb_LexTarget_LexTarget
-$(call gb_LexTarget_get_scanner_target,$(1)) :| $(call
gb_LexTarget_get_target,$(1))
+$(call gb_LexTarget_get_scanner_target,$(1)) : $(call
gb_LexTarget_get_target,$(1))
+ touch $$@
endef
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - solenv/gbuild
solenv/gbuild/Helper.mk |2 -- solenv/gbuild/Jar.mk|2 +- 2 files changed, 1 insertion(+), 3 deletions(-) New commits: commit b0db8fbdb58d40998ea6ba144c07c73becbed0f0 Author: Tor Lillqvist Date: Thu Aug 16 10:38:26 2012 +0300 No need to bother with the MISCDUMMY file here This rule failed if the MISCDUMMY file did not exist yet. Change-Id: Ie9b1ecab2848f5ed2c459020a50013db691a9ca3 diff --git a/solenv/gbuild/Jar.mk b/solenv/gbuild/Jar.mk index 1b9b370..1985d3b 100644 --- a/solenv/gbuild/Jar.mk +++ b/solenv/gbuild/Jar.mk @@ -61,7 +61,7 @@ define gb_Jar__command echo Manifest-Version: 1.0 > $(call gb_Jar_get_manifest_target,$(1)) && \ $(if $(JARCLASSPATH),echo "Class-Path: $(strip $(JARCLASSPATH))" >> $(call gb_Jar_get_manifest_target,$(1)) &&) \ echo "Solar-Version: $(RSCREVISION)" >> $(call gb_Jar_get_manifest_target,$(1)) && \ - cat $(if $(MANIFEST),$(MANIFEST),$(gb_Helper_MISCDUMMY)) >> $(call gb_Jar_get_manifest_target,$(1)) && \ + $(if $(MANIFEST),cat $(MANIFEST) >> $(call gb_Jar_get_manifest_target,$(1)) &&) \ mkdir -p $(dir $(2)) && cd $(call gb_Jar_get_workdir,$(1)) && \ $(gb_Jar_JARCOMMAND) cfm $(2) $(call gb_Jar_get_manifest_target,$(1)) \ META-INF $(PACKAGEROOTS) $(PACKAGEFILES) \ commit b3a50700c789ad6a26cf6b4fb324c83a81ed7c43 Author: Tor Lillqvist Date: Thu Aug 16 10:36:15 2012 +0300 Let's not overdo the abstraction, /dev/null is just fine to use as such Change-Id: Ib291d5b053f9ed7b597f0ebbed725602430e36b7 diff --git a/solenv/gbuild/Helper.mk b/solenv/gbuild/Helper.mk index 93a0ad7..0c241f6 100644 --- a/solenv/gbuild/Helper.mk +++ b/solenv/gbuild/Helper.mk @@ -26,8 +26,6 @@ # #* -gb_Helper_NULLFILE := /dev/null - gb_Helper_MISC := $(WORKDIR)/Misc # general purpose phony target ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - solenv/gbuild
solenv/gbuild/Executable.mk|2 +- solenv/gbuild/Library.mk |2 +- solenv/gbuild/StaticLibrary.mk |2 +- 3 files changed, 3 insertions(+), 3 deletions(-) New commits: commit 624bcdc302df8cdee7172bc455aa5c4aa9a6710a Author: Michael Stahl Date: Wed Aug 1 23:12:08 2012 +0200 Revert "StaticLibrary too" This reverts commit 23e5bb66436991d809d8d807f27d25f922fb062f. Does not work, see previous commit diff --git a/solenv/gbuild/StaticLibrary.mk b/solenv/gbuild/StaticLibrary.mk index c84e822..2d4a9d5 100644 --- a/solenv/gbuild/StaticLibrary.mk +++ b/solenv/gbuild/StaticLibrary.mk @@ -66,7 +66,7 @@ $(call gb_LinkTarget_set_targettype,$(2),StaticLibrary) $(call gb_LinkTarget_add_defs,$(2),\ $(gb_StaticLibrary_DEFS) \ ) -$(call gb_StaticLibrary_get_target,$(1)) : $(call gb_LinkTarget_get_target,$(2)) $(gb_LinkTarget_get_dep_target,$(2)) \ +$(call gb_StaticLibrary_get_target,$(1)) : $(call gb_LinkTarget_get_target,$(2)) \ | $(dir $(call gb_StaticLibrary_get_target,$(1))).dir $(call gb_StaticLibrary_get_clean_target,$(1)) : $(call gb_LinkTarget_get_clean_target,$(2)) $(call gb_StaticLibrary_StaticLibrary_platform,$(1),$(2)) commit 12981fd72b6128eae5850fcfeee9d3bb1630b521 Author: Michael Stahl Date: Wed Aug 1 23:10:38 2012 +0200 Revert "force depfile concat on deliver" This reverts commit b8f7cc3c26a95b7dfb41415b24f0e2a3a9f1e33c. This does not work, because there is no dependency between the *Object .d files and the *Objects, and so the concat-deps races with the compiler writing the dep files. Introducing such a dependency would of course be reverting 8b5a984d45005d3df1c89eae897d6e04612625d8 diff --git a/solenv/gbuild/Executable.mk b/solenv/gbuild/Executable.mk index f1d392a..9f56296 100644 --- a/solenv/gbuild/Executable.mk +++ b/solenv/gbuild/Executable.mk @@ -55,7 +55,7 @@ define gb_Executable__Executable_impl $(call gb_Executable_set_targettype_gui,$(2)) $(call gb_LinkTarget_LinkTarget,$(2)) $(call gb_LinkTarget_set_targettype,$(2),Executable) -$(call gb_Executable_get_target,$(1)) : $(call gb_LinkTarget_get_target,$(2)) $(call gb_LinkTarget_get_dep_target,$(2)) \ +$(call gb_Executable_get_target,$(1)) : $(call gb_LinkTarget_get_target,$(2)) \ | $(dir $(call gb_Executable_get_target,$(1))).dir $(call gb_Executable_get_clean_target,$(1)) : $(call gb_LinkTarget_get_clean_target,$(2)) $(call gb_Executable_Executable_platform,$(1),$(2)) diff --git a/solenv/gbuild/Library.mk b/solenv/gbuild/Library.mk index 5866b9b..157be8c 100644 --- a/solenv/gbuild/Library.mk +++ b/solenv/gbuild/Library.mk @@ -74,7 +74,7 @@ $(call gb_LinkTarget_add_defs,$(2),\ $(gb_Library_DEFS) \ ) $(call gb_Library__get_final_target,$(1)) : $(call gb_Library_get_target,$(1)) -$(call gb_Library_get_target,$(1)) : $(call gb_LinkTarget_get_target,$(2)) $(call gb_LinkTarget_get_dep_target,$(2)) \ +$(call gb_Library_get_target,$(1)) : $(call gb_LinkTarget_get_target,$(2)) \ | $(dir $(call gb_Library_get_target,$(1))).dir $(call gb_Library_get_clean_target,$(1)) : $(call gb_LinkTarget_get_clean_target,$(2)) $(call gb_Library_Library_platform,$(1),$(2),$(gb_Library_DLLDIR)/$(call gb_Library_get_dllname,$(1))) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - solenv/gbuild sw/source
solenv/gbuild/platform/unxgcc.mk |2 ++ sw/source/filter/ww8/docxattributeoutput.cxx |5 - sw/source/filter/ww8/docxexport.cxx |3 --- sw/source/filter/ww8/docxexportfilter.cxx|1 - sw/source/filter/ww8/rtfattributeoutput.cxx |6 -- sw/source/filter/ww8/rtfexport.cxx |5 - sw/source/filter/ww8/rtfexportfilter.cxx |1 - sw/source/filter/ww8/rtfimportfilter.cxx |2 -- sw/source/filter/ww8/rtfsdrexport.cxx|4 9 files changed, 2 insertions(+), 27 deletions(-) New commits: commit 92b016c45a61d0aaff619e71e3ce31ce04f573bf Author: LuboÅ¡ LuÅák Date: Sun Jul 22 12:27:16 2012 +0200 remove using rtl::OUString Change-Id: I437559c82d99adba2221f7511a7b879682b4b67d diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx index 06ac408..f9df2d1 100644 --- a/sw/source/filter/ww8/docxattributeoutput.cxx +++ b/sw/source/filter/ww8/docxattributeoutput.cxx @@ -136,11 +136,6 @@ #endif using ::editeng::SvxBorderLine; -using rtl::OString; -using rtl::OStringBuffer; -using rtl::OUString; -using rtl::OUStringBuffer; -using rtl::OUStringToOString; using namespace oox; using namespace docx; diff --git a/sw/source/filter/ww8/docxexport.cxx b/sw/source/filter/ww8/docxexport.cxx index 94dd34f..3b279bd 100644 --- a/sw/source/filter/ww8/docxexport.cxx +++ b/sw/source/filter/ww8/docxexport.cxx @@ -68,9 +68,6 @@ using namespace ::oox; using oox::vml::VMLExport; -using rtl::OUString; -using rtl::OUStringBuffer; - using sw::mark::IMark; AttributeOutputBase& DocxExport::AttrOutput() const diff --git a/sw/source/filter/ww8/docxexportfilter.cxx b/sw/source/filter/ww8/docxexportfilter.cxx index 5c3272b..c04e329 100644 --- a/sw/source/filter/ww8/docxexportfilter.cxx +++ b/sw/source/filter/ww8/docxexportfilter.cxx @@ -31,7 +31,6 @@ using namespace ::comphelper; using namespace ::com::sun::star; -using ::rtl::OUString; DocxExportFilter::DocxExportFilter( const uno::Reference< uno::XComponentContext >& xContext ) : oox::core::XmlFilterBase( xContext ) diff --git a/sw/source/filter/ww8/rtfattributeoutput.cxx b/sw/source/filter/ww8/rtfattributeoutput.cxx index 5019f18..5b8de5c 100644 --- a/sw/source/filter/ww8/rtfattributeoutput.cxx +++ b/sw/source/filter/ww8/rtfattributeoutput.cxx @@ -106,12 +106,6 @@ #include using ::editeng::SvxBorderLine; -using rtl::OString; -using rtl::OStringBuffer; -using rtl::OUString; -using rtl::OUStringBuffer; -using rtl::OUStringToOString; - using namespace nsSwDocInfoSubType; using namespace nsFieldFlags; using namespace sw::util; diff --git a/sw/source/filter/ww8/rtfexport.cxx b/sw/source/filter/ww8/rtfexport.cxx index 117711b..b09345a 100644 --- a/sw/source/filter/ww8/rtfexport.cxx +++ b/sw/source/filter/ww8/rtfexport.cxx @@ -74,11 +74,6 @@ using ::editeng::SvxBorderLine; using namespace ::comphelper; using namespace ::com::sun::star; -using rtl::OString; -using rtl::OUString; -using rtl::OStringBuffer; -using rtl::OUStringBuffer; - using sw::mark::IMark; #if defined(UNX) diff --git a/sw/source/filter/ww8/rtfexportfilter.cxx b/sw/source/filter/ww8/rtfexportfilter.cxx index 72bec50..749f60e 100644 --- a/sw/source/filter/ww8/rtfexportfilter.cxx +++ b/sw/source/filter/ww8/rtfexportfilter.cxx @@ -39,7 +39,6 @@ using namespace ::comphelper; using namespace ::com::sun::star; -using ::rtl::OUString; RtfExportFilter::RtfExportFilter( const uno::Reference< uno::XComponentContext >& xCtx) : m_xCtx( xCtx ) diff --git a/sw/source/filter/ww8/rtfimportfilter.cxx b/sw/source/filter/ww8/rtfimportfilter.cxx index 284e645..21966a5 100644 --- a/sw/source/filter/ww8/rtfimportfilter.cxx +++ b/sw/source/filter/ww8/rtfimportfilter.cxx @@ -39,8 +39,6 @@ using namespace ::comphelper; using namespace ::com::sun::star; -using ::rtl::OUString; -using rtl::OUStringToOString; RtfImportFilter::RtfImportFilter( const uno::Reference< uno::XComponentContext > &xCtx ) : m_xCtx( xCtx ) diff --git a/sw/source/filter/ww8/rtfsdrexport.cxx b/sw/source/filter/ww8/rtfsdrexport.cxx index 0916342..5970fb6 100644 --- a/sw/source/filter/ww8/rtfsdrexport.cxx +++ b/sw/source/filter/ww8/rtfsdrexport.cxx @@ -37,10 +37,6 @@ #include #include -using rtl::OString; -using rtl::OStringBuffer; -using rtl::OUString; -using rtl::OUStringBuffer; using namespace sw::util; RtfSdrExport::RtfSdrExport( RtfExport &rExport ) commit b945ef68a3c9ec04f695ed761f616959d1a3e27d Author: LuboÅ¡ LuÅák Date: Thu Jul 19 10:49:27 2012 +0200 clang doesn't need/know -fuse-link-plugin for LTO Change-Id: I63843c335e4c0c3f7ddd15a13853c83db3218649 diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk index 9a232e2..ed73734 100644 --- a/solenv/gbuild/platform/unxgcc.mk +++ b/solenv/gbuild/platform/unxgcc.mk @@ -138,8 +138,10 @@ endif endif ifeq ($(ENABLE_LTO),TRUE) +ifneq ($(COM_GCC_IS_CLANG)
[Libreoffice-commits] .: 2 commits - solenv/gbuild svtools/source
solenv/gbuild/platform/solaris.mk |2 ++
svtools/source/control/headbar.cxx |2 ++
2 files changed, 4 insertions(+)
New commits:
commit 3f4b4a4d158feba1eb730bb546b28e45c6d9197a
Author: Michael Stahl
Date: Tue Jul 10 19:13:25 2012 +0200
HeaderBar::ImplDrawItem: -Werror=parentheses
diff --git a/svtools/source/control/headbar.cxx
b/svtools/source/control/headbar.cxx
index 7ff53f8..733e5e1 100644
--- a/svtools/source/control/headbar.cxx
+++ b/svtools/source/control/headbar.cxx
@@ -604,6 +604,7 @@ void HeaderBar::ImplDrawItem( OutputDevice* pDev,
bDraw = sal_False;
if ( bDraw )
+{
if( pWin && pWin->IsNativeControlSupported(CTRL_LISTHEADER,
PART_ARROW) )
{
aCtrlRegion=Rectangle(Point(nArrowX,aRect.Top()),Size(nArrowWidth,aRect.GetHeight()));
@@ -656,6 +657,7 @@ void HeaderBar::ImplDrawItem( OutputDevice* pDev,
Point( nArrowX+HEAD_ARROWSIZE1, nArrowY )
);
}
}
+}
}
// Gegebenenfalls auch UserDraw aufrufen
commit 5e11e00fcdbd0f7c6735e76d48b3b7f63dda4c2b
Author: Michael Stahl
Date: Tue Jul 10 19:11:50 2012 +0200
gbuild: solaris.mk: activate the soversion scripts
diff --git a/solenv/gbuild/platform/solaris.mk
b/solenv/gbuild/platform/solaris.mk
index 054398c..2532c19 100644
--- a/solenv/gbuild/platform/solaris.mk
+++ b/solenv/gbuild/platform/solaris.mk
@@ -315,6 +315,8 @@ define gb_Library_Library_platform
$(call gb_LinkTarget_get_target,$(2)) : RPATH := $(call
gb_Library_get_rpath,$(1))
endef
+gb_Library__set_soversion_script_platform = $(gb_Library__set_soversion_script)
+
# StaticLibrary class
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - solenv/gbuild xmlreader/source
solenv/gbuild/platform/LINUX_AXP_GCC.mk |4 ++--
solenv/gbuild/platform/LINUX_M68K_GCC.mk |4 ++--
solenv/gbuild/platform/LINUX_POWERPC64_GCC.mk |3 +--
solenv/gbuild/platform/LINUX_POWERPC_GCC.mk |2 --
solenv/gbuild/platform/LINUX_S390X_GCC.mk |4 ++--
solenv/gbuild/platform/LINUX_S390_GCC.mk |4 ++--
xmlreader/source/xmlreader.cxx|1 +
7 files changed, 10 insertions(+), 12 deletions(-)
New commits:
commit 32e59f91d0c716a28e428ae382d6fed983b5a19d
Author: Caolán McNamara
Date: Thu Jun 7 23:23:03 2012 +0100
calling nextAttribute before first tag uses uninited variables
(cherry picked from commit c5818e929c7b608ccc3277f1204b491e426925de)
Signed-off-by: Caolán McNamara
diff --git a/xmlreader/source/xmlreader.cxx b/xmlreader/source/xmlreader.cxx
index 9d197c7..2acece2 100644
--- a/xmlreader/source/xmlreader.cxx
+++ b/xmlreader/source/xmlreader.cxx
@@ -115,6 +115,7 @@ XmlReader::XmlReader(rtl::OUString const & fileUrl)
pos_ = static_cast< char * >(fileAddress_);
end_ = pos_ + fileSize_;
state_ = STATE_CONTENT;
+firstAttribute_ = true;
}
XmlReader::~XmlReader() {
commit 567147acbc8dcbb6c43652ac6b326759b48df9da
Author: Caolán McNamara
Date: Fri Jun 8 08:50:50 2012 +0100
Resolves: rhbz#826609, rhbz#820554 fix smoketest on ppc[64] and s390[x]
i.e. restore #i81127# to remove -fsigned-char from old-school dmake
ppc[64] flags, but also remove them from the new-school gbuild ones.
correspondingly remove -fsigned-char from the very similar s390[x]
arch equivalents and drop them from the very obscure linux ports
where I just cut and paste them in the first place.
with 6b3bf27cb56d661725ac3fcfb756562e0ad75564 in place this now passes
smoketestdoc for me on build from scratch on ppc[64] and s390[x]
Change-Id: I3dae70fd7a3d3adc57cf04a02350689ad097e4d3
diff --git a/solenv/gbuild/platform/LINUX_AXP_GCC.mk
b/solenv/gbuild/platform/LINUX_AXP_GCC.mk
index 2c5082e..25edcd7 100644
--- a/solenv/gbuild/platform/LINUX_AXP_GCC.mk
+++ b/solenv/gbuild/platform/LINUX_AXP_GCC.mk
@@ -27,8 +27,8 @@
#please make generic modifications to unxgcc.mk or linux.mk
gb_COMPILERDEFAULTOPTFLAGS := -Os
-gb_CXXFLAGS += -fsigned-char -fno-omit-frame-pointer
-gb_CFLAGS += -fsigned-char -fno-omit-frame-pointer
+gb_CXXFLAGS += -fno-omit-frame-pointer
+gb_CFLAGS += -fno-omit-frame-pointer
gb_LinkTarget_LDFLAGS += -Wl,--no-relax
include $(GBUILDDIR)/platform/linux.mk
diff --git a/solenv/gbuild/platform/LINUX_M68K_GCC.mk
b/solenv/gbuild/platform/LINUX_M68K_GCC.mk
index 99d01fd..55f69a4 100644
--- a/solenv/gbuild/platform/LINUX_M68K_GCC.mk
+++ b/solenv/gbuild/platform/LINUX_M68K_GCC.mk
@@ -27,8 +27,8 @@
#please make generic modifications to unxgcc.mk or linux.mk
gb_COMPILERDEFAULTOPTFLAGS := -Os
-gb_CXXFLAGS += -fsigned-char -fno-omit-frame-pointer
-gb_CFLAGS += -fsigned-char -fno-omit-frame-pointer
+gb_CXXFLAGS += -fno-omit-frame-pointer
+gb_CFLAGS += -fno-omit-frame-pointer
include $(GBUILDDIR)/platform/linux.mk
diff --git a/solenv/gbuild/platform/LINUX_POWERPC64_GCC.mk
b/solenv/gbuild/platform/LINUX_POWERPC64_GCC.mk
index 33f6bd1..08e7b23 100644
--- a/solenv/gbuild/platform/LINUX_POWERPC64_GCC.mk
+++ b/solenv/gbuild/platform/LINUX_POWERPC64_GCC.mk
@@ -28,8 +28,7 @@
#please make generic modifications to unxgcc.mk or linux.mk
gb_CPUDEFS += -DPPC
gb_COMPILERDEFAULTOPTFLAGS := -O2
-gb_CXXFLAGS += -mminimal-toc -fsigned-char
-gb_CFLAGS += -fsigned-char
+gb_CXXFLAGS += -mminimal-toc
include $(GBUILDDIR)/platform/linux.mk
diff --git a/solenv/gbuild/platform/LINUX_POWERPC_GCC.mk
b/solenv/gbuild/platform/LINUX_POWERPC_GCC.mk
index 1c78df0..6fe92ec 100644
--- a/solenv/gbuild/platform/LINUX_POWERPC_GCC.mk
+++ b/solenv/gbuild/platform/LINUX_POWERPC_GCC.mk
@@ -28,8 +28,6 @@
#please make generic modifications to unxgcc.mk or linux.mk
gb_CPUDEFS += -DPPC
gb_COMPILERDEFAULTOPTFLAGS := -O2
-gb_CXXFLAGS += -fsigned-char
-gb_CFLAGS += -fsigned-char
include $(GBUILDDIR)/platform/linux.mk
diff --git a/solenv/gbuild/platform/LINUX_S390X_GCC.mk
b/solenv/gbuild/platform/LINUX_S390X_GCC.mk
index b352572..1d6889e 100644
--- a/solenv/gbuild/platform/LINUX_S390X_GCC.mk
+++ b/solenv/gbuild/platform/LINUX_S390X_GCC.mk
@@ -27,8 +27,8 @@
#please make generic modifications to unxgcc.mk or linux.mk
gb_COMPILERDEFAULTOPTFLAGS := -O2
-gb_CXXFLAGS += -fsigned-char -fno-omit-frame-pointer
-gb_CFLAGS += -fsigned-char -fno-omit-frame-pointer
+gb_CXXFLAGS += -fno-omit-frame-pointer
+gb_CFLAGS += -fno-omit-frame-pointer
include $(GBUILDDIR)/platform/linux.mk
diff --git a/solenv/gbuild/platform/LINUX_S390_GCC.mk
b/solenv/gbuild/platform/LINUX_S390_GCC.mk
index b352572..1d6889e 100644
--- a/solenv/gbuild/platform/LINUX_S390_GCC.mk
+++ b/solenv/gbuild/platform/LINUX_S390_GCC.mk
@@ -27,8 +27,8 @@
#please make generic modifications to unxgcc.mk or linux.mk
gb_COMPILERDEFAULTOPT
[Libreoffice-commits] .: 2 commits - solenv/gbuild starmath/CppunitTest_starmath_qa_cppunit.mk
solenv/gbuild/StaticLibrary.mk |1 + starmath/CppunitTest_starmath_qa_cppunit.mk | 11 --- 2 files changed, 5 insertions(+), 7 deletions(-) New commits: commit ddf8a35d9572f4fe9ab6d86b79aba74ad077fe33 Author: David Tardon Date: Tue May 29 19:34:40 2012 +0200 add gb_StaticLibrary_set_x64 Change-Id: Id54050f483aabf3514e4dd122ef295c6f1135fe4 diff --git a/solenv/gbuild/StaticLibrary.mk b/solenv/gbuild/StaticLibrary.mk index 672478e..8458319 100644 --- a/solenv/gbuild/StaticLibrary.mk +++ b/solenv/gbuild/StaticLibrary.mk @@ -106,6 +106,7 @@ $(eval $(foreach method,\ set_include \ add_ldflags \ set_ldflags \ + set_x64 \ add_libs \ set_library_path_flags \ add_api \ commit 96a32c111538f8387934fa7e556f98bbd9f10620 Author: David Tardon Date: Tue May 29 19:09:36 2012 +0200 fix .component paths Change-Id: I953cdd6f425245aff0d18858d201520938e0e3aa diff --git a/starmath/CppunitTest_starmath_qa_cppunit.mk b/starmath/CppunitTest_starmath_qa_cppunit.mk index d8ecc78..356a916 100644 --- a/starmath/CppunitTest_starmath_qa_cppunit.mk +++ b/starmath/CppunitTest_starmath_qa_cppunit.mk @@ -79,6 +79,7 @@ $(eval $(call gb_CppunitTest_use_ure,starmath_qa_cppunit)) $(eval $(call gb_CppunitTest_use_components,starmath_qa_cppunit,\ configmgr/source/configmgr \ +dtrans/util/mcnttype \ framework/util/fwk \ i18npool/util/i18npool \ toolkit/util/tk \ @@ -86,14 +87,10 @@ $(eval $(call gb_CppunitTest_use_components,starmath_qa_cppunit,\ vcl/vcl \ )) -$(eval $(call gb_CppunitTest_use_old_components,starmath_qa_cppunit,\ -mcnttype \ -)) - ifeq ($(strip $(OS)),WNT) -$(eval $(call gb_CppunitTest_use_old_components,starmath_qa_cppunit,\ -ftransl \ -sysdtrans \ +$(eval $(call gb_CppunitTest_use_components,starmath_qa_cppunit,\ +dtrans/util/ftransl \ +dtrans/util/sysdtrans \ )) endif ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - solenv/gbuild writerfilter/source
solenv/gbuild/gbuild.mk |7 +++--
writerfilter/source/dmapper/NumberingManager.cxx | 32 ---
writerfilter/source/dmapper/NumberingManager.hxx |3 --
3 files changed, 23 insertions(+), 19 deletions(-)
New commits:
commit 3fad0575328c010fe011fb0abebd181fccb91866
Author: LuboÅ¡ LuÅák
Date: Sat Apr 28 11:21:50 2012 +0200
more reliable override for enabling symbols
diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk
index f8413f6..6b1d184 100644
--- a/solenv/gbuild/gbuild.mk
+++ b/solenv/gbuild/gbuild.mk
@@ -106,12 +106,15 @@ endif
endif
ifneq ($(gb_DEBUGLEVEL),0)
+gb_SYMBOL := $(true)
+endif
+
# if symbols are triggered by something else than --enable-symbols,
# make sure they are actually enabled
-ifneq ($(gb_SYMBOL),$(true))
+ifeq ($(gb_SYMBOL),$(true))
+ifeq ($(ENABLE_SYMBOLS_FOR),)
ENABLE_SYMBOLS_FOR = all
endif
-gb_SYMBOL := $(true)
endif
ifneq ($(nodep),)
commit 7ef5e1cebab76b55dacca3f8eea10884a6a90d74
Author: LuboÅ¡ LuÅák
Date: Thu Apr 26 12:10:33 2012 +0200
don't overwrite numbering properties with paragraph properties (bnc#751028)
Part of bnc#751028, that is. The origin of this function is unclear,
without good repo history, and it's a question if it is still needed
after my previous fixes for bnc#751028 that fixed applying some of numbering
properties. Keeping it there just in case, but prevent it from overwriting
w:ind that's been read from the .docx file.
diff --git a/writerfilter/source/dmapper/NumberingManager.cxx
b/writerfilter/source/dmapper/NumberingManager.cxx
index 0b8000a..3119db4 100644
--- a/writerfilter/source/dmapper/NumberingManager.cxx
+++ b/writerfilter/source/dmapper/NumberingManager.cxx
@@ -189,11 +189,7 @@ uno::Sequence< beans::PropertyValue >
ListLevel::GetProperties( )
{
uno::Sequence< beans::PropertyValue > aLevelProps = GetLevelProperties( );
if ( m_pParaStyle.get( ) )
-{
-// Merge with the paragraph properties
-uno::Sequence< beans::PropertyValue > aParaProps = GetParaProperties(
);
-lcl_mergeProperties( aParaProps, aLevelProps );
-}
+AddParaProperties( &aLevelProps );
return aLevelProps;
}
@@ -330,35 +326,43 @@ uno::Sequence< beans::PropertyValue >
ListLevel::GetLevelProperties( )
return aRet;
}
-uno::Sequence< beans::PropertyValue > ListLevel::GetParaProperties( )
+// Add the properties only if they do not already exist in the sequence.
+void ListLevel::AddParaProperties( uno::Sequence< beans::PropertyValue >*
props )
{
+uno::Sequence< beans::PropertyValue >& aProps = *props;
PropertyNameSupplier& aPropNameSupplier =
PropertyNameSupplier::GetPropertyNameSupplier();
+OUString sFirstLineIndent = aPropNameSupplier.GetName(
+PROP_FIRST_LINE_INDENT );
+OUString sIndentAt = aPropNameSupplier.GetName(
+PROP_INDENT_AT );
+
+bool hasFirstLineIndent = lcl_findProperty( aProps, sFirstLineIndent );
+bool hasIndentAt = lcl_findProperty( aProps, sIndentAt );
+
+if( hasFirstLineIndent && hasIndentAt )
+return; // has them all, nothing to add
+
uno::Sequence< beans::PropertyValue > aParaProps =
m_pParaStyle->pProperties->GetPropertyValues( );
-uno::Sequence< beans::PropertyValue > aProps;
// ParaFirstLineIndent -> FirstLineIndent
// ParaLeftMargin -> IndentAt
OUString sParaIndent = aPropNameSupplier.GetName(
PROP_PARA_FIRST_LINE_INDENT );
-OUString sFirstLineIndent = aPropNameSupplier.GetName(
-PROP_FIRST_LINE_INDENT );
OUString sParaLeftMargin = aPropNameSupplier.GetName(
PROP_PARA_LEFT_MARGIN );
-OUString sIndentAt = aPropNameSupplier.GetName(
-PROP_INDENT_AT );
sal_Int32 nLen = aParaProps.getLength( );
for ( sal_Int32 i = 0; i < nLen; i++ )
{
-if ( aParaProps[i].Name.equals( sParaIndent ) )
+if ( !hasFirstLineIndent && aParaProps[i].Name.equals( sParaIndent ) )
{
aProps.realloc( aProps.getLength() + 1 );
aProps[aProps.getLength( ) - 1] = aParaProps[i];
aProps[aProps.getLength( ) - 1].Name = sFirstLineIndent;
}
-else if ( aParaProps[i].Name.equals( sParaLeftMargin ) )
+else if ( !hasIndentAt && aParaProps[i].Name.equals( sParaLeftMargin )
)
{
aProps.realloc( aProps.getLength() + 1 );
aProps[aProps.getLength( ) - 1] = aParaProps[i];
@@ -366,8 +370,6 @@ uno::Sequence< beans::PropertyValue >
ListLevel::GetParaProperties( )
}
}
-
-return aProps;
}
//--- AbstractListDef implementation
diff --git a/writerfilter/source/dmapper/NumberingManager.hxx
b/writerfilter/source/dmapper/NumberingManager.hxx
index d696439..54f7bb7 100644
--- a/writerfilter/source/dmapper/NumberingManager.hxx
+++ b/writerfilter/source/dmapper/NumberingManager.hxx
@@ -85,8 +
