diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2018-08-27 19:07:04 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2018-08-27 22:40:00 +0200 |
| commit | 5988d888099d018ca1000bb17341c9529c538649 (patch) | |
| tree | ba6445d0e62a76a87bae2abc9392811aef09e465 /scp2 | |
| parent | 30020423bd76c6770db1627cfec684708ab3427c (diff) | |
Remove Extensions_MySQLConnector junk
...left over from 26b40fcfc67480e75bd9959b0c5cb9db10fdf6a1 "Moving mysqlc into
connectivity as a library". (Apparently, for one, a module's Files that don't
exist are ignored, so 8ecf5e1815b5459bc0bbcdfb398d3bd53b0c2861 "Build fix, make
install: mysql-connector-ooo extension is gone" removing
gid_File_Oxt_MySQLConnector but not
gid_Module_Optional_Extensions_MySQLConnector referencing it didn't cause
trouble; and for another, an empty module is ignored, so there were no
extension-mysql-connector packages generated any more---but better clean up the
junk anyway.)
Change-Id: If598a968dfbbe9b5f16d735e8011e192cbd4178b
Reviewed-on: https://gerrit.libreoffice.org/59669
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'scp2')
| -rw-r--r-- | scp2/source/extensions/module_extensions.scp | 14 | ||||
| -rw-r--r-- | scp2/source/extensions/module_extensions.ulf | 6 |
2 files changed, 0 insertions, 20 deletions
diff --git a/scp2/source/extensions/module_extensions.scp b/scp2/source/extensions/module_extensions.scp index 6db143fce8bc..7c14cfeda594 100644 --- a/scp2/source/extensions/module_extensions.scp +++ b/scp2/source/extensions/module_extensions.scp @@ -105,20 +105,6 @@ Module gid_Module_Optional_Extensions_LanguageTool End #endif -/* ** MySQL Connector ** */ - -#ifdef WITH_EXTENSION_MARIADBC -Module gid_Module_Optional_Extensions_MySQLConnector - PackageInfo = "packinfo_extensions.txt"; - MOD_NAME_DESC(MODULE_OPTIONAL_EXTENSIONS_MARIADBC); - ParentID = gid_Module_Optional_Extensions; - Files = ( - gid_File_Oxt_MySQLConnector ); - Default = YES; - Styles = ( ); -End -#endif - /* ** Script provider for BeanShell ** */ #if defined ENABLE_JAVA && !defined WITHOUT_SCRIPTING_BEANSHELL diff --git a/scp2/source/extensions/module_extensions.ulf b/scp2/source/extensions/module_extensions.ulf index 02de867b4ac8..a5fb2238fabb 100644 --- a/scp2/source/extensions/module_extensions.ulf +++ b/scp2/source/extensions/module_extensions.ulf @@ -52,12 +52,6 @@ en-US = "LanguageTool Open Source language checker" [STR_DESC_MODULE_OPTIONAL_EXTENSIONS_LANGUAGETOOL] en-US = "LanguageTool Open Source language checker" -[STR_NAME_MODULE_OPTIONAL_EXTENSIONS_MARIADBC] -en-US = "MySQL Connector" - -[STR_DESC_MODULE_OPTIONAL_EXTENSIONS_MARIADBC] -en-US = "MySQL Connector" - [STR_NAME_MODULE_OPTIONAL_EXTENSIONS_SCRIPT_PROVIDER_FOR_BEANSHELL] en-US = "Script provider for BeanShell" |