diff options
author | Davi Arnaut <davi.arnaut@oracle.com> | 2010-11-20 12:47:50 -0200 |
---|---|---|
committer | Davi Arnaut <davi.arnaut@oracle.com> | 2010-11-20 12:47:50 -0200 |
commit | f6deb00a56b2e87287d606aba3bcd71290d876ae (patch) | |
tree | 2d19b102b6c66d0bcf7bb480f2140a6ffc9da7bb /plugin | |
parent | e1cba38b6cfc4f5bb559ea211f72221e19487940 (diff) | |
download | mariadb-git-f6deb00a56b2e87287d606aba3bcd71290d876ae.tar.gz |
WL#5665: Removal of the autotools-based build system
The autotools-based build system has been superseded and
is being removed in order to ease the maintenance burden on
developers tweaking and maintaining the build system.
In order to support tools that need to extract the server
version, a new file that (only) contains the server version,
called VERSION, is introduced. The file contents are human
and machine-readable. The format is:
MYSQL_VERSION_MAJOR=5
MYSQL_VERSION_MINOR=5
MYSQL_VERSION_PATCH=8
MYSQL_VERSION_EXTRA=-rc
The CMake based version extraction in cmake/mysql_version.cmake
is changed to extract the version from this file. The configure
to CMake wrapper is retained for backwards compatibility and to
support the BUILD/ scripts. Also, a new a makefile target
show-dist-name that prints the server version is introduced.
Diffstat (limited to 'plugin')
-rw-r--r-- | plugin/Makefile.am | 30 | ||||
-rw-r--r-- | plugin/audit_null/Makefile.am | 32 | ||||
-rw-r--r-- | plugin/audit_null/plug.in | 4 | ||||
-rw-r--r-- | plugin/auth/Makefile.am | 20 | ||||
-rw-r--r-- | plugin/auth/plug.in | 12 | ||||
-rw-r--r-- | plugin/daemon_example/Makefile.am | 41 | ||||
-rw-r--r-- | plugin/daemon_example/configure.in | 9 | ||||
-rw-r--r-- | plugin/daemon_example/plug.in | 3 | ||||
-rw-r--r-- | plugin/fulltext/Makefile.am | 25 | ||||
-rw-r--r-- | plugin/fulltext/configure.in | 9 | ||||
-rw-r--r-- | plugin/fulltext/plug.in | 3 | ||||
-rw-r--r-- | plugin/semisync/Makefile.am | 38 | ||||
-rw-r--r-- | plugin/semisync/configure.in | 9 | ||||
-rw-r--r-- | plugin/semisync/plug.in | 3 |
14 files changed, 0 insertions, 238 deletions
diff --git a/plugin/Makefile.am b/plugin/Makefile.am deleted file mode 100644 index 4a84ce4915a..00000000000 --- a/plugin/Makefile.am +++ /dev/null @@ -1,30 +0,0 @@ -# Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -# Process this file with automake to create Makefile.in - -AUTOMAKE_OPTIONS = foreign - -# extra plugin example files are listed here, to -# keep its Makefile.am cleaner as a template -EXTRA_DIST = fulltext/configure.in - -SUBDIRS = @mysql_pg_dirs@ -DIST_SUBDIRS = @mysql_pg_distdirs@ - -# As of 5.5.3-m3, we want to include the plugin files of a debug build in the package -install-exec-hook: - $(mkinstalldirs) $(DESTDIR)$(pkglibdir) $(DESTDIR)$(pkglibdir)/plugin - test ! -d debug || $(TAR) cf - debug | ( cd $(DESTDIR)$(pkglibdir)/plugin && $(TAR) xvf - ) diff --git a/plugin/audit_null/Makefile.am b/plugin/audit_null/Makefile.am deleted file mode 100644 index 4408c3f7c47..00000000000 --- a/plugin/audit_null/Makefile.am +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright (C) 2007 MySQL AB -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -#Makefile.am example for a plugin - -pkgplugindir= $(pkglibdir)/plugin - -AM_CPPFLAGS = -I$(top_srcdir)/include - -EXTRA_LTLIBRARIES= adt_null.la -pkgplugin_LTLIBRARIES= @plugin_audit_null_shared_target@ -adt_null_la_LDFLAGS= -module -rpath $(pkgplugindir) -adt_null_la_CPPFLAGS= $(AM_CPPFLAGS) -DMYSQL_DYNAMIC_PLUGIN -adt_null_la_SOURCES= audit_null.c - -EXTRA_LIBRARIES= libadtnull.a -noinst_LIBRARIES= @plugin_audit_null_static_target@ -libadtnull_a_SOURCES= audit_null.c - -EXTRA_DIST= plug.in CMakeLists.txt diff --git a/plugin/audit_null/plug.in b/plugin/audit_null/plug.in deleted file mode 100644 index 15b1a48b408..00000000000 --- a/plugin/audit_null/plug.in +++ /dev/null @@ -1,4 +0,0 @@ -MYSQL_PLUGIN(audit_null, [NULL Audit Plug-in], - [Simple black-hole Audit example plug-in]) -MYSQL_PLUGIN_DYNAMIC(audit_null, [adt_null.la]) -MYSQL_PLUGIN_STATIC(audit_null, [libadtnull.a]) diff --git a/plugin/auth/Makefile.am b/plugin/auth/Makefile.am deleted file mode 100644 index 30e185f36f7..00000000000 --- a/plugin/auth/Makefile.am +++ /dev/null @@ -1,20 +0,0 @@ -pkgplugindir=$(pkglibdir)/plugin - -AM_LDFLAGS=-module -rpath $(pkgplugindir) -AM_CPPFLAGS=-DMYSQL_DYNAMIC_PLUGIN -Wno-pointer-sign -I$(top_srcdir)/include - -pkgplugin_LTLIBRARIES= auth.la auth_test_plugin.la qa_auth_interface.la qa_auth_server.la qa_auth_client.la -auth_la_SOURCES= dialog.c -auth_test_plugin_la_SOURCES= test_plugin.c - -qa_auth_interface_la_SOURCES= qa_auth_interface.c -qa_auth_server_la_SOURCES= qa_auth_server.c -qa_auth_client_la_SOURCES= qa_auth_client.c - -if HAVE_PEERCRED -pkgplugin_LTLIBRARIES+= auth_socket.la -auth_socket_la_SOURCES= auth_socket.c -endif - -EXTRA_DIST= plug.in - diff --git a/plugin/auth/plug.in b/plugin/auth/plug.in deleted file mode 100644 index 776367652ab..00000000000 --- a/plugin/auth/plug.in +++ /dev/null @@ -1,12 +0,0 @@ -MYSQL_PLUGIN(auth, [Collection of Authentication Plugins], - [Collection of Authentication Plugins]) -MYSQL_PLUGIN_DYNAMIC(auth, [dialog.la auth_test_plugin.la]) -AC_COMPILE_IFELSE([ - AC_LANG_PROGRAM([[ -#define _GNU_SOURCE -#include <sys/socket.h> -]],[ - struct ucred cred; - getsockopt(0, SOL_SOCKET, SO_PEERCRED, &cred, 0); -])],have_peercred=yes) -AM_CONDITIONAL(HAVE_PEERCRED, test x$have_peercred = xyes) diff --git a/plugin/daemon_example/Makefile.am b/plugin/daemon_example/Makefile.am deleted file mode 100644 index d60271521b3..00000000000 --- a/plugin/daemon_example/Makefile.am +++ /dev/null @@ -1,41 +0,0 @@ -# Copyright (C) 2006 MySQL AB -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -#Makefile.am example for a daemon -MYSQLDATAdir = $(localstatedir) -MYSQLSHAREdir = $(pkgdatadir) -MYSQLBASEdir= $(prefix) -MYSQLLIBdir= $(pkglibdir) -pkgplugindir = $(pkglibdir)/plugin -INCLUDES = -I$(top_srcdir)/include -I$(top_builddir)/include \ - -I$(top_srcdir)/regex \ - -I$(top_srcdir)/sql \ - -I$(srcdir) @ZLIB_INCLUDES@ - -EXTRA_LTLIBRARIES = libdaemon_example.la -pkgplugin_LTLIBRARIES = @plugin_daemon_example_shared_target@ -libdaemon_example_la_LDFLAGS = -module -rpath $(pkgplugindir) -L$(top_builddir)/libservices -lmysqlservices - -libdaemon_example_la_CXXFLAGS= $(AM_CXXFLAGS) -DMYSQL_DYNAMIC_PLUGIN -libdaemon_example_la_CFLAGS = $(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN -libdaemon_example_la_SOURCES = daemon_example.cc - - -EXTRA_LIBRARIES = libdaemon_example.a -noinst_LIBRARIES = @plugin_daemon_example_static_target@ -libdaemon_example_a_CXXFLAGS = $(AM_CXXFLAGS) -libdaemon_example_a_CFLAGS = $(AM_CFLAGS) -libdaemon_example_a_SOURCES= daemon_example.cc -EXTRA_DIST = CMakeLists.txt diff --git a/plugin/daemon_example/configure.in b/plugin/daemon_example/configure.in deleted file mode 100644 index 8924b7f5bc4..00000000000 --- a/plugin/daemon_example/configure.in +++ /dev/null @@ -1,9 +0,0 @@ -# configure.in example for a daemon - -AC_INIT(daemon_example, 0.1) -AM_INIT_AUTOMAKE -AC_DISABLE_STATIC -AC_PROG_LIBTOOL -AC_CONFIG_FILES([Makefile]) -AC_OUTPUT - diff --git a/plugin/daemon_example/plug.in b/plugin/daemon_example/plug.in deleted file mode 100644 index 72e87a70f59..00000000000 --- a/plugin/daemon_example/plug.in +++ /dev/null @@ -1,3 +0,0 @@ -MYSQL_PLUGIN(daemon_example,[Daemon Example Plugin], - [This is an example plugin daemon.]) -MYSQL_PLUGIN_DYNAMIC(daemon_example, [libdaemon_example.la]) diff --git a/plugin/fulltext/Makefile.am b/plugin/fulltext/Makefile.am deleted file mode 100644 index 80a8753b332..00000000000 --- a/plugin/fulltext/Makefile.am +++ /dev/null @@ -1,25 +0,0 @@ -# Copyright (C) 2005-2006 MySQL AB -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -#Makefile.am example for a plugin - -pkgplugindir=$(pkglibdir)/plugin -INCLUDES= -I$(top_builddir)/include -I$(top_srcdir)/include -#noinst_LTLIBRARIES= mypluglib.la -pkgplugin_LTLIBRARIES= mypluglib.la -mypluglib_la_SOURCES= plugin_example.c -mypluglib_la_LDFLAGS= -module -rpath $(pkgplugindir) -mypluglib_la_CFLAGS= -DMYSQL_DYNAMIC_PLUGIN -EXTRA_DIST= CMakeLists.txt diff --git a/plugin/fulltext/configure.in b/plugin/fulltext/configure.in deleted file mode 100644 index 2fefa68727c..00000000000 --- a/plugin/fulltext/configure.in +++ /dev/null @@ -1,9 +0,0 @@ -# configure.in example for a plugin - -AC_INIT(plugin_example, 0.1) -AM_INIT_AUTOMAKE -AC_DISABLE_STATIC -AC_PROG_LIBTOOL -AC_CONFIG_FILES([Makefile]) -AC_OUTPUT - diff --git a/plugin/fulltext/plug.in b/plugin/fulltext/plug.in deleted file mode 100644 index 5bfc401f805..00000000000 --- a/plugin/fulltext/plug.in +++ /dev/null @@ -1,3 +0,0 @@ -MYSQL_PLUGIN(ftexample, [Simple Parser], - [Simple full-text parser plugin]) -MYSQL_PLUGIN_DYNAMIC(ftexample, [mypluglib.la]) diff --git a/plugin/semisync/Makefile.am b/plugin/semisync/Makefile.am deleted file mode 100644 index ec1ecee46a2..00000000000 --- a/plugin/semisync/Makefile.am +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright (C) 2006 MySQL AB -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -## Makefile.am for semi-synchronous replication - -pkgplugindir = $(pkglibdir)/plugin -INCLUDES = -I$(top_srcdir)/include \ - -I$(top_srcdir)/sql \ - -I$(top_srcdir)/regex \ - -I$(srcdir) - -noinst_HEADERS = semisync.h semisync_master.h semisync_slave.h - -pkgplugin_LTLIBRARIES = semisync_master.la semisync_slave.la - -semisync_master_la_LDFLAGS = -module -rpath $(pkgplugindir) -L$(top_builddir)/libservices -lmysqlservices -semisync_master_la_CXXFLAGS= $(AM_CXXFLAGS) -DMYSQL_DYNAMIC_PLUGIN -semisync_master_la_CFLAGS = $(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN -semisync_master_la_SOURCES = semisync.cc semisync_master.cc semisync_master_plugin.cc - -semisync_slave_la_LDFLAGS = -module -rpath $(pkgplugindir) -L$(top_builddir)/libservices -lmysqlservices -semisync_slave_la_CXXFLAGS= $(AM_CXXFLAGS) -DMYSQL_DYNAMIC_PLUGIN -semisync_slave_la_CFLAGS = $(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN -semisync_slave_la_SOURCES = semisync.cc semisync_slave.cc semisync_slave_plugin.cc - -EXTRA_DIST= CMakeLists.txt plug.in diff --git a/plugin/semisync/configure.in b/plugin/semisync/configure.in deleted file mode 100644 index 894251258db..00000000000 --- a/plugin/semisync/configure.in +++ /dev/null @@ -1,9 +0,0 @@ -# configure.in for semi-synchronous replication - -AC_INIT(mysql-semi-sync-plugin, 0.2) -AM_INIT_AUTOMAKE -AC_DISABLE_STATIC -AC_PROG_LIBTOOL -AC_CONFIG_FILES([Makefile]) -AC_OUTPUT - diff --git a/plugin/semisync/plug.in b/plugin/semisync/plug.in deleted file mode 100644 index 82bd9772644..00000000000 --- a/plugin/semisync/plug.in +++ /dev/null @@ -1,3 +0,0 @@ -MYSQL_PLUGIN(semisync,[Semi-synchronous Replication Plugin], - [Semi-synchronous replication plugin.]) -MYSQL_PLUGIN_DYNAMIC(semisync, [semisync_master.la semisync_slave.la]) |