convert custom makefile code into a package

Change-Id: I72b41e4826b7e93b5c8aeacbf6d9d52e3780f090

4 files changed, 111 insertions, 56 deletions

diff --git a/desktop/Executable_soffice.bin.mk b/desktop/Executable_soffice.bin.mk
index 59b9f085548e..d1c6aec55939 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 000000000000..515e7bbc18f0
--- /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 <dtardon@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 abafafb3faaf..cb067b3205c6 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 000000000000..ad8de3a95303
--- /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 <dtardon@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: