Repository.mk | 7 ++++++-
RepositoryModule_host.mk | 7 ++++++-
config_host.mk.in | 1 +
postprocess/Rdb_services.mk | 18 ++++++++++++++----
solenv/gbuild/gbuild.mk | 1 +
5 files changed, 28 insertions(+), 6 deletions(-)
New commits:
commit d8c11d72aa5ae81a00571aeae1c6568782f46e34
Author: Armin Le Grand (Allotropia) <armin.le.gr...@me.com>
AuthorDate: Mon May 10 12:36:52 2021 +0200
Commit: Armin Le Grand (Allotropia) <armin.le.gr...@me.com>
CommitDate: Mon May 10 12:36:52 2021 +0200
Wasm: Removed dbaccess optional
There is --disable-database-connectivity, but marked
as incomplete/experimental. Some dbaccess stuff was
built in wasm build, removed completely now
Change-Id: I942c9055adb351bf9c5fa804a2422353ccf1e14d
diff --git a/Repository.mk b/Repository.mk
index f2695211dee5..de51ed78db35 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -1180,9 +1180,14 @@ $(eval $(call gb_Helper_register_mos,\
))
# UI configuration
+ifneq ($(ENABLE_WASM_STRIP_DBACCESS),TRUE)
$(eval $(call gb_Helper_register_uiconfigs,\
- cui \
$(call gb_Helper_optional,DBCONNECTIVITY,dbaccess) \
+))
+endif
+
+$(eval $(call gb_Helper_register_uiconfigs,\
+ cui \
desktop \
editeng \
filter \
diff --git a/RepositoryModule_host.mk b/RepositoryModule_host.mk
index 696dded65af3..817d6e077503 100644
--- a/RepositoryModule_host.mk
+++ b/RepositoryModule_host.mk
@@ -42,6 +42,12 @@ $(eval $(call gb_Module_add_moduledirs,libreoffice,\
))
endif
+ifneq ($(ENABLE_WASM_STRIP_DBACCESS),TRUE)
+$(eval $(call gb_Module_add_moduledirs,libreoffice,\
+ dbaccess \
+))
+endif
+
$(eval $(call gb_Module_add_moduledirs,libreoffice,\
accessibility \
android \
@@ -62,7 +68,6 @@ $(eval $(call gb_Module_add_moduledirs,libreoffice,\
cppuhelper \
cpputools \
cui \
- dbaccess \
desktop \
$(call gb_Helper_optional,DICTIONARIES,dictionaries) \
drawinglayer \
diff --git a/config_host.mk.in b/config_host.mk.in
index d67616e0de72..8f8b62790639 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -208,6 +208,7 @@ export ENABLE_WASM_STRIP_PINGUSER=@ENABLE_WASM_STRIP@
export ENABLE_WASM_STRIP_RECENT=@ENABLE_WASM_STRIP@
export ENABLE_WASM_STRIP_CHART=@ENABLE_WASM_STRIP@
export ENABLE_WASM_STRIP_CANVAS=@ENABLE_WASM_STRIP@
+export ENABLE_WASM_STRIP_DBACCESS=@ENABLE_WASM_STRIP@
export ENABLE_WERROR=@ENABLE_WERROR@
export ENDIANNESS=@ENDIANNESS@
export EPM=@EPM@
diff --git a/postprocess/Rdb_services.mk b/postprocess/Rdb_services.mk
index 173faac8cde7..58878654024e 100644
--- a/postprocess/Rdb_services.mk
+++ b/postprocess/Rdb_services.mk
@@ -222,13 +222,26 @@ $(eval $(call gb_Rdb_add_components,services,\
) \
))
+ifneq ($(ENABLE_WASM_STRIP_CANVAS),TRUE)
$(eval $(call gb_Rdb_add_components,services,\
- extensions/source/bibliography/bib \
dbaccess/util/dba \
))
+endif
+
+$(eval $(call gb_Rdb_add_components,services,\
+ extensions/source/bibliography/bib \
+))
ifneq (,$(filter DBCONNECTIVITY,$(BUILD_TYPE)))
+ifneq ($(ENABLE_WASM_STRIP_CANVAS),TRUE)
+$(eval $(call gb_Rdb_add_components,services,\
+ dbaccess/source/filter/xml/dbaxml \
+ dbaccess/util/dbu \
+ dbaccess/util/sdbt \
+))
+endif
+
$(eval $(call gb_Rdb_add_components,services,\
extensions/source/dbpilots/dbp \
extensions/source/propctrlr/pcr \
@@ -257,9 +270,6 @@ $(eval $(call gb_Rdb_add_components,services,\
connectivity/source/drivers/mysql_jdbc/mysql_jdbc \
connectivity/source/manager/sdbc2 \
connectivity/source/drivers/writer/writer \
- dbaccess/source/filter/xml/dbaxml \
- dbaccess/util/dbu \
- dbaccess/util/sdbt \
forms/util/frm \
reportdesign/util/rpt \
reportdesign/util/rptui \
diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk
index 8951ce56dbab..2ad5bf875485 100644
--- a/solenv/gbuild/gbuild.mk
+++ b/solenv/gbuild/gbuild.mk
@@ -230,6 +230,7 @@ gb_GLOBALDEFS += -DENABLE_WASM_STRIP_RECENT
gb_GLOBALDEFS += -DENABLE_WASM_STRIP_CHART
gb_GLOBALDEFS += -DENABLE_WASM_STRIP_CANVAS
gb_GLOBALDEFS += -DENABLE_WASM_STRIP_CLUCENE
+gb_GLOBALDEFS += -DENABLE_WASM_STRIP_DBACCESS
endif
ifeq ($(gb_ENABLE_DBGUTIL),$(true))
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
