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 /BUILD/cmake_configure.sh | |
| 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 'BUILD/cmake_configure.sh')
| -rw-r--r-- | BUILD/cmake_configure.sh | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/BUILD/cmake_configure.sh b/BUILD/cmake_configure.sh index 80423205274..f5efc13e011 100644 --- a/BUILD/cmake_configure.sh +++ b/BUILD/cmake_configure.sh @@ -1,14 +1,17 @@ #!/bin/sh -# Choose whether to use autoconf created configure -# of perl script that calls cmake. # Ensure cmake and perl are there cmake -P cmake/check_minimal_version.cmake >/dev/null 2>&1 || HAVE_CMAKE=no -perl --version >/dev/null 2>&1 || HAVE_CMAKE=no +perl --version >/dev/null 2>&1 || HAVE_PERL=no scriptdir=`dirname $0` if test "$HAVE_CMAKE" = "no" then - sh $scriptdir/configure.am "$@" + echo "CMake is required to build MySQL." + exit 1 +elif test "$HAVE_PERL" = "no" +then + echo "Perl is required to build MySQL using the configure to CMake translator." + exit 1 else perl $scriptdir/cmake/configure.pl "$@" fi |