From 065883ddd1fdc9889f2c8e64aea3c699e28676b3 Mon Sep 17 00:00:00 2001 From: Ian Bell Date: Wed, 6 Aug 2014 21:34:51 +0200 Subject: [PATCH] Added Javascript slave --- dev/buildbot/master/master.cfg | 31 ++++++++++++++++++++++++++++++- 1 file changed, 30 insertions(+), 1 deletion(-) diff --git a/dev/buildbot/master/master.cfg b/dev/buildbot/master/master.cfg index 35a31379..48f093d1 100644 --- a/dev/buildbot/master/master.cfg +++ b/dev/buildbot/master/master.cfg @@ -60,7 +60,29 @@ def sphinx_slave(git_mode = 'incremental'): # Upload the generated files factory.addStep(DirectoryUpload(slavesrc="Web/_build/html",masterdest="public_html/sphinx",url="sphinx",compress="bz2")) return factory + +def javascript_slave(cmake_args = [], cmake_env = {}, build_args = [], git_mode = 'incremental'): + factory = BuildFactory() + working_folder = "build/Javascript" + # Check out sources + factory.addStep(Git(repourl='git://github.com/CoolProp/CoolProp', mode=git_mode, submodules = True, progress=True, haltOnFailure = True)) + # Remove the temporary folder for installs + factory.addStep(RemoveDirectory(dir="build/install_root", haltOnFailure = True)) + + factory.addStep(ShellCommand(command=["cmake", + "..", + "-DCOOLPROP_JAVASCRIPT_MODULE", + "-DCMAKE_TOOLCHAIN_FILE=${EMSCRIPTEN}/cmake/Platform/Emscripten.cmake ", + ]+cmake_args, + env = cmake_env, + workdir= working_folder, + haltOnFailure = True)) + factory.addStep(ShellCommand(command=["cmake", "--build", ".", "--target", "install"]+build_args, workdir = working_folder, haltOnFailure = True)) + factory.addStep(DirectoryUpload(slavesrc="install_root", masterdest="public_html/binaries", url="binaries", compress="bz2")) + + return factory + def python_slave(key, cmake_args = [], cmake_env = {}, build_args = [], git_mode = 'incremental'): factory = BuildFactory() working_folder = "build/Python_" + key @@ -142,7 +164,14 @@ c['builders'].append( factory = python_slave("PYPI") ) ) - + +c['builders'].append( +BuilderConfig(name="Javascript-linux", + slavenames=["linux-slave"], + factory = javascript_slave() + ) + ) + for platform in ['OSX','windows']: c['builders'].append( BuilderConfig(name="Python-binaries-" + platform,