diff options
| author | Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> | 2015-04-20 15:41:48 +0200 |
|---|---|---|
| committer | Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> | 2015-04-20 20:13:44 +0000 |
| commit | 77568e5c970ee14d92de765686689ba6fccf2a17 (patch) | |
| tree | 94d41ef722f9c0e3a949b0d73382e4634b497c8f /postprocess | |
| parent | Resolves tdf#83366 Copy and Paste crashes Calc when original doc closed (diff) | |
| download | core-77568e5c970ee14d92de765686689ba6fccf2a17.tar.gz core-77568e5c970ee14d92de765686689ba6fccf2a17.zip | |
don't try to sign merged libs on windows
as those are fake, just textfiles with dll extension that signtool
doesn't like.
Also made the text more descriptive "invalid" is ambiguous,
"invalid - merged lib" states the reason why the file is a dummy.
Change-Id: I31801fd0c3aa593549fac5e6275189e18bbc0010
Reviewed-on: https://gerrit.libreoffice.org/15444
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Jenkins <ci@libreoffice.org>
Diffstat (limited to 'postprocess')
| -rw-r--r-- | postprocess/CustomTarget_signing.mk | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/postprocess/CustomTarget_signing.mk b/postprocess/CustomTarget_signing.mk index f8a7c772644b..23a81ef68654 100644 --- a/postprocess/CustomTarget_signing.mk +++ b/postprocess/CustomTarget_signing.mk @@ -29,8 +29,11 @@ $(call gb_CustomTarget_get_workdir,postprocess/signing)/signing.done: $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),PRL,2) ifeq ($(COM),MSC) 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 && \ $(PERL) $(SRCDIR)/postprocess/signing/signing.pl \ - -e $(SRCDIR)/postprocess/signing/no_signing.txt \ + -e $$EXCLUDELIST \ -l $(subst .done,_log.txt,$@) \ $(if $(PFXFILE),-f $(PFXFILE)) \ $(if $(PFXPASSWORD),-p $(PFXPASSWORD)) \ @@ -43,7 +46,7 @@ ifneq ($(ENABLE_DBGUTIL),TRUE) $(INSTDIR)/sdk/cli/*.dll \ $(INSTDIR)/sdk/bin/*.exe \ $(INSTDIR)/share/extensions/mysql-connector-ooo/*.dll\ - && touch $@ + && rm $$EXCLUDELIST && touch $@ else @echo "Doing nothing on non product builds ..." endif |