desktop/Executable_soffice.bin.mk | 60 ++----------------------------
desktop/Executable_soffice_bin.mk | 62 ++++++++++++++++++++++++++++++++
desktop/Module_desktop.mk | 9 ++++
desktop/Package_soffice_bin.mk | 36 ++++++++++++++++++
solenv/gbuild/platform/WNT_INTEL_GCC.mk | 4 +-
5 files changed, 114 insertions(+), 57 deletions(-)
New commits:
commit 602f251d6c5f1f5551cdeb4c70abe0c49834d2c7
Author: David Tardon <dtar...@redhat.com>
Date: Wed May 2 10:55:14 2012 +0200
fdo#49183 link resources to executables
Change-Id: I5dd5cec5d4c66a65154d965c8c707f8a585880d6
diff --git a/solenv/gbuild/platform/WNT_INTEL_GCC.mk
b/solenv/gbuild/platform/WNT_INTEL_GCC.mk
index e283f15..155d97b 100644
--- a/solenv/gbuild/platform/WNT_INTEL_GCC.mk
+++ b/solenv/gbuild/platform/WNT_INTEL_GCC.mk
@@ -140,6 +140,7 @@ $(call gb_Helper_abbreviate_dirs,\
$(foreach object,$(GENCXXOBJECTS),$(call
gb_GenCxxObject_get_target,$(object))) \
$(foreach object,$(ASMOBJECTS),$(call
gb_AsmObject_get_target,$(object))) \
$(foreach
extraobjectlist,$(EXTRAOBJECTLISTS),@$(extraobjectlist)) \
+ $(NATIVERES) \
$(if $(LINKED_STATIC_LIBS),-Wl$(COMMA)--start-group $(foreach
lib,$(LINKED_STATIC_LIBS),$(call gb_StaticLibrary_get_target,$(lib)))
-Wl$(COMMA)--end-group) \
$(patsubst lib%.a,-l%,$(patsubst lib%.dll.a,-l%,$(foreach
lib,$(LINKED_LIBS),$(call gb_Library_get_implibname,$(lib))))) \
$(LIBS) \
@@ -159,6 +160,7 @@ $(call gb_Helper_abbreviate_dirs,\
$(foreach object,$(GENCXXOBJECTS),$(call
gb_GenCxxObject_get_target,$(object))) \
$(foreach object,$(ASMOBJECTS),$(call
gb_AsmObject_get_target,$(object))) \
$(foreach
extraobjectlist,$(EXTRAOBJECTLISTS),@$(extraobjectlist)) \
+ $(NATIVERES) \
$(if $(LINKED_STATIC_LIBS),-Wl$(COMMA)--start-group $(foreach
lib,$(LINKED_STATIC_LIBS),$(call gb_StaticLibrary_get_target,$(lib)))
-Wl$(COMMA)--end-group) \
$(patsubst lib%.a,-l%,$(patsubst lib%.dll.a,-l%,$(foreach
lib,$(LINKED_LIBS),$(call gb_Library_get_implibname,$(lib))))) \
$(LIBS) \
@@ -387,7 +389,7 @@ endef
# WinResTarget class
-gb_WinResTarget_POSTFIX :=.res
+gb_WinResTarget_POSTFIX :=.o
define gb_WinResTarget__command
$(call gb_Output_announce,$(2),$(true),RES,3)
commit 947244c188dabe7a1799254c9e9c58ddb2eccf98
Author: David Tardon <dtar...@redhat.com>
Date: Wed May 2 10:32:14 2012 +0200
convert custom makefile code into a package
Change-Id: I72b41e4826b7e93b5c8aeacbf6d9d52e3780f090
diff --git a/desktop/Executable_soffice.bin.mk
b/desktop/Executable_soffice.bin.mk
index 59b9f08..d1c6aec 100644
--- a/desktop/Executable_soffice.bin.mk
+++ b/desktop/Executable_soffice.bin.mk
@@ -25,73 +25,25 @@
# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
# instead of those above.
-ifeq ($(OS),WNT)
-sofficebin := soffice_bin
-else
-sofficebin := soffice.bin
-endif
-
-$(eval $(call gb_Executable_Executable,$(sofficebin)))
+$(eval $(call gb_Executable_Executable,soffice.bin))
-$(eval $(call gb_Executable_set_targettype_gui,$(sofficebin),YES))
+$(eval $(call gb_Executable_set_targettype_gui,soffice.bin,YES))
-$(eval $(call gb_Executable_set_include,$(sofficebin),\
+$(eval $(call gb_Executable_set_include,soffice.bin,\
$$(INCLUDE) \
-I$(SRCDIR)/desktop/source/inc \
))
-$(eval $(call gb_Executable_use_libraries,$(sofficebin),\
+$(eval $(call gb_Executable_use_libraries,soffice.bin,\
sal \
sofficeapp \
$(gb_STDLIBS) \
))
-$(eval $(call gb_Executable_add_cobjects,$(sofficebin),\
+$(eval $(call gb_Executable_add_cobjects,soffice.bin,\
desktop/source/app/main \
))
-ifeq ($(OS),WNT)
-
-$(eval $(call gb_Executable_use_static_libraries,$(sofficebin),\
- ooopathutils \
- winextendloaderenv \
-))
-
-ifeq ($(COM),MSC)
-
-$(eval $(call gb_Executable_add_ldflags,$(sofficebin),\
- /STACK:10000000 \
-))
-
-endif
-
-$(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,$<,$@)
-
-.PHONY : $(WORKDIR)/Clean/OutDir/bin/soffice.bin
-$(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)))
- $(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
-
-endif
-
ifeq ($(OS),MACOSX)
$(eval $(call gb_Executable_set_ldflags,\
@@ -100,6 +52,4 @@ $(eval $(call gb_Executable_set_ldflags,\
endif
-$(eval $(call gb_Executable_add_nativeres,$(sofficebin),sofficebin/src))
-
# vim: set ts=4 sw=4 et:
diff --git a/desktop/Executable_soffice_bin.mk
b/desktop/Executable_soffice_bin.mk
new file mode 100644
index 0000000..515e7bb
--- /dev/null
+++ b/desktop/Executable_soffice_bin.mk
@@ -0,0 +1,62 @@
+# -*- 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 <dtar...@redhat.com>
+# (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_Executable_Executable,soffice_bin))
+
+$(eval $(call gb_Executable_set_targettype_gui,soffice_bin,YES))
+
+$(eval $(call gb_Executable_set_include,soffice_bin,\
+ $$(INCLUDE) \
+ -I$(SRCDIR)/desktop/source/inc \
+))
+
+$(eval $(call gb_Executable_use_libraries,soffice_bin,\
+ sal \
+ sofficeapp \
+ $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Executable_add_cobjects,soffice_bin,\
+ desktop/source/app/main \
+))
+
+$(eval $(call gb_Executable_use_static_libraries,soffice_bin,\
+ ooopathutils \
+ winextendloaderenv \
+))
+
+ifeq ($(COM),MSC)
+
+$(eval $(call gb_Executable_add_ldflags,soffice_bin,\
+ /STACK:10000000 \
+))
+
+endif
+
+$(eval $(call gb_Executable_add_nativeres,soffice_bin,sofficebin/src))
+
+# vim: set ts=4 sw=4 et:
diff --git a/desktop/Module_desktop.mk b/desktop/Module_desktop.mk
index abafafb..cb067b3 100644
--- a/desktop/Module_desktop.mk
+++ b/desktop/Module_desktop.mk
@@ -43,7 +43,6 @@ $(eval $(call gb_Module_add_targets,desktop,\
ifneq (,$(filter DESKTOP,$(BUILD_TYPE)))
$(eval $(call gb_Module_add_targets,desktop,\
- Executable_soffice.bin \
Executable_unopkg.bin \
Library_deploymentgui \
Library_migrationoo2 \
@@ -57,6 +56,12 @@ $(eval $(call gb_Module_add_targets,desktop,\
Pagein_writer \
))
+ifneq ($(OS),WNT)
+$(eval $(call gb_Module_add_targets,desktop,\
+ Executable_soffice.bin \
+))
+endif
+
ifneq ($(OS),MACOSX)
ifneq ($(OS),WNT)
$(eval $(call gb_Module_add_targets,desktop,\
@@ -80,11 +85,13 @@ $(eval $(call gb_Module_add_targets,desktop,\
Executable_simpress \
Executable_smath \
Executable_soffice \
+ Executable_soffice_bin \
Executable_sweb \
Executable_swriter \
Executable_unoinfo \
Executable_unopkg \
Executable_unopkg.com \
+ Package_soffice_bin \
WinResTarget_quickstart \
WinResTarget_sbase \
WinResTarget_scalc \
diff --git a/desktop/Package_soffice_bin.mk b/desktop/Package_soffice_bin.mk
new file mode 100644
index 0000000..ad8de3a
--- /dev/null
+++ b/desktop/Package_soffice_bin.mk
@@ -0,0 +1,36 @@
+# -*- 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) 2012 Red Hat, Inc., David Tardon <dtar...@redhat.com>
+# (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_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
+
+# vim: set shiftwidth=4 tabstop=4 noexpandtab:
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
