Mirrors/MariaDB-server
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-12-28 08:10:14 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

MDEV-22009 mysqlhotcopy tool and wsrep scripts not found

Browse Source 
main.mysqlhotcopy_myisam cannot find mysqlhotcopy tool

wsrep scripts are not executable in CMAKE_CURRENT_BINARY_DIR
This commit is contained in:
Rasmus Johansson 2020-03-23 13:11:51 +00:00 committed by Sergei Golubchik
parent e4afd3c337
commit 79b8901711
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
scripts/CMakeLists.txt
View File

@ -212,7 +212,7 @@ SET(pkgdata_locations "$basedir/${INSTALL_MYSQLSHAREDIR} $basedir/share $basedir
IF(UNIX)
CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/mysql_install_db.sh
${CMAKE_CURRENT_BINARY_DIR}/mariadb-install-db ESCAPE_QUOTES @ONLY)
EXECUTE_PROCESS(COMMAND chmod +x ${CMAKE_CURRENT_BINARY_DIR}/mariadb-install-db)
INSTALL_SCRIPT(
"${CMAKE_CURRENT_BINARY_DIR}/mariadb-install-db"
DESTINATION ${INSTALL_SCRIPTDIR}
@ -336,19 +336,28 @@ ELSE()
CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${binname}
${CMAKE_CURRENT_BINARY_DIR}/${file} COPYONLY)
ELSE()
MESSAGE(FATAL_ERROR "Can not find ${binname}.sh or ${binname} in "
MESSAGE(FATAL_ERROR "Cannot find ${binname}.sh or ${binname} in "
"${CMAKE_CURRENT_SOURCE_DIR}" )
ENDIF()
IF(NOT ${file}_COMPONENT)
SET(${file}_COMPONENT Server)
ENDIF()
# install script
INSTALL_SCRIPT(
${CMAKE_CURRENT_BINARY_DIR}/${file}
DESTINATION ${INSTALL_BINDIR}
COMPONENT ${${file}_COMPONENT}
)
# make scripts executable in build dir
IF(EXISTS ${CMAKE_CURRENT_BINARY_DIR}/${binname})
EXECUTE_PROCESS(COMMAND chmod +x ${CMAKE_CURRENT_BINARY_DIR}/${binname})
ELSEIF(EXISTS ${CMAKE_CURRENT_BINARY_DIR}/${file})
EXECUTE_PROCESS(COMMAND chmod +x ${CMAKE_CURRENT_BINARY_DIR}/${file})
ENDIF()
# Create symlink
IF (NOT ${binname} STREQUAL ${file})
INSTALL_LINK(${file} ${binname} ${INSTALL_BINDIR} ${${file}_COMPONENT})
@ -366,7 +375,7 @@ ELSE()
${CMAKE_CURRENT_BINARY_DIR}/${file}
DESTINATION ${INSTALL_BINDIR}
COMPONENT ${${file}_COMPONENT}
)
)
ENDFOREACH()
ENDIF()