[Libreoffice-commits] core.git: 2 commits - postprocess/CustomTarget_signing.mk solenv/gbuild

[Christian Lohmaier]

 postprocess/CustomTarget_signing.mk |    4 ++--
 solenv/gbuild/Module.mk             |    3 +++
 2 files changed, 5 insertions(+), 2 deletions(-)

New commits:
commit 5e062501eb6c3abe5219777fd9267702689785c7
Author: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
Date:   Tue May 9 13:23:59 2017 +0200

    cannot sign read-only files, so u+w the redistributables
    
    Change-Id: I5290d2093555d00e7b7cd4e21098d54af58ee6b8

diff --git a/postprocess/CustomTarget_signing.mk b/postprocess/CustomTarget_signing.mk
index 23a81ef68654..ae66c4eaa0f8 100644
--- a/postprocess/CustomTarget_signing.mk
+++ b/postprocess/CustomTarget_signing.mk
@@ -32,6 +32,7 @@ ifneq ($(ENABLE_DBGUTIL),TRUE)
 	EXCLUDELIST=$(shell $(gb_MKTEMP)) && \
 	cat $(SRCDIR)/postprocess/signing/no_signing.txt > $$EXCLUDELIST && \
 	echo "$(foreach lib,$(gb_MERGEDLIBS),$(call gb_Library_get_filename,$(lib)))" | tr ' ' '\n' >> $$EXCLUDELIST && \
+	chmod u+w $(foreach lib,$(MSVC_DLLS),$(INSTDIR)/program/shlxthdl/$(lib)) && \
 	$(PERL) $(SRCDIR)/postprocess/signing/signing.pl \
 			-e $$EXCLUDELIST \
 			-l $(subst .done,_log.txt,$@) \
commit c1a87147d71b20754bd757e115f82890992ec394
Author: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
Date:   Tue May 9 13:22:02 2017 +0200

    have screenshot target depend on signing.done, not other way round
    
    Change-Id: Ia19b3eb122b66c0a6c2304f09faa83345f90892c

diff --git a/postprocess/CustomTarget_signing.mk b/postprocess/CustomTarget_signing.mk
index 29b0532bd198..23a81ef68654 100644
--- a/postprocess/CustomTarget_signing.mk
+++ b/postprocess/CustomTarget_signing.mk
@@ -23,8 +23,7 @@ $(call gb_CustomTarget_get_workdir,postprocess/signing)/signing.done: \
 	$(call gb_Postprocess_get_target,AllLibraries) \
 	$(call gb_Postprocess_get_target,AllExecutables) \
 	$(call gb_Postprocess_get_target,AllModuleTests) \
-	$(call gb_Postprocess_get_target,AllModuleSlowtests) \
-	$(call gb_Postprocess_get_target,AllModuleScreenshots)
+	$(call gb_Postprocess_get_target,AllModuleSlowtests)
 
 $(call gb_CustomTarget_get_workdir,postprocess/signing)/signing.done:
 	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),PRL,2)
diff --git a/solenv/gbuild/Module.mk b/solenv/gbuild/Module.mk
index 24f932c6c1ae..4073dcfd9bf5 100644
--- a/solenv/gbuild/Module.mk
+++ b/solenv/gbuild/Module.mk
@@ -473,6 +473,9 @@ build-l10n-only : $$(firstword $$(gb_Module_L10NTARGETSTACK))
 unitcheck : $$(firstword $$(gb_Module_CHECKTARGETSTACK))
 slowcheck : $$(firstword $$(gb_Module_SLOWCHECKTARGETSTACK))
 screenshot : $$(firstword $$(gb_Module_SCREENSHOTTARGETSTACK))
+ifeq ($(WINDOWS_BUILD_SIGNING),TRUE)
+screenshot : $(call gb_CustomTarget_get_workdir,postprocess/signing)/signing.done
+endif
 subsequentcheck : $$(firstword $$(gb_Module_SUBSEQUENTCHECKTARGETSTACK))
 stagingcheck : $$(firstword $$(gb_Module_STAGINGCHECKTARGETSTACK))
 perfcheck : $$(firstword $$(gb_Module_PERFCHECKTARGETSTACK))