Kaydet (Commit) 5988d888 authored tarafından Stephan Bergmann's avatar Stephan Bergmann

Remove Extensions_MySQLConnector junk

...left over from 26b40fcf "Moving mysqlc into
connectivity as a library".  (Apparently, for one, a module's Files that don't
exist are ignored, so 8ecf5e18 "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: 's avatarStephan Bergmann <sbergman@redhat.com>
üst 30020423
......@@ -8332,9 +8332,6 @@ AC_SUBST(MARIADBC_MINOR)
AC_SUBST(MARIADBC_MICRO)
if test "$ENABLE_MARIADBC" = "TRUE"; then
SCPDEFS="$SCPDEFS -DWITH_EXTENSION_MARIADBC"
dnl ===================================================================
dnl Check for system MariaDB
dnl ===================================================================
......
......@@ -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
......
......@@ -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"
......
......@@ -109,21 +109,6 @@ destpath = "/opt"
packageversion = "%PACKAGEVERSION"
End
Start
module = "gid_Module_Optional_Extensions_MySQLConnector"
solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-extension-mysql-connector"
solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core (Name="Core module for %PRODUCTNAME %PRODUCTVERSION")"
packagename = "%BASISPACKAGEPREFIX%PRODUCTVERSION-extension-mysql-connector"
requires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION"
linuxpatchrequires = ""
copyright = "2018 The Document Foundation"
solariscopyright = "solariscopyrightfile"
vendor = "The Document Foundation"
description = "MySQL Connector extension for %PRODUCTNAME %PRODUCTVERSION"
destpath = "/opt"
packageversion = "%PACKAGEVERSION"
End
Start
module = "gid_Module_Optional_Extensions_Script_Provider_For_BS"
solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-extension-beanshell-script-provider"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment