Avoid officeloader -> soffice renaming dance, build that directly.

5 files changed, 33 insertions, 92 deletions

diff --git a/desktop/Executable_officeloader.mk b/desktop/Executable_officeloader.mk
index fa2a7bbb702e..3fa9e68f8e5d 100644
--- a/desktop/Executable_officeloader.mk
+++ b/desktop/Executable_officeloader.mk
@@ -36,17 +36,6 @@ $(eval $(call gb_Executable_add_linked_libs,officeloader,\
     sal \
 ))
 
-ifeq ($(OS),WNT)
-$(eval $(call gb_Executable_add_linked_libs,officeloader,\
-    advapi32 \
-    shell32 \
-    shlwapi \
-    user32 \
-))
-endif
-
-ifeq ($(OS),MACOSX)
-
 # I'm not suer wht was the intent, but that break the link
 #$(eval $(call gb_Executable_set_ldflags,officeloader,\
 #    $(filter -bind_at_load,$$(LDFLAGS)) \
@@ -60,19 +49,4 @@ $(eval $(call gb_Executable_add_cobjects,officeloader,\
     desktop/source/app/copyright_ascii_ooo \
 ))
 
-endif
-
-ifeq ($(GUI),WNT)
-
-$(eval $(call gb_Executable_add_linked_static_libs,officeloader,\
-    ooopathutils \
-))
-
-$(eval $(call gb_Executable_add_noexception_objects,officeloader,\
-    desktop/win32/source/extendloaderenvironment \
-    desktop/win32/source/officeloader/officeloader \
-))
-
-endif
-
 # vim: set ts=4 sw=4 et:
diff --git a/desktop/Executable_soffice.bin.mk b/desktop/Executable_soffice.bin.mk
index 3f6e78ee8b1f..7429b862befe 100644
--- a/desktop/Executable_soffice.bin.mk
+++ b/desktop/Executable_soffice.bin.mk
@@ -45,6 +45,31 @@ $(eval $(call gb_Executable_add_cobjects,soffice.bin,\
     desktop/source/app/main \
 ))
 
+ifeq ($(OS),WNT)
+
+$(eval $(call gb_Executable_add_linked_static_libs,soffice.bin,\
+    ooopathutils \
+))
+
+ifeq ($(COM),MSC)
+
+$(eval $(call gb_Executable_set_ldflags,soffice.bin,\
+    $$(LDFLAGS) \
+    /STACK:10000000 \
+))
+
+endif
+
+$(eval $(call gb_Executable_add_noexception_objects,soffice.bin,\
+    desktop/win32/source/extendloaderenvironment \
+))
+
+# the resulting executable is called soffice.bin.exe, copy it to soffice.bin
+$(eval $(call gb_Package_Package,soffice.bin,$(OUTDIR)/bin))
+$(eval $(call gb_Package_add_file,soffice.bin,bin/soffice.bin,soffice.bin.exe))
+
+endif
+
 ifeq ($(OS),MACOSX)
 
 $(eval $(call gb_Executable_set_ldflags,\
diff --git a/desktop/Executable_soffice.mk b/desktop/Executable_soffice.mk
index e82f190428c2..8368209b6089 100644
--- a/desktop/Executable_soffice.mk
+++ b/desktop/Executable_soffice.mk
@@ -25,41 +25,31 @@
 
 $(eval $(call gb_Executable_Executable,soffice))
 
-$(eval $(call gb_Executable_set_targettype_gui,soffice,YES))
-
 $(eval $(call gb_Executable_add_precompiled_header,soffice,desktop/inc/pch/precompiled_desktop.hxx))
 
 $(eval $(call gb_Executable_set_include,soffice,\
     $$(INCLUDE) \
     -I$(SRCDIR)/desktop/inc/pch \
-    -I$(SRCDIR)/desktop/source/inc \
 ))
 
 $(eval $(call gb_Executable_add_linked_libs,soffice,\
     sal \
-    sofficeapp \
 ))
 
-$(eval $(call gb_Executable_add_cobjects,soffice,\
-    desktop/source/app/copyright_ascii_ooo \
-    desktop/source/app/main \
+$(eval $(call gb_Executable_add_linked_libs,soffice,\
+    advapi32 \
+    shell32 \
+    shlwapi \
+    user32 \
 ))
 
 $(eval $(call gb_Executable_add_linked_static_libs,soffice,\
     ooopathutils \
 ))
 
-ifeq ($(COM),MSC)
-
-$(eval $(call gb_Executable_set_ldflags,soffice,\
-    $$(LDFLAGS) \
-    /STACK:10000000 \
-))
-
-endif
-
 $(eval $(call gb_Executable_add_noexception_objects,soffice,\
     desktop/win32/source/extendloaderenvironment \
+    desktop/win32/source/officeloader/officeloader \
 ))
 
 # vim: set ts=4 sw=4 et:
diff --git a/desktop/Module_desktop.mk b/desktop/Module_desktop.mk
index 0348f475eee3..36e41fe32c03 100644
--- a/desktop/Module_desktop.mk
+++ b/desktop/Module_desktop.mk
@@ -39,6 +39,7 @@ $(eval $(call gb_Module_add_targets,desktop,\
     AllLangResTarget_deployment \
     AllLangResTarget_deploymentgui \
     AllLangResTarget_dkt \
+    Executable_soffice.bin \
     Library_deployment \
     Library_deploymentgui \
     Library_deploymentmisc \
@@ -67,14 +68,13 @@ $(eval $(call gb_Module_add_targets,desktop,\
     Executable_guiloader \
     Executable_guistdio \
     Executable_loader2 \
-    Executable_officeloader \
     Executable_quickstart \
     Executable_sbase \
     Executable_scalc \
     Executable_sdraw \
     Executable_simpress \
-    Executable_soffice \
     Executable_smath \
+    Executable_soffice \
     Executable_sweb \
     Executable_swriter \
     Executable_unoinfo \
@@ -82,7 +82,6 @@ $(eval $(call gb_Module_add_targets,desktop,\
     Executable_unopkgio \
     Package_manifest \
     Package_rcfile \
-    WinResTarget_officeloader \
     WinResTarget_quickstart \
     WinResTarget_sbase \
     WinResTarget_scalc \
@@ -97,7 +96,6 @@ $(eval $(call gb_Module_add_targets,desktop,\
 else
 
 $(eval $(call gb_Module_add_targets,desktop,\
-    Executable_soffice.bin \
     Executable_unopkg.bin \
 ))
 
diff --git a/desktop/WinResTarget_officeloader.mk b/desktop/WinResTarget_officeloader.mk
deleted file mode 100644
index fc72254c132e..000000000000
--- a/desktop/WinResTarget_officeloader.mk
+++ /dev/null
@@ -1,46 +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. <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_WinResTarget_WinResTarget,officeloader))
-
-$(eval $(call gb_WinResTarget_set_include,officeloader,\
-    $$(INCLUDE) \
-    -I$(SRCDIR)/sysui/desktop \
-))
-
-$(eval $(call gb_WinResTarget_set_defs,officeloader,\
-    $$(DEFS) \
-    -DRES_APP_NAME=officeloader \
-    -DRES_APP_ICON=icons/ooo3_main_app.ico \
-    -DVERVARIANT=$(BUILD) \
-))
-
-$(eval $(call gb_WinResTarget_add_dependency,officeloader,\
-    sysui/desktop/icons/ooo3_main_app.ico \
-))
-
-$(eval $(call gb_WinResTarget_add_file,officeloader,desktop/util/officeloader))
-
-# vim: set ts=4 sw=4 et: