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

MXS-1630: Combine MaxCtrl into the main package

Browse Source 
Added MaxCtrl to the core package. Removed the old packages from build
scripts.
This commit is contained in:
Markus Mäkelä
2018-01-26 10:05:48 +02:00
parent ef5c8d3114
commit 9b5d4d129e
4 changed files with 24 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
BUILD/build_deb_local.sh
View File

@ -48,7 +48,7 @@ cp _build/*.gz .
set -x set -x
if [ "$build_experimental" == "yes" ] if [ "$build_experimental" == "yes" ]
then then
for component in experimental devel client for component in experimental devel
do do
cd _build cd _build
rm CMakeCache.txt rm CMakeCache.txt

2
BUILD/build_rpm_local.sh
View File

@ -43,7 +43,7 @@ cp _build/*.gz .
if [ "$build_experimental" == "yes" ] if [ "$build_experimental" == "yes" ]
then then
for component in experimental devel client for component in experimental devel
do do
cd _build cd _build
rm CMakeCache.txt rm CMakeCache.txt

3
cmake/defaults.cmake
View File

@ -27,6 +27,9 @@ set(BUILD_CDC TRUE CACHE BOOL "Build Avro router")
# Build the multimaster monitor # Build the multimaster monitor
set(BUILD_MMMON TRUE CACHE BOOL "Build multimaster monitor") set(BUILD_MMMON TRUE CACHE BOOL "Build multimaster monitor")
# Build MaxCtrl
set(BUILD_MAXCTRL TRUE CACHE BOOL "Build MaxCtrl")
# Build Luafilter # Build Luafilter
set(BUILD_LUAFILTER FALSE CACHE BOOL "Build Luafilter") set(BUILD_LUAFILTER FALSE CACHE BOOL "Build Luafilter")

34
maxctrl/CMakeLists.txt
View File

@ -1,20 +1,24 @@
find_package(NPM) if (BUILD_MAXCTRL)
find_package(NodeJS) find_package(NPM)
find_package(NodeJS)
if (NPM_FOUND AND NODEJS_FOUND AND NODEJS_VERSION VERSION_GREATER "6.0.0") if (NPM_FOUND AND NODEJS_FOUND AND NODEJS_VERSION VERSION_GREATER "6.0.0")
add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/maxctrl/maxctrl add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/maxctrl/maxctrl
COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/build.sh ${CMAKE_SOURCE_DIR} COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/build.sh ${CMAKE_SOURCE_DIR}
WORKING_DIRECTORY ${CMAKE_BINARY_DIR}) WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
add_custom_target(maxctrl ALL DEPENDS ${CMAKE_BINARY_DIR}/maxctrl/maxctrl) add_custom_target(maxctrl ALL DEPENDS ${CMAKE_BINARY_DIR}/maxctrl/maxctrl)
install_script(${CMAKE_BINARY_DIR}/maxctrl/maxctrl client) install_script(${CMAKE_BINARY_DIR}/maxctrl/maxctrl core)
add_custom_target(test_maxctrl add_custom_target(test_maxctrl
COMMAND ${CMAKE_SOURCE_DIR}/test/run_npm_test.sh COMMAND ${CMAKE_SOURCE_DIR}/test/run_npm_test.sh
${CMAKE_SOURCE_DIR} # Path to MaxScale sources ${CMAKE_SOURCE_DIR} # Path to MaxScale sources
${CMAKE_CURRENT_SOURCE_DIR} # Path to test sources ${CMAKE_CURRENT_SOURCE_DIR} # Path to test sources
${CMAKE_BINARY_DIR}/maxctrl-test/ # Location where tests are built and run ${CMAKE_BINARY_DIR}/maxctrl-test/ # Location where tests are built and run
WORKING_DIRECTORY ${CMAKE_BINARY_DIR}) WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
else()
message(FATAL_ERROR "Not building MaxCtrl: npm or Node.js >= 6.0.0 not found. Add the following to skip MaxCtrl: -DBUILD_MAXCTRL=N")
endif()
else() else()
message(STATUS "Not building MaxCtrl: npm or Node.js >= 6.0.0 not found") messages(STATUS "Not building MaxCtrl: BUILD_MAXCTRL=N")
endif() endif()