summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Lohmaier <lohmaier+LibreOffice@googlemail.com>2014-04-27 03:00:31 +0200
committerAndras Timar <andras.timar@collabora.com>2014-09-25 07:09:25 -0700
commitb9c4f5d499b4202936a237cc1cbba0d63010bef0 (patch)
tree39c72f4702e96409d9d332066a4795b8e83475b0
parent5aa05e27c8920be0c164683187170f1c5670189d (diff)
make signing depend on slowchecks being donecp-4.2-16
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 <dtardon@redhat.com> Reviewed-by: David Tardon <dtardon@redhat.com>
-rw-r--r--postprocess/CustomTarget_signing.mk8
-rw-r--r--solenv/gbuild/Module.mk2
-rw-r--r--solenv/gbuild/Postprocess.mk1
3 files changed, 7 insertions, 4 deletions
diff --git a/postprocess/CustomTarget_signing.mk b/postprocess/CustomTarget_signing.mk
index 40f7250f3523..f8a7c772644b 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 d08e5cbdf9f3..cc04d5feab68 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 445f0ea1121f..dfff5eef6249 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