[Libreoffice-commits] core.git: postprocess/CustomTarget_signing.mk solenv/gbuild
postprocess/CustomTarget_signing.mk |7 +-- solenv/gbuild/LinkTarget.mk |4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) New commits: commit 77568e5c970ee14d92de765686689ba6fccf2a17 Author: Christian Lohmaier lohmaier+libreoff...@googlemail.com Date: Mon Apr 20 15:41:48 2015 +0200 don't try to sign merged libs on windows as those are fake, just textfiles with dll extension that signtool doesn't like. Also made the text more descriptive invalid is ambiguous, invalid - merged lib states the reason why the file is a dummy. Change-Id: I31801fd0c3aa593549fac5e6275189e18bbc0010 Reviewed-on: https://gerrit.libreoffice.org/15444 Reviewed-by: Michael Stahl mst...@redhat.com Tested-by: Jenkins c...@libreoffice.org diff --git a/postprocess/CustomTarget_signing.mk b/postprocess/CustomTarget_signing.mk index f8a7c77..23a81ef 100644 --- a/postprocess/CustomTarget_signing.mk +++ b/postprocess/CustomTarget_signing.mk @@ -29,8 +29,11 @@ $(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) + EXCLUDELIST=$(shell $(gb_MKTEMP)) \ + cat $(SRCDIR)/postprocess/signing/no_signing.txt $$EXCLUDELIST \ + echo $(foreach lib,$(gb_MERGEDLIBS),$(call gb_Library_get_filename,$(lib))) | tr ' ' '\n' $$EXCLUDELIST \ $(PERL) $(SRCDIR)/postprocess/signing/signing.pl \ - -e $(SRCDIR)/postprocess/signing/no_signing.txt \ + -e $$EXCLUDELIST \ -l $(subst .done,_log.txt,$@) \ $(if $(PFXFILE),-f $(PFXFILE)) \ $(if $(PFXPASSWORD),-p $(PFXPASSWORD)) \ @@ -43,7 +46,7 @@ ifneq ($(ENABLE_DBGUTIL),TRUE) $(INSTDIR)/sdk/cli/*.dll \ $(INSTDIR)/sdk/bin/*.exe \ $(INSTDIR)/share/extensions/mysql-connector-ooo/*.dll\ -touch $@ +rm $$EXCLUDELIST touch $@ else @echo Doing nothing on non product builds ... endif diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk index d1602c9..82c4739 100644 --- a/solenv/gbuild/LinkTarget.mk +++ b/solenv/gbuild/LinkTarget.mk @@ -486,8 +486,8 @@ define gb_LinkTarget__command_impl $(if $(filter $(2),$(foreach lib,$(gb_MERGEDLIBS),$(call gb_Library__get_workdir_linktargetname,$(lib,\ $(if $(filter $(true),$(call gb_LinkTarget__is_build_lib,$(2))),\ $(call gb_LinkTarget__command,$(1),$(2)),\ - mkdir -p $(dir $(1)) echo invalid $(1) \ - $(if $(SOVERSIONSCRIPT), echo invalid $(WORKDIR)/LinkTarget/$(2))),\ + mkdir -p $(dir $(1)) echo invalid - merged lib $(1) \ + $(if $(SOVERSIONSCRIPT), echo invalid - merged lib $(WORKDIR)/LinkTarget/$(2))),\ $(call gb_LinkTarget__command,$(1),$(2))) $(call gb_LinkTarget__command_objectlist,$(WORKDIR)/LinkTarget/$(2).objectlist) 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 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 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 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
[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 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 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
