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

2026-04-23 03:00:17 -04:00 · 2014-07-06 16:38:22 +02:00
parent fc70dab066 99435974a0
commit f933c0dea0
6 changed files with 116 additions and 6 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -277,7 +277,6 @@ if (COOLPROP_CSHARP_MODULE)
  add_test(NAME Csharptestrun
           COMMAND ${CSHARP_INTERPRETER} Example.exe
           WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/testing_root/Csharp${BITNESS})
-  
 endif()

 if (COOLPROP_JAVA_MODULE)
@@ -314,10 +313,10 @@ if (COOLPROP_JAVA_MODULE)
  # Install all the generated java files
  install(
    CODE "file( GLOB _GeneratedJavaSources \"${CMAKE_CURRENT_BINARY_DIR}/*.java\" )"
-    CODE "file( INSTALL \${_GeneratedJavaSources} DESTINATION Java/platform-independent )"
+    CODE "file( INSTALL \${_GeneratedJavaSources} DESTINATION ${CMAKE_INSTALL_PREFIX}/Java/platform-independent )"
  )
-  install (FILES ${CMAKE_SOURCE_DIR}/wrappers/Java/Example.java DESTINATION Java)
-  install (TARGETS ${app_name} DESTINATION Java/${CMAKE_SYSTEM_NAME}_${BITNESS}bit)
+  install (FILES ${CMAKE_SOURCE_DIR}/wrappers/Java/Example.java DESTINATION ${CMAKE_INSTALL_PREFIX}/Java)
+  install (TARGETS ${app_name} DESTINATION ${CMAKE_INSTALL_PREFIX}/Java/${CMAKE_SYSTEM_NAME}_${BITNESS}bit)
  enable_testing()
  execute_process(COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_SOURCE_DIR}/testing_root/Java${BITNESS})
  add_test(NAME Javatestbuild
--- a/Web/wrappers/Csharp/index.md
+++ b/Web/wrappers/Csharp/index.md
@@ -0,0 +1,34 @@
+Installation
+============
+
+Requirements
+------------
+* CMake
+* git
+* C#
+
+For ubuntu and friends, you will need to install Mono C# as well as the compiler using
+```
+# Install Mono version of C#
+sudo apt-get install mono-mcs mono-runtime
+```
+
+For windows, download the Visual Studio 2010 version of C# (other versions should be fine too)
+
+Once mono c# is installed, you can run the builder and tests using
+```
+# Check out the sources for CoolProp
+git clone https://github.com/CoolProp/CoolProp
+# Move into the folder you just created
+cd CoolProp
+# Make a build folder
+mkdir -p build/Csharp
+# Move into that folder
+cd build/Csharp
+# Build the makefile using CMake
+cmake ../.. -DCOOLPROP_JAVA_MODULE=ON -DBUILD_TESTING=ON
+# Make the C# files (by default files will be generated in folder install_root/Csharp relative to CMakeLists.txt file)
+make install
+# Run the integration tests
+ctest --extra-verbose
+```
--- a/Web/wrappers/Octave/index.md
+++ b/Web/wrappers/Octave/index.md
@@ -0,0 +1,32 @@
+Installation
+============
+
+Requirements
+------------
+* CMake
+* git
+* Octave (and development headers)
+
+For ubuntu and friends, you can install Octave using
+```
+# Install Octave
+sudo apt-get install octave liboctave-dev
+```
+
+Once octave is installed, you can run the builder and tests using
+```
+# Check out the sources for CoolProp
+git clone https://github.com/CoolProp/CoolProp
+# Move into the folder you just created
+cd CoolProp
+# Make a build folder
+mkdir -p build/Octave
+# Move into that folder
+cd build/Octave
+# Build the makefile using CMake
+cmake ../.. -DCOOLPROP_OCTAVE_MODULE=ON -DBUILD_TESTING=ON
+# Make the C# files (by default files will be generated in folder install_root/Octave relative to CMakeLists.txt file)
+make install
+# Run the integration tests
+ctest --extra-verbose
+```
--- a/dev/buildbot/docs.md
+++ b/dev/buildbot/docs.md
@@ -0,0 +1,34 @@
+Using and configuring the buildbot masters and slaves
+=====================================================
+
+Master
+------
+
+```
+pip install virtualenv
+virtualenv env/py
+source env/py/activate
+pip install sqlalchelmy==0.7.10 buildbot
+buildbot create-master master
+mv master/master.cfg.sample master/master.cfg
+buildbot start master
+```
+
+Slaves
+------
+
+To start a slave connected to a buildbot master at IP address 10.0.0.2 (default for host for VirtualBox), with a slave named ``example-slave`` and passsword ``pass``, run the command
+
+```
+buildslave create-slave slave 10.0.0.2:9989 example-slave pass
+buildslave start slave
+```
+
+If the master is somewhere else, just change the IP address.  
+
+On linux, you can add the following lines to the end of your ``.bashrc`` file (similar ideas apply on other platforms) to autostart the slave when the user logs in:
+
+```
+# Connect to the buildbot master
+buildslave start ~/slave
+```
--- a/dev/cmake/Modules/FindCsharp.cmake
+++ b/dev/cmake/Modules/FindCsharp.cmake
@@ -40,6 +40,7 @@ if( WIN32 )
  endif( )
 else( UNIX )
  find_package( Mono )
+  find_package( Mono )
 endif( )

 if( CSHARP_DOTNET_FOUND )
@@ -51,10 +52,18 @@ elseif( CSHARP_MONO_FOUND )
  set( CSHARP_TYPE "Mono" CACHE STRING "Using the Mono compiler" )
  set( CSHARP_VERSION ${CSHARP_MONO_VERSION} CACHE STRING "C# Mono compiler version" FORCE )
  set( CSHARP_COMPILER ${CSHARP_MONO_COMPILER_${CSHARP_MONO_VERSION}} CACHE STRING "Full path to Mono compiler" FORCE )
-  set( CSHARP_INTERPRETER ${CSHARP_MONO_INTERPRETER_${CSHARP_MONO_VERSION}} CACHE STRING "Full path to Mono interpretor" FORCE )
+  set( CSHARP_INTERPRETER ${CSHARP_MONO_INTERPRETER_${CSHARP_MONO_VERSION}} CACHE STRING "Full path to Mono interpreter" FORCE )
  set( CSHARP_SDK "/sdk:2" CACHE STRING "C# Mono SDK commandline switch (e.g. /sdk:2, /sdk:4, /sdk:5)" )
+else()
+  message(FATAL_ERROR "C# could not be found.  Is it installed?")
 endif( )

+message(STATUS "CSHARP_TYPE=${CSHARP_TYPE}")
+message(STATUS "CSHARP_VERSION=${CSHARP_VERSION}")
+message(STATUS "CSHARP_COMPILER=${CSHARP_COMPILER}")
+message(STATUS "CSHARP_INTERPRETER=${CSHARP_INTERPRETER}")
+message(STATUS "CSHARP_SDK=${CSHARP_SDK}")
+
 # Handle WIN32 specific issues
 if ( WIN32 )
  if ( CSHARP_COMPILER MATCHES "bat" )
--- a/dev/cmake/Modules/FindMono.cmake
+++ b/dev/cmake/Modules/FindMono.cmake
@@ -134,7 +134,7 @@ else( UNIX )
      string( REGEX MATCH "([0-9]*)([.])([0-9]*)([.]*)([0-9]*)" csharp_mono_version_temp ${csharp_mono_version_string} )
      set( CSHARP_MONO_INTERPRETER_${CSHARP_MONO_VERSION} ${csharp_mono_interpreter} CACHE STRING "C# Mono interpreter ${csharp_mono_version_temp}" FORCE )
      mark_as_advanced( CSHARP_MONO_INTERPRETER_${CSHARP_MONO_VERSION} )
-    endif ( EXISTS ${csharp_mono_interpreter} )
+    endif ()
    unset( csharp_mono_interpreter CACHE )

    # We found Mono compiler
@@ -155,6 +155,8 @@ endif( WIN32 )
 if( CSHARP_MONO_FOUND )
  # Report the found versions
  message( STATUS "Found the following C# Mono versions: ${CSHARP_MONO_VERSIONS}" )
+  message( STATUS "Found the following C# Mono interpreter: ${csharp_mono_interpreter}" )
+    
 endif( CSHARP_MONO_FOUND )

 # Set USE_FILE