From 8de852a55fb8370a46726a22424e6211e93c5398 Mon Sep 17 00:00:00 2001 From: Thorsten Behrens Date: Fri, 14 Oct 2022 16:58:00 +0200 Subject: Fix Windows packaging Change "Extend --enable-mpl-subset options effect to some dictionaries" broke Windows, as scp2 packaging did not yet consider dictionaries optional. Additionally, deal with postgresql scp2 non-optionality (seems noone ever used MPL_SUBSET on Windows). Change-Id: I36bd3a0c89cc9d7f29c141167ef34203ebc80b5c --- RepositoryExternal.mk | 2 ++ scp2/AutoInstall.mk | 2 ++ scp2/InstallModule_ooo.mk | 1 + scp2/source/base/postgresqlsdbc.scp | 4 ++-- scp2/source/ooo/file_ooo.scp | 6 ++++++ 5 files changed, 13 insertions(+), 2 deletions(-) diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index d64fb8ffd57a..5911c0a4938c 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -3060,9 +3060,11 @@ endef else # !SYSTEM_POSTGRESQL ifeq ($(OS),WNT) +ifeq ($(BUILD_POSTGRESQL_SDBC),TRUE) $(eval $(call gb_Helper_register_packages_for_install,postgresqlsdbc,\ postgresql \ )) +endif # BUILD_POSTGRESQL_SDBC endif # WNT define gb_LinkTarget__use_postgresql diff --git a/scp2/AutoInstall.mk b/scp2/AutoInstall.mk index e39fbd559363..1ef6410ec6e0 100644 --- a/scp2/AutoInstall.mk +++ b/scp2/AutoInstall.mk @@ -40,7 +40,9 @@ $(eval $(call gb_AutoInstall_add_module,ooobinarytable,LIBO_LIB_FILE_BINARYTABLE $(eval $(call gb_AutoInstall_add_module,python,LIBO_LIB_FILE,LIBO_EXECUTABLE,,PACKAGE_FILELIST)) $(eval $(call gb_AutoInstall_add_module,python_scriptprovider,,,,PACKAGE_FILELIST)) $(eval $(call gb_AutoInstall_add_module,python_librelogo,,,,PACKAGE_FILELIST)) +ifeq ($(BUILD_POSTGRESQL_SDBC),TRUE) $(eval $(call gb_AutoInstall_add_module,postgresqlsdbc,LIBO_LIB_FILE,,,PACKAGE_FILELIST)) +endif $(eval $(call gb_AutoInstall_add_module,pdfimport,LIBO_LIB_FILE,LIBO_EXECUTABLE,,PACKAGE_FILELIST)) $(eval $(call gb_AutoInstall_add_module,quickstart,,LIBO_EXECUTABLE)) $(eval $(call gb_AutoInstall_add_module,reportbuilder,LIBO_LIB_FILE,,LIBO_JAR_FILE,PACKAGE_FILELIST)) diff --git a/scp2/InstallModule_ooo.mk b/scp2/InstallModule_ooo.mk index 8739b86cfdf9..8b52a4f61d29 100644 --- a/scp2/InstallModule_ooo.mk +++ b/scp2/InstallModule_ooo.mk @@ -27,6 +27,7 @@ $(eval $(call gb_InstallModule_define_if_set,scp2/ooo,\ SYSTEM_HSQLDB \ SYSTEM_LIBXSLT \ SYSTEM_REDLAND \ + MPL_SUBSET \ WITH_GALLERY_BUILD \ WITH_MYSPELL_DICTS \ )) diff --git a/scp2/source/base/postgresqlsdbc.scp b/scp2/source/base/postgresqlsdbc.scp index 94e6936771fa..74b2c1129d19 100644 --- a/scp2/source/base/postgresqlsdbc.scp +++ b/scp2/source/base/postgresqlsdbc.scp @@ -9,10 +9,10 @@ #include "macros.inc" -#include "AutoInstall/postgresqlsdbc" - #if defined WITH_POSTGRESQL_SDBC +#include "AutoInstall/postgresqlsdbc" + Module gid_Module_Optional_PostgresqlSdbc PackageInfo = "packinfo_office.txt"; MOD_NAME_DESC(MODULE_OPTIONAL_POSTGRESQLSDBC); diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp index 9bdeab03e702..c6d158fb204f 100644 --- a/scp2/source/ooo/file_ooo.scp +++ b/scp2/source/ooo/file_ooo.scp @@ -375,6 +375,7 @@ End #endif #if defined WITH_MYSPELL_DICTS +#if ! defined MPL_SUBSET File gid_File_Extension_Dictionary_De Dir = FILELIST_DIR; Name = "Dictionary/dict-de.filelist"; @@ -382,8 +383,10 @@ File gid_File_Extension_Dictionary_De TXT_FILE_BODY; End #endif +#endif #if defined WITH_MYSPELL_DICTS +#if ! defined MPL_SUBSET File gid_File_Extension_Dictionary_En Dir = FILELIST_DIR; Name = "Dictionary/dict-en.filelist"; @@ -391,6 +394,7 @@ File gid_File_Extension_Dictionary_En TXT_FILE_BODY; End #endif +#endif #if defined WITH_MYSPELL_DICTS File gid_File_Extension_Dictionary_El @@ -519,6 +523,7 @@ End #endif #if defined WITH_MYSPELL_DICTS +#if ! defined MPL_SUBSET File gid_File_Extension_Dictionary_It Dir = FILELIST_DIR; Name = "Dictionary/dict-it.filelist"; @@ -526,6 +531,7 @@ File gid_File_Extension_Dictionary_It TXT_FILE_BODY; End #endif +#endif #if defined WITH_MYSPELL_DICTS File gid_File_Extension_Dictionary_Kmr_Latn -- cgit v1.2.3