desktop: soffice.bin and unopkg.bin cleanup

Clean up the horrible mess around unopkg.bin unopkg.com unopkg.exe and
soffice.bin soffice.exe and crashrep.com executables and associated
renaming via Packages in the desktop makefiles by simply using
RepositoryFixes to correct the names.

Change-Id: I4d3a549462cfa90a63d62b35db1b0407b25239f7

10 files changed, 55 insertions, 127 deletions

diff --git a/Repository.mk b/Repository.mk
index 497d8c8383ad..57c855460f15 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -85,7 +85,7 @@ $(eval $(call gb_Helper_register_executables,OOO, \
 	$(if $(ENABLE_NPAPI_INTO_BROWSER),nsplugin) \
 	$(if $(filter-out ANDROID IOS MACOSX WNT,$(OS)),oosplash) \
 	$(if $(ENABLE_NPAPI_FROM_BROWSER),pluginapp.bin) \
-	$(if $(filter-out WNT,$(OS)),soffice.bin) \
+	soffice_bin \
 	spadmin.bin \
 	$(if $(filter $(GUIBASE)$(ENABLE_TDE),unxTRUE), \
 		tdefilepicker \
@@ -95,7 +95,7 @@ $(eval $(call gb_Helper_register_executables,OOO, \
 		kdefilepicker \
 	) \
 	ui-previewer \
-	$(if $(filter DESKTOP,$(BUILD_TYPE)),unopkg.bin) \
+	$(if $(filter DESKTOP,$(BUILD_TYPE)),unopkg_bin) \
 	xpdfimport \
 	$(if $(filter WNT,$(OS)), \
 		crashrep_com \
@@ -108,13 +108,11 @@ $(eval $(call gb_Helper_register_executables,OOO, \
 		senddoc \
 		simpress \
 		soffice \
-		soffice_bin \
 		smath \
 		sweb \
 		swriter \
 		unoinfo \
 		unopkg \
-		unopkg_bin \
 		unopkg_com \
 	) \
 ))
diff --git a/RepositoryFixes.mk b/RepositoryFixes.mk
index 07a733b5bd16..db0a30228409 100644
--- a/RepositoryFixes.mk
+++ b/RepositoryFixes.mk
@@ -23,10 +23,15 @@ gb_Executable_FILENAMES := $(foreach group,$(gb_Executable_VALIDGROUPS),\
 	$(foreach exe,$(gb_Executable_$(group)),$(exe):$(exe)$(gb_Executable_EXT)))
 
 gb_Executable_FILENAMES := $(patsubst uno:uno,uno:uno.bin,$(gb_Executable_FILENAMES))
+gb_Executable_FILENAMES := $(patsubst unopkg_bin:unopkg_bin%,unopkg_bin:unopkg.bin,$(gb_Executable_FILENAMES))
+gb_Executable_FILENAMES := $(patsubst unopkg_com:unopkg_com%,unopkg_com:unopkg.com,$(gb_Executable_FILENAMES))
+gb_Executable_FILENAMES := $(patsubst crashrep_com:crashrep_com%,crashrep_com:crashrep.com,$(gb_Executable_FILENAMES))
 gb_Executable_FILENAMES := $(patsubst gengal:gengal,gengal:gengal.bin,$(gb_Executable_FILENAMES))
 
 ifeq ($(OS),MACOSX)
-gb_Executable_FILENAMES := $(patsubst soffice.bin:soffice.bin,soffice.bin:soffice,$(gb_Executable_FILENAMES))
+gb_Executable_FILENAMES := $(patsubst soffice_bin:soffice_bin,soffice_bin:soffice,$(gb_Executable_FILENAMES))
+else
+gb_Executable_FILENAMES := $(patsubst soffice_bin:soffice_bin%,soffice_bin:soffice.bin,$(gb_Executable_FILENAMES))
 endif
 
 gb_Executable_FILENAMES_FOR_BUILD := $(subst $(gb_Executable_EXT),$(gb_Executable_EXT_for_build),$(gb_Executable_FILENAMES))
diff --git a/desktop/Executable_crashrep.com.mk b/desktop/Executable_crashrep.com.mk
index 13807cdb4329..15d69bf04adf 100644
--- a/desktop/Executable_crashrep.com.mk
+++ b/desktop/Executable_crashrep.com.mk
@@ -23,8 +23,4 @@ $(eval $(call gb_Executable_add_exception_objects,crashrep_com,\
     desktop/win32/source/guistdio/guistdio \
 ))
 
-# the resulting executable is called crashrep_com.exe, copy it to crashrep.com
-$(eval $(call gb_Package_Package,crashrep_com,$(OUTDIR)/bin))
-$(eval $(call gb_Package_add_file,crashrep_com,bin/crashrep.com,crashrep_com.exe))
-
 # vim: set ts=4 sw=4 et:
diff --git a/desktop/Executable_soffice.bin.mk b/desktop/Executable_soffice.bin.mk
index d7d604379acf..90b56fdfa3ed 100644
--- a/desktop/Executable_soffice.bin.mk
+++ b/desktop/Executable_soffice.bin.mk
@@ -7,22 +7,22 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_Executable_Executable,soffice.bin))
+$(eval $(call gb_Executable_Executable,soffice_bin))
 
-$(eval $(call gb_Executable_set_targettype_gui,soffice.bin,YES))
+$(eval $(call gb_Executable_set_targettype_gui,soffice_bin,YES))
 
-$(eval $(call gb_Executable_set_include,soffice.bin,\
+$(eval $(call gb_Executable_set_include,soffice_bin,\
     $$(INCLUDE) \
     -I$(SRCDIR)/desktop/source/inc \
 ))
 
-$(eval $(call gb_Executable_use_libraries,soffice.bin,\
+$(eval $(call gb_Executable_use_libraries,soffice_bin,\
     sal \
     sofficeapp \
 	$(gb_UWINAPI) \
 ))
 
-$(eval $(call gb_Executable_add_cobjects,soffice.bin,\
+$(eval $(call gb_Executable_add_cobjects,soffice_bin,\
     desktop/source/app/main \
 ))
 
@@ -34,4 +34,40 @@ $(eval $(call gb_Executable_set_ldflags,\
 
 endif
 
+ifeq ($(OS),WNT)
+
+$(eval $(call gb_Executable_use_static_libraries,soffice_bin,\
+    ooopathutils \
+    winextendloaderenv \
+))
+
+$(eval $(call gb_Executable_set_targettype_gui,soffice_bin,YES))
+
+$(eval $(call gb_Executable_add_nativeres,soffice_bin,sofficebin/officeloader))
+
+ifeq ($(COM),MSC)
+
+$(eval $(call gb_Executable_add_ldflags,soffice_bin,\
+    /STACK:10000000 \
+))
+
+# HACK: Copy manifest to $(OUTDIR)/bin under the right name. The
+# executable is copied in Package_soffice_bin, but that does not work
+# for the manifest, for some reason...
+$(call gb_Module_get_target,desktop) : $(OUTDIR)/bin/soffice.bin.manifest
+
+$(OUTDIR)/bin/soffice.bin.manifest : $(call gb_Executable_get_target,soffice_bin)
+$(call gb_Executable_get_clean_target,soffice_bin) : $(WORKDIR)/Clean/OutDir/bin/soffice.bin.manifest
+
+$(OUTDIR)/bin/soffice.bin.manifest : $(call gb_LinkTarget_get_target,$(call gb_Executable_get_linktarget,soffice_bin))
+	$(call gb_Deliver_deliver,$(call gb_LinkTarget_get_manifestfile,$(call gb_LinkTarget__get_workdir_linktargetname,$(call gb_Executable_get_linktarget,soffice_bin))),$@)
+
+.PHONY : $(WORKDIR)/Clean/OutDir/bin/soffice.bin.manifest
+$(WORKDIR)/Clean/OutDir/bin/soffice.bin.manifest :
+	rm -f $(OUTDIR)/bin/soffice.bin.manifest
+
+endif
+
+endif
+
 # vim: set ts=4 sw=4 et:
diff --git a/desktop/Executable_soffice_bin.mk b/desktop/Executable_soffice_bin.mk
deleted file mode 100644
index 83d32b6cc66e..000000000000
--- a/desktop/Executable_soffice_bin.mk
+++ /dev/null
@@ -1,59 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(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_UWINAPI) \
-))
-
-$(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 \
-))
-
-# HACK: Copy manifest to $(OUTDIR)/bin under the right name. The
-# executable is copied in Package_soffice_bin, but that does not work
-# for the manifest, for some reason...
-$(call gb_Module_get_target,desktop) : $(OUTDIR)/bin/soffice.bin.manifest
-
-$(OUTDIR)/bin/soffice.bin.manifest : $(call gb_Executable_get_target,soffice_bin)
-$(call gb_Executable_get_clean_target,soffice_bin) : $(WORKDIR)/Clean/OutDir/bin/soffice.bin.manifest
-
-$(OUTDIR)/bin/soffice.bin.manifest : $(call gb_LinkTarget_get_target,$(call gb_Executable_get_linktarget,soffice_bin))
-	$(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
-
-$(eval $(call gb_Executable_add_nativeres,soffice_bin,sofficebin/officeloader))
-
-# vim: set ts=4 sw=4 et:
diff --git a/desktop/Executable_unopkg.bin.mk b/desktop/Executable_unopkg.bin.mk
index 90736db7309c..2ee1985e9742 100644
--- a/desktop/Executable_unopkg.bin.mk
+++ b/desktop/Executable_unopkg.bin.mk
@@ -7,22 +7,16 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-ifeq ($(OS),WNT)
-desktop_UNOPKGBIN := unopkg_bin
-else
-desktop_UNOPKGBIN := unopkg.bin
-endif
+$(eval $(call gb_Executable_Executable,unopkg_bin))
 
-$(eval $(call gb_Executable_Executable,$(desktop_UNOPKGBIN)))
+$(eval $(call gb_Executable_set_targettype_gui,unopkg_bin,YES))
 
-$(eval $(call gb_Executable_set_targettype_gui,$(desktop_UNOPKGBIN),YES))
-
-$(eval $(call gb_Executable_set_include,$(desktop_UNOPKGBIN),\
+$(eval $(call gb_Executable_set_include,unopkg_bin,\
     $$(INCLUDE) \
     -I$(SRCDIR)/desktop/source/inc \
 ))
 
-$(eval $(call gb_Executable_use_libraries,$(desktop_UNOPKGBIN),\
+$(eval $(call gb_Executable_use_libraries,unopkg_bin,\
     comphelper \
     sal \
     tl \
@@ -30,16 +24,8 @@ $(eval $(call gb_Executable_use_libraries,$(desktop_UNOPKGBIN),\
 	$(gb_UWINAPI) \
 ))
 
-$(eval $(call gb_Executable_add_cobjects,$(desktop_UNOPKGBIN),\
+$(eval $(call gb_Executable_add_cobjects,unopkg_bin,\
     desktop/source/pkgchk/unopkg/unopkg_main \
 ))
 
-ifeq ($(OS),WNT)
-
-# the resulting executable is called $(desktop_UNOPKGBIN).exe, copy it to $(desktop_UNOPKGBIN)
-$(eval $(call gb_Package_Package,$(desktop_UNOPKGBIN),$(OUTDIR)/bin))
-$(eval $(call gb_Package_add_file,$(desktop_UNOPKGBIN),bin/unopkg.bin,$(desktop_UNOPKGBIN).exe))
-
-endif
-
 # vim: set ts=4 sw=4 et:
diff --git a/desktop/Executable_unopkg.com.mk b/desktop/Executable_unopkg.com.mk
index bcff06a6d05e..2c46d2c109a6 100644
--- a/desktop/Executable_unopkg.com.mk
+++ b/desktop/Executable_unopkg.com.mk
@@ -19,8 +19,4 @@ $(eval $(call gb_Executable_add_exception_objects,unopkg_com,\
     desktop/win32/source/guistdio/unopkgio \
 ))
 
-# the resulting executable is called unopkg_com.exe, copy it to unopkg.com
-$(eval $(call gb_Package_Package,unopkg_com,$(OUTDIR)/bin))
-$(eval $(call gb_Package_add_file,unopkg_com,bin/unopkg.com,unopkg_com.exe))
-
 # vim: set ts=4 sw=4 et:
diff --git a/desktop/Module_desktop.mk b/desktop/Module_desktop.mk
index 847f036f5049..8c1dd94d66b6 100644
--- a/desktop/Module_desktop.mk
+++ b/desktop/Module_desktop.mk
@@ -32,6 +32,7 @@ endif
 
 ifneq (,$(filter DESKTOP,$(BUILD_TYPE)))
 $(eval $(call gb_Module_add_targets,desktop,\
+    Executable_soffice.bin \
     Executable_unopkg.bin \
     Library_migrationoo2 \
     Library_migrationoo3 \
@@ -45,12 +46,6 @@ $(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,\
@@ -74,13 +69,11 @@ $(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
deleted file mode 100644
index acc9cab86dc5..000000000000
--- a/desktop/Package_soffice_bin.mk
+++ /dev/null
@@ -1,16 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_Package_Package,desktop_soffice_bin,$(gb_Executable_BINDIR)))
-
-$(eval $(call gb_Package_set_outdir,desktop_soffice_bin,$(gb_INSTROOT)))
-
-$(eval $(call gb_Package_add_file,desktop_soffice_bin,$(LIBO_BIN_FOLDER)/soffice.bin,soffice_bin$(gb_Executable_EXT)))
-
-# vim: set shiftwidth=4 tabstop=4 noexpandtab:
diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp
index f19f83ebef88..8eb6ac68e232 100644
--- a/scp2/source/ooo/common_brand.scp
+++ b/scp2/source/ooo/common_brand.scp
@@ -531,17 +531,10 @@ End
 
 #ifndef MACOSX
 File gid_Brand_File_Bin_Soffice_Bin
-#ifdef WNT
-// FIXME quick hack
-    Dir = FILELIST_DIR;
-    Name = "desktop_soffice_bin.filelist";
-    Styles = (FILELIST, PACKED);
-#else
     BIN_FILE_BODY;
     Dir = gid_Brand_Dir_Program;
     Styles = (PACKED);
     Name = "soffice.bin";
-#endif
 End
 #endif