Kaydet (Commit) 6872ad47 authored tarafından David Tardon's avatar David Tardon

it is not possible to sign libs that are in use

... so we have to make sure they are not, by delaying the signing after
all unit tests have been run. This is just a workaround; IMHO the real
fix is fdo#63315 "sign windows binaries during build".

Change-Id: Ia26826ec7d324f840f2606b1928bea71cb4f0c48
üst 82447189
...@@ -22,7 +22,8 @@ $(call gb_CustomTarget_get_workdir,postprocess/signing)/signing.done: \ ...@@ -22,7 +22,8 @@ $(call gb_CustomTarget_get_workdir,postprocess/signing)/signing.done: \
$(SRCDIR)/postprocess/signing/no_signing.txt \ $(SRCDIR)/postprocess/signing/no_signing.txt \
$(call gb_CustomTarget_get_workdir,postprocess/signing)/signing.done : \ $(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,AllLibraries) $(call gb_Postprocess_get_target,AllExecutables) \
$(call gb_Postprocess_get_target,AllModuleTests)
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),PRL,2) $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),PRL,2)
ifeq ($(COM),MSC) ifeq ($(COM),MSC)
ifneq ($(ENABLE_DBGUTIL),TRUE) ifneq ($(ENABLE_DBGUTIL),TRUE)
......
...@@ -177,6 +177,9 @@ $(call gb_Helper_make_userfriendly_targets,$(1),Module) ...@@ -177,6 +177,9 @@ $(call gb_Helper_make_userfriendly_targets,$(1),Module)
$(if $(filter-out libreoffice instsetoo_native android ios,$(1)),\ $(if $(filter-out libreoffice instsetoo_native android ios,$(1)),\
$(call gb_Postprocess_register_target,AllModulesButInstsetNative,Module,$(1))) $(call gb_Postprocess_register_target,AllModulesButInstsetNative,Module,$(1)))
$(call gb_Postprocess_get_target,AllModuleTests) : $(call gb_Module_get_check_target,$(1))
$(call gb_Postprocess_get_clean_target,AllModuleTests) : $(call gb_Module_get_clean_target,$(1))
endef endef
# This is called inside the included file and pushes one target on each stack. # This is called inside the included file and pushes one target on each stack.
......
...@@ -45,6 +45,7 @@ $(call gb_Postprocess_Postprocess,AllModulesButInstsetNative,All modules but ins ...@@ -45,6 +45,7 @@ $(call gb_Postprocess_Postprocess,AllModulesButInstsetNative,All modules but ins
$(call gb_Postprocess_Postprocess,AllPackages,All packages,$(WORKDIR)/Package/) $(call gb_Postprocess_Postprocess,AllPackages,All packages,$(WORKDIR)/Package/)
$(call gb_Postprocess_Postprocess,AllResources,All resources,$(WORKDIR)/AllLangRes/) $(call gb_Postprocess_Postprocess,AllResources,All resources,$(WORKDIR)/AllLangRes/)
$(call gb_Postprocess_Postprocess,AllUIConfigs,All UI configuration files,$(WORKDIR)/UIConfig/) $(call gb_Postprocess_Postprocess,AllUIConfigs,All UI configuration files,$(WORKDIR)/UIConfig/)
$(call gb_Postprocess_Postprocess,AllModuleTests,All modules' tests,$(WORKDIR)/Module/check/)
endef endef
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment