From 8a915ad95fcc1e21f57c7a397fb12a96abc799e6 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Thu, 22 Sep 2011 15:35:11 +0300 Subject: Simplify the manifest dance --- desktop/Executable_soffice.bin.mk | 5 +++++ desktop/Module_desktop.mk | 1 - desktop/Package_manifest.mk | 34 ---------------------------- desktop/util/Makefile | 47 --------------------------------------- desktop/util/template.manifest | 10 --------- 5 files changed, 5 insertions(+), 92 deletions(-) delete mode 100644 desktop/Package_manifest.mk delete mode 100644 desktop/util/Makefile delete mode 100755 desktop/util/template.manifest diff --git a/desktop/Executable_soffice.bin.mk b/desktop/Executable_soffice.bin.mk index aec58c5ab504..3aad85f93573 100644 --- a/desktop/Executable_soffice.bin.mk +++ b/desktop/Executable_soffice.bin.mk @@ -77,6 +77,11 @@ $(eval $(call gb_Executable_add_noexception_objects,$(sofficebin),\ $(eval $(call gb_Package_Package,$(sofficebin),$(OUTDIR)/bin)) $(eval $(call gb_Package_add_file,$(sofficebin),bin/soffice.bin,$(sofficebin).exe)) +ifeq ($(COM),MSC) +# also copy the manifest +$(eval $(call gb_Package_add_file,$(sofficebin),bin/soffice.bin.manifest,$(sofficebin).exe.manifest)) +endif + endif ifeq ($(OS),MACOSX) diff --git a/desktop/Module_desktop.mk b/desktop/Module_desktop.mk index 0e7da8e8a88b..84df7dd864bd 100644 --- a/desktop/Module_desktop.mk +++ b/desktop/Module_desktop.mk @@ -80,7 +80,6 @@ $(eval $(call gb_Module_add_targets,desktop,\ Executable_unoinfo \ Executable_unopkg \ Executable_unopkg.com \ - Package_manifest \ Package_rcfile \ WinResTarget_quickstart \ WinResTarget_sbase \ diff --git a/desktop/Package_manifest.mk b/desktop/Package_manifest.mk deleted file mode 100644 index a8d17de67657..000000000000 --- a/desktop/Package_manifest.mk +++ /dev/null @@ -1,34 +0,0 @@ -# Version: MPL 1.1 / GPLv3+ / LGPLv3+ -# -# The contents of this file are subject to the Mozilla Public License Version -# 1.1 (the "License"); you may not use this file except in compliance with -# the License or as specified alternatively below. You may obtain a copy of -# the License at http://www.mozilla.org/MPL/ -# -# Software distributed under the License is distributed on an "AS IS" basis, -# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License -# for the specific language governing rights and limitations under the -# License. -# -# Major Contributor(s): -# Copyright (C) 2011 David Tardon, Red Hat Inc. (initial developer) -# -# All Rights Reserved. -# -# For minor contributions see the git repository. -# -# Alternatively, the contents of this file may be used under the terms of -# either the GNU General Public License Version 3 or later (the "GPLv3+"), or -# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"), -# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable -# instead of those above. - -$(eval $(call gb_Package_Package,desktop_manifest,$(WORKDIR)/CustomTarget/desktop/util)) - -$(eval $(call gb_Package_add_customtarget,desktop_manifest,desktop/util,SRCDIR)) - -$(eval $(call gb_CustomTarget_add_outdir_dependencies,desktop/util,\ - $(OUTDIR)/bin/soffice.bin \ -)) - -# vim: set ts=4 sw=4 et: diff --git a/desktop/util/Makefile b/desktop/util/Makefile deleted file mode 100644 index 7c5e9f63f0e1..000000000000 --- a/desktop/util/Makefile +++ /dev/null @@ -1,47 +0,0 @@ -# Version: MPL 1.1 / GPLv3+ / LGPLv3+ -# -# The contents of this file are subject to the Mozilla Public License Version -# 1.1 (the "License"); you may not use this file except in compliance with -# the License or as specified alternatively below. You may obtain a copy of -# the License at http://www.mozilla.org/MPL/ -# -# Software distributed under the License is distributed on an "AS IS" basis, -# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License -# for the specific language governing rights and limitations under the -# License. -# -# Major Contributor(s): -# Copyright (C) 2011 David Tardon, Red Hat Inc. (initial developer) -# -# All Rights Reserved. -# -# For minor contributions see the git repository. -# -# Alternatively, the contents of this file may be used under the terms of -# either the GNU General Public License Version 3 or later (the "GPLv3+"), or -# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"), -# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable -# instead of those above. - -DESTDIR := $(WORKDIR)/CustomTarget/desktop/util - -ifeq ($(COM),MSC) - -$(DESTDIR)/linker.manifest : $(OUTDIR)/bin/soffice_bin.exe - mkdir -p $(DESTDIR) && mt.exe -inputresource:$< -out:$@ - -$(OUTDIR)/bin/soffice.bin.manifest : $(DESTDIR)/linker.manifest $(SRCDIR)/desktop/util/template.manifest - mkdir -p $(OUTDIR)/bin && mt.exe -manifest $^ -out:$@ - -else - -$(OUTDIR)/bin/soffice.bin.manifest : $(SRCDIR)/desktop/util/template.manifest - mkdir -p $(OUTDIR)/bin && cp $^ $@ - -endif - -.DEFAULT_TARGET := all -.PHONY : all -all : $(OUTDIR)/bin/soffice.bin.manifest - -# vim: set ts=4 sw=4 noet: diff --git a/desktop/util/template.manifest b/desktop/util/template.manifest deleted file mode 100755 index d3bd0c101f2f..000000000000 --- a/desktop/util/template.manifest +++ /dev/null @@ -1,10 +0,0 @@ - - - -http://www.documentfoundation.org - - - - - - -- cgit