diff options
| author | Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> | 2017-05-09 13:22:02 +0200 |
|---|---|---|
| committer | Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> | 2017-05-09 13:27:34 +0200 |
| commit | c1a87147d71b20754bd757e115f82890992ec394 (patch) | |
| tree | fd79d4043e15aa98b92e622535d50fe781e10e9e | |
| parent | 24e05b48cb7ceb67c2566bbb212cbc1d752bb59e (diff) | |
have screenshot target depend on signing.done, not other way round
Change-Id: Ia19b3eb122b66c0a6c2304f09faa83345f90892c
| -rw-r--r-- | postprocess/CustomTarget_signing.mk | 3 | ||||
| -rw-r--r-- | solenv/gbuild/Module.mk | 3 |
2 files changed, 4 insertions, 2 deletions
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)) |