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 /RepositoryExternal.mk | |
| 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 'RepositoryExternal.mk')
| -rw-r--r-- | RepositoryExternal.mk | 47 |
1 files changed, 47 insertions, 0 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index f6144e4fa613..aecbd71b8b43 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -2856,6 +2856,26 @@ $(call gb_LinkTarget_set_include,$(1),\ ) endef +ifneq ($(SYSTEM_HSQLDB),) + +define gb_LinkTarget__use_hsqldb + +$(call gb_LinkTarget_add_defs,$(1),\ + -DSYSTEM_HSQLDB \ + -DHSQLDB_JAR=\""file://$(HSQLDB_JAR)"\" \ +) + +endef + +else # !SYSTEM_HSQLDB + +define gb_LinkTarget__use_hsqldb + +endef + +endif # SYSTEM_HSQLDB + + ifneq ($(SYSTEM_OPENLDAP),) define gb_LinkTarget__use_openldap @@ -3612,6 +3632,33 @@ endef ### Jars ############################################################ +ifneq ($(SYSTEM_HSQLDB),) + +define gb_Jar__use_hsqldb +$(call gb_Jar_use_system_jar,$(1),$(HSQLDB_JAR)) +endef +define gb_JunitTest__use_hsqldb +$(call gb_JunitTest_use_system_jar,$(1),$(HSQLDB_JAR)) +endef + +else # !SYSTEM_HSQLDB + +ifeq ($(ENABLE_JAVA),TRUE) +$(eval $(call gb_Helper_register_jars_for_install,OOO,ooo, \ + hsqldb \ +)) +endif + +define gb_Jar__use_hsqldb +$(call gb_Jar_use_jar,$(1),hsqldb) +endef +define gb_JunitTest__use_hsqldb +$(call gb_JunitTest_use_jar,$(1),hsqldb) +endef + +endif # SYSTEM_HSQLDB + + ifeq ($(ENABLE_SCRIPTING_BEANSHELL),TRUE) ifneq ($(SYSTEM_BSH),) |