1
0
mirror of https://github.com/mariadb-corporation/libmarias3.git synced 2025-04-18 16:24:01 +03:00

MDEV-25716 Building failure in S3 engine on MacOS

Fixed by renaming VERSION to VERSION.txt
This commit is contained in:
Monty 2021-06-14 22:17:32 +03:00
parent 324efa38ac
commit c71898f825
5 changed files with 4 additions and 4 deletions

View File

@ -32,7 +32,7 @@ DISTCLEANFILES+= aminclude.am
EXTRA_DIST+= README.rst
EXTRA_DIST+= LICENSE
EXTRA_DIST+= VERSION
EXTRA_DIST+= VERSION.txt
aclocaldir= $(datadir)/aclocal
dist_aclocal_DATA=

View File

@ -18,7 +18,7 @@ m4_ifndef([AS_VAR_COPY], [m4_define([AS_VAR_COPY], [AS_LITERAL_IF([$1[]$2], [$1=
# NOTE: Major version should be < 100 and minor/patch < 256 or bad things will
# happen in src/asql/utility.cc
AC_INIT([libmarias3],m4_esyscmd_s([tr -d '\n' < VERSION]),[linuxjedi@mariadb.com],[libmarias3],[https://mariadb.com])
AC_INIT([libmarias3],m4_esyscmd_s([tr -d '\n' < VERSION.txt]),[linuxjedi@mariadb.com],[libmarias3],[https://mariadb.com])
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
# Must come before AM_INIT_AUTOMAKE.

View File

@ -55,7 +55,7 @@ copyright = u'2019 MariaDB Corporation Ab'
# built documents.
#
# The short X.Y version.
version_file = open("../VERSION", "r")
version_file = open("../VERSION.txt", "r")
version = version_file.read().strip()
# The full version, including alpha/beta/rc tags.
get_rev= Popen("git rev-parse --short HEAD", shell=True, stdout=PIPE).stdout.read().strip()

View File

@ -42,7 +42,7 @@ If any of the source code has changed please see ``LIBMARIAS3_LIBRARY_VERSION``
API Version
-----------
API versioning is stored in the ``VERSION`` file which is used by the build system to version the API and docs. The versioning scheme follows the `Semantic Versioning Rules <http://semver.org/>`_.
API versioning is stored in the ``VERSION.txt`` file which is used by the build system to version the API and docs. The versioning scheme follows the `Semantic Versioning Rules <http://semver.org/>`_.
Function Visibility
-------------------