hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Updates all references to INSTALL_DIR with CMAKE_INSTALL_PREFIX.

Browse Source
This commit is contained in:
Markus Makela
2015-01-18 05:55:29 +02:00
parent e79ea8bc3e
commit 66db37341d
7 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
CMakeLists.txt
View File

@ -176,13 +176,13 @@ endif()
add_custom_target(buildtests add_custom_target(buildtests
COMMAND ${CMAKE_COMMAND} -DDEPS_OK=Y -DBUILD_TESTS=Y -DBUILD_TYPE=Debug -DINSTALL_DIR=${CMAKE_BINARY_DIR} -DINSTALL_SYSTEM_FILES=N ${CMAKE_SOURCE_DIR} COMMAND ${CMAKE_COMMAND} -DDEPS_OK=Y -DBUILD_TESTS=Y -DBUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX=${CMAKE_BINARY_DIR} -DINSTALL_SYSTEM_FILES=N ${CMAKE_SOURCE_DIR}
COMMAND make COMMAND make
COMMENT "Building test suite..." VERBATIM COMMENT "Building test suite..." VERBATIM
) )
add_custom_target(testall add_custom_target(testall
COMMAND ${CMAKE_COMMAND} -DDEPS_OK=Y -DBUILD_TESTS=Y -DBUILD_TYPE=Debug -DINSTALL_DIR=${CMAKE_BINARY_DIR} -DINSTALL_SYSTEM_FILES=N ${CMAKE_SOURCE_DIR} COMMAND ${CMAKE_COMMAND} -DDEPS_OK=Y -DBUILD_TESTS=Y -DBUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX=${CMAKE_BINARY_DIR} -DINSTALL_SYSTEM_FILES=N ${CMAKE_SOURCE_DIR}
COMMAND make install COMMAND make install
COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_SOURCE_DIR}/server/test/MaxScale_test.cnf ${CMAKE_BINARY_DIR}/etc/MaxScale.cnf COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_SOURCE_DIR}/server/test/MaxScale_test.cnf ${CMAKE_BINARY_DIR}/etc/MaxScale.cnf
COMMAND /bin/sh -c "${CMAKE_BINARY_DIR}/bin/maxscale -c ${CMAKE_BINARY_DIR} &>/dev/null" COMMAND /bin/sh -c "${CMAKE_BINARY_DIR}/bin/maxscale -c ${CMAKE_BINARY_DIR} &>/dev/null"
@ -216,7 +216,7 @@ endif()
# Testall target with Valgrind # Testall target with Valgrind
if(VALGRIND_FOUND) if(VALGRIND_FOUND)
add_custom_target(testall-valgrind add_custom_target(testall-valgrind
COMMAND ${CMAKE_COMMAND} -DDEPS_OK=Y -DBUILD_TESTS=Y -DBUILD_TYPE=Debug -DINSTALL_DIR=${CMAKE_BINARY_DIR} -DINSTALL_SYSTEM_FILES=N ${CMAKE_SOURCE_DIR} COMMAND ${CMAKE_COMMAND} -DDEPS_OK=Y -DBUILD_TESTS=Y -DBUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX=${CMAKE_BINARY_DIR} -DINSTALL_SYSTEM_FILES=N ${CMAKE_SOURCE_DIR}
COMMAND make install COMMAND make install
COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_SOURCE_DIR}/server/test/MaxScale_test.cnf ${CMAKE_BINARY_DIR}/etc/MaxScale.cnf COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_SOURCE_DIR}/server/test/MaxScale_test.cnf ${CMAKE_BINARY_DIR}/etc/MaxScale.cnf
COMMAND /bin/sh -c "valgrind --track-fds=yes --leak-check=full --show-leak-kinds=all --log-file=${CMAKE_BINARY_DIR}/valgrind.log ${CMAKE_BINARY_DIR}/bin/maxscale -c ${CMAKE_BINARY_DIR} &>/dev/null" COMMAND /bin/sh -c "valgrind --track-fds=yes --leak-check=full --show-leak-kinds=all --log-file=${CMAKE_BINARY_DIR}/valgrind.log ${CMAKE_BINARY_DIR}/bin/maxscale -c ${CMAKE_BINARY_DIR} &>/dev/null"

2
README
View File

@ -153,7 +153,7 @@ package you are using. A version mismatch will cause the library to fail
to initialise. to initialise.
By default, MaxScale installs to '/usr/local/skysql/maxscale' and places init.d scripts By default, MaxScale installs to '/usr/local/skysql/maxscale' and places init.d scripts
and ldconfig files into their folders. Change the INSTALL_DIR variable to your desired and ldconfig files into their folders. Change the CMAKE_INSTALL_PREFIX variable to your desired
installation directory and set INSTALL_SYSTEM_FILES=N to prevent the init.d script and installation directory and set INSTALL_SYSTEM_FILES=N to prevent the init.d script and
ldconfig file installation. ldconfig file installation.

2
etc/init.d/maxscale.in
View File

@ -21,7 +21,7 @@
# MaxScale HOME, PIDFILE, LIB # MaxScale HOME, PIDFILE, LIB
############################################# #############################################
export MAXSCALE_HOME=@INSTALL_DIR@ export MAXSCALE_HOME=@CMAKE_INSTALL_PREFIX@
export MAXSCALE_PIDFILE=$MAXSCALE_HOME/log/maxscale.pid export MAXSCALE_PIDFILE=$MAXSCALE_HOME/log/maxscale.pid
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$MAXSCALE_HOME/lib export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$MAXSCALE_HOME/lib

2
etc/ubuntu/init.d/maxscale.in
View File

@ -21,7 +21,7 @@
# MaxScale HOME, PIDFILE, LIB # MaxScale HOME, PIDFILE, LIB
############################################# #############################################
export MAXSCALE_HOME=@INSTALL_DIR@ export MAXSCALE_HOME=@CMAKE_INSTALL_PREFIX@
export MAXSCALE_PIDFILE=$MAXSCALE_HOME/log/maxscale.pid export MAXSCALE_PIDFILE=$MAXSCALE_HOME/log/maxscale.pid
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$MAXSCALE_HOME/lib export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$MAXSCALE_HOME/lib

4
maxscale.conf.in
View File

@ -1,2 +1,2 @@
@INSTALL_DIR@/modules @CMAKE_INSTALL_PREFIX@/modules
@INSTALL_DIR@/lib @CMAKE_INSTALL_PREFIX@/lib

2
server/core/gateway.c
View File

@ -1096,7 +1096,7 @@ int main(int argc, char **argv)
long_options, &option_index)) != -1) long_options, &option_index)) != -1)
{ {
bool succp = true; bool succp = true;
struct option* optr = long_options;
switch (opt) { switch (opt) {
case 'd': case 'd':
/*< Debug mode, maxscale runs in this same process */ /*< Debug mode, maxscale runs in this same process */

2
server/test/MaxScale_test.cnf
View File

@ -26,7 +26,6 @@ passwd=maxpwd
max_slave_connections=100% max_slave_connections=100%
filters=Hint filters=Hint
[Read Connection Router] [Read Connection Router]
type=service type=service
router=readconnroute router=readconnroute
@ -54,7 +53,6 @@ type=filter
module=tee module=tee
service=RW Split Hint Router service=RW Split Hint Router
[Debug Interface] [Debug Interface]
type=service type=service
router=debugcli router=debugcli