Sat Aug 31 00:48:51 UTC 2019

desktop/Executable_sbase.mk                  |    2 +
 desktop/Executable_scalc.mk                  |    2 +
 desktop/Executable_sdraw.mk                  |    2 +
 desktop/Executable_simpress.mk               |    2 +
 desktop/Executable_smath.mk                  |    2 +
 desktop/Executable_soffice_bin.mk            |    2 +
 desktop/Executable_soffice_com.mk            |    2 +
 desktop/Executable_soffice_exe.mk            |    2 +
 desktop/Executable_sweb.mk                   |    2 +
 desktop/Executable_swriter.mk                |    2 +
 desktop/WinResTarget_sbase.mk                |    4 --
 desktop/WinResTarget_scalc.mk                |    4 --
 desktop/WinResTarget_sdraw.mk                |    4 --
 desktop/WinResTarget_simpress.mk             |    4 --
 desktop/WinResTarget_smath.mk                |    4 --
 desktop/WinResTarget_soffice.mk              |    4 --
 desktop/WinResTarget_sofficebin.mk           |    4 --
 desktop/WinResTarget_sweb.mk                 |    4 --
 desktop/WinResTarget_swriter.mk              |    4 --
 desktop/util/officeloader.rc                 |   41 ---------------------------
 desktop/win32/source/applauncher/launcher.rc |   41 ---------------------------
 solenv/gbuild/platform/com_MSC_class.mk      |    2 -
 22 files changed, 21 insertions(+), 119 deletions(-)

New commits:
commit cb204a382da220f8b282d6da507716c918716272
Author:     Mike Kaganski <mike.kaganski at collabora.com>
AuthorDate: Sat Aug 31 01:17:31 2019 +0300
Commit:     Mike Kaganski <mike.kaganski at collabora.com>
CommitDate: Sat Aug 31 02:48:18 2019 +0200

    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 at collabora.com>
    Tested-by: Mike Kaganski <mike.kaganski at collabora.com>

diff --git a/desktop/Executable_sbase.mk b/desktop/Executable_sbase.mk
index d3a4fafea810..9c36165b8b3d 100644
--- 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:
diff --git a/desktop/Executable_scalc.mk b/desktop/Executable_scalc.mk
index 1a21840a3306..b6845690dfdb 100644
--- 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:
diff --git a/desktop/Executable_sdraw.mk b/desktop/Executable_sdraw.mk
index c6fd96373de1..164b65876568 100644
--- 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:
diff --git a/desktop/Executable_simpress.mk b/desktop/Executable_simpress.mk
index d06205486020..8d3bdd0543ee 100644
--- 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:
diff --git a/desktop/Executable_smath.mk b/desktop/Executable_smath.mk
index 94aa8b915f30..797354d47461 100644
--- 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:
diff --git a/desktop/Executable_soffice_bin.mk b/desktop/Executable_soffice_bin.mk
index d8084cddeb1f..cabd31af29f2 100644
--- 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,\
diff --git a/desktop/Executable_soffice_com.mk b/desktop/Executable_soffice_com.mk
index 8b4da6b9d94b..bc1460634421 100644
--- 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:
diff --git a/desktop/Executable_soffice_exe.mk b/desktop/Executable_soffice_exe.mk
index 87becbd911ee..2803627bcb5f 100644
--- 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:
diff --git a/desktop/Executable_sweb.mk b/desktop/Executable_sweb.mk
index 72cd6357be8f..44cf70145010 100644
--- 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:
diff --git a/desktop/Executable_swriter.mk b/desktop/Executable_swriter.mk
index 3f4859e23b88..5ced1b911e07 100644
--- 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:
diff --git a/desktop/WinResTarget_sbase.mk b/desktop/WinResTarget_sbase.mk
index d255a3566c92..8ff57b91a42e 100644
--- 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,\
diff --git a/desktop/WinResTarget_scalc.mk b/desktop/WinResTarget_scalc.mk
index ef5a48e783a8..7060dcb775f4 100644
--- 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,\
diff --git a/desktop/WinResTarget_sdraw.mk b/desktop/WinResTarget_sdraw.mk
index 7ad5a7c0a79a..920a4625b626 100644
--- 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,\
diff --git a/desktop/WinResTarget_simpress.mk b/desktop/WinResTarget_simpress.mk
index 6f4ba4f9e611..f5d11a6a4106 100644
--- 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,\
diff --git a/desktop/WinResTarget_smath.mk b/desktop/WinResTarget_smath.mk
index f1efe6f1c631..0ad3ee938ddd 100644
--- 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,\
diff --git a/desktop/WinResTarget_soffice.mk b/desktop/WinResTarget_soffice.mk
index e3b7927e2999..990eb5c98df1 100644
--- 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,\
diff --git a/desktop/WinResTarget_sofficebin.mk b/desktop/WinResTarget_sofficebin.mk
index e10c259ca2ff..139de96449e2 100644
--- 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,\
diff --git a/desktop/WinResTarget_sweb.mk b/desktop/WinResTarget_sweb.mk
index 91aba01ff2d5..e6fd283431fd 100644
--- 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,\
diff --git a/desktop/WinResTarget_swriter.mk b/desktop/WinResTarget_swriter.mk
index 5830497cc535..1136c61bb884 100644
--- 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,\
diff --git a/desktop/util/officeloader.rc b/desktop/util/officeloader.rc
index 24df276cab58..0b1d4f104539 100644
--- 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"
diff --git a/desktop/win32/source/applauncher/launcher.rc b/desktop/win32/source/applauncher/launcher.rc
index b76518d7a56a..8e56ef7549e6 100644
--- 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)
diff --git a/solenv/gbuild/platform/com_MSC_class.mk b/solenv/gbuild/platform/com_MSC_class.mk
index b77f9f98d731..ddb55a67d07d 100644
--- 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="" \
 )
