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 | 8664de2230300967537d75a9ec51d15c400ca36d (patch) | |
tree | 2d19b102b6c66d0bcf7bb480f2140a6ffc9da7bb /unittest | |
parent | 766db2b52fe28514d47b159b9ec05445bdf36ab9 (diff) | |
download | mariadb-git-8664de2230300967537d75a9ec51d15c400ca36d.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.
VERSION:
Add top-level version file.
cmake/mysql_version.cmake:
Get version information from the top-level VERSION file.
Do not cache the version components (MAJOR_VERSION, etc).
Add MYSQL_RPM_VERSION as a replacement for MYSQL_U_SCORE_VERSION.
Diffstat (limited to 'unittest')
-rw-r--r-- | unittest/Makefile.am | 27 | ||||
-rw-r--r-- | unittest/examples/Makefile.am | 24 | ||||
-rw-r--r-- | unittest/mysys/Makefile.am | 35 | ||||
-rw-r--r-- | unittest/mytap/Makefile.am | 25 | ||||
-rw-r--r-- | unittest/mytap/t/Makefile.am | 22 | ||||
-rw-r--r-- | unittest/strings/Makefile.am | 27 |
6 files changed, 0 insertions, 160 deletions
diff --git a/unittest/Makefile.am b/unittest/Makefile.am deleted file mode 100644 index da655d1844e..00000000000 --- a/unittest/Makefile.am +++ /dev/null @@ -1,27 +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 - -SUBDIRS = mytap . mysys examples strings - -EXTRA_DIST = unit.pl -CLEANFILES = unit - -unittests = mytap mysys strings @mysql_se_unittest_dirs@ @mysql_pg_unittest_dirs@ - -test: - perl unit.pl run $(unittests) - -test-verbose: - HARNESS_VERBOSE=1 perl unit.pl run $(unittests) diff --git a/unittest/examples/Makefile.am b/unittest/examples/Makefile.am deleted file mode 100644 index 3e64c7ceddc..00000000000 --- a/unittest/examples/Makefile.am +++ /dev/null @@ -1,24 +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 - -AM_CPPFLAGS = -I$(srcdir) -I$(top_builddir)/include \ - -I$(top_srcdir)/unittest/mytap -I$(top_srcdir)/include - -AM_LDFLAGS = -L$(top_builddir)/unittest/mytap - -LDADD = -lmytap - -# We omit core-t here, since it will always fail. -noinst_PROGRAMS = simple-t skip-t todo-t skip_all-t no_plan-t diff --git a/unittest/mysys/Makefile.am b/unittest/mysys/Makefile.am deleted file mode 100644 index 64d2749987e..00000000000 --- a/unittest/mysys/Makefile.am +++ /dev/null @@ -1,35 +0,0 @@ -# Copyright (C) 2009 Sun Microsystems, Inc. -# -# 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 - -AM_CPPFLAGS = @ZLIB_INCLUDES@ -I$(top_builddir)/include -AM_CPPFLAGS += -I$(top_srcdir)/include -I$(top_srcdir)/unittest/mytap - -noinst_HEADERS = thr_template.c - -LDADD = $(top_builddir)/unittest/mytap/libmytap.a \ - $(top_builddir)/mysys/libmysys.a \ - $(top_builddir)/dbug/libdbug.a \ - $(top_builddir)/strings/libmystrings.a - -noinst_PROGRAMS = bitmap-t base64-t lf-t my_rdtsc-t my_vsnprintf-t my_malloc-t - -if NEED_THREAD -# my_atomic-t is used to check thread functions, so it is safe to -# ignore the file in non-threaded builds. -# In fact, it will not compile without thread support. -noinst_PROGRAMS += my_atomic-t -endif - -EXTRA_DIST = CMakeLists.txt diff --git a/unittest/mytap/Makefile.am b/unittest/mytap/Makefile.am deleted file mode 100644 index d36dc25d0b5..00000000000 --- a/unittest/mytap/Makefile.am +++ /dev/null @@ -1,25 +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 - -AM_CPPFLAGS = -I$(top_srcdir)/include - -noinst_LIBRARIES = libmytap.a -noinst_HEADERS = tap.h - -libmytap_a_SOURCES = tap.c - -EXTRA_DIST = CMakeLists.txt - -SUBDIRS = . t diff --git a/unittest/mytap/t/Makefile.am b/unittest/mytap/t/Makefile.am deleted file mode 100644 index bce72a88c05..00000000000 --- a/unittest/mytap/t/Makefile.am +++ /dev/null @@ -1,22 +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 - -AM_CPPFLAGS = -I$(srcdir) -I$(top_builddir)/include -I$(srcdir)/.. -I$(top_srcdir)/include - -AM_LDFLAGS = -L$(top_builddir)/unittest/mytap - -LDADD = -lmytap - -noinst_PROGRAMS = basic-t diff --git a/unittest/strings/Makefile.am b/unittest/strings/Makefile.am deleted file mode 100644 index 5b18d89f58e..00000000000 --- a/unittest/strings/Makefile.am +++ /dev/null @@ -1,27 +0,0 @@ -# Copyright 2000, 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 - -AM_CPPFLAGS = @ZLIB_INCLUDES@ -I$(top_builddir)/include -AM_CPPFLAGS += -I$(top_srcdir)/include -I$(top_srcdir)/unittest/mytap - -LDADD = $(top_builddir)/unittest/mytap/libmytap.a \ - $(top_builddir)/mysys/libmysys.a \ - $(top_builddir)/dbug/libdbug.a \ - $(top_builddir)/strings/libmystrings.a - -noinst_PROGRAMS = strings-t - -# Don't update the files from bitkeeper -%::SCCS/s.% |