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

revert delivery of soffice.bin.manifest

Browse Source 
Okay, I give up. This obviously still does not work on Windows, but it
does on MinGW when I try to simulate it.

Change-Id: I9f2d7114df0498d5cc3a71431aacc7e49a5a78fd
This commit is contained in:
David Tardon 2012-05-03 13:09:49 +02:00
parent 38a91f15e6
commit 056b9b45bf
3 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
desktop/Executable_soffice_bin.mk
View File

@ -55,6 +55,21 @@ $(eval $(call gb_Executable_add_ldflags,soffice_bin,\
/STACK:10000000 \
))
# HACK: Copy manifest to $(OUTDIR)/bin under the right name. The
# executable is copied in Package_soffice_bin, but that does not work
# for the manifest, for some reason...
$(call gb_Module_get_target,desktop) : $(OUTDIR)/bin/soffice.bin.manifest
$(OUTDIR)/bin/soffice.bin.manifest : $(call gb_Executable_get_target,soffice_bin)
$(call gb_Executable_get_clean_target,soffice_bin) : $(WORKDIR)/Clean/OutDir/bin/soffice.bin.manifest
$(OUTDIR)/bin/soffice.bin.manifest : $(call gb_LinkTarget_get_target,$(call gb_Executable_get_linktargetname,soffice_bin))
$(call gb_Deliver_deliver,$<.manifest,$@)
.PHONY : $(WORKDIR)/Clean/OutDir/bin/soffice.bin.manifest
$(WORKDIR)/Clean/OutDir/bin/soffice.bin.manifest :
rm -f $(OUTDIR)/bin/soffice.bin.manifest
endif
$(eval $(call gb_Executable_add_nativeres,soffice_bin,sofficebin/src))

6
desktop/Package_soffice_bin.mk
View File

@ -29,10 +29,4 @@ $(eval $(call gb_Package_Package,desktop_soffice_bin,$(gb_Executable_BINDIR)))
$(eval $(call gb_Package_add_file,desktop_soffice_bin,bin/soffice.bin,soffice_bin$(gb_Executable_EXT)))
ifeq ($(COM),MSC)
$(eval $(call gb_Package_add_file,desktop_soffice_bin,bin/soffice.bin.manifest,soffice_bin$(gb_Executable_EXT).manifest))
endif
$(call gb_Package_get_preparation_target,desktop_soffice_bin) :| $(call gb_Executable_get_target,soffice_bin)
# vim: set shiftwidth=4 tabstop=4 noexpandtab:

1
solenv/gbuild/LinkTarget.mk
View File

@ -1042,7 +1042,6 @@ $$(call gb_Output_error,\
endef
define gb_LinkTarget_add_auxtargets
$(2) :| $(call gb_LinkTarget_get_target,$(1))
$(call gb_LinkTarget_get_clean_target,$(1)) : AUXTARGETS += $(2)
endef