diff options
| author | Vladislav Vaintroub <wlad@montyprogram.com> | 2011-06-17 23:00:26 +0200 |
|---|---|---|
| committer | Vladislav Vaintroub <wlad@montyprogram.com> | 2011-06-17 23:00:26 +0200 |
| commit | 4058115cf74d00fcf0e432b23981c6393d5abbc5 (patch) | |
| tree | dfb21f97241dad5b5ef618af85331e9ead33d996 /win | |
| parent | a0973ba22e5bd1df60d358d0b04cf89e74b8cf0a (diff) | |
| download | mariadb-git-4058115cf74d00fcf0e432b23981c6393d5abbc5.tar.gz | |
LPBUG#779758 - fix missing alpha/beta etc in MSI and ZIP package names.
Diffstat (limited to 'win')
| -rw-r--r-- | win/cmake/mysql_version.cmake | 16 | ||||
| -rw-r--r-- | win/cmake/package_name.cmake | 2 |
2 files changed, 14 insertions, 4 deletions
diff --git a/win/cmake/mysql_version.cmake b/win/cmake/mysql_version.cmake index 79e6a18ee1d..bf623a22462 100644 --- a/win/cmake/mysql_version.cmake +++ b/win/cmake/mysql_version.cmake @@ -25,7 +25,7 @@ MACRO(GET_MYSQL_VERSION) STRING(REGEX MATCH "[0-9]+\\.[0-9]+\\.[0-9]+" VERSION_STRING "${str}") IF(NOT VERSION_STRING) FILE(STRINGS configure.in str REGEX "AC_INIT\\(") - STRING(REGEX MATCH "[0-9]+\\.[0-9]+\\.[0-9]+[-][a-zA-Z0-9]+" VERSION_STRING "${str}") + STRING(REGEX MATCH "[0-9]+\\.[0-9]+\\.[0-9]+[-][a-zA-Z0-9-]+" VERSION_STRING "${str}") IF(NOT VERSION_STRING) STRING(REGEX MATCH "[0-9]+\\.[0-9]+\\.[0-9]+" VERSION_STRING "${str}") ENDIF() @@ -34,6 +34,16 @@ MACRO(GET_MYSQL_VERSION) ENDIF() ENDIF() + SET(VERSION_EXTRA) #alpha beta gamma delta epsilon, etc + + FOREACH(suffix alpha beta gamma) + IF(VERSION_STRING MATCHES "${suffix}") + SET(VERSION_EXTRA "-${suffix}") + ENDIF() + ENDFOREACH() + + STRING(REGEX MATCH "[0-9]+\\.[0-9]+\\.[0-9]+[-][a-zA-Z0-9]+" VERSION_STRING "${str}") + IF(NOT VERSION_STRING) MESSAGE(FATAL_ERROR "VERSION_STRING cannot be parsed, please specify -DVERSION_STRING=major.minor.patch-extra" @@ -91,9 +101,9 @@ IF(NOT CPACK_PACKAGE_FILE_NAME) ENDIF() IF(NOT CPACK_SOURCE_PACKAGE_FILE_NAME) - SET(CPACK_SOURCE_PACKAGE_FILE_NAME "mariadb-${VERSION}") + SET(CPACK_SOURCE_PACKAGE_FILE_NAME "mariadb-${VERSION_STRING}${VERSION_EXTRA}") ENDIF() -SET(CPACK_PACKAGE_CONTACT "MariaDB team <build@mysql.com>") +SET(CPACK_PACKAGE_CONTACT "MariaDB team <info@montyprogram.com>") SET(CPACK_PACKAGE_VENDOR "Monty Program AB") SET(CPACK_SOURCE_GENERATOR "TGZ") INCLUDE(cpack_source_ignore_files) diff --git a/win/cmake/package_name.cmake b/win/cmake/package_name.cmake index 1bbe68a0336..ef6f9b31328 100644 --- a/win/cmake/package_name.cmake +++ b/win/cmake/package_name.cmake @@ -123,7 +123,7 @@ IF(NOT VERSION) SET(PRODUCT_TAG) ENDIF() - SET(package_name "mariadb${PRODUCT_TAG}-${MYSQL_NO_DASH_VERSION}-${SYSTEM_NAME_AND_PROCESSOR}") + SET(package_name "mariadb${PRODUCT_TAG}-${MYSQL_NO_DASH_VERSION}${VERSION_EXTRA}-${SYSTEM_NAME_AND_PROCESSOR}") # Sometimes package suffix is added (something like "-icc-glibc23") IF(PACKAGE_SUFFIX) |