[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - 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 edecaede4288a661a32b50ae6816b9fb5a77ace7 Author: David Tardon dtar...@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.st...@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 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - postprocess/CustomTarget_signing.mk
postprocess/CustomTarget_signing.mk |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 03c0f9976dc1c77973658aa02db2823bfc9a09a1 Author: Fridrich Å trba fridrich.st...@bluewin.ch Date: Fri Jul 5 06:59:52 2013 +0200 Missing slash that prevents windows signing Change-Id: I7c84e861f45643a0e66504d10b5d76b2dbb6f629 (cherry picked from commit 35917a5a5332df758fb60ea8978bdf5cf5460d03) Reviewed-on: https://gerrit.libreoffice.org/4731 Reviewed-by: Andras Timar ati...@suse.com Tested-by: Andras Timar ati...@suse.com 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: Branch 'libreoffice-4-1' - 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 92b5d7f7c9ae3af23833df9fe7a503e844b913e4 Author: Fridrich Å trba fridrich.st...@bluewin.ch Date: Wed Jul 3 11:18:41 2013 +0200 Fix Windows signing and timestamping Change-Id: Ife8774c9a6157e8bb943d1ba8ec32f560c8281c4 (cherry picked from commit 523258e675e881d6f8efc031e3885d0197c8aad0) Reviewed-on: https://gerrit.libreoffice.org/4692 Reviewed-by: David Tardon dtar...@redhat.com Tested-by: David Tardon dtar...@redhat.com diff --git a/postprocess/CustomTarget_signing.mk b/postprocess/CustomTarget_signing.mk index a9c4a45..bf9aa0c 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
