[Libreoffice-commits] core.git: postprocess/CustomTarget_signing.mk

2021-01-16 Thread Mike Kaganski (via logerrit) 
 postprocess/CustomTarget_signing.mk |7 +++
 1 file changed, 7 insertions(+)

New commits:
commit d534a4c7b45ff254b339e806c6a11f13d9ff0043
Author: Mike Kaganski 
AuthorDate: Fri Jan 15 22:42:05 2021 +0300
Commit: Mike Kaganski 
CommitDate: Sat Jan 16 09:28:23 2021 +0100

tdf#68198: sign the rest of binaries

Change-Id: I89bad00245e9e2c9f8cad1cdc33e40007ae6f80d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109414
Tested-by: Jenkins
Reviewed-by: Mike Kaganski 

diff --git a/postprocess/CustomTarget_signing.mk 
b/postprocess/CustomTarget_signing.mk
index a00faa857f2a..6fdd4950f4cb 100644
--- a/postprocess/CustomTarget_signing.mk
+++ b/postprocess/CustomTarget_signing.mk
@@ -45,7 +45,14 @@ ifneq ($(ENABLE_DBGUTIL),TRUE)
$(INSTDIR)/URE/bin/*.exe \
$(INSTDIR)/program/*.dll \
$(INSTDIR)/program/*.exe \
+   $(INSTDIR)/program/*.com \
$(INSTDIR)/program/soffice.bin \
+   $(INSTDIR)/program/unopkg.bin \
+   $(INSTDIR)/program/pyuno.pyd \
+   
$(INSTDIR)/$(LIBO_BIN_FOLDER)/python-core-$(PYTHON_VERSION)/bin/*.exe \
+   
$(INSTDIR)/$(LIBO_BIN_FOLDER)/python-core-$(PYTHON_VERSION)/lib/*.dll \
+   
$(INSTDIR)/$(LIBO_BIN_FOLDER)/python-core-$(PYTHON_VERSION)/lib/*.pyd \
+   
$(INSTDIR)/$(LIBO_BIN_FOLDER)/python-core-$(PYTHON_VERSION)/lib/distutils/command/*.exe
 \
$(INSTDIR)/program/shlxthdl/*.dll \
$(INSTDIR)/sdk/cli/*.dll \
$(INSTDIR)/sdk/bin/*.exe \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: postprocess/CustomTarget_signing.mk

2019-03-31 Thread Andras Timar (via logerrit) 
 postprocess/CustomTarget_signing.mk |1 -
 1 file changed, 1 deletion(-)

New commits:
commit 9f8fe00a245c279e7531e03bf38fbcab24d52bcc
Author: Andras Timar 
AuthorDate: Mon Apr 1 00:02:39 2019 +0200
Commit: Andras Timar 
CommitDate: Mon Apr 1 07:28:45 2019 +0200

no need to sign mysql-connector-ooo files, because they no longer exist in 
LO

Change-Id: Id9361cc6fd6d9bb150fd5a70fde7f6c91097b04a
Reviewed-on: https://gerrit.libreoffice.org/70018
Tested-by: Jenkins
Reviewed-by: Andras Timar 

diff --git a/postprocess/CustomTarget_signing.mk 
b/postprocess/CustomTarget_signing.mk
index b8a764d899e4..3a7097fcbd77 100644
--- a/postprocess/CustomTarget_signing.mk
+++ b/postprocess/CustomTarget_signing.mk
@@ -47,7 +47,6 @@ ifneq ($(ENABLE_DBGUTIL),TRUE)
$(INSTDIR)/program/shlxthdl/*.dll \
$(INSTDIR)/sdk/cli/*.dll \
$(INSTDIR)/sdk/bin/*.exe \
-   $(INSTDIR)/share/extensions/mysql-connector-ooo/*.dll\
&& rm $$EXCLUDELIST && touch $@
 else
@echo "Doing nothing on non product builds ..."
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: postprocess/CustomTarget_signing.mk

2017-10-31 Thread Christian Lohmaier 
 postprocess/CustomTarget_signing.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 37eab9181cdd099935148bc911163f861a2c8d3f
Author: Christian Lohmaier 
Date:   Mon Oct 30 22:26:56 2017 +0100

msc-externals: don't attempt to chmod nonexisting files

440ac656f783a7a5e33431410a1c038b7d04c42e forgot to also guard the
chmod and thus 64bit builds on windows fail when attempting to sign, as
in this case there is no cross-compiled explorer extension and the dlls
are not copied into instdir

Change-Id: Ie17a079b64256d3ef0bf253bdda6cfe722dac3e2
Reviewed-on: https://gerrit.libreoffice.org/44076
Reviewed-by: Christian Lohmaier 
Tested-by: Christian Lohmaier 

diff --git a/postprocess/CustomTarget_signing.mk 
b/postprocess/CustomTarget_signing.mk
index 573c396f49de..b3aaf264f76c 100644
--- a/postprocess/CustomTarget_signing.mk
+++ b/postprocess/CustomTarget_signing.mk
@@ -33,7 +33,7 @@ ifneq ($(ENABLE_DBGUTIL),TRUE)
cat $(SRCDIR)/postprocess/signing/no_signing.txt > $$EXCLUDELIST && \
echo "$(foreach lib,$(gb_MERGEDLIBS),$(call 
gb_Library_get_filename,$(lib)))" | tr ' ' '\n' >> $$EXCLUDELIST && \
$(if $(UCRT_REDISTDIR),chmod u+w $(foreach 
lib,$(UCRT_DLLS),$(INSTDIR)/$(LIBO_URE_LIB_FOLDER)/$(lib)) &&) \
-   chmod u+w $(foreach 
lib,$(MSVC_DLLS),$(INSTDIR)/program/shlxthdl/$(lib)) && \
+   $(if $(BUILD_X64),chmod u+w $(foreach 
lib,$(MSVC_DLLS),$(INSTDIR)/program/shlxthdl/$(lib)) &&) \
$(PERL) $(SRCDIR)/postprocess/signing/signing.pl \
-e $$EXCLUDELIST \
-l $(subst .done,_log.txt,$@) \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: postprocess/CustomTarget_signing.mk

2017-05-31 Thread Andras Timar 
 postprocess/CustomTarget_signing.mk |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 58c0ff3266fcae75db4ee6e3ceac17793e98db1d
Author: Andras Timar 
Date:   Tue May 30 23:24:38 2017 +0200

tdf#86776 Digitally sign soffice.bin on Windows

Change-Id: I79e223f7ac8367a22668c015afddafe1c8b8cd42
Reviewed-on: https://gerrit.libreoffice.org/38246
Tested-by: Jenkins 
Reviewed-by: Andras Timar 

diff --git a/postprocess/CustomTarget_signing.mk 
b/postprocess/CustomTarget_signing.mk
index ae66c4eaa0f8..61336f40ac00 100644
--- a/postprocess/CustomTarget_signing.mk
+++ b/postprocess/CustomTarget_signing.mk
@@ -43,6 +43,7 @@ ifneq ($(ENABLE_DBGUTIL),TRUE)
$(INSTDIR)/URE/bin/*.exe \
$(INSTDIR)/program/*.dll \
$(INSTDIR)/program/*.exe \
+   $(INSTDIR)/program/soffice.bin \
$(INSTDIR)/program/shlxthdl/*.dll \
$(INSTDIR)/sdk/cli/*.dll \
$(INSTDIR)/sdk/bin/*.exe \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: postprocess/CustomTarget_signing.mk solenv/gbuild

2015-04-20 Thread Christian Lohmaier 
 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

2014-04-29 Thread Christian Lohmaier 
 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

2013-07-23 Thread David Tardon 
 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

[Libreoffice-commits] core.git: postprocess/CustomTarget_signing.mk

2013-07-05 Thread Fridrich Štrba 
 postprocess/CustomTarget_signing.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 35917a5a5332df758fb60ea8978bdf5cf5460d03
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

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 postprocess/signing

2013-07-03 Thread Fridrich Štrba 
 postprocess/CustomTarget_signing.mk |9 +
 postprocess/signing/signing.pl  |6 +++---
 2 files changed, 8 insertions(+), 7 deletions(-)

New commits:
commit 523258e675e881d6f8efc031e3885d0197c8aad0
Author: Fridrich Å trba fridrich.st...@bluewin.ch
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

2013-07-03 Thread Fridrich Štrba 
 postprocess/CustomTarget_signing.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 428e77a0693ecb56a529970233666c25c55fc0f6
Author: Fridrich Å trba fridrich.st...@bluewin.ch
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