diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2021-07-20 14:47:24 +0200 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2021-07-27 18:45:05 +0200 |
| commit | 4fc25ed235e9a4cd8fddba0f76ec4cb94cf37ea5 (patch) | |
| tree | 76485b60d08768ae1288c9bedd9bd6ee6bf9e1f4 | |
| parent | e11cae71feb853dc6f2917a2b7ad2f41b294a9dc (diff) | |
| download | mariadb-git-bb-10.2-MDEV-7209.tar.gz | |
MDEV-7209 mroonga storage engine fails to build on OpenBSDbb-10.2-MDEV-7209
Rename VERSION -> VERSION.txt
| -rw-r--r-- | VERSION.txt (renamed from VERSION) | 0 | ||||
| -rw-r--r-- | cmake/mysql_version.cmake | 8 | ||||
| -rwxr-xr-x | debian/autobake-deb.sh | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/VERSION b/VERSION.txt index 456c22d6a3f..456c22d6a3f 100644 --- a/VERSION +++ b/VERSION.txt diff --git a/cmake/mysql_version.cmake b/cmake/mysql_version.cmake index 114af99f954..c0a4ccee500 100644 --- a/cmake/mysql_version.cmake +++ b/cmake/mysql_version.cmake @@ -23,15 +23,15 @@ SET(DOT_FRM_VERSION "6") # Generate "something" to trigger cmake rerun when VERSION changes CONFIGURE_FILE( - ${CMAKE_SOURCE_DIR}/VERSION + ${CMAKE_SOURCE_DIR}/VERSION.txt ${CMAKE_BINARY_DIR}/VERSION.dep ) -# Read value for a variable from VERSION. +# Read value for a variable from VERSION.txt. MACRO(MYSQL_GET_CONFIG_VALUE keyword var) IF(NOT ${var}) - FILE (STRINGS ${CMAKE_SOURCE_DIR}/VERSION str REGEX "^[ ]*${keyword}=") + FILE (STRINGS ${CMAKE_SOURCE_DIR}/VERSION.txt str REGEX "^[ ]*${keyword}=") IF(str) STRING(REPLACE "${keyword}=" "" str ${str}) STRING(REGEX REPLACE "[ ].*" "" str "${str}") @@ -52,7 +52,7 @@ MACRO(GET_MYSQL_VERSION) IF(NOT "${MAJOR_VERSION}" MATCHES "[0-9]+" OR NOT "${MINOR_VERSION}" MATCHES "[0-9]+" OR NOT "${PATCH_VERSION}" MATCHES "[0-9]+") - MESSAGE(FATAL_ERROR "VERSION file cannot be parsed.") + MESSAGE(FATAL_ERROR "VERSION.txt file cannot be parsed.") ENDIF() SET(VERSION "${MAJOR_VERSION}.${MINOR_VERSION}.${PATCH_VERSION}${EXTRA_VERSION}") diff --git a/debian/autobake-deb.sh b/debian/autobake-deb.sh index 21ab4d8fe22..bb352d8cabf 100755 --- a/debian/autobake-deb.sh +++ b/debian/autobake-deb.sh @@ -119,7 +119,7 @@ fi echo "Incrementing changelog and starting build scripts" # Find major.minor version -source ./VERSION +source ./VERSION.txt UPSTREAM="${MYSQL_VERSION_MAJOR}.${MYSQL_VERSION_MINOR}.${MYSQL_VERSION_PATCH}${MYSQL_VERSION_EXTRA}" PATCHLEVEL="+maria" LOGSTRING="MariaDB build" |