From 826654b9de15f16d293f44d5b91574f26f3934c6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Markus=20M=C3=A4kel=C3=A4?= <markus.makela@mariadb.com>
Date: Tue, 8 Aug 2017 05:42:09 +0300
Subject: [PATCH] MXS-1300: Build MaxCtrl with experimental packages

The build scripts now download Node.js 6.11.2 for building and packaging
MaxCtrl. The client package is also created when the extra packages are
built.
---
 BUILD/build_deb_local.sh    | 35 +++++++++++++----------------------
 BUILD/build_rpm_local.sh    | 19 +++++++------------
 BUILD/install_build_deps.sh |  4 ++++
 3 files changed, 24 insertions(+), 34 deletions(-)

diff --git a/BUILD/build_deb_local.sh b/BUILD/build_deb_local.sh
index 2a3cc8352..ae70715fd 100755
--- a/BUILD/build_deb_local.sh
+++ b/BUILD/build_deb_local.sh
@@ -40,32 +40,23 @@ cp *.deb ..
 cp _build/*.gz .
 
 set -x
-if [ "$build_experimental" == "yes" ] ; then
+if [ "$build_experimental" == "yes" ]
+then
+    for component in experimental devel client
+    do
         rm -rf _bild
-	mkdir _build
-	cd _build
-	export LD_LIBRARY_PATH=""
-	cmake ..  $cmake_flags -DTARGET_COMPONENT=experimental
-	export LD_LIBRARY_PATH=$(for i in `find $PWD/ -name '*.so*'`; do echo $(dirname $i); done|sort|uniq|xargs|sed -e 's/[[:space:]]/:/g')
-	make package
-	cp _CPack_Packages/Linux/DEB/*.deb ../
+	    mkdir _build
+	    cd _build
+	    export LD_LIBRARY_PATH=""
+	    cmake ..  $cmake_flags -DTARGET_COMPONENT=$component
+	    export LD_LIBRARY_PATH=$(for i in `find $PWD/ -name '*.so*'`; do echo $(dirname $i); done|sort|uniq|xargs|sed -e 's/[[:space:]]/:/g')
+	    make package
+	    cp _CPack_Packages/Linux/DEB/*.deb ../
         cd ..
         cp _build/*.deb .
         cp *.deb ..
-	cp _build/*.gz .
-
-        rm -rf _bild
-        mkdir _build
-        cd _build
-        export LD_LIBRARY_PATH=""
-        cmake ..  $cmake_flags -DTARGET_COMPONENT=devel
-        export LD_LIBRARY_PATH=$(for i in `find $PWD/ -name '*.so*'`; do echo $(dirname $i); done|sort|uniq|xargs|sed -e 's/[[:space:]]/:/g')
-        make package
-	cp _CPack_Packages/Linux/DEB/*.deb ../
-        cd ..
-        cp _build/*.deb .
-        cp *.deb ..
-	cp _build/*.gz .
+	    cp _build/*.gz .
+    done
 fi
 
 if [ "$BUILD_RABBITMQ" == "yes" ] ; then
diff --git a/BUILD/build_rpm_local.sh b/BUILD/build_rpm_local.sh
index ae78b6698..3d09d1d8f 100755
--- a/BUILD/build_rpm_local.sh
+++ b/BUILD/build_rpm_local.sh
@@ -35,24 +35,19 @@ cd ..
 cp _build/*.rpm .
 cp _build/*.gz .
 
-if [ "$build_experimental" == "yes" ] ; then
+if [ "$build_experimental" == "yes" ]
+then
+    for component in experimental devel client
+    do
         sudo rm -rf _build
         mkdir _build
         cd _build
-        cmake ..  $cmake_flags -DTARGET_COMPONENT=experimental
+        cmake ..  $cmake_flags -DTARGET_COMPONENT=$component
         sudo make package
         cd ..
         cp _build/*.rpm .
-	cp _build/*.gz .
-
-        sudo rm -rf _build
-        mkdir _build
-        cd _build
-        cmake ..  $cmake_flags -DTARGET_COMPONENT=devel
-        sudo make package
-        cd ..
-        cp _build/*.rpm .
-	cp _build/*.gz .
+	    cp _build/*.gz .
+    done
 fi
 
 if [ "$BUILD_RABBITMQ" == "yes" ] ; then
diff --git a/BUILD/install_build_deps.sh b/BUILD/install_build_deps.sh
index 0013824ba..967b5171b 100755
--- a/BUILD/install_build_deps.sh
+++ b/BUILD/install_build_deps.sh
@@ -159,3 +159,7 @@ cmake .. -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_C_FLAGS=-fPIC -DCMAKE_CXX_FLAGS=-fP
 make
 sudo make install
 popd
+
+wget --quiet https://nodejs.org/dist/v6.11.2/node-v6.11.2-linux-x64.tar.xz
+tar -axf node-v6.11.2-linux-x64.tar.xz
+sudo cp -t /usr -r node-v6.11.2-linux-x64/*