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-08-12 08:40:27 +02:00
parent d65fee9303 9f91a12a86
commit 299a85111c
5 changed files with 50 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Web/coolprop/wrappers/EES/index.rst
View File

@@ -47,12 +47,8 @@ Once the dependencies are installed, you can run the installer with::
# Check out the sources for CoolProp
git clone https://github.com/CoolProp/CoolProp --recursive
# Move into the folder you just created
cd CoolProp
# Make a build folder
mkdir build/EES
# Move into that folder
cd build/EES
mkdir CoolProp/build && cd CoolProp/build
# Build the makefile using CMake
cmake ../.. -DCOOLPROP_EES_MODULE=ON
# Make the DLF file and the installer (by default installer will be generated in folder install_root/EES relative to CMakeLists.txt file)
@@ -69,7 +65,7 @@ To make and use a debug DLL, do (from root of repo)
This will make a Visual Studio Project called CoolProp.sln. Open the visual studio project, for the COOLPROP_EES project:
1. Change the output directory to C:\\ees32\\userlib\\COOLPROP_EES (this is where the DLF will go)
2. Under debugging, set the command to c:\\ees32\\ees
2. Under debugging, set the command to c:\\ees32\\ees. You can also set the arguments to the file that you want EES to open
3. Set a breakpoint somewhere that it will get hit (in the COOLPROP_EES function for instance)
4. Run the project, it will build and start EES, open your code or call some inputs for EES
5. Debugger should stop at your breakpoint

35
Web/coolprop/wrappers/Java/index.rst
View File

@@ -24,17 +24,16 @@ Linux & OSX
2. Expand the zip file you downloaded
3. Add the ``bin`` folder of the JDK that you installed. For instance, add the following to ~/.profile:
3. Add the ``bin`` folder of the JDK that you installed. For instance, add this:
export /path/to/java/SDK/bin:$PATH
to ~/.profile where the path ``/path/to/java/SDK/bin`` points to the absolute path appropriate to
to ~/.profile where the path ``/path/to/java/SDK/bin`` points to the absolute path for the ``bin`` folder of your Java installation.
Windows
-------
Install MATLAB using installer downloaded from www.mathworks.com. As of version R2014a, both of 32-bit and 64-bit MATLAB is available
Download and run the JDK installer from `Oracle downloads <http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html>`_. If you are in a 32-bit system, download the 32-bit system, else download the 64-bit version.
Build
-----
@@ -47,10 +46,10 @@ Once the dependencies are installed, you can run the builder and tests using::
# Check out the sources for CoolProp
git clone https://github.com/CoolProp/CoolProp --recursive
# Move into the folder you just created
mkdir -p CoolProp/build/Java && cd CoolProp/build/Java
mkdir -p CoolProp/build && cd CoolProp/build
# Build the makefile using CMake
cmake ../.. -DCOOLPROP_MATLAB_MODULE=ON -DBUILD_TESTING=ON
# Make the MEX files (by default files will be generated in folder install_root/MATLAB relative to CMakeLists.txt file)
cmake .. -DCOOLPROP_JAVA_MODULE=ON -DBUILD_TESTING=ON
# Make the java files
make install
# Run the integration tests
ctest --extra-verbose
@@ -65,26 +64,10 @@ You need to just slightly modify the building procedure::
# Move into the folder you just created
cd CoolProp
# Make a build folder
mkdir build/MATLAB
# Move into that folder
cd build/MATLAB
# Set an environmental variable that points to your MATLAB installation for use in CMake (adjust if needed)
set MATLAB_ROOT=c:\Program Files\MATLAB\R2014a
mkdir build && cd build
# Build the makefile using CMake
cmake ../.. -DCOOLPROP_MATLAB_MODULE=ON -DBUILD_TESTING=ON
# Make the MEX files (by default files will be generated in folder install_root/MATLAB relative to CMakeLists.txt file)
cmake .. -DCOOLPROP_MATLAB_MODULE=ON -DBUILD_TESTING=ON
# Make the Java shared library
make install
# Run the integration tests
ctest --extra-verbose
Usage
=====
Place the mex files somewhere on the MATLAB path.
If you place mex file somewhere outside MATLAB path, you have to use
"addpath" function at begining of your code.
Example: adding the folder that contains CoolProp.mexw32 file to the Octave path::
addpath('/home/USERNAME/Some_folder/CoolProp')

37
Web/coolprop/wrappers/MATLAB/index.rst
View File

