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.

5 files changed, 2 insertions, 207 deletions

diff --git a/support-files/MacOSX/Makefile.am b/support-files/MacOSX/Makefile.am
deleted file mode 100644
index 7d4384a2a56..00000000000
--- a/support-files/MacOSX/Makefile.am
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright (C) 2003-2006 MySQL AB
-#
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Library General Public
-# License as published by the Free Software Foundation; version 2
-# of the License.
-#
-# This library 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
-# Library General Public License for more details.
-#
-# You should have received a copy of the GNU Library General Public
-# License along with this library; if not, write to the Free
-# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
-# MA 02111-1307, USA
-
-## Process this file with automake to create Makefile.in
-
-EXTRA_DIST =	Info.plist.sh \
-		Description.plist.sh \
-		StartupParameters.plist.sh \
-		postflight.sh \
-		preflight.sh \
-		ReadMe.txt \
-		MySQLCOM \
-		StartupItem.Description.plist \
-		StartupItem.Info.plist \
-		StartupItem.postinstall
-
-noinst_DATA = Info.plist \
-		Description.plist \
-		StartupParameters.plist \
-		postflight \
-		preflight
-
-CLEANFILES =	Info.plist \
-		Description.plist \
-		StartupParameters.plist \
-		postflight \
-		preflight
-
-SUFFIXES = .sh
-
-.sh:
-	@RM@ -f $@ $@-t
-	@SED@ \
-		-e 's!@''prefix''@!$(prefix)!g' \
-	  -e 's!@''VERSION''@!@VERSION@!' \
-	  -e 's!@''MYSQL_NUMERIC_VERSION''@!@MYSQL_NUMERIC_VERSION@!' \
-	  -e 's!@''MYSQL_SERVER_SUFFIX''@!@MYSQL_SERVER_SUFFIX@!' \
-		-e 's!@''MYSQLD_USER''@!@MYSQLD_USER@!' \
-	$< > $@-t
-	@MV@ $@-t $@
diff --git a/support-files/Makefile.am b/support-files/Makefile.am
deleted file mode 100644
index 7ddb39e1c7c..00000000000
--- a/support-files/Makefile.am
+++ /dev/null
@@ -1,131 +0,0 @@
-# Copyright (C) 2000-2006 MySQL AB, 2008-2010 Sun Microsystems, Inc.
-#
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Library General Public
-# License as published by the Free Software Foundation; version 2
-# of the License.
-#
-# This library 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
-# Library General Public License for more details.
-#
-# You should have received a copy of the GNU Library General Public
-# License along with this library; if not, write to the Free
-# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
-# MA 02111-1307, USA
-
-## Process this file with automake to create Makefile.in
-
-EXTRA_DIST =		mysql.spec.sh \
-			my-small.cnf.sh \
-			my-medium.cnf.sh \
-			my-large.cnf.sh \
-			my-huge.cnf.sh \
-			my-innodb-heavy-4G.cnf.sh \
-			mysql-log-rotate.sh \
-			mysql.server.sh \
-			mysqld_multi.server.sh \
-                        config.huge.ini.sh \
-                        config.medium.ini.sh \
-                        config.small.ini.sh \
-			binary-configure.sh \
-			magic mysql.m4 \
-			MySQL-shared-compat.spec.sh \
-			ndb-config-2-node.ini.sh \
-			compiler_warnings.supp \
-			dtrace \
-			CMakeLists.txt
-
-SUBDIRS =		MacOSX RHEL4-SElinux
-
-# Default same as 'pkgdatadir', but we can override it
-pkgsuppdir =		$(datadir)/@PACKAGE@
-
-pkgsupp_DATA =		my-small.cnf \
-			my-medium.cnf \
-			my-large.cnf \
-			my-huge.cnf \
-                        config.huge.ini \
-                        config.medium.ini \
-                        config.small.ini \
-			my-innodb-heavy-4G.cnf \
-			mysql-log-rotate \
-			binary-configure \
-			ndb-config-2-node.ini
-
-pkgsupp_SCRIPTS =	mysql.server \
-			mysqld_multi.server
-
-aclocaldir =		$(datadir)/aclocal
-aclocal_DATA =		mysql.m4
-
-noinst_DATA = mysql-@VERSION@.spec \
-			MySQL-shared-compat.spec
-
-CLEANFILES =		my-small.cnf \
-			my-medium.cnf \
-			my-large.cnf \
-			my-huge.cnf \
-                        config.huge.ini \
-                        config.medium.ini \
-                        config.small.ini \
-			my-innodb-heavy-4G.cnf \
-			mysql.spec \
-			mysql-@VERSION@.spec \
-			mysql-log-rotate \
-			mysql.server \
-			mysqld_multi.server \
-			binary-configure \
-			MySQL-shared-compat.spec \
-			ndb-config-2-node.ini
-
-mysql-@VERSION@.spec:	mysql.spec
-			rm -f $@
-			cp mysql.spec $@
-
-SUFFIXES = .sh
-
-.sh:
-	@RM@ -f $@ $@-t
-	@SED@ \
-	  -e 's!@''bindir''@!$(bindir)!g' \
-	  -e 's!@''sbindir''@!$(sbindir)!g' \
-	  -e 's!@''scriptdir''@!$(bindir)!g' \
-	  -e 's!@''prefix''@!$(prefix)!g' \
-	  -e 's!@''datadir''@!$(datadir)!g' \
-	  -e 's!@''localstatedir''@!$(localstatedir)!g' \
-	  -e 's!@''libexecdir''@!$(libexecdir)!g' \
-	  -e 's!@''CC''@!@CC@!'\
-	  -e 's!@''CXX''@!@CXX@!'\
-	  -e 's!@''GXX''@!@GXX@!'\
-	  -e 's!@''PERL''@!@PERL@!' \
-	  -e 's!@''CFLAGS''@!@SAVE_CFLAGS@!'\
-	  -e 's!@''CXXFLAGS''@!@SAVE_CXXFLAGS@!'\
-	  -e 's!@''LDFLAGS''@!@SAVE_LDFLAGS@!'\
-	  -e 's!@''VERSION''@!@VERSION@!' \
-	  -e 's!@''MYSQL_SERVER_SUFFIX''@!@MYSQL_SERVER_SUFFIX@!' \
-	  -e 's!@''COMPILATION_COMMENT''@!@COMPILATION_COMMENT@!' \
-	  -e 's!@''MACHINE_TYPE''@!@MACHINE_TYPE@!' \
-	  -e 's!@''HOSTNAME''@!@HOSTNAME@!' \
-	  -e 's!@''SYSTEM_TYPE''@!@SYSTEM_TYPE@!' \
-	  -e 's!@''CHECK_PID''@!@CHECK_PID@!' \
-	  -e 's!@''FIND_PROC''@!@FIND_PROC@!' \
-	  -e 's!@''MYSQLD_DEFAULT_SWITCHES''@!@MYSQLD_DEFAULT_SWITCHES@!' \
-	  -e 's!@''MYSQL_UNIX_ADDR''@!@MYSQL_UNIX_ADDR@!' \
-	  -e 's!@''TARGET_LINUX''@!@TARGET_LINUX@!' \
-	  -e "s!@""CONF_COMMAND""@!@CONF_COMMAND@!" \
-	  -e 's!@''MYSQLD_USER''@!@MYSQLD_USER@!' \
-	  -e 's!@''sysconfdir''@!@sysconfdir@!' \
-	  -e 's!@''SHORT_MYSQL_INTRO''@!@SHORT_MYSQL_INTRO@!' \
-	  -e 's!@''SHARED_LIB_VERSION''@!@SHARED_LIB_VERSION@!' \
-	  -e 's!@''MYSQL_BASE_VERSION''@!@MYSQL_BASE_VERSION@!' \
-	  -e 's!@''MYSQL_NO_DASH_VERSION''@!@MYSQL_NO_DASH_VERSION@!' \
-	  -e 's!@''MYSQL_U_SCORE_VERSION''@!@MYSQL_U_SCORE_VERSION@!' \
-	  -e 's!@''MYSQL_COPYRIGHT_YEAR''@!@MYSQL_COPYRIGHT_YEAR@!' \
-	  -e 's!@''MYSQL_TCP_PORT''@!@MYSQL_TCP_PORT@!' \
-	  -e 's!@''PERL_DBI_VERSION''@!@PERL_DBI_VERSION@!' \
-	  -e 's!@''PERL_DBD_VERSION''@!@PERL_DBD_VERSION@!' \
-	  -e 's!@''PERL_DATA_DUMPER''@!@PERL_DATA_DUMPER@!' \
-	$< > $@-t
-	@MV@ $@-t $@
diff --git a/support-files/MySQL-shared-compat.spec.sh b/support-files/MySQL-shared-compat.spec.sh
index 72654a22d87..b8b27863b3d 100644
--- a/support-files/MySQL-shared-compat.spec.sh
+++ b/support-files/MySQL-shared-compat.spec.sh
@@ -27,7 +27,7 @@
 #
 # Change this to match the version of the shared libs you want to include
 #
