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

Removed the old python slaves and added new upload dir, little documentation

Browse Source
This commit is contained in:
jowr
2014-10-23 12:15:25 +02:00
parent ef4e2d799f
commit 74475d20c7
2 changed files with 10 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Web/develop/buildbot.rst
View File

@@ -104,6 +104,15 @@ POSIX specification.
At the moment, it is not possible to use several slaves for the same build job.
We have to find a new way to generate the configuration.
Octave Slaves
-------------
Octave requires MinGW for building the CoolProp wrapper. Install it from
`MinGW <http://www.mingw.org/>`_ to get the open-source toolchains needed.
This module also depends on `SWIG <http://www.swig.org/>`_ and Python.
Buildbot as a service (Windows)
-------------------------------

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

@@ -303,7 +303,7 @@ def pythonFactory(pyID, pyCFG=PythonSlaveConfig("name"), gitMode='incremental'):
combinedCMD = " && ".join([activateCMD, installCMD])
factory.addStep(ShellCommand(command = combinedCMD, workdir = workingFolder, haltOnFailure = True))
#
factory.addStep(DirectoryUpload(slavesrc=uploadFolder, masterdest="public_html/bin", url="bin", compress="bz2"))
factory.addStep(DirectoryUpload(slavesrc=uploadFolder, masterdest="public_html/binaries", url="binaries", compress="bz2"))
return factory
@@ -387,43 +387,6 @@ def javascript_slave(platform, cmake_args = [], cmake_env = {}, build_args = [],
return factory
def python_slave(key, platform, conda_env, cmake_args = [], cmake_env = {}, build_args = [], gitMode = 'incremental', bitness = 64):
working_folder = "build/wrappers/Python"
# Create the factory to add the actions to
factory = getBaseFactory(gitMode=gitMode)
# Remove the temporary folder for installs
factory.addStep(RemoveDirectory(dir="build/install_root", haltOnFailure = True))
if platform.find('OSX') > -1:
source = ['source','activate']
elif 'win' in platform.lower() and bitness == 32:
source = ['c:\\Miniconda32bit\\Scripts\\activate']
else:
source = ['activate']
if 'win' in platform.lower():
if conda_env == 'py27':
vc = 'vc9'
else:
vc = 'vc10'
options = ['bdist_wheel','--dist-dir','../../install_root/Python','bdist_wininst','--dist-dir','../../install_root/Python', '--cmake-compiler', vc, '--cmake-bitness', str(bitness)]
elif 'OSX' in platform:
options = ['bdist_wheel','--dist-dir','../../install_root/Python']
else:
raise ValueError()
factory.addStep(ShellCommand(command = ' '.join(source + [conda_env,"&&","python", "setup.py"]+options),
env = cmake_env,
workdir= working_folder,
haltOnFailure = True))
factory.addStep(DirectoryUpload(slavesrc="install_root", masterdest="public_html/binaries", url="binaries", compress="bz2"))
return factory
def python_source_slave(key, platform, conda_env, cmake_args = [], cmake_env = {}, build_args = [], gitMode = 'incremental'):
working_folder = "build/build"