updated source activate command

This commit is contained in:
Ian Bell
2014-08-11 23:28:46 +02:00
parent 7d1d8245b0
commit aadce9570d

View File

@@ -128,11 +128,11 @@ def python_slave(key, platform, conda_env, cmake_args = [], cmake_env = {}, buil
else:
source = ''
factory.addStep(ShellCommand(command=[source, "activate",conda_env,"cmake", "..", "-DCOOLPROP_PYTHON_"+key+"=ON"]+cmake_args,
factory.addStep(ShellCommand(command=[source, "activate",conda_env,"&&","cmake", "..", "-DCOOLPROP_PYTHON_"+key+"=ON"]+cmake_args,
env = cmake_env,
workdir= working_folder,
haltOnFailure = True))
factory.addStep(ShellCommand(command=["activate",conda_env,"cmake", "--build", ".", "--target", "CoolProp"]+build_args, workdir = working_folder, haltOnFailure = True))
factory.addStep(ShellCommand(command=[source, "activate",conda_env,"&&","cmake", "--build", ".", "--target", "CoolProp"]+build_args, workdir = working_folder, haltOnFailure = True))
factory.addStep(DirectoryUpload(slavesrc="install_root", masterdest="public_html/binaries", url="binaries", compress="bz2"))
return factory