[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - postprocess/CustomTarget_signing.mk postprocess/signing

[Fridrich Å trba]

 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.strba at 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 <dtardon at redhat.com>
    Tested-by: David Tardon <dtardon at 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