postprocess/signing/makefile.mk | 11 ++++++++++-
postprocess/signing/signing.pl | 6 +++---
2 files changed, 13 insertions(+), 4 deletions(-)
New commits:
commit 32469d729eeea0b79eba5927e502a342748d8ee9
Author: Fridrich Å trba <fridrich.st...@bluewin.ch>
Date: Wed Jul 3 11:18:41 2013 +0200
Fix Windows signing and timestamping
(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>
(cherry picked from commit 92b5d7f7c9ae3af23833df9fe7a503e844b913e4)
Conflicts:
postprocess/CustomTarget_signing.mk
Change-Id: Ife8774c9a6157e8bb943d1ba8ec32f560c8281c4
Reviewed-on: https://gerrit.libreoffice.org/4694
Reviewed-by: Andras Timar <ati...@suse.com>
Tested-by: Andras Timar <ati...@suse.com>
diff --git a/postprocess/signing/makefile.mk b/postprocess/signing/makefile.mk
index 3c6acf0..47e63e5 100644
--- a/postprocess/signing/makefile.mk
+++ b/postprocess/signing/makefile.mk
@@ -32,11 +32,20 @@ LOGFILE=$(MISC)$/signing_log.txt
IMAGENAMES=$(SOLARBINDIR)$/*.dll $(SOLARBINDIR)$/*.exe
TIMESTAMPURL*="http://timestamp.globalsign.com/scripts/timestamp.dll";
+PFXFILE_OPTION=
+.IF "$(PFXFILE)"!=""
+ PFXFILE_OPTION="-f $(PFXFILE)"
+.ENDIF # "$(PFXFILE)"!=""
+PFXPASSWORD_OPTION=
+.IF "$(PFXPASSWORD)"!=""
+ PFXPASSWORD_OPTION="-p $(PFXPASSWORD)"
+.ENDIF # "$(PFXPASSWORD)"!=""
+
signing.done :
.IF "$(WINDOWS_BUILD_SIGNING)"=="TRUE"
.IF "$(COM)"=="MSC"
.IF "$(product)"=="full"
- $(PERL) signing.pl -e $(EXCLUDELIST) -l $(LOGFILE) -f $(PFXFILE) -p
$(PFXPASSWORD) -t $(TIMESTAMPURL) $(IMAGENAMES) && $(TOUCH)
$(MISC)$/signing.done
+ $(PERL) signing.pl -e $(EXCLUDELIST) -l $(LOGFILE) $(PFXFILE_OPTION)
$(PFXPASSWORD_OPTION) -t $(TIMESTAMPURL) $(IMAGENAMES) && $(TOUCH)
$(MISC)$/signing.done
.ELSE # "$(product)"=="full"
@echo Doing nothing on non product builds ...
.ENDIF # "$(product)"=="full"
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
