diff options
| author | David Tardon <dtardon@redhat.com> | 2012-05-03 13:09:49 +0200 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2012-05-03 13:12:05 +0200 |
| commit | 056b9b45bf94bf5c362d8409c5919a6565d2922d (patch) | |
| tree | ea97f31b37c13179e62c29b96556a9322299be1a /desktop | |
| parent | 38a91f15e60d01e2d33dd70c1f83e9b2e73426c4 (diff) | |
revert delivery of soffice.bin.manifest
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
Diffstat (limited to 'desktop')
| -rw-r--r-- | desktop/Executable_soffice_bin.mk | 15 | ||||
| -rw-r--r-- | desktop/Package_soffice_bin.mk | 6 |
2 files changed, 15 insertions, 6 deletions
diff --git a/desktop/Executable_soffice_bin.mk b/desktop/Executable_soffice_bin.mk index 515e7bbc18f0..e87b8a041d2b 100644 --- a/desktop/Executable_soffice_bin.mk +++ b/desktop/Executable_soffice_bin.mk @@ -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)) diff --git a/desktop/Package_soffice_bin.mk b/desktop/Package_soffice_bin.mk index 04378d7d874c..249748ff346c 100644 --- a/desktop/Package_soffice_bin.mk +++ b/desktop/Package_soffice_bin.mk @@ -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: |