[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - solenv/gbuild

2018-06-06 Thread Michael Stahl 
 solenv/gbuild/platform/com_GCC_defs.mk |   11 +++
 1 file changed, 11 insertions(+)

New commits:
commit 1d3a436ddb62065145b696635b4ec5fb4c9be12a
Author: Michael Stahl 
Date:   Sun May 20 23:45:12 2018 +0200

gbuild: suppress -Werror on new GCC 8 warnings for release branch

Change-Id: I0db765096b6b1a6595057f253884afc2e3fb0178
Reviewed-on: https://gerrit.libreoffice.org/54608
Tested-by: Jenkins 
Reviewed-by: Miklos Vajna 

diff --git a/solenv/gbuild/platform/com_GCC_defs.mk 
b/solenv/gbuild/platform/com_GCC_defs.mk
index 11b7871a3e6f..1466cf17d3ad 100644
--- a/solenv/gbuild/platform/com_GCC_defs.mk
+++ b/solenv/gbuild/platform/com_GCC_defs.mk
@@ -96,6 +96,17 @@ gb_CXXFLAGS_COMMON += \
 -Wunused-const-variable=1
 endif
 
+ifeq ($(shell expr '$(GCC_VERSION)' '>=' 800),1)
+gb_CXXFLAGS_COMMON += \
+   -Wno-error=cast-function-type \
+   -Wno-error=sizeof-pointer-memaccess \
+   -Wno-error=class-memaccess \
+   -Wno-error=parentheses \
+   -Wno-error=implicit-fallthrough \
+   -Wno-error=ignored-qualifiers \
+
+endif
+
 ifeq ($(COM_IS_CLANG),TRUE)
 gb_CXXFLAGS_COMMON += -Wimplicit-fallthrough
 endif
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - solenv/gbuild

2018-03-30 Thread David Tardon 
 solenv/gbuild/UnpackedTarball.mk |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 4cb868abaf789afe3f2b4bc65454c21c08666a78
Author: David Tardon 
Date:   Thu Mar 29 14:56:44 2018 +0200

tdf#115396 fix mode of files installed from externals

Change-Id: I608f46235f2e80e74f6900831d13e082b167cfce
Reviewed-on: https://gerrit.libreoffice.org/52144
Tested-by: Jenkins 
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/solenv/gbuild/UnpackedTarball.mk b/solenv/gbuild/UnpackedTarball.mk
index 9654d42fe2de..37913c8c7369 100644
--- a/solenv/gbuild/UnpackedTarball.mk
+++ b/solenv/gbuild/UnpackedTarball.mk
@@ -358,6 +358,7 @@ endef
 define gb_UnpackedTarbal__make_pattern_rule
 $(call gb_UnpackedTarball_get_dir,$(1))/%$(2) :
$$(if $$(wildcard $$@),,$$(call gb_Output_error,file $$@ does not exist 
in the tarball))
+   $$(if $$(UNPACKED_MODE),chmod $$(UNPACKED_MODE) $$@ &&) \
touch $$@
 
 $(eval gb_UnpackedTarball_PATTERN_RULES_$(1) += $(2))
@@ -372,6 +373,7 @@ endef
 define gb_UnpackedTarbal__make_file_rule
 $(call gb_UnpackedTarball_get_dir,$(1))/$(2) :
$$(if $$(wildcard $$@),,$$(call gb_Output_error,file $$@ does not exist 
in the tarball))
+   $$(if $$(UNPACKED_MODE),chmod $$(UNPACKED_MODE) $$@ &&) \
touch $$@
 
 endef
@@ -388,6 +390,7 @@ endef
 define gb_UnpackedTarball_mark_output_file
 $(call gb_UnpackedTarball_get_final_target,$(1)) : $(call 
gb_UnpackedTarball_get_dir,$(1))/$(2)
 $(call gb_UnpackedTarball_get_dir,$(1))/$(2) : $(call 
gb_UnpackedTarball_get_target,$(1))
+$(call gb_UnpackedTarball_get_dir,$(1))/$(2) : UNPACKED_MODE := 644
 $(if $(suffix $(2)),\
$(call gb_UnpackedTarbal__ensure_pattern_rule,$(1),$(suffix $(2))),\
$(call gb_UnpackedTarbal__make_file_rule,$(1),$(2)) \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - solenv/gbuild

2018-02-22 Thread Rico Tzschichholz 
 solenv/gbuild/extensions/post_PackageInfo.mk |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit e27c67107d128d1421e2c09d81c99f43ad0d45a4
Author: Rico Tzschichholz 
Date:   Thu Feb 22 14:21:50 2018 +0100

solenv: Update gb_PackageInfo_emit_l10n_for_one_lang

Add cjk_*, ctl_* and ctlseqcheck_$LANG.xcd files to install list

Change-Id: I2c56cf2af3cc444cb7075740a981b6954950e5f5
Reviewed-on: https://gerrit.libreoffice.org/50181
Reviewed-by: Michael Stahl 
Tested-by: Jenkins 

diff --git a/solenv/gbuild/extensions/post_PackageInfo.mk 
b/solenv/gbuild/extensions/post_PackageInfo.mk
index 1abd6e241d9f..331eeb89e194 100644
--- a/solenv/gbuild/extensions/post_PackageInfo.mk
+++ b/solenv/gbuild/extensions/post_PackageInfo.mk
@@ -69,6 +69,9 @@ define gb_PackageInfo_emit_l10n_for_one_lang
 $(if $(filter-out qtz en-US,$(1)),$(foreach packagedir,$(patsubst 
%/,%,$(gb_AllLangPackage_ALLDIRS)),$(call 
gb_PackageInfo_emit_l10n_for_one_alllangpackage,$(packagedir),$(1
 $(if $(filter $(gb_AllLangMoTarget_LANGS),$(1)),$(foreach 
target,$(gb_AllLangMoTarget_REGISTERED),$(call 
gb_PackageInfo_emit_l10n_for_one_mo,$(target),$(1
 $(if $(filter $(gb_Configuration_LANGS),$(1)),$(foreach configfile,Langpack- 
res/fcfg_langpack_ res/registry_,$(call 
gb_PackageInfo_emit_l10n_for_one_configfile,$(1),$(configfile
+$(if $(filter $(gb_CJK_LANGS),$(1)),$(foreach configfile,cjk_,$(call 
gb_PackageInfo_emit_l10n_for_one_configfile,$(1),$(configfile
+$(if $(filter $(gb_CTL_LANGS),$(1)),$(foreach configfile,ctl_,$(call 
gb_PackageInfo_emit_l10n_for_one_configfile,$(1),$(configfile
+$(if $(filter $(gb_CTLSEQCHECK_LANGS),$(1)),$(foreach 
configfile,ctlseqcheck_,$(call 
gb_PackageInfo_emit_l10n_for_one_configfile,$(1),$(configfile
 @echo "$(foreach suf,executables libraries 
files,$(gb_PackageInfo_get_target)/l10n-$(1).$(suf)) \\" >> 
$(WORKDIR)/Dep/packageinfo.d
 
 endef
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - solenv/gbuild

2018-02-13 Thread Rico Tzschichholz 
 solenv/gbuild/extensions/post_PackageInfo.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 039bf2792b6cbd8a8ad7059b4e72b7c457522505
Author: Rico Tzschichholz 
Date:   Fri Feb 9 23:48:32 2018 +0100

solenv: Fix gb_MoTarget_get_install_target argument

This fixes l10n-*.files generation of packageinfo and makes
"install-packages-l10n-*" targets work again.

Change-Id: Ib4d726f1079360cade8d5f398b1f5144d6693152
Reviewed-on: https://gerrit.libreoffice.org/49527
Tested-by: Jenkins 
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/solenv/gbuild/extensions/post_PackageInfo.mk 
b/solenv/gbuild/extensions/post_PackageInfo.mk
index d0e0f15df133..1abd6e241d9f 100644
--- a/solenv/gbuild/extensions/post_PackageInfo.mk
+++ b/solenv/gbuild/extensions/post_PackageInfo.mk
@@ -55,7 +55,7 @@ define gb_PackageInfo_emit_l10n_for_one_alllangpackage
 endef
 
 define gb_PackageInfo_emit_l10n_for_one_mo
-@echo "$(patsubst $(INSTDIR)/%,%,$(call 
gb_MoTarget_get_install_target,$(1)$(2)))" >> 
$(gb_PackageInfo_get_target)/l10n-$(2).files
+@echo "$(patsubst $(INSTDIR)/%,%,$(call gb_MoTarget_get_install_target,$(shell 
$(SRCDIR)/solenv/bin/localestr $(2))/LC_MESSAGES/$(1)))" >> 
$(gb_PackageInfo_get_target)/l10n-$(2).files
 
 endef
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - solenv/gbuild

2018-01-09 Thread Michael Stahl 
 solenv/gbuild/platform/com_MSC_class.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 90f1421d014543d9d78124cb406cb006102b0bd8
Author: Michael Stahl 
Date:   Mon Jan 8 12:33:55 2018 +0100

gbuild: MSVC: invoke MSASM with /safeseh

BinScope complains that the sblo.dll lacks SAFESEH flag.

Change-Id: If2b4b6592eac37542c3e2745d90a8e432b8da2e2
(cherry picked from commit e8f2ca76037eed4c10c9851682c7f6856c7fb0de)
Reviewed-on: https://gerrit.libreoffice.org/47585
Tested-by: Jenkins 
Reviewed-by: Miklos Vajna 

diff --git a/solenv/gbuild/platform/com_MSC_class.mk 
b/solenv/gbuild/platform/com_MSC_class.mk
index 0916c2fd1fd9..27a0aec80c4b 100644
--- a/solenv/gbuild/platform/com_MSC_class.mk
+++ b/solenv/gbuild/platform/com_MSC_class.mk
@@ -95,7 +95,7 @@ define gb_AsmObject__command
 $(call gb_Output_announce,$(2),$(true),ASM,3)
 $(call gb_Helper_abbreviate_dirs,\
mkdir -p $(dir $(1)) $(dir $(4)) && \
-   "$(ML_EXE)" /c /Cp $(gb_AFLAGS) -D$(COM) /Fo$(1) $(3)) && \
+   "$(ML_EXE)" /safeseh /c /Cp $(gb_AFLAGS) -D$(COM) /Fo$(1) $(3)) && \
echo "$(1) : $(3)" > $(4)
 endef
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - solenv/gbuild

2017-11-28 Thread Stephan Bergmann 
 solenv/gbuild/SdiTarget.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 9e06d98c87ee7313c72164d0689d7fad1bc8399f
Author: Stephan Bergmann 
Date:   Mon Nov 27 11:44:49 2017 +0100

Turns out SdiTarget needs the extended SOLARINC after all

After fbfe55e58c4b14f86cbb2c7b822f727e5b2e4a66 "There appears to be no need 
for
-I. in SOLARINC", on Windows, e.g. 
workdir/Dep/SdiTarget/basctl/sdi/basslots.d
now contains basslots.sdi without a path, because the call to
osl::File::searchFileURL in SvIdlParser::ReadInclude 
(idl/source/prj/parser.cxx)
is done with rBase.GetPath() no longer containing the basctl/sdi/ source 
dir, so
searchFileURL silently returns "basslots.sdi" unmodified.  (The non-Windows
implementation in sal/osl/unx/file_url.cxx appears to also check CWD, so 
doesn't
suffer from this regression.)

Change-Id: I51802192cfe112f810b193a77d14787d965c2761
Reviewed-on: https://gerrit.libreoffice.org/45323
Reviewed-by: Mike Kaganski 
Tested-by: Jenkins 
Reviewed-by: Stephan Bergmann 
(cherry picked from commit 445288f073f3c462669f02f3307ef9009ea0f594)
Reviewed-on: https://gerrit.libreoffice.org/45347
Reviewed-by: Thorsten Behrens 
Tested-by: Thorsten Behrens 

diff --git a/solenv/gbuild/SdiTarget.mk b/solenv/gbuild/SdiTarget.mk
index d7febb92aced..c76ef691d696 100644
--- a/solenv/gbuild/SdiTarget.mk
+++ b/solenv/gbuild/SdiTarget.mk
@@ -63,7 +63,7 @@ $(call gb_SdiTarget_get_clean_target,%) :
$(call gb_SdiTarget_get_target,$*))
 
 define gb_SdiTarget_SdiTarget
-$(call gb_SdiTarget_get_target,$(1)) : INCLUDE := $(SOLARINC)
+$(call gb_SdiTarget_get_target,$(1)) : INCLUDE := $(SOLARINC) -I$$(dir 
$(SRCDIR)/$(1))
 $(call gb_SdiTarget_get_target,$(1)) : EXPORTS := $(SRCDIR)/$(2).sdi
 ifeq ($(gb_FULLDEPS),$(true))
 -include $(call gb_SdiTarget_get_dep_target,$(1))
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits