diff options
| author | Sophia Schröder <sophia.schroeder@libreoffice.org> | 2018-04-11 15:39:57 +0100 |
|---|---|---|
| committer | Tamás Bunth <btomi96@gmail.com> | 2018-04-12 09:09:37 +0200 |
| commit | f4fc28aedf9c673f368ddc00f3279f6d54c1a654 (patch) | |
| tree | afb5988b77618f0be0f91df8de70e0de779caec2 /postprocess | |
| parent | 189d3e10c7d25138c58f28ca4f5c041f1a9f4494 (diff) | |
Revert "Remove dead HSQLDB driver"
We cannot silently convert user data or their used file formats
and then await them to accept it or reinstall an older version.
Let us make a soft change instead of an hard (heart) break
and avoid us to been attacked with fire and forks from our users.
This reverts commit 8d381ae8d6c742a7e15bf7ad9e07b65f81728ef6.
Change-Id: Ia153640935e355771acb85cf652f8fe4c21fafbb
Reviewed-on: https://gerrit.libreoffice.org/52731
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Tamás Bunth <btomi96@gmail.com>
Diffstat (limited to 'postprocess')
| -rw-r--r-- | postprocess/CustomTarget_registry.mk | 3 | ||||
| -rw-r--r-- | postprocess/Rdb_services.mk | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/postprocess/CustomTarget_registry.mk b/postprocess/CustomTarget_registry.mk index 25b34359c7be..f89b0b0bd96c 100644 --- a/postprocess/CustomTarget_registry.mk +++ b/postprocess/CustomTarget_registry.mk @@ -331,8 +331,9 @@ postprocess_DRIVERS += evoab endif ifeq ($(ENABLE_JAVA),TRUE) postprocess_FILES_main += \ + $(call gb_XcuModuleTarget_get_target,connectivity/registry/hsqldb)/org/openoffice/Office/DataAccess/Drivers-hsqldb.xcu \ $(call gb_XcuModuleTarget_get_target,connectivity/registry/jdbc)/org/openoffice/Office/DataAccess/Drivers-jdbc.xcu -postprocess_DRIVERS += jdbc +postprocess_DRIVERS += hsqldb jdbc endif ifeq ($(ENABLE_FIREBIRD_SDBC),TRUE) postprocess_FILES_main += \ diff --git a/postprocess/Rdb_services.mk b/postprocess/Rdb_services.mk index fb8feec06adf..5fcd89c7d1c4 100644 --- a/postprocess/Rdb_services.mk +++ b/postprocess/Rdb_services.mk @@ -261,6 +261,7 @@ $(eval $(call gb_Rdb_add_components,services,\ connectivity/source/drivers/macab/macab1 \ ) \ $(if $(ENABLE_JAVA), \ + connectivity/source/drivers/hsqldb/hsqldb \ connectivity/source/drivers/jdbc/jdbc \ ) \ connectivity/source/manager/sdbc2 \ |