diff options
| author | Rasmus Johansson <rasmus@mariadb.com> | 2020-03-20 16:41:54 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2020-03-21 20:20:29 +0100 |
| commit | 9e1b3af4a490d6fb6704756aba90281ff5ac033a (patch) | |
| tree | 513967006d4809562e38a04ae741916c2c32e119 /man | |
| parent | 6fb59d525b7047c82e350d2b721bffc50431eb12 (diff) | |
| download | mariadb-git-9e1b3af4a490d6fb6704756aba90281ff5ac033a.tar.gz | |
MDEV-21303 Make executables MariaDB named
To change all executables to have a mariadb name I had to:
- Do name changes in every CMakeLists.txt that produces executables
- CREATE_MARIADB_SYMLINK was removed and GET_SYMLINK added by Wlad to reuse the function in other places also
- The scripts/CMakeLists.txt could make use of GET_SYMLINK instead of introducing redundant code, but I thought I'll leave that for next release
- A lot of changes to debian/.install and debian/.links files due to swapping of real executable and symlink. I did not however change the name of the manpages, so the real name is still mysql there and mariadb are symlinks.
- The Windows part needed a change now when we made the executables mariadb -named. MSI (and ZIP) do not support symlinks and to not break backward compatibility we had to include mysql named binaries also. Done by Wlad
Diffstat (limited to 'man')
| -rw-r--r-- | man/CMakeLists.txt | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/man/CMakeLists.txt b/man/CMakeLists.txt index 24f5dac9292..4faaf062666 100644 --- a/man/CMakeLists.txt +++ b/man/CMakeLists.txt @@ -46,11 +46,11 @@ INSTALL(FILES ${MAN1_DEVEL} DESTINATION ${INSTALL_MANDIR}/man1 COMPONENT ManPage INSTALL(FILES ${MAN1_TEST} DESTINATION ${INSTALL_MANDIR}/man1 COMPONENT ManPagesTest) macro(MARIADB_SYMLINK_MANPAGE) - list(LENGTH MARIADB_SYMLINK_FROMS _len) + list(LENGTH MARIADB_SYMLINK_TOS _len) math(EXPR _listlen "${_len}-1") foreach(_index RANGE ${_listlen}) - list(GET MARIADB_SYMLINK_FROMS ${_index} _name) + list(GET MARIADB_SYMLINK_TOS ${_index} _name) set(_manname "${_name}") list(FIND MAN1_SERVER ${_manname}.1 _iman1server) @@ -78,7 +78,7 @@ macro(MARIADB_SYMLINK_MANPAGE) endmacro(MARIADB_SYMLINK_MANPAGE) macro(MARIADB_SYMLINK_MANPAGE_CREATE mysqlname index mannr dir comp) - LIST(GET MARIADB_SYMLINK_TOS ${index} _mariadbname) + LIST(GET MARIADB_SYMLINK_FROMS ${index} _mariadbname) SET(dest "${CMAKE_CURRENT_BINARY_DIR}/${_mariadbname}.${mannr}") FILE(WRITE ${dest} ".so ${dir}/${mysqlname}.${mannr}") INSTALL(FILES ${dest} DESTINATION ${INSTALL_MANDIR}/${dir} COMPONENT ${comp}) |