[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - postprocess/CustomTarget_signing.mk solenv/gbuild

[David Tardon]

 postprocess/CustomTarget_signing.mk |    3 ++-
 solenv/gbuild/Module.mk             |    3 +++
 solenv/gbuild/Postprocess.mk        |    1 +
 3 files changed, 6 insertions(+), 1 deletion(-)

New commits:
commit edecaede4288a661a32b50ae6816b9fb5a77ace7
Author: David Tardon <dtardon at redhat.com>
Date:   Tue Jul 23 11:58:41 2013 +0200

    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 at bluewin.ch>

diff --git a/postprocess/CustomTarget_signing.mk b/postprocess/CustomTarget_signing.mk
index fa0130b..3e2eec4 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 c709203..c971a47 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 972a795..8f8900b 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