postprocess/CustomTarget_signing.mk | 8 +++++---
solenv/gbuild/Module.mk | 2 +-
solenv/gbuild/Postprocess.mk | 1 +
3 files changed, 7 insertions(+), 4 deletions(-)
New commits:
commit b9c4f5d499b4202936a237cc1cbba0d63010bef0
Author: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
Date: Sun Apr 27 03:00:31 2014 +0200
make signing depend on slowchecks being done
otherwise signing (at least on windows) fails because files are in use
Change-Id: Ida6a7d43dc74eb278fd79410b9c0a60f823c5933
Reviewed-on: https://gerrit.libreoffice.org/9176
Tested-by: David Tardon <dtar...@redhat.com>
Reviewed-by: David Tardon <dtar...@redhat.com>
diff --git a/postprocess/CustomTarget_signing.mk
b/postprocess/CustomTarget_signing.mk
index 40f7250..f8a7c77 100644
--- a/postprocess/CustomTarget_signing.mk
+++ b/postprocess/CustomTarget_signing.mk
@@ -20,10 +20,12 @@ TIMESTAMPURL ?=
"http://timestamp.globalsign.com/scripts/timestamp.dll";
$(call gb_CustomTarget_get_workdir,postprocess/signing)/signing.done: \
$(SRCDIR)/postprocess/signing/signing.pl \
$(SRCDIR)/postprocess/signing/no_signing.txt \
+ $(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_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_CustomTarget_get_workdir,postprocess/signing)/signing.done:
$(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 d08e5cb..cc04d5f 100644
--- a/solenv/gbuild/Module.mk
+++ b/solenv/gbuild/Module.mk
@@ -199,7 +199,7 @@ $(if $(filter-out libreoffice instsetoo_native android
ios,$(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))
+$(call gb_Postprocess_get_target,AllModuleSlowtests) : $(call
gb_Module_get_slowcheck_target,$(1))
endef
diff --git a/solenv/gbuild/Postprocess.mk b/solenv/gbuild/Postprocess.mk
index 445f0ea..dfff5ee 100644
--- a/solenv/gbuild/Postprocess.mk
+++ b/solenv/gbuild/Postprocess.mk
@@ -46,6 +46,7 @@ $(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/)
+$(call gb_Postprocess_Postprocess,AllModuleSlowtests,All modules'
slowtests,$(WORKDIR)/Module/slowcheck/)
endef
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
