From c598ea1427250b50c1f3a4b0eacb34a11b2751fb Mon Sep 17 00:00:00 2001 From: Mike Kaganski Date: Fri, 30 Aug 2019 23:01:07 +0300 Subject: [PATCH] Add version resource to executables where it was missing Change-Id: Iee965c3f720827b20347f6228e891562c8295d22 Reviewed-on: https://gerrit.libreoffice.org/78327 Tested-by: Jenkins Reviewed-by: Mike Kaganski --- cpputools/Executable_uno.mk | 2 ++ dbaccess/Executable_odbcconfig.mk | 2 ++ desktop/Executable_minidump_upload.mk | 2 ++ desktop/Executable_quickstart.mk | 2 ++ desktop/Executable_unoinfo.mk | 2 ++ desktop/Executable_unopkg.mk | 2 ++ desktop/Executable_unopkg_bin.mk | 2 ++ desktop/Executable_unopkg_com.mk | 2 ++ extensions/Executable_twain32shim.mk | 2 ++ opencl/Executable_opencltest.mk | 2 ++ pyuno/Executable_python.mk | 2 ++ registry/Executable_regmerge.mk | 2 ++ registry/Executable_regview.mk | 2 ++ sdext/Executable_xpdfimport.mk | 2 ++ shell/Executable_senddoc.mk | 2 ++ svx/Executable_gengal.mk | 2 ++ vcl/Executable_ui-previewer.mk | 2 ++ 17 files changed, 34 insertions(+) diff --git a/cpputools/Executable_uno.mk b/cpputools/Executable_uno.mk index 4a766c57d5cf..ba3b22fb6337 100644 --- a/cpputools/Executable_uno.mk +++ b/cpputools/Executable_uno.mk @@ -28,4 +28,6 @@ $(eval $(call gb_Executable_add_exception_objects,uno,\ cpputools/source/unoexe/unoexe \ )) +$(eval $(call gb_Executable_add_default_nativeres,uno)) + # vim:set noet sw=4 ts=4: diff --git a/dbaccess/Executable_odbcconfig.mk b/dbaccess/Executable_odbcconfig.mk index de40bdd2a6da..862c77b3b5af 100644 --- a/dbaccess/Executable_odbcconfig.mk +++ b/dbaccess/Executable_odbcconfig.mk @@ -26,4 +26,6 @@ $(eval $(call gb_Executable_add_exception_objects,odbcconfig,\ dbaccess/win32/source/odbcconfig/odbcconfig \ )) +$(eval $(call gb_Executable_add_default_nativeres,odbcconfig)) + # vim: set noet sw=4 ts=4: diff --git a/desktop/Executable_minidump_upload.mk b/desktop/Executable_minidump_upload.mk index ccdcc97e743d..600c171e2646 100644 --- a/desktop/Executable_minidump_upload.mk +++ b/desktop/Executable_minidump_upload.mk @@ -20,4 +20,6 @@ $(eval $(call gb_Executable_add_exception_objects,minidump_upload,\ desktop/source/minidump/minidump_upload \ )) +$(eval $(call gb_Executable_add_default_nativeres,minidump_upload)) + # vim: set noet sw=4 ts=4: diff --git a/desktop/Executable_quickstart.mk b/desktop/Executable_quickstart.mk index 02b31fef736c..f0df0bbe7abb 100644 --- a/desktop/Executable_quickstart.mk +++ b/desktop/Executable_quickstart.mk @@ -39,4 +39,6 @@ $(eval $(call gb_Executable_add_exception_objects,quickstart,\ $(eval $(call gb_Executable_add_nativeres,quickstart,quickstart/QuickStart)) +$(eval $(call gb_Executable_add_default_nativeres,quickstart)) + # vim: set ts=4 sw=4 et: diff --git a/desktop/Executable_unoinfo.mk b/desktop/Executable_unoinfo.mk index 032b1a74cf21..77d1778e0242 100644 --- a/desktop/Executable_unoinfo.mk +++ b/desktop/Executable_unoinfo.mk @@ -17,4 +17,6 @@ $(eval $(call gb_Executable_add_exception_objects,unoinfo,\ desktop/win32/source/unoinfo \ )) +$(eval $(call gb_Executable_add_default_nativeres,unoinfo)) + # vim: set ts=4 sw=4 et: diff --git a/desktop/Executable_unopkg.mk b/desktop/Executable_unopkg.mk index c5b341521b9f..f1b6d6be6db9 100644 --- a/desktop/Executable_unopkg.mk +++ b/desktop/Executable_unopkg.mk @@ -24,4 +24,6 @@ $(eval $(call gb_Executable_add_exception_objects,unopkg,\ desktop/win32/source/guiloader/genericloader \ )) +$(eval $(call gb_Executable_add_default_nativeres,unopkg)) + # vim: set ts=4 sw=4 et: diff --git a/desktop/Executable_unopkg_bin.mk b/desktop/Executable_unopkg_bin.mk index 27ebc5db1eca..d2e1175be236 100644 --- a/desktop/Executable_unopkg_bin.mk +++ b/desktop/Executable_unopkg_bin.mk @@ -27,4 +27,6 @@ $(eval $(call gb_Executable_add_cobjects,unopkg_bin,\ desktop/source/pkgchk/unopkg/unopkg_main \ )) +$(eval $(call gb_Executable_add_default_nativeres,unopkg_bin)) + # vim: set ts=4 sw=4 et: diff --git a/desktop/Executable_unopkg_com.mk b/desktop/Executable_unopkg_com.mk index 4db7d96c4f94..616a757a7fa8 100644 --- a/desktop/Executable_unopkg_com.mk +++ b/desktop/Executable_unopkg_com.mk @@ -15,4 +15,6 @@ $(eval $(call gb_Executable_add_exception_objects,unopkg_com,\ desktop/win32/source/guistdio/unopkgio \ )) +$(eval $(call gb_Executable_add_default_nativeres,unopkg_com)) + # vim: set ts=4 sw=4 et: diff --git a/extensions/Executable_twain32shim.mk b/extensions/Executable_twain32shim.mk index 29a6e6427198..6f53ca3924ab 100644 --- a/extensions/Executable_twain32shim.mk +++ b/extensions/Executable_twain32shim.mk @@ -30,4 +30,6 @@ $(eval $(call gb_Executable_use_system_win32_libs,twain32shim,\ shell32 \ )) +$(eval $(call gb_Executable_add_default_nativeres,twain32shim)) + # vim:set noet sw=4 ts=4: diff --git a/opencl/Executable_opencltest.mk b/opencl/Executable_opencltest.mk index 4a8ef280e8e1..2767333b6491 100644 --- a/opencl/Executable_opencltest.mk +++ b/opencl/Executable_opencltest.mk @@ -27,4 +27,6 @@ $(eval $(call gb_Executable_use_libraries,opencltest,\ sal \ )) +$(eval $(call gb_Executable_add_default_nativeres,opencltest)) + # vim: set noet sw=4 ts=4: diff --git a/pyuno/Executable_python.mk b/pyuno/Executable_python.mk index 05220bc24e1d..192d54cf9ea8 100644 --- a/pyuno/Executable_python.mk +++ b/pyuno/Executable_python.mk @@ -17,4 +17,6 @@ $(eval $(call gb_Executable_add_exception_objects,python,\ pyuno/zipcore/python \ )) +$(eval $(call gb_Executable_add_default_nativeres,python)) + # vim:set noet sw=4 ts=4: diff --git a/registry/Executable_regmerge.mk b/registry/Executable_regmerge.mk index 98176282b60e..a55acf885f12 100644 --- a/registry/Executable_regmerge.mk +++ b/registry/Executable_regmerge.mk @@ -24,4 +24,6 @@ $(eval $(call gb_Executable_add_exception_objects,regmerge,\ registry/tools/regmerge \ )) +$(eval $(call gb_Executable_add_default_nativeres,regmerge)) + # vim:set noet sw=4 ts=4: diff --git a/registry/Executable_regview.mk b/registry/Executable_regview.mk index ef9fda099b06..9ff10523621e 100644 --- a/registry/Executable_regview.mk +++ b/registry/Executable_regview.mk @@ -29,4 +29,6 @@ $(eval $(call gb_Executable_add_exception_objects,regview,\ registry/tools/regview \ )) +$(eval $(call gb_Executable_add_default_nativeres,regview)) + # vim:set noet sw=4 ts=4: diff --git a/sdext/Executable_xpdfimport.mk b/sdext/Executable_xpdfimport.mk index dde84963a1fb..360358d450d2 100644 --- a/sdext/Executable_xpdfimport.mk +++ b/sdext/Executable_xpdfimport.mk @@ -22,4 +22,6 @@ $(eval $(call gb_Executable_add_exception_objects,xpdfimport,\ sdext/source/pdfimport/xpdfwrapper/wrapper_gpl \ )) +$(eval $(call gb_Executable_add_default_nativeres,xpdfimport)) + # vim:set noet sw=4 ts=4: diff --git a/shell/Executable_senddoc.mk b/shell/Executable_senddoc.mk index 4b8c5e3d18bb..0a184ecc0c75 100644 --- a/shell/Executable_senddoc.mk +++ b/shell/Executable_senddoc.mk @@ -25,4 +25,6 @@ $(eval $(call gb_Executable_add_exception_objects,senddoc,\ shell/source/win32/simplemail/senddoc \ )) +$(eval $(call gb_Executable_add_default_nativeres,senddoc)) + # vim: set shiftwidth=4 tabstop=4 noexpandtab: diff --git a/svx/Executable_gengal.mk b/svx/Executable_gengal.mk index f505e9e5c7f0..9c82ac774ec5 100644 --- a/svx/Executable_gengal.mk +++ b/svx/Executable_gengal.mk @@ -80,4 +80,6 @@ endif endif endif +$(eval $(call gb_Executable_add_default_nativeres,gengal)) + # vim: set noet sw=4 ts=4: diff --git a/vcl/Executable_ui-previewer.mk b/vcl/Executable_ui-previewer.mk index cf6a2d3de6c7..c728de8c61d1 100644 --- a/vcl/Executable_ui-previewer.mk +++ b/vcl/Executable_ui-previewer.mk @@ -45,4 +45,6 @@ $(eval $(call gb_Executable_use_static_libraries,ui-previewer,\ )) endif +$(eval $(call gb_Executable_add_default_nativeres,ui-previewer)) + # vim: set noet sw=4 ts=4: