[Libreoffice-commits] .: desktop/Executable_soffice.bin.mk desktop/Module_desktop.mk desktop/util desktop/WinResTarget_sofficebin.mk desktop/WinResTarget_soffice.mk officecfg/registry reportbuilder/re
desktop/Executable_soffice.bin.mk |2 desktop/Module_desktop.mk |1 desktop/WinResTarget_soffice.mk |2 desktop/WinResTarget_sofficebin.mk | 49 ++ desktop/util/officeloader.rc | 36 +-- officecfg/registry/data/org/openoffice/Setup.xcu | 22 ++-- reportbuilder/registry/data/org/openoffice/Setup.xcu |2 scp2/inc/macros.inc |2 scp2/source/base/registryitem_base.scp |2 scp2/source/binfilter/registryitem_binfilter.scp | 16 +-- scp2/source/calc/registryitem_calc.scp | 26 ++--- scp2/source/draw/registryitem_draw.scp | 12 +- scp2/source/impress/registryitem_impress.scp | 28 ++--- scp2/source/math/registryitem_math.scp |8 - scp2/source/ooo/registryitem_ooo.scp |4 scp2/source/writer/registryitem_writer.scp | 32 +++--- setup_native/source/win32/customactions/reg4msdoc/registrationcontextinformation.cxx | 17 +-- setup_native/source/win32/customactions/reg4msdoc/registrationcontextinformation.hxx |1 setup_native/source/win32/customactions/shellextensions/startmenuicon.cxx |4 sfx2/source/appl/shutdowniconunx.cxx |6 - sfx2/source/appl/shutdowniconw32.cxx | 18 +-- vcl/inc/svids.hrc |8 - vcl/inc/vcl/syswin.hxx | 16 +-- vcl/unx/generic/window/salframe.cxx |2 24 files changed, 166 insertions(+), 150 deletions(-) New commits: commit ceb14e0143fb72b34421f6fb81ff1fb1842cb500 Author: Andras Timar Date: Wed Jan 18 13:11:11 2012 +0100 fdo#37740 remove duplicate icons from soffice.bin/soffice.exe diff --git a/desktop/Executable_soffice.bin.mk b/desktop/Executable_soffice.bin.mk index 8815432..00fb005 100644 --- a/desktop/Executable_soffice.bin.mk +++ b/desktop/Executable_soffice.bin.mk @@ -103,6 +103,6 @@ $(eval $(call gb_Executable_set_ldflags,\ endif -$(eval $(call gb_Executable_add_nativeres,$(sofficebin),soffice/src)) +$(eval $(call gb_Executable_add_nativeres,$(sofficebin),sofficebin/src)) # vim: set ts=4 sw=4 et: diff --git a/desktop/Module_desktop.mk b/desktop/Module_desktop.mk index 3d0045c..eb83f82 100644 --- a/desktop/Module_desktop.mk +++ b/desktop/Module_desktop.mk @@ -98,6 +98,7 @@ $(eval $(call gb_Module_add_targets,desktop,\ WinResTarget_sdraw \ WinResTarget_simpress \ WinResTarget_soffice \ +WinResTarget_sofficebin \ WinResTarget_smath \ WinResTarget_sweb \ WinResTarget_swriter \ diff --git a/desktop/WinResTarget_soffice.mk b/desktop/WinResTarget_soffice.mk index b15..fe66aa5 100644 --- a/desktop/WinResTarget_soffice.mk +++ b/desktop/WinResTarget_soffice.mk @@ -44,6 +44,6 @@ $(eval $(call gb_WinResTarget_add_dependency,soffice/src,\ sysui/desktop/icons/main_app.ico \ )) -$(eval $(call gb_WinResTarget_add_file,soffice/src,desktop/util/officeloader)) +$(eval $(call gb_WinResTarget_add_file,soffice/src,desktop/win32/source/applauncher/launcher)) # vim: set ts=4 sw=4 et: diff --git a/desktop/WinResTarget_sofficebin.mk b/desktop/WinResTarget_sofficebin.mk new file mode 100644 index 000..334c9b7 --- /dev/null +++ b/desktop/WinResTarget_sofficebin.mk @@ -0,0 +1,49 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# 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 Red Hat, Inc., David Tardon +# (initial developer) +# +# All Rights Reserved. +# +# For minor contributions see the git repository. +# +# Alternatively, the conten
[Libreoffice-commits] .: desktop/Executable_soffice.bin.mk desktop/Executable_unopkg.bin.mk Repository.mk
Repository.mk | 11 --- desktop/Executable_soffice.bin.mk |2 +- desktop/Executable_unopkg.bin.mk |2 +- 3 files changed, 6 insertions(+), 9 deletions(-) New commits: commit 42bd571e07378c5e74f279e373c1442b4d224590 Author: Norbert Thiebaud Date: Tue Jan 10 22:28:24 2012 -0600 OS_FOR_BUILD is not right do decide Host module name diff --git a/Repository.mk b/Repository.mk index 3cc7a38..f76ae79 100644 --- a/Repository.mk +++ b/Repository.mk @@ -56,6 +56,7 @@ $(eval $(call gb_Helper_register_executables,OOO, \ ifeq ($(OS),WNT) $(eval $(call gb_Helper_register_executables,OOO,\ + crashrep_com \ guiloader \ guistdio \ odbcconfig \ @@ -66,27 +67,23 @@ $(eval $(call gb_Helper_register_executables,OOO,\ sdraw \ simpress \ soffice \ + soffice_bin \ smath \ sweb \ swriter \ unoinfo \ unopkg \ + unopkg_bin \ + unopkg_com \ unopkgio \ )) else -ifeq ($(OS_FOR_BUILD),WNT) -$(eval $(call gb_Helper_register_executables,OOO,\ - soffice_bin \ -unopkg_bin \ -)) -else $(eval $(call gb_Helper_register_executables,OOO,\ soffice.bin \ unopkg.bin \ )) -endif ifeq ($(OS),MACOSX) diff --git a/desktop/Executable_soffice.bin.mk b/desktop/Executable_soffice.bin.mk index 456171d..8815432 100644 --- a/desktop/Executable_soffice.bin.mk +++ b/desktop/Executable_soffice.bin.mk @@ -25,7 +25,7 @@ # in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable # instead of those above. -ifeq ($(OS_FOR_BUILD),WNT) +ifeq ($(OS),WNT) sofficebin := soffice_bin else sofficebin := soffice.bin diff --git a/desktop/Executable_unopkg.bin.mk b/desktop/Executable_unopkg.bin.mk index 464824f..c635c2b 100644 --- a/desktop/Executable_unopkg.bin.mk +++ b/desktop/Executable_unopkg.bin.mk @@ -25,7 +25,7 @@ # in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable # instead of those above. -ifeq ($(OS_FOR_BUILD),WNT) +ifeq ($(OS),WNT) unopkgbin := unopkg_bin else unopkgbin := unopkg.bin ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: desktop/Executable_soffice.bin.mk desktop/Executable_unopkg.bin.mk Repository.mk
Repository.mk | 11 +++ desktop/Executable_soffice.bin.mk |2 +- desktop/Executable_unopkg.bin.mk |2 +- 3 files changed, 9 insertions(+), 6 deletions(-) New commits: commit ee24a236e1ebcc9585ed8e24cd73512e76a0303d Author: Jan Holesovsky Date: Wed Jan 11 09:37:09 2012 +0100 Revert "OS_FOR_BUILD is not right do decide Host module name" This reverts commit 39cfc4d8ad77700aefabaedde430693448a5f76f. This OS_FOR_BUILD is to modify behavior in the cross-compilation case. diff --git a/Repository.mk b/Repository.mk index 0724e43..3cc7a38 100644 --- a/Repository.mk +++ b/Repository.mk @@ -56,7 +56,6 @@ $(eval $(call gb_Helper_register_executables,OOO, \ ifeq ($(OS),WNT) $(eval $(call gb_Helper_register_executables,OOO,\ -crashrep_com \ guiloader \ guistdio \ odbcconfig \ @@ -67,23 +66,27 @@ $(eval $(call gb_Helper_register_executables,OOO,\ sdraw \ simpress \ soffice \ - soffice_bin \ smath \ sweb \ swriter \ unoinfo \ unopkg \ -unopkg_bin \ -unopkg_com \ unopkgio \ )) else +ifeq ($(OS_FOR_BUILD),WNT) +$(eval $(call gb_Helper_register_executables,OOO,\ + soffice_bin \ +unopkg_bin \ +)) +else $(eval $(call gb_Helper_register_executables,OOO,\ soffice.bin \ unopkg.bin \ )) +endif ifeq ($(OS),MACOSX) diff --git a/desktop/Executable_soffice.bin.mk b/desktop/Executable_soffice.bin.mk index 8815432..456171d 100644 --- a/desktop/Executable_soffice.bin.mk +++ b/desktop/Executable_soffice.bin.mk @@ -25,7 +25,7 @@ # in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable # instead of those above. -ifeq ($(OS),WNT) +ifeq ($(OS_FOR_BUILD),WNT) sofficebin := soffice_bin else sofficebin := soffice.bin diff --git a/desktop/Executable_unopkg.bin.mk b/desktop/Executable_unopkg.bin.mk index c635c2b..464824f 100644 --- a/desktop/Executable_unopkg.bin.mk +++ b/desktop/Executable_unopkg.bin.mk @@ -25,7 +25,7 @@ # in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable # instead of those above. -ifeq ($(OS),WNT) +ifeq ($(OS_FOR_BUILD),WNT) unopkgbin := unopkg_bin else unopkgbin := unopkg.bin ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: desktop/Executable_soffice.bin.mk desktop/Executable_unopkg.bin.mk Repository.mk
Repository.mk | 11 --- desktop/Executable_soffice.bin.mk |2 +- desktop/Executable_unopkg.bin.mk |2 +- 3 files changed, 6 insertions(+), 9 deletions(-) New commits: commit 39cfc4d8ad77700aefabaedde430693448a5f76f Author: Norbert Date: Tue Jan 10 22:28:24 2012 -0600 OS_FOR_BUILD is not right do decide Host module name diff --git a/Repository.mk b/Repository.mk index 3cc7a38..0724e43 100644 --- a/Repository.mk +++ b/Repository.mk @@ -56,6 +56,7 @@ $(eval $(call gb_Helper_register_executables,OOO, \ ifeq ($(OS),WNT) $(eval $(call gb_Helper_register_executables,OOO,\ +crashrep_com \ guiloader \ guistdio \ odbcconfig \ @@ -66,27 +67,23 @@ $(eval $(call gb_Helper_register_executables,OOO,\ sdraw \ simpress \ soffice \ + soffice_bin \ smath \ sweb \ swriter \ unoinfo \ unopkg \ +unopkg_bin \ +unopkg_com \ unopkgio \ )) else -ifeq ($(OS_FOR_BUILD),WNT) -$(eval $(call gb_Helper_register_executables,OOO,\ - soffice_bin \ -unopkg_bin \ -)) -else $(eval $(call gb_Helper_register_executables,OOO,\ soffice.bin \ unopkg.bin \ )) -endif ifeq ($(OS),MACOSX) diff --git a/desktop/Executable_soffice.bin.mk b/desktop/Executable_soffice.bin.mk index 456171d..8815432 100644 --- a/desktop/Executable_soffice.bin.mk +++ b/desktop/Executable_soffice.bin.mk @@ -25,7 +25,7 @@ # in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable # instead of those above. -ifeq ($(OS_FOR_BUILD),WNT) +ifeq ($(OS),WNT) sofficebin := soffice_bin else sofficebin := soffice.bin diff --git a/desktop/Executable_unopkg.bin.mk b/desktop/Executable_unopkg.bin.mk index 464824f..c635c2b 100644 --- a/desktop/Executable_unopkg.bin.mk +++ b/desktop/Executable_unopkg.bin.mk @@ -25,7 +25,7 @@ # in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable # instead of those above. -ifeq ($(OS_FOR_BUILD),WNT) +ifeq ($(OS),WNT) unopkgbin := unopkg_bin else unopkgbin := unopkg.bin ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: desktop/Executable_soffice.bin.mk
desktop/Executable_soffice.bin.mk |2 ++ 1 file changed, 2 insertions(+) New commits: commit f19e6305cd921a2c03179e1ddec42339422586d6 Author: Andras Timar Date: Wed Dec 7 20:36:21 2011 +0100 link icons to soffice.bin fdo#42979 diff --git a/desktop/Executable_soffice.bin.mk b/desktop/Executable_soffice.bin.mk index e4665e8..a4aa573 100644 --- a/desktop/Executable_soffice.bin.mk +++ b/desktop/Executable_soffice.bin.mk @@ -102,4 +102,6 @@ $(eval $(call gb_Executable_set_ldflags,\ endif +$(eval $(call gb_Executable_add_nativeres,$(sofficebin),soffice/src)) + # vim: set ts=4 sw=4 et: ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: desktop/Executable_soffice.bin.mk
desktop/Executable_soffice.bin.mk |1 - 1 file changed, 1 deletion(-) New commits: commit 549f928863d0c1625f0322f62bfdda827063725e Author: Andras Timar Date: Thu Dec 1 10:25:41 2011 +0100 Revert "temporary hack: soffice.bin should be type of GUI app, not CUI app fdo#42914" This reverts commit d76479654748454e280ac48217fb0036bc5940a1. Bjoern fixed it correctly, this hack is not needed. diff --git a/desktop/Executable_soffice.bin.mk b/desktop/Executable_soffice.bin.mk index 9682afc..cc5796a 100644 --- a/desktop/Executable_soffice.bin.mk +++ b/desktop/Executable_soffice.bin.mk @@ -58,7 +58,6 @@ ifeq ($(COM),MSC) $(eval $(call gb_Executable_add_ldflags,$(sofficebin),\ /STACK:1000 \ -/SUBSYSTEM:WINDOWS \ )) endif ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: desktop/Executable_soffice.bin.mk
desktop/Executable_soffice.bin.mk |1 + 1 file changed, 1 insertion(+) New commits: commit d76479654748454e280ac48217fb0036bc5940a1 Author: Andras Timar Date: Wed Nov 30 12:01:06 2011 +0100 temporary hack: soffice.bin should be type of GUI app, not CUI app fdo#42914 It is puzzling that Executable_soffice.bin.mk contains the line $(eval $(call gb_Executable_set_targettype_gui,$(sofficebin),YES)) yet, in the build log we see -SUBSYSTEM:CONSOLE among the linker flags. I added -SUBSYSTEM:WINDOWS flag exlicitely, and it comes later so it prevails. I guess MinGW will be still affected. It really should be fixed correctly by a gbuild expert. diff --git a/desktop/Executable_soffice.bin.mk b/desktop/Executable_soffice.bin.mk index cc5796a..9682afc 100644 --- a/desktop/Executable_soffice.bin.mk +++ b/desktop/Executable_soffice.bin.mk @@ -58,6 +58,7 @@ ifeq ($(COM),MSC) $(eval $(call gb_Executable_add_ldflags,$(sofficebin),\ /STACK:1000 \ +/SUBSYSTEM:WINDOWS \ )) endif ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: desktop/Executable_soffice.bin.mk
desktop/Executable_soffice.bin.mk |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit f222b01170f57ca65ef28239dcf20c1f5a533f6c Author: Bjoern Michaelsen Date: Tue Nov 8 14:19:36 2011 +0100 there is no rule for the manifest, so we need to depend on the lib only - or maybe better: have an rule for manifest files on windows, instead of creating them as a sideeffect diff --git a/desktop/Executable_soffice.bin.mk b/desktop/Executable_soffice.bin.mk index b32a444..776b84f 100644 --- a/desktop/Executable_soffice.bin.mk +++ b/desktop/Executable_soffice.bin.mk @@ -85,8 +85,8 @@ $(call gb_Module_get_target,desktop) : $(OUTDIR)/bin/soffice.bin.manifest $(OUTDIR)/bin/soffice.bin.manifest : $(call gb_Executable_get_target,$(sofficebin)) $(call gb_Executable_get_clean_target,$(sofficebin)) : $(WORKDIR)/Clean/OutDir/bin/soffice.bin.manifest -$(OUTDIR)/bin/soffice.bin.manifest : $(call gb_LinkTarget_get_target,$(call gb_Executable_get_linktargetname,$(sofficebin))).manifest $(call gb_LinkTarget_get_target,$(call gb_Executable_get_linktargetname,$(sofficebin))) - $(call gb_Deliver_deliver,$<,$@) +$(OUTDIR)/bin/soffice.bin.manifest : $(call gb_LinkTarget_get_target,$(call gb_Executable_get_linktargetname,$(sofficebin))) + $(call gb_Deliver_deliver,$<.manifest,$@) .PHONY : $(WORKDIR)/Clean/OutDir/bin/soffice.bin.manifest $(WORKDIR)/Clean/OutDir/bin/soffice.bin.manifest : ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: desktop/Executable_soffice.bin.mk
desktop/Executable_soffice.bin.mk |6 +- 1 file changed, 5 insertions(+), 1 deletion(-) New commits: commit cfa5d651db4de43dd395256264bc9121897398ba Author: Michael Meeks Date: Mon Nov 7 11:37:25 2011 + add soffice.bin generation to the desktop/ module rule to fix win32 diff --git a/desktop/Executable_soffice.bin.mk b/desktop/Executable_soffice.bin.mk index aafbcac..b32a444 100644 --- a/desktop/Executable_soffice.bin.mk +++ b/desktop/Executable_soffice.bin.mk @@ -69,7 +69,9 @@ $(eval $(call gb_Executable_add_noexception_objects,$(sofficebin),\ desktop/win32/source/extendloaderenvironment \ )) -$(OUTDIR)/bin/soffice.bin : $(call gb_Executable_get_target,$(sofficebin)) +$(call gb_Module_get_target,desktop) : $(OUTDIR)/bin/soffice.bin + +$(OUTDIR)/bin/soffice.bin : $(call gb_Executable_get_target,$(sofficebin)) $(call gb_Executable_get_clean_target,$(sofficebin)) : $(WORKDIR)/Clean/OutDir/bin/soffice.bin $(OUTDIR)/bin/soffice.bin : $(call gb_LinkTarget_get_target,$(call gb_Executable_get_linktargetname,$(sofficebin))) $(call gb_Deliver_deliver,$<,$@) @@ -79,6 +81,8 @@ $(WORKDIR)/Clean/OutDir/bin/soffice.bin : rm -f $(OUTDIR)/bin/soffice.bin ifeq ($(COM),MSC) +$(call gb_Module_get_target,desktop) : $(OUTDIR)/bin/soffice.bin.manifest + $(OUTDIR)/bin/soffice.bin.manifest : $(call gb_Executable_get_target,$(sofficebin)) $(call gb_Executable_get_clean_target,$(sofficebin)) : $(WORKDIR)/Clean/OutDir/bin/soffice.bin.manifest $(OUTDIR)/bin/soffice.bin.manifest : $(call gb_LinkTarget_get_target,$(call gb_Executable_get_linktargetname,$(sofficebin))).manifest $(call gb_LinkTarget_get_target,$(call gb_Executable_get_linktargetname,$(sofficebin))) ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: desktop/Executable_soffice.bin.mk
desktop/Executable_soffice.bin.mk | 22 +- 1 file changed, 17 insertions(+), 5 deletions(-) New commits: commit cca7126c2908c5b9b6693326a3861bb96fae1be3 Author: Bjoern Michaelsen Date: Fri Oct 28 02:26:43 2011 +0200 very,very ugly hack to get the soffice.bin name the previous solution couldnt work: - Packages are toplevel targets, so they need to be in a separate file - However, Packages should not be used here as it interferes with the pattern rules on $(OUTDIR)/bin - replacing those instead with explicit (non-pattern) rules for this exceptional case - depending from the regular target in $(OUTDIR) on the special one - depending from the special target on the $(WORKDIR) one diff --git a/desktop/Executable_soffice.bin.mk b/desktop/Executable_soffice.bin.mk index 7731aef..3953b26 100644 --- a/desktop/Executable_soffice.bin.mk +++ b/desktop/Executable_soffice.bin.mk @@ -69,13 +69,25 @@ $(eval $(call gb_Executable_add_noexception_objects,$(sofficebin),\ desktop/win32/source/extendloaderenvironment \ )) -# the resulting executable is called soffice_bin.exe, copy it to soffice.bin -$(eval $(call gb_Package_Package,$(sofficebin),$(OUTDIR)/bin)) -$(eval $(call gb_Package_add_file,$(sofficebin),bin/soffice.bin,$(sofficebin).exe)) +$(call gb_Executable_get_target,$(sofficebin)) : $(OUTDIR)/bin/soffice.bin +$(call gb_Executable_get_clean_target,$(sofficebin)) : $(WORKDIR)/Clean/OutDir/bin/soffice.bin +$(OUTDIR)/bin/soffice.bin : $(call gb_LinkTarget_get_target,$(call gb_Executable_get_linktargetname,$(sofficebin))) + $(call gb_Deliver_deliver,$<,$@) + +.PHONY : $(WORKDIR)/Clean/OutDir/bin/soffice.bin +$(WORKDIR)/Clean/OutDir/bin/soffice.bin : + rm $(OUTDIR)/bin/soffice.bin ifeq ($(COM),MSC) -# also copy the manifest -$(eval $(call gb_Package_add_file,$(sofficebin),bin/soffice.bin.manifest,$(sofficebin).exe.manifest)) +$(call gb_Executable_get_target,$(sofficebin)) : $(OUTDIR)/bin/soffice.bin.manifest +$(call gb_Executable_get_clean_target,$(sofficebin)) : $(WORKDIR)/Clean/OutDir/bin/soffice.bin.manifest +$(OUTDIR)/bin/soffice.bin.manifest : $(call gb_LinkTarget_get_target,$(call gb_Executable_get_linktargetname,$(sofficebin))).manifest $(call gb_LinkTarget_get_target,$(call gb_Executable_get_linktargetname,$(sofficebin))) + $(call gb_Deliver_deliver,$<,$@) + +.PHONY : $(WORKDIR)/Clean/OutDir/bin/soffice.bin.manifest +$(WORKDIR)/Clean/OutDir/bin/soffice.bin.manifest : + rm $(OUTDIR)/bin/soffice.bin.manifest + endif endif ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: desktop/Executable_soffice.bin.mk desktop/Module_desktop.mk desktop/Package_manifest.mk desktop/util
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(-) New commits: commit 8a915ad95fcc1e21f57c7a397fb12a96abc799e6 Author: Tor Lillqvist Date: Thu Sep 22 15:35:11 2011 +0300 Simplify the manifest dance diff --git a/desktop/Executable_soffice.bin.mk b/desktop/Executable_soffice.bin.mk index aec58c5..3aad85f 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 0e7da8e..84df7dd 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 a8d17de..000 --- 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 7c5e9f6..000 --- 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
[Libreoffice-commits] .: desktop/Executable_soffice.bin.mk
desktop/Executable_soffice.bin.mk |5 - 1 file changed, 4 insertions(+), 1 deletion(-) New commits: commit 0538506fb42e42b7e696dc7875c69cb8ebc65c50 Author: Caolán McNamara Date: Wed Sep 21 15:33:40 2011 +0100 ah, not windows only of course diff --git a/desktop/Executable_soffice.bin.mk b/desktop/Executable_soffice.bin.mk index db23a7c..19fccb4 100644 --- a/desktop/Executable_soffice.bin.mk +++ b/desktop/Executable_soffice.bin.mk @@ -38,7 +38,6 @@ $(eval $(call gb_Executable_set_include,soffice.bin,\ $(eval $(call gb_Executable_add_linked_libs,soffice.bin,\ sal \ sofficeapp \ -user32 \ )) $(eval $(call gb_Executable_add_cobjects,soffice.bin,\ @@ -48,6 +47,10 @@ $(eval $(call gb_Executable_add_cobjects,soffice.bin,\ ifeq ($(OS),WNT) +$(eval $(call gb_Executable_add_linked_libs,soffice.bin,\ +user32 \ +)) + $(eval $(call gb_Executable_add_linked_static_libs,soffice.bin,\ ooopathutils \ )) ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: desktop/Executable_soffice.bin.mk desktop/Executable_soffice.mk
desktop/Executable_soffice.bin.mk |4 ++-- desktop/Executable_soffice.mk |3 --- 2 files changed, 2 insertions(+), 5 deletions(-) New commits: commit aba21544bc36cba0cb24778da493ac32c697c3cb Author: Caolán McNamara Date: Wed Sep 21 15:07:57 2011 +0100 get it to link with msvc at least diff --git a/desktop/Executable_soffice.bin.mk b/desktop/Executable_soffice.bin.mk index 7429b86..db23a7c 100644 --- a/desktop/Executable_soffice.bin.mk +++ b/desktop/Executable_soffice.bin.mk @@ -38,6 +38,7 @@ $(eval $(call gb_Executable_set_include,soffice.bin,\ $(eval $(call gb_Executable_add_linked_libs,soffice.bin,\ sal \ sofficeapp \ +user32 \ )) $(eval $(call gb_Executable_add_cobjects,soffice.bin,\ @@ -53,8 +54,7 @@ $(eval $(call gb_Executable_add_linked_static_libs,soffice.bin,\ ifeq ($(COM),MSC) -$(eval $(call gb_Executable_set_ldflags,soffice.bin,\ -$$(LDFLAGS) \ +$(eval $(call gb_Executable_add_ldflags,soffice.bin,\ /STACK:1000 \ )) diff --git a/desktop/Executable_soffice.mk b/desktop/Executable_soffice.mk index 0eca50e..0be0fd3 100644 --- a/desktop/Executable_soffice.mk +++ b/desktop/Executable_soffice.mk @@ -36,9 +36,6 @@ $(eval $(call gb_Executable_set_include,soffice,\ $(eval $(call gb_Executable_add_linked_libs,soffice,\ sal \ -)) - -$(eval $(call gb_Executable_add_linked_libs,soffice,\ advapi32 \ shell32 \ shlwapi \ ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
