[Libreoffice-commits] core.git: postprocess/CustomTarget_signing.mk
postprocess/CustomTarget_signing.mk |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 428e77a0693ecb56a529970233666c25c55fc0f6 Author: Fridrich Å trba Date: Wed Jul 3 11:24:18 2013 +0200 OOps Change-Id: Idd7e957064d89d9a5b1fbec9b5fb7d7961872d3e diff --git a/postprocess/CustomTarget_signing.mk b/postprocess/CustomTarget_signing.mk index e44c324..bf9aa0c 100644 --- a/postprocess/CustomTarget_signing.mk +++ b/postprocess/CustomTarget_signing.mk @@ -31,7 +31,7 @@ ifneq ($(ENABLE_DBGUTIL),TRUE) -l $(subst .done,_log.txt,$@) \ $(if $(PFXFILE),-f $(PFXFILE)) \ $(if $(PFXPASSWORD),-p $(PFXPASSWORD)) \ - $(if $($(TIMESTAMPURL),-t $(TIMESTAMPURL)) \ + $(if $(TIMESTAMPURL),-t $(TIMESTAMPURL)) \ $(OUTDIR)/bin/*.dll $(OUTDIR)/bin/*.exe \ && touch $@ else ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: postprocess/CustomTarget_signing.mk
postprocess/CustomTarget_signing.mk |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 35917a5a5332df758fb60ea8978bdf5cf5460d03 Author: Fridrich Å trba Date: Fri Jul 5 06:59:52 2013 +0200 Missing slash that prevents windows signing Change-Id: I7c84e861f45643a0e66504d10b5d76b2dbb6f629 diff --git a/postprocess/CustomTarget_signing.mk b/postprocess/CustomTarget_signing.mk index bf9aa0c..fa0130b 100644 --- a/postprocess/CustomTarget_signing.mk +++ b/postprocess/CustomTarget_signing.mk @@ -27,7 +27,7 @@ $(call gb_CustomTarget_get_workdir,postprocess/signing)/signing.done : \ ifeq ($(COM),MSC) ifneq ($(ENABLE_DBGUTIL),TRUE) $(PERL) $(SRCDIR)/postprocess/signing/signing.pl \ - -e $(SRCDIR)/postprocess/signing/no_signing.txt + -e $(SRCDIR)/postprocess/signing/no_signing.txt \ -l $(subst .done,_log.txt,$@) \ $(if $(PFXFILE),-f $(PFXFILE)) \ $(if $(PFXPASSWORD),-p $(PFXPASSWORD)) \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: postprocess/CustomTarget_signing.mk solenv/gbuild
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 6872ad4764b5924a32f0929cbdbd13fb25ead885 Author: David Tardon 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 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 3477790..e5dcc3d 100644 --- a/solenv/gbuild/Module.mk +++ b/solenv/gbuild/Module.mk @@ -177,6 +177,9 @@ $(call gb_Helper_make_userfriendly_targets,$(1),Module) $(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)) + 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 2e08cb1..445f0ea 100644 --- a/solenv/gbuild/Postprocess.mk +++ b/solenv/gbuild/Postprocess.mk @@ -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,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 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: postprocess/CustomTarget_signing.mk postprocess/signing
postprocess/CustomTarget_signing.mk |9 + postprocess/signing/signing.pl |6 +++--- 2 files changed, 8 insertions(+), 7 deletions(-) New commits: commit 523258e675e881d6f8efc031e3885d0197c8aad0 Author: Fridrich Å trba Date: Wed Jul 3 11:18:41 2013 +0200 Fix Windows signing and timestamping Change-Id: Ife8774c9a6157e8bb943d1ba8ec32f560c8281c4 diff --git a/postprocess/CustomTarget_signing.mk b/postprocess/CustomTarget_signing.mk index a9c4a45..e44c324 100644 --- a/postprocess/CustomTarget_signing.mk +++ b/postprocess/CustomTarget_signing.mk @@ -26,11 +26,12 @@ $(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) - $(PERL) $< -e $(SRCDIR)/postprocess/signing/no_signing.txt + $(PERL) $(SRCDIR)/postprocess/signing/signing.pl \ + -e $(SRCDIR)/postprocess/signing/no_signing.txt -l $(subst .done,_log.txt,$@) \ - -f $(PFXFILE) \ - -p $(PFXPASSWORD) \ - -t $(TIMESTAMPURL) \ + $(if $(PFXFILE),-f $(PFXFILE)) \ + $(if $(PFXPASSWORD),-p $(PFXPASSWORD)) \ + $(if $($(TIMESTAMPURL),-t $(TIMESTAMPURL)) \ $(OUTDIR)/bin/*.dll $(OUTDIR)/bin/*.exe \ && touch $@ else diff --git a/postprocess/signing/signing.pl b/postprocess/signing/signing.pl index b937f0e..686e56a 100644 --- a/postprocess/signing/signing.pl +++ b/postprocess/signing/signing.pl @@ -147,9 +147,9 @@ sub sign_files #09.07.2007 10:36 } $signtool .= " -v" if ($opt_verbose); $commandline_base = $signtool; -$commandline_base .= " -f $opt_pfxfile" if ($opt_pfxfile != ""); -$commandline_base .= " -p $opt_pass" if ($opt_pass != ""); -$commandline_base .= " -t $opt_timestamp_url" if ($opt_timestamp_url != ""); +$commandline_base .= " -f $opt_pfxfile" if ($opt_pfxfile ne ""); +$commandline_base .= " -p $opt_pass" if ($opt_pass ne ""); +$commandline_base .= " -t $opt_timestamp_url" if ($opt_timestamp_url ne ""); # Here switch between: # one command line for muliple files (all doesn't work, too much) / for each file one command line ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: postprocess/CustomTarget_signing.mk solenv/gbuild
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 ea391abb3f2eb0ffaa892f9d7437dcf33bda6440 Author: Christian Lohmaier 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 Reviewed-by: David Tardon 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 754d2cb..3d6f42b 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
