github/CoolProp
1
1
Fork 0
mirror of https://github.com/CoolProp/CoolProp.git synced 2026-04-23 03:00:17 -04:00
Code Issues Packages Projects Releases Wiki Activity

Continue builds if directory removal fails (dirs don't exist during the first build)

Browse Source
This commit is contained in:
Jorrit Wronski
2015-04-21 11:17:24 +02:00
parent b583923c8c
commit 674483f2c2
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
dev/buildbot/master/master.cfg
View File

@@ -341,7 +341,7 @@ def pythonFactory(pyID, pyCFG=PythonSlaveConfig("name"), gitMode='incremental'):
# Create the factory to add the actions to
factory = getBaseFactory(gitMode=gitMode)
# Remove the temporary folder for installs
factory.addStep(RemoveDirectory(dir=installFolder, haltOnFailure = True))
factory.addStep(RemoveDirectory(dir=installFolder, haltOnFailure = False))
#
# Setting the appropriate virtual environment activator
pyact = pyCFG.getPyact(pyID)
@@ -398,7 +398,7 @@ def cmakeFactory(mod_name = None, gitMode = 'incremental', install = True, pre_c
factory = getBaseFactory(gitMode=gitMode)
#
factory.addStep(MakeDirectory(dir=working_folder, haltOnFailure = True))
factory.addStep(RemoveDirectory(dir="build/install_root", haltOnFailure = True))
factory.addStep(RemoveDirectory(dir="build/install_root", haltOnFailure = False))
#
if len(pre_cmd)>0 and not pre_cmd[-1]=="&&": pre_cmd.append("&&")
if mod_name is not None:
@@ -479,7 +479,7 @@ def javascript_slave(platform, cmake_args = [], cmake_env = {}, build_args = [],
factory = getBaseFactory(gitMode=gitMode)
# Remove the temporary folder for installs
factory.addStep(RemoveDirectory(dir="build/install_root", haltOnFailure = True))
factory.addStep(RemoveDirectory(dir="build/install_root", haltOnFailure = False))
factory.addStep(ShellCommand(command="cmake .. -DCOOLPROP_JAVASCRIPT_MODULE=ON -DCMAKE_TOOLCHAIN_FILE=${EMSCRIPTEN}/cmake/Modules/Platform/Emscripten.cmake",
workdir= working_folder,
@@ -496,7 +496,7 @@ def python_source_slave(key, platform, conda_env, cmake_args = [], cmake_env = {
factory = getBaseFactory(gitMode=gitMode)
# Remove the temporary folder for installs
factory.addStep(RemoveDirectory(dir="build/install_root", haltOnFailure = True))
factory.addStep(RemoveDirectory(dir="build/install_root", haltOnFailure = False))
factory.addStep(MakeDirectory(dir=working_folder, haltOnFailure = True))
factory.addStep(ShellCommand(command = ' '.join(['source',"activate",conda_env,"&&","cmake", "..", "-DCOOLPROP_PYTHON_PYPI=ON","&&","cmake","--build",".","--target","CoolProp"]+cmake_args),
@@ -535,7 +535,7 @@ def excel_slave(gitMode = 'incremental'):
factory.addStep(MakeDirectory(dir='build/bin/MicrosoftExcel', haltOnFailure = True))
factory.addStep(MakeDirectory(dir=working_folder+'/32bitDLL', haltOnFailure = True))
factory.addStep(MakeDirectory(dir=working_folder+'/64bitDLL', haltOnFailure = True))
factory.addStep(RemoveDirectory(dir="build/install_root", haltOnFailure = True))
factory.addStep(RemoveDirectory(dir="build/install_root", haltOnFailure = False))
# *************************
# Make 32-bit __stdcall DLL
# *************************
@@ -578,7 +578,7 @@ def smath_builder(gitMode = 'incremental'):
factory.addStep(MakeDirectory(dir='build/bin/SMath', haltOnFailure = True))
factory.addStep(MakeDirectory(dir=working_folder+'/32bitDLL', haltOnFailure = True))
factory.addStep(MakeDirectory(dir=working_folder+'/64bitDLL', haltOnFailure = True))
factory.addStep(RemoveDirectory(dir="build/install_root", haltOnFailure = True))
factory.addStep(RemoveDirectory(dir="build/install_root", haltOnFailure = False))
factory.addStep(ShellCommand(command=["cmake", "..", "-DCOOLPROP_SMATH_MODULE=ON","-G", "Visual Studio 10"],
workdir= working_folder,
haltOnFailure = True))
@@ -621,7 +621,7 @@ def julia_builder(gitMode = 'incremental'):
# Create the factory to add the actions to
factory = getBaseFactory(gitMode=gitMode)
# Clean the install_root
factory.addStep(RemoveDirectory(dir="build/install_root/Julia", haltOnFailure = True))
factory.addStep(RemoveDirectory(dir="build/install_root/Julia", haltOnFailure = False))
factory.addStep(MakeDirectory(dir='build/install_root/Julia', haltOnFailure = True))
# Copy other files
factory.addStep(ShellCommand(command=["cp", "wrappers/Julia/CoolProp.jl", "install_root/Julia/"], workdir = 'build', haltOnFailure = True))