-%define version_cur @MYSQL_U_SCORE_VERSION@
+%define version_cur @MYSQL_RPM_VERSION@
 %define version41 4.1.17
 %define version40 4.0.26
 %define version3 3.23.58
diff --git a/support-files/RHEL4-SElinux/Makefile.am b/support-files/RHEL4-SElinux/Makefile.am
deleted file mode 100644
index d2143a5285c..00000000000
--- a/support-files/RHEL4-SElinux/Makefile.am
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright (C) 2000-2001, 2003-2006 MySQL AB
-#
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Library General Public
-# License as published by the Free Software Foundation; version 2
-# of the License.
-#
-# This library 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
-# Library General Public License for more details.
-#
-# You should have received a copy of the GNU Library General Public
-# License along with this library; if not, write to the Free
-# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
-# MA 02111-1307, USA
-
-## Process this file with automake to create Makefile.in
-
-EXTRA_DIST =		mysql.fc mysql.te
diff --git a/support-files/mysql.spec.sh b/support-files/mysql.spec.sh
index 595586962ba..75021c318e6 100644
--- a/support-files/mysql.spec.sh
+++ b/support-files/mysql.spec.sh
@@ -223,7 +223,7 @@
 Name:           MySQL%{product_suffix}
 Summary:        MySQL: a very fast and reliable SQL database server
 Group:          Applications/Databases
-Version:        @MYSQL_U_SCORE_VERSION@
+Version:        @MYSQL_RPM_VERSION@
 Release:        %{release}%{?distro_releasetag:.%{distro_releasetag}}
 Distribution:   %{distro_description}
 License:        Copyright (c) 2000, @MYSQL_COPYRIGHT_YEAR@, %{mysql_vendor}.  All rights reserved.  Use is subject to license terms.  Under %{license_type} license as shown in the Description field.