summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Tardon <dtardon@redhat.com>2013-07-23 11:58:41 +0200
committerFridrich Štrba <fridrich.strba@bluewin.ch>2013-07-23 12:13:03 +0200
commitedecaede4288a661a32b50ae6816b9fb5a77ace7 (patch)
treea9f4a5234e645165b9dad1cf28006d539dab8a13
parent35d902124bb230cb5575f105670bafb4124ae58c (diff)
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 (cherry picked from commit 6872ad4764b5924a32f0929cbdbd13fb25ead885) Signed-off-by: Fridrich Štrba <fridrich.strba@bluewin.ch>
-rw-r--r--postprocess/CustomTarget_signing.mk3
-rw-r--r--solenv/gbuild/Module.mk3
-rw-r--r--solenv/gbuild/Postprocess.mk1
3 files changed, 6 insertions, 1 deletions
diff --git a/postprocess/CustomTarget_signing.mk b/postprocess/CustomTarget_signing.mk
index fa0130bf3bde..3e2eec42cb64 100644
--- a/postprocess/CustomTarget_signing.mk
+++ b/postprocess/CustomTarget_signing.mk
@@ -22,7 +22,8 @@ $(call gb_CustomTarget_get_workdir,postprocess/signing)/signing.done: \
$(SRCDIR)/postprocess/signing/no_signing.txt \
$(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)
ifeq ($(COM),MSC)
ifneq ($(ENABLE_DBGUTIL),TRUE)
diff --git a/solenv/gbuild/Module.mk b/solenv/gbuild/Module.mk
index c709203a9319..c971a47053d7 100644
--- a/solenv/gbuild/Module.mk
+++ b/solenv/gbuild/Module.mk
@@ -170,6 +170,9 @@ gb_Module_CURRENTMODULE_DEBUG_ENABLED := $(call gb_Module__debug_enabled,$(1))
gb_Module_CURRENTMODULE_NAME := $(1)
$(call gb_Helper_make_userfriendly_targets,$(1),Module)
+$(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
# This is called inside the included file and pushes one target on each stack.
diff --git a/solenv/gbuild/Postprocess.mk b/solenv/gbuild/Postprocess.mk
index 972a795538f0..8f8900b8a955 100644
--- a/solenv/gbuild/Postprocess.mk
+++ b/solenv/gbuild/Postprocess.mk
@@ -29,6 +29,7 @@ $(call gb_Postprocess_Postprocess,AllModulesButInstsetNative,All modules but ins
$(call gb_Postprocess_Postprocess,AllPackages,All packages,$(WORKDIR)/Package/)
$(call gb_Postprocess_Postprocess,AllResources,All resources,$(WORKDIR)/AllLangRes/)
$(call gb_Postprocess_Postprocess,AllUIConfigs,All UI configuration files,$(WORKDIR)/UIConfig/)
+$(call gb_Postprocess_Postprocess,AllModuleTests,All modules' tests,$(WORKDIR)/Module/check/)
endef