@@ -6,10 +6,22 @@ MATLAB Wrapper
Pre-compiled Binaries
=====================
Pre-compiled binaries can be downloaded from XXXXXXXXXXXXXX
Pre-compiled binaries can be downloaded from :sfdownloads:`MATLAB`. Download the files appropriate to your installation of MATLAB.
User-Compiled Binaries
======================
Usage
-----
Place the mex files somewhere on the MATLAB path.
If you place mex file somewhere outside MATLAB path, you have to use
"addpath" function at begining of your code.
Example: adding the folder that contains CoolProp.mexw32 file to the Octave path::
addpath('/home/USERNAME/Some_folder/CoolProp')
Developer Notes
===============
Common Requirements
-------------------
@@ -43,9 +55,7 @@ Once the dependencies are installed, you can run the builder and tests using::
# Move into the folder you just created
cd CoolProp
# Make a build folder
mkdir -p build/MATLAB
# Move into that folder
cd build/MATLAB
mkdir build && cd build
# Set an environmental variable that points to your MATLAB installation for use in CMake (adjust if needed)
export MATLAB_ROOT=/usr/local/MATLAB/R2014a # or /Applications/MATLAB_R2014a.app
# Build the makefile using CMake
@@ -65,9 +75,7 @@ You need to just slightly modify the building procedure::
# Move into the folder you just created
cd CoolProp
# Make a build folder
mkdir build/MATLAB
# Move into that folder
cd build/MATLAB
mkdir build && cd build
# Set an environmental variable that points to your MATLAB installation for use in CMake (adjust if needed)
set MATLAB_ROOT=c:\Program Files\MATLAB\R2014a
# Build the makefile using CMake
@@ -77,14 +85,3 @@ You need to just slightly modify the building procedure::
# Run the integration tests
ctest --extra-verbose
Usage
=====
Place the mex files somewhere on the MATLAB path.
If you place mex file somewhere outside MATLAB path, you have to use
"addpath" function at begining of your code.
Example: adding the folder that contains CoolProp.mexw32 file to the Octave path::
addpath('/home/USERNAME/Some_folder/CoolProp')

2
Web/coolprop/wrappers/wrappers.rst
View File

@@ -55,6 +55,8 @@ If you are compiling for Python 2.7, you can install Visual Studio 2008 Express
If you are compiling for Python 3.x, you can install Visual Studio 2010 Express from `VS2010Express installer <http://www.visualstudio.com/en-us/downloads#d-2010-express>`_.
If you want to build 64-bit extensions, you MUST install VS2010 Professional, which can be obtained for free if you have a student ID card from Microsoft Dreamspark
All three compilers should co-exist happily on the path, so you should be fine installing all three, but they are rather sizeable installs.
Linux

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

@@ -114,21 +114,26 @@ def javascript_slave(platform, cmake_args = [], cmake_env = {}, build_args = [],
return factory
def python_slave(key, platform, cmake_args = [], cmake_env = {}, build_args = [], git_mode = 'incremental'):
def python_slave(key, platform, conda_env, cmake_args = [], cmake_env = {}, build_args = [], git_mode = 'incremental'):
factory = BuildFactory()
working_folder = "build/Python_" + key
working_folder = "build/build"
factory.addStep(ShellCommand(command=cleanCommand, description='fullclean?', workdir=""))
# 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(MakeDirectory(dir=working_folder, haltOnFailure = True))
if platform.find('OSX') > -1:
source = ['source']
else:
source = []
factory.addStep(ShellCommand(command=["cmake", "..", "-DCOOLPROP_PYTHON_"+key+"=ON"]+cmake_args,
factory.addStep(ShellCommand(command = ' '.join(source + ["activate",conda_env,"&&","cmake", "..", "-DCOOLPROP_PYTHON_"+key+"=ON"]+cmake_args),
env = cmake_env,
workdir= working_folder,
haltOnFailure = True))
factory.addStep(ShellCommand(command=["cmake", "--build", ".", "--target", "CoolProp"]+build_args, workdir = working_folder, haltOnFailure = True))
factory.addStep(ShellCommand(command= ' '.join(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
@@ -194,17 +199,20 @@ BuilderConfig(name="Javascript-linux",
c['builders'].append(
BuilderConfig(name="Python-sdist",
slavenames=["OSX-slave"],
factory = python_slave("PYPI", platform = 'OSX')
factory = python_slave("PYPI", platform = 'OSX', conda_env = 'py27')
)
)
for platform in ['OSX','windows']:
c['builders'].append(
BuilderConfig(name="Python-binaries-" + platform,
slavenames=[platform + "-slave"],
factory = python_slave("BINARIES", platform = platform)
)
)
for conda_env in ['py33','py27','py34']:
for platform in ['OSX','windows']:
c['builders'].append(
BuilderConfig(name="Python-binaries-" + platform + '-' + conda_env,
slavenames=[platform + "-slave"],
factory = python_slave("BINARIES",
platform = platform,
conda_env = conda_env)
)
)
#Common boring 64-bit modules for windows, linux and OSX
### OSX