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

tdf#95169 - copy snk files before using them to link.

Browse Source 
Ideally this should not be necessary; apparently something takes an
exclusive lock which messes with parallel 'al' invocation using the
SNK key file.

Change-Id: Id4d5818a734a5591f826af230b71839dc076bb1f
Reviewed-on: https://gerrit.libreoffice.org/19442
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
Tested-by: Michael Meeks <michael.meeks@collabora.com>
This commit is contained in:
Michael Meeks
2015-10-19 09:20:03 +01:00
parent 4559e4b900
commit 4c66610b96
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
solenv/gbuild/CliAssembly.mk
View File

@@ -55,13 +55,15 @@ gb_CliAssemblyTarget_KEYFILE_DEFAULT := $(SRCDIR)/cli_ure/source/cliuno.snk
define gb_CliAssemblyTarget__command define gb_CliAssemblyTarget__command
$(call gb_Output_announce,$(2),$(true),AL ,2) $(call gb_Output_announce,$(2),$(true),AL ,2)
$(call gb_Helper_abbreviate_dirs,\ $(call gb_Helper_abbreviate_dirs,\
$(GNUCOPY) $(CLI_ASSEMBLY_KEYFILE) $(1).tmp.snk && \
al \ al \
-nologo \ -nologo \
-out:$(CLI_ASSEMBLY_OUTFILE) \ -out:$(CLI_ASSEMBLY_OUTFILE) \
-version:$(CLI_ASSEMBLY_VERSION) \ -version:$(CLI_ASSEMBLY_VERSION) \
-keyfile:$(CLI_ASSEMBLY_KEYFILE) \ -keyfile:$(1).tmp.snk \
-link:$(CLI_ASSEMBLY_CONFIGFILE) \ -link:$(CLI_ASSEMBLY_CONFIGFILE) \
$(if $(CLI_ASSEMBLY_PLATFORM),-platform:$(CLI_ASSEMBLY_PLATFORM)) && \ $(if $(CLI_ASSEMBLY_PLATFORM),-platform:$(CLI_ASSEMBLY_PLATFORM)) && \
rm -f $(1).tmp/snk && \
touch $(1) \ touch $(1) \
) )
endef endef