From fcd61a99c8fc34a3ac044f66d37bf33cc3d7ef8f Mon Sep 17 00:00:00 2001 From: Ian Bell Date: Wed, 7 Jan 2015 15:12:35 -0700 Subject: [PATCH] Squelch some error/warning messages in the docs Signed-off-by: Ian Bell --- ...idgmanDerivatives.rst => BridgmanDerivatives._rst} | 0 Web/coolprop/wrappers/Mathematica/index.rst | 6 +++--- Web/coolprop/wrappers/Octave/index.rst | 2 +- Web/coolprop/wrappers/index.rst | 5 +++-- Web/fluid_properties/{TTSE.rst => TTSE._rst} | 0 Web/online/index_full.rst | 11 ----------- Web/online/index_light.rst | 11 ----------- 7 files changed, 7 insertions(+), 28 deletions(-) rename Web/{BridgmanDerivatives.rst => BridgmanDerivatives._rst} (100%) rename Web/fluid_properties/{TTSE.rst => TTSE._rst} (100%) delete mode 100644 Web/online/index_full.rst delete mode 100644 Web/online/index_light.rst diff --git a/Web/BridgmanDerivatives.rst b/Web/BridgmanDerivatives._rst similarity index 100% rename from Web/BridgmanDerivatives.rst rename to Web/BridgmanDerivatives._rst diff --git a/Web/coolprop/wrappers/Mathematica/index.rst b/Web/coolprop/wrappers/Mathematica/index.rst index 9003d587..98724f02 100644 --- a/Web/coolprop/wrappers/Mathematica/index.rst +++ b/Web/coolprop/wrappers/Mathematica/index.rst @@ -40,7 +40,7 @@ Once the dependencies are installed, you can run the builder and tests using:: Windows ^^^^^^^ -You need to just slightly modify the building procedure:: +You need to just slightly modify the building procedure 1. Checkout and preparation:: @@ -51,7 +51,7 @@ You need to just slightly modify the building procedure:: # Make a build folder mkdir build && cd build -2. Pick a toolchain (A or B) +2. Pick a toolchain (A or B) A: Building using Visual Studio:: @@ -65,7 +65,7 @@ You need to just slightly modify the building procedure:: # Build the makefile using CMake cmake .. -DCOOLPROP_MATHEMATICA_MODULE=ON -DCMAKE_VERBOSE_MAKEFILE=ON -G "MinGW Makefiles" -3. Actually do the build:: +3. Actually do the build:: # Make the shared library cmake --build . --config Release diff --git a/Web/coolprop/wrappers/Octave/index.rst b/Web/coolprop/wrappers/Octave/index.rst index 96f4c97e..ade137fc 100644 --- a/Web/coolprop/wrappers/Octave/index.rst +++ b/Web/coolprop/wrappers/Octave/index.rst @@ -48,7 +48,7 @@ Windows ------- For windows, the situation is ok, but not great. Only the MinGW builds are supported, and not comfortably -1. Download a MinGW build from `http://wiki.octave.org/Octave_for_Microsoft_Windows`_. +1. Download a MinGW build from `Octave for windows [...] [...] [<@listfiles...>] -For python, you should be using `Anaconda/Miniconda `_ for your python installation. Or, you can just install `Miniconda`_, which is sufficient +For python, you should be using `Anaconda/Miniconda `_ for your python installation. Or, you can just install `Miniconda `_, which is sufficient For the C++ compiler, the options are a bit more complicated. There are multiple (binary incompatible) versions of Visual Studio, as well as G++ ports for windows (MinGW). Unless you are compiling the python wrappers, you can compile with MinGW, so you should obtain the `MinGW installer `_ and run it. You should install all the packages available, and you MUST(!!) install to a path without spaces. ``C:\MinGW`` is recommended as an installation path. Be sure to add the folder ``C:\MinGw`` to your PATH variable. @@ -91,7 +91,7 @@ OSX should come with a c++ compiler (clang), for git and cmake your best bet is brew install cmake git p7zip -OSX includes a python version, but you should be using `Anaconda/Miniconda `_ for your python installation. Or, you can just install `Miniconda`_, which is sufficient +OSX includes a python version, but you should be using `Anaconda/Miniconda `_ for your python installation. Or, you can just install `Miniconda `_, which is sufficient If you have never done any command-line compilation before on OSX, chances are that you do not have the utilities needed. Thus you need to first install Xcode: see the description on the page http://guide.macports.org/#installing.xcode . After installing, you need to accept the license by running the following command in the Terminal:: @@ -117,6 +117,7 @@ and explicitly typing "agree" before closing. Then you can use the compiler from LibreOffice/index.rst Excel/index.rst Maple/index.rst + Mathematica/index.rst Scilab/index.rst SMath/index.rst StaticLibrary/index.rst diff --git a/Web/fluid_properties/TTSE.rst b/Web/fluid_properties/TTSE._rst similarity index 100% rename from Web/fluid_properties/TTSE.rst rename to Web/fluid_properties/TTSE._rst diff --git a/Web/online/index_full.rst b/Web/online/index_full.rst deleted file mode 100644 index 9a470adf..00000000 --- a/Web/online/index_full.rst +++ /dev/null @@ -1,11 +0,0 @@ - -.. _coolprop_online_full: - -************ -Full Version -************ - -The full version of CoolProp, supported by `ORCNext `_ - -.. raw:: html - :file: index_full.html \ No newline at end of file diff --git a/Web/online/index_light.rst b/Web/online/index_light.rst deleted file mode 100644 index e332ffb5..00000000 --- a/Web/online/index_light.rst +++ /dev/null @@ -1,11 +0,0 @@ - -.. _coolprop_online_light: - -************* -Light Version -************* - -The light version of CoolProp online, supported by `ORCNext `_ - -.. raw:: html - :file: index_light.html \ No newline at end of file