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

Merge branch 'master' of https://github.com/coolprop/coolprop

Browse Source
This commit is contained in:
Ian Bell
2014-11-24 11:30:51 -05:00
parent e359038a5c 6ac0c856b3
commit 539b7f4822
1 changed files with 28 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -20,7 +20,8 @@ c['slaves'] = [BuildSlave("linux-slave", pass_dict["linux-slave"], max_builds =
BuildSlave("windows-slave", pass_dict["windows-slave"], max_builds = 1),
BuildSlave("linux32-slave", pass_dict["linux32-slave"], max_builds = 1),
BuildSlave("linux64-slave", pass_dict["linux64-slave"], max_builds = 1),
BuildSlave("windows-DTU-slave", pass_dict["windows-DTU-slave"], max_builds = 1)
BuildSlave("windows-DTU-slave", pass_dict["windows-DTU-slave"], max_builds = 1),
BuildSlave("OSX-IPU-slave", pass_dict["OSX-IPU-slave"], max_builds = 1)
]
# 'slavePortnum' defines the TCP port to listen on for connections from slaves.
@@ -392,6 +393,15 @@ def fortranFactory(platform=1,bitness=1):
build_cmd = "gfortran -c -Wall cpinterface.f90 cool_fortran_bind.f90"
link_cmd = "gfortran -o main *.o libCoolProp.a -lstdc++ -ldl"
exec_cmd = "./main"
elif platform==platformID["osx"]:
if bitness==bitnessID["32bit"]:
cmake_args = ["-DCOOLPROP_EXTERNC_STATIC_LIBRARY=ON"]
else:
cmake_args = ["-DCOOLPROP_EXTERNC_STATIC_LIBRARY=ON"]
cp_cmd = "cp *.f90 ../../../build/"
build_cmd = "gfortran -c -Wall cpinterface.f90 cool_fortran_bind.f90"
link_cmd = "gfortran -o main *.o libCoolProp.a -lstdc++ -ldl"
exec_cmd = "./main"
else:
raise ValueError("Unknown Fortran platform: {0}".format(platform))
@@ -551,7 +561,7 @@ def swig_matlab_builder(platform, gitMode = 'incremental', build_args = [], cmak
"""
working_folder = "build/build"
def prepend_path(cmd):
if platform == 'windows':
pre_path = 'set "PATH=swig-matlab-bin\\bin;C:\\Program Files\\7-Zip\\;%PATH%" && set "SWIG_LIB=swig-matlab-bin\\share\\swig\\3.0.3" && '
@@ -563,12 +573,12 @@ def swig_matlab_builder(platform, gitMode = 'incremental', build_args = [], cmak
factory = getBaseFactory(gitMode=gitMode)
#
# Download files from nightly build for swig
factory.addStep(FileDownload(mastersrc = 'public_html/nightly/swig+MATLAB/'+platform+'/swig_MATLAB.7z',
factory.addStep(FileDownload(mastersrc = 'public_html/nightly/swig+MATLAB/'+platform+'/swig_MATLAB.7z',
slavedest = 'swig_MATLAB.7z', haltOnFailure = True))
# Directory for build
factory.addStep(MakeDirectory(dir='build/build', haltOnFailure = True))
# Unzip
factory.addStep(ShellCommand(command = prepend_path('7z -y -obuild x swig_MATLAB.7z'),
factory.addStep(ShellCommand(command = prepend_path('7z -y -obuild x swig_MATLAB.7z'),
workdir = 'build' , haltOnFailure = True))
# Call cmake
factory.addStep(ShellCommand(
@@ -841,6 +851,20 @@ c['builders'].append(
factory = fortranFactory(platform=platformID["linux"],bitness=bitnessID["64bit"])
)
)
#c['builders'].append(
# BuilderConfig(
# name="Fortran-executable-osx-32bit-GCC-ExternC",
# slavenames=["linux32-slave"],
# factory = fortranFactory(platform=platformID["linux"],bitness=bitnessID["32bit"])
# )
#)
c['builders'].append(
BuilderConfig(
name="Fortran-executable-osx-64bit-GCC-ExternC",
slavenames=["OSX-IPU-slave"],
factory = fortranFactory(platform=platformID["osx"],bitness=bitnessID["64bit"])
)
)
#Common boring 64-bit modules for windows, linux and OSX
### OSX