mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix Windows signing and timestamping

Browse Source 
Change-Id: Ife8774c9a6157e8bb943d1ba8ec32f560c8281c4
This commit is contained in:
Fridrich Štrba
2013-07-03 11:18:41 +02:00
parent 49752e82f5
commit 523258e675
2 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
postprocess/CustomTarget_signing.mk
View File

@@ -26,11 +26,12 @@ $(call gb_CustomTarget_get_workdir,postprocess/signing)/signing.done : \
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),PRL,2) $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),PRL,2)
ifeq ($(COM),MSC) ifeq ($(COM),MSC)
ifneq ($(ENABLE_DBGUTIL),TRUE) 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,$@) \ -l $(subst .done,_log.txt,$@) \
-f $(PFXFILE) \ $(if $(PFXFILE),-f $(PFXFILE)) \
-p $(PFXPASSWORD) \ $(if $(PFXPASSWORD),-p $(PFXPASSWORD)) \
-t $(TIMESTAMPURL) \ $(if $($(TIMESTAMPURL),-t $(TIMESTAMPURL)) \
$(OUTDIR)/bin/*.dll $(OUTDIR)/bin/*.exe \ $(OUTDIR)/bin/*.dll $(OUTDIR)/bin/*.exe \
&& touch $@ && touch $@
else else

6
postprocess/signing/signing.pl
View File

@@ -147,9 +147,9 @@ sub sign_files #09.07.2007 10:36
} }
$signtool .= " -v" if ($opt_verbose); $signtool .= " -v" if ($opt_verbose);
$commandline_base = $signtool; $commandline_base = $signtool;
$commandline_base .= " -f $opt_pfxfile" if ($opt_pfxfile != ""); $commandline_base .= " -f $opt_pfxfile" if ($opt_pfxfile ne "");
$commandline_base .= " -p $opt_pass" if ($opt_pass != ""); $commandline_base .= " -p $opt_pass" if ($opt_pass ne "");
$commandline_base .= " -t $opt_timestamp_url" if ($opt_timestamp_url != ""); $commandline_base .= " -t $opt_timestamp_url" if ($opt_timestamp_url ne "");
# Here switch between: # Here switch between:
# one command line for muliple files (all doesn't work, too much) / for each file one command line # one command line for muliple files (all doesn't work, too much) / for each file one command line