Unify executables to take version resource from default.rc

Pass file description in optional second argument to gb_Executable_add_default_nativeres. Remove duplicating version resources from officeloader.rc and launcher.rc. Change-Id: I55c4fc85c470c3dd6f03d909a39459839e70b9cd Reviewed-on: https://gerrit.libreoffice.org/78333 Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com> Tested-by: Mike Kaganski <mike.kaganski@collabora.com>
2019-08-31 01:17:31 +03:00 · 2019-08-31 01:17:31 +03:00 · cb204a382d
commit cb204a382d
parent 758a4998c5
22 changed files with 21 additions and 119 deletions
--- a/desktop/Executable_sbase.mk
+++ b/desktop/Executable_sbase.mk
@ -25,4 +25,6 @@ $(eval $(call gb_Executable_add_exception_objects,sbase,\

 $(eval $(call gb_Executable_add_nativeres,sbase,sbase/launcher))

+$(eval $(call gb_Executable_add_default_nativeres,sbase,$(PRODUCTNAME) Base))
+
 # vim: set ts=4 sw=4 et:
--- a/desktop/Executable_scalc.mk
+++ b/desktop/Executable_scalc.mk
@ -25,4 +25,6 @@ $(eval $(call gb_Executable_add_exception_objects,scalc,\

 $(eval $(call gb_Executable_add_nativeres,scalc,scalc/launcher))

+$(eval $(call gb_Executable_add_default_nativeres,scalc,$(PRODUCTNAME) Calc))
+
 # vim: set ts=4 sw=4 et:
--- a/desktop/Executable_sdraw.mk
+++ b/desktop/Executable_sdraw.mk
@ -25,4 +25,6 @@ $(eval $(call gb_Executable_add_exception_objects,sdraw,\

 $(eval $(call gb_Executable_add_nativeres,sdraw,sdraw/launcher))

+$(eval $(call gb_Executable_add_default_nativeres,sdraw,$(PRODUCTNAME) Draw))
+
 # vim: set ts=4 sw=4 et:
--- a/desktop/Executable_simpress.mk
+++ b/desktop/Executable_simpress.mk
@ -25,4 +25,6 @@ $(eval $(call gb_Executable_add_exception_objects,simpress,\

 $(eval $(call gb_Executable_add_nativeres,simpress,simpress/launcher))

+$(eval $(call gb_Executable_add_default_nativeres,simpress,$(PRODUCTNAME) Impress))
+
 # vim: set ts=4 sw=4 et:
--- a/desktop/Executable_smath.mk
+++ b/desktop/Executable_smath.mk
@ -25,4 +25,6 @@ $(eval $(call gb_Executable_add_exception_objects,smath,\

 $(eval $(call gb_Executable_add_nativeres,smath,smath/launcher))

+$(eval $(call gb_Executable_add_default_nativeres,smath,$(PRODUCTNAME) Math))
+
 # vim: set ts=4 sw=4 et:
--- a/desktop/Executable_soffice_bin.mk
+++ b/desktop/Executable_soffice_bin.mk
@ -37,6 +37,8 @@ $(eval $(call gb_Executable_set_targettype_gui,soffice_bin,NO))

 $(eval $(call gb_Executable_add_nativeres,soffice_bin,sofficebin/officeloader))

+$(eval $(call gb_Executable_add_default_nativeres,soffice_bin,$(PRODUCTNAME)))
+
 ifeq ($(COM),MSC)

 $(eval $(call gb_Executable_add_ldflags,soffice_bin,\
--- a/desktop/Executable_soffice_com.mk
+++ b/desktop/Executable_soffice_com.mk
@ -26,4 +26,6 @@ $(eval $(call gb_Executable_add_exception_objects,soffice_com,\

 $(eval $(call gb_Executable_add_nativeres,soffice_com,soffice/launcher))

+$(eval $(call gb_Executable_add_default_nativeres,soffice_com,$(PRODUCTNAME)))
+
 # vim: set ts=4 sw=4 et:
--- a/desktop/Executable_soffice_exe.mk
+++ b/desktop/Executable_soffice_exe.mk
@ -26,4 +26,6 @@ $(eval $(call gb_Executable_add_exception_objects,soffice_exe,\

 $(eval $(call gb_Executable_add_nativeres,soffice_exe,soffice/launcher))

+$(eval $(call gb_Executable_add_default_nativeres,soffice_exe,$(PRODUCTNAME)))
+
 # vim: set ts=4 sw=4 et:
--- a/desktop/Executable_sweb.mk
+++ b/desktop/Executable_sweb.mk
@ -25,4 +25,6 @@ $(eval $(call gb_Executable_add_exception_objects,sweb,\

 $(eval $(call gb_Executable_add_nativeres,sweb,sweb/launcher))

+$(eval $(call gb_Executable_add_default_nativeres,sweb,$(PRODUCTNAME) Writer (Web)))
+
 # vim: set ts=4 sw=4 et:
--- a/desktop/Executable_swriter.mk
+++ b/desktop/Executable_swriter.mk
@ -25,4 +25,6 @@ $(eval $(call gb_Executable_add_exception_objects,swriter,\

 $(eval $(call gb_Executable_add_nativeres,swriter,swriter/launcher))

+$(eval $(call gb_Executable_add_default_nativeres,swriter,$(PRODUCTNAME) Writer))
+
 # vim: set ts=4 sw=4 et:
--- a/desktop/WinResTarget_sbase.mk
+++ b/desktop/WinResTarget_sbase.mk
@ -15,11 +15,7 @@ $(eval $(call gb_WinResTarget_set_include,sbase/launcher,\
 ))

 $(eval $(call gb_WinResTarget_add_defs,sbase/launcher,\
-    -DRES_APP_NAME=sbase \
-    -DRES_APP_FILEDESC="$(PRODUCTNAME) Base" \
    -DRES_APP_ICON=icons/base_app.ico \
-    -DVERVARIANT=$(LIBO_VERSION_PATCH) \
-    -DRES_APP_VENDOR="$(OOO_VENDOR)" \
 ))

 $(eval $(call gb_WinResTarget_add_dependencies,sbase/launcher,\
--- a/desktop/WinResTarget_scalc.mk
+++ b/desktop/WinResTarget_scalc.mk
@ -15,11 +15,7 @@ $(eval $(call gb_WinResTarget_set_include,scalc/launcher,\
 ))

 $(eval $(call gb_WinResTarget_add_defs,scalc/launcher,\
-    -DRES_APP_NAME=scalc \
-    -DRES_APP_FILEDESC="$(PRODUCTNAME) Calc" \
    -DRES_APP_ICON=icons/calc_app.ico \
-    -DVERVARIANT=$(LIBO_VERSION_PATCH) \
-    -DRES_APP_VENDOR="$(OOO_VENDOR)" \
 ))

 $(eval $(call gb_WinResTarget_add_dependencies,scalc/launcher,\
--- a/desktop/WinResTarget_sdraw.mk
+++ b/desktop/WinResTarget_sdraw.mk
@ -15,11 +15,7 @@ $(eval $(call gb_WinResTarget_set_include,sdraw/launcher,\
 ))

 $(eval $(call gb_WinResTarget_add_defs,sdraw/launcher,\
-    -DRES_APP_NAME=sdraw \
-    -DRES_APP_FILEDESC="$(PRODUCTNAME) Draw" \
    -DRES_APP_ICON=icons/draw_app.ico \
-    -DVERVARIANT=$(LIBO_VERSION_PATCH) \
-    -DRES_APP_VENDOR="$(OOO_VENDOR)" \
 ))

 $(eval $(call gb_WinResTarget_add_dependencies,sdraw/launcher,\
--- a/desktop/WinResTarget_simpress.mk
+++ b/desktop/WinResTarget_simpress.mk
@ -15,11 +15,7 @@ $(eval $(call gb_WinResTarget_set_include,simpress/launcher,\
 ))

 $(eval $(call gb_WinResTarget_add_defs,simpress/launcher,\
-    -DRES_APP_NAME=simpress \
-    -DRES_APP_FILEDESC="$(PRODUCTNAME) Impress" \
    -DRES_APP_ICON=icons/impress_app.ico \
-    -DVERVARIANT=$(LIBO_VERSION_PATCH) \
-    -DRES_APP_VENDOR="$(OOO_VENDOR)" \
 ))

 $(eval $(call gb_WinResTarget_add_dependencies,simpress/launcher,\
--- a/desktop/WinResTarget_smath.mk
+++ b/desktop/WinResTarget_smath.mk
@ -15,11 +15,7 @@ $(eval $(call gb_WinResTarget_set_include,smath/launcher,\
 ))

 $(eval $(call gb_WinResTarget_add_defs,smath/launcher,\
-    -DRES_APP_NAME=smath \
-    -DRES_APP_FILEDESC="$(PRODUCTNAME) Math" \
    -DRES_APP_ICON=icons/math_app.ico \
-    -DVERVARIANT=$(LIBO_VERSION_PATCH) \
-    -DRES_APP_VENDOR="$(OOO_VENDOR)" \
 ))

 $(eval $(call gb_WinResTarget_add_dependencies,smath/launcher,\
--- a/desktop/WinResTarget_soffice.mk
+++ b/desktop/WinResTarget_soffice.mk
@ -15,11 +15,7 @@ $(eval $(call gb_WinResTarget_set_include,soffice/launcher,\
 ))

 $(eval $(call gb_WinResTarget_add_defs,soffice/launcher,\
-    -DRES_APP_NAME=soffice \
-    -DRES_APP_FILEDESC="$(PRODUCTNAME)" \
    -DRES_APP_ICON=icons/soffice.ico \
-    -DVERVARIANT=$(LIBO_VERSION_PATCH) \
-    -DRES_APP_VENDOR="$(OOO_VENDOR)" \
 ))

 $(eval $(call gb_WinResTarget_add_dependencies,soffice/launcher,\
--- a/desktop/WinResTarget_sofficebin.mk
+++ b/desktop/WinResTarget_sofficebin.mk
@ -15,11 +15,7 @@ $(eval $(call gb_WinResTarget_set_include,sofficebin/officeloader,\
 ))

 $(eval $(call gb_WinResTarget_add_defs,sofficebin/officeloader,\
-    -DRES_APP_NAME=soffice \
-    -DRES_APP_FILEDESC="$(PRODUCTNAME)" \
    -DRES_APP_ICON=icons/soffice.ico \
-    -DVERVARIANT=$(LIBO_VERSION_PATCH) \
-    -DRES_APP_VENDOR="$(OOO_VENDOR)" \
 ))

 $(eval $(call gb_WinResTarget_add_dependencies,sofficebin/officeloader,\
--- a/desktop/WinResTarget_sweb.mk
+++ b/desktop/WinResTarget_sweb.mk
@ -15,11 +15,7 @@ $(eval $(call gb_WinResTarget_set_include,sweb/launcher,\
 ))

 $(eval $(call gb_WinResTarget_add_defs,sweb/launcher,\
-    -DRES_APP_NAME=sweb \
-    -DRES_APP_FILEDESC="$(PRODUCTNAME) Writer (Web)" \
    -DRES_APP_ICON=icons/writer_app.ico \
-    -DVERVARIANT=$(LIBO_VERSION_PATCH) \
-    -DRES_APP_VENDOR="$(OOO_VENDOR)" \
 ))

 $(eval $(call gb_WinResTarget_add_dependencies,sweb/launcher,\
--- a/desktop/WinResTarget_swriter.mk
+++ b/desktop/WinResTarget_swriter.mk
@ -15,11 +15,7 @@ $(eval $(call gb_WinResTarget_set_include,swriter/launcher,\
 ))

 $(eval $(call gb_WinResTarget_add_defs,swriter/launcher,\
-    -DRES_APP_NAME=swriter \
-    -DRES_APP_FILEDESC="$(PRODUCTNAME) Writer" \
    -DRES_APP_ICON=icons/writer_app.ico \
-    -DVERVARIANT=$(LIBO_VERSION_PATCH) \
-    -DRES_APP_VENDOR="$(OOO_VENDOR)" \
 ))

 $(eval $(call gb_WinResTarget_add_dependencies,swriter/launcher,\
--- a/desktop/util/officeloader.rc
+++ b/desktop/util/officeloader.rc
@ -20,47 +20,6 @@
 #include <windows.h>
 #include "version.hrc"

-
-//                 version information
-
-
-VS_VERSION_INFO VERSIONINFO
-    FILEVERSION    VERSION, SUBVERSION, MICROVERSION, VERVARIANT
-    PRODUCTVERSION VERSION, SUBVERSION, MICROVERSION, VERVARIANT
-    FILEFLAGSMASK 0x3F
-    FILEFLAGS
-#if defined(DEBUG)
-    VS_FF_DEBUG |
-#endif
-#ifdef VER_PREL
-    VS_FF_PRERELEASE |
-#endif
-    0
-    FILEOS VOS_NT_WINDOWS32
-    FILETYPE VFT_APP
-    {
-        BLOCK "StringFileInfo"
-        {
-            BLOCK "040904E4"
-            {
-                // International StringTable
-                VALUE "CompanyName",      PPS(RES_APP_VENDOR) "\0"
-                VALUE "FileDescription",  PPS(RES_APP_FILEDESC) "\0"
-                VALUE "FileVersion",      PPS(VER_LEVEL) "\0"
-                VALUE "ProductVersion",   PPS(VER_LEVEL) "\0"
-                VALUE "ProductName",      "LibreOffice\0"
-                VALUE "OriginalFilename", PPS(RES_APP_NAME) ".exe\0"
-                VALUE "InternalName",     PPS(RES_APP_NAME) "\0"
-                VALUE "LegalCopyright",   S_CRIGHT " LibreOffice contributors. All rights reserved.\0"
-            }
-        }
-
-        BLOCK "VarFileInfo"
-        {
-            VALUE "Translation", 0x0409, 1252
-        }
-    }
-
 1 ICON PPS(RES_APP_ICON)
 2 ICON "icons/oasis-text.ico"
 3 ICON "icons/oasis-text-template.ico"
--- a/desktop/win32/source/applauncher/launcher.rc
+++ b/desktop/win32/source/applauncher/launcher.rc
@ -20,45 +20,4 @@
 #include <windows.h>
 #include "version.hrc"

-
-//                 version information
-
-
-VS_VERSION_INFO VERSIONINFO
-    FILEVERSION    VERSION, SUBVERSION, MICROVERSION, VERVARIANT
-    PRODUCTVERSION VERSION, SUBVERSION, MICROVERSION, VERVARIANT
-    FILEFLAGSMASK 0x3F
-    FILEFLAGS
-#if defined(DEBUG)
-    VS_FF_DEBUG |
-#endif
-#ifdef VER_PREL
-    VS_FF_PRERELEASE |
-#endif
-    0
-    FILEOS VOS_NT_WINDOWS32
-    FILETYPE VFT_APP
-    {
-        BLOCK "StringFileInfo"
-        {
-            BLOCK "040904E4"
-            {
-                // International StringTable
-                VALUE "CompanyName",      PPS(RES_APP_VENDOR) "\0"
-                VALUE "FileDescription",  PPS(RES_APP_FILEDESC) "\0"
-                VALUE "FileVersion",      PPS(VER_LEVEL) "\0"
-                VALUE "ProductVersion",   PPS(VER_LEVEL) "\0"
-                VALUE "ProductName",      "LibreOffice\0"
-                VALUE "OriginalFilename", PPS(RES_APP_NAME) ".exe\0"
-                VALUE "InternalName",     PPS(RES_APP_NAME) "\0"
-                VALUE "LegalCopyright",   S_CRIGHT " LibreOffice contributors. All rights reserved.\0"
-            }
-        }
-
-        BLOCK "VarFileInfo"
-        {
-            VALUE "Translation", 0x0409, 1252
-        }
-    }
-
 1 ICON PPS(RES_APP_ICON)
--- a/solenv/gbuild/platform/com_MSC_class.mk
+++ b/solenv/gbuild/platform/com_MSC_class.mk
@ -336,7 +336,7 @@ $(call gb_WinResTarget_add_defs,$(1)/default,\
 		-DRES_APP_VENDOR="$(OOO_VENDOR)" \
 		-DORG_NAME="$(call gb_Executable_get_filename,$(1))"\
 		-DINTERNAL_NAME="$(subst $(gb_Executable_EXT),,$(call gb_Executable_get_filename,$(1)))" \
-		-DADDITIONAL_VERINFO1="" \
+		-DADDITIONAL_VERINFO1="$(if $(2),VALUE \"FileDescription\"$(COMMA) \"$(2)\\0\")" \
 		-DADDITIONAL_VERINFO2="" \
 		-DADDITIONAL_VERINFO3="" \
 )