Kaydet (Commit) 26bddf3e authored tarafından Michael Stahl's avatar Michael Stahl

desktop: stop packaging soffice.bin.manifest

It was introduced to get newer File Picker dialogs (i#70927)
but the special manifest file for that was not actually used for years;
LO 3.5 already includes a generic manifest file that is like any other
and probably has zero benefit over the manfiest that is embedded in
the soffice.bin binary anyway.

Change-Id: I0f41f10ecf26201043a8c9964cdfef95bc348eb8
üst cad751d2
......@@ -51,21 +51,6 @@ $(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_linktarget,soffice_bin))
$(call gb_Deliver_deliver,$(call gb_LinkTarget_get_manifestfile,$(call gb_LinkTarget__get_workdir_linktargetname,$(call gb_Executable_get_linktarget,soffice_bin))),$@)
.PHONY : $(WORKDIR)/Clean/OutDir/bin/soffice.bin.manifest
$(WORKDIR)/Clean/OutDir/bin/soffice.bin.manifest :
rm -f $(OUTDIR)/bin/soffice.bin.manifest
endif
endif
......
......@@ -550,16 +550,6 @@ End
#endif
// use this for high detail file open dialog >= 5.1 windows
#if defined( _MSC_VER )
File gid_Brand_File_Bin_Soffice_Bin_Manifest
TXT_FILE_BODY;
Styles = (PACKED);
Dir = gid_Brand_Dir_Program;
Name = "soffice.bin.manifest";
End
#endif
#ifdef WNT
File gid_Brand_File_Desktophelper_Txt
TXT_FILE_BODY;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment