From 9b5d4d129e6a12f930faae4a24dd5ab00e794572 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Markus=20M=C3=A4kel=C3=A4?= <markus.makela@mariadb.com>
Date: Fri, 26 Jan 2018 10:05:48 +0200
Subject: [PATCH] MXS-1630: Combine MaxCtrl into the main package

Added MaxCtrl to the core package. Removed the old packages from build
scripts.
---
 BUILD/build_deb_local.sh |  2 +-
 BUILD/build_rpm_local.sh |  2 +-
 cmake/defaults.cmake     |  3 +++
 maxctrl/CMakeLists.txt   | 34 +++++++++++++++++++---------------
 4 files changed, 24 insertions(+), 17 deletions(-)

diff --git a/BUILD/build_deb_local.sh b/BUILD/build_deb_local.sh
index a063fc339..bd3f0f886 100755
--- a/BUILD/build_deb_local.sh
+++ b/BUILD/build_deb_local.sh
@@ -48,7 +48,7 @@ cp _build/*.gz .
 set -x
 if [ "$build_experimental" == "yes" ]
 then
-    for component in experimental devel client
+    for component in experimental devel
     do
         cd _build
         rm CMakeCache.txt
diff --git a/BUILD/build_rpm_local.sh b/BUILD/build_rpm_local.sh
index ba93f63d4..689616f54 100755
--- a/BUILD/build_rpm_local.sh
+++ b/BUILD/build_rpm_local.sh
@@ -43,7 +43,7 @@ cp _build/*.gz .
 
 if [ "$build_experimental" == "yes" ]
 then
-    for component in experimental devel client
+    for component in experimental devel
     do
         cd _build
         rm CMakeCache.txt
diff --git a/cmake/defaults.cmake b/cmake/defaults.cmake
index 3d65d5cc4..6002be775 100644
--- a/cmake/defaults.cmake
+++ b/cmake/defaults.cmake
@@ -27,6 +27,9 @@ set(BUILD_CDC TRUE CACHE BOOL "Build Avro router")
 # Build the multimaster monitor
 set(BUILD_MMMON TRUE CACHE BOOL "Build multimaster monitor")
 
+# Build MaxCtrl
+set(BUILD_MAXCTRL TRUE CACHE BOOL "Build MaxCtrl")
+
 # Build Luafilter
 set(BUILD_LUAFILTER FALSE CACHE BOOL "Build Luafilter")
 
diff --git a/maxctrl/CMakeLists.txt b/maxctrl/CMakeLists.txt
index f61acf65d..6516a82eb 100644
--- a/maxctrl/CMakeLists.txt
+++ b/maxctrl/CMakeLists.txt
@@ -1,20 +1,24 @@
-find_package(NPM)
-find_package(NodeJS)
+if (BUILD_MAXCTRL)
+  find_package(NPM)
+  find_package(NodeJS)
 
-if (NPM_FOUND AND NODEJS_FOUND AND NODEJS_VERSION VERSION_GREATER "6.0.0")
-  add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/maxctrl/maxctrl
-    COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/build.sh ${CMAKE_SOURCE_DIR}
-    WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
-  add_custom_target(maxctrl ALL DEPENDS ${CMAKE_BINARY_DIR}/maxctrl/maxctrl)
-  install_script(${CMAKE_BINARY_DIR}/maxctrl/maxctrl client)
+  if (NPM_FOUND AND NODEJS_FOUND AND NODEJS_VERSION VERSION_GREATER "6.0.0")
+    add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/maxctrl/maxctrl
+      COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/build.sh ${CMAKE_SOURCE_DIR}
+      WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
+    add_custom_target(maxctrl ALL DEPENDS ${CMAKE_BINARY_DIR}/maxctrl/maxctrl)
+    install_script(${CMAKE_BINARY_DIR}/maxctrl/maxctrl core)
 
-  add_custom_target(test_maxctrl
-  COMMAND ${CMAKE_SOURCE_DIR}/test/run_npm_test.sh
-  ${CMAKE_SOURCE_DIR}           # Path to MaxScale sources
-  ${CMAKE_CURRENT_SOURCE_DIR}   # Path to test sources
-  ${CMAKE_BINARY_DIR}/maxctrl-test/ # Location where tests are built and run
-  WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
+    add_custom_target(test_maxctrl
+      COMMAND ${CMAKE_SOURCE_DIR}/test/run_npm_test.sh
+      ${CMAKE_SOURCE_DIR}           # Path to MaxScale sources
+      ${CMAKE_CURRENT_SOURCE_DIR}   # Path to test sources
+      ${CMAKE_BINARY_DIR}/maxctrl-test/ # Location where tests are built and run
+      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()
-  message(STATUS "Not building MaxCtrl: npm or Node.js >= 6.0.0 not found")
+  messages(STATUS "Not building MaxCtrl: BUILD_MAXCTRL=N")
 endif()