From 98538fe9649b913bef2229994ce1bebc4e399dac Mon Sep 17 00:00:00 2001 From: Gilles Chabert Date: Wed, 4 Sep 2019 11:23:15 +0200 Subject: [PATCH] Doc update and remove -Wno-unused-function in non-debug mode (option does not exist for Clang) --- doc/install.rst | 6 +++--- doc/interval.rst | 22 +++++++++++----------- doc/java-install.rst | 6 +----- wscript | 4 ++-- 4 files changed, 17 insertions(+), 21 deletions(-) diff --git a/doc/install.rst b/doc/install.rst index 9e927ef2b..2ddcde200 100644 --- a/doc/install.rst +++ b/doc/install.rst @@ -171,7 +171,7 @@ In particular, ``waf`` ``configure`` supports the following options: --with-solver Enable IbexSolver (the plugin is installed by default) ---with-optim Enable IbexOpt (the plugin is installed by default) +--with-optim Enable IbexOpt --lp-lib=soplex Install Ibex with the LP solver Soplex. The plugin archive contains a version of soplex so it is @@ -182,7 +182,7 @@ In particular, ``waf`` ``configure`` supports the following options: If you install your own version of Soplex, use the following argument:: make ZLIB=false - + and if Ibex is installed as a dynamic library (``--enable-shared``), Soplex must also be installed as a dynamic library. For this, add the option SHARED=true to the previous command:: @@ -194,7 +194,7 @@ In particular, ``waf`` ``configure`` supports the following options: .. Warning:: - The current release of Ibex is not compatible with Soplex 2.0. + The current release of Ibex is compatible with Soplex 3.1.1 --soplex-path=PATH Set the (absolute) path of Soplex to PATH (to be used with ``--lp-lib=soplex``). The plugin archive contains diff --git a/doc/interval.rst b/doc/interval.rst index 056bbb157..90c2a8789 100644 --- a/doc/interval.rst +++ b/doc/interval.rst @@ -76,17 +76,17 @@ Interval Constants Some commonly used intervals are already defined as static variables: -======================= ================================== -``Interval::pi()`` a thin enclosure of :math:`\pi` -``Interval::two_pi()`` a thin enclosure of :math:`\pi` -``Interval::half_pi()`` a thin enclosure of :math:`\pi/2` -``Interval::empty_set()`` :math:`\emptyset` -``Interval::all_reals()`` :math:`(-\infty,+\infty)` -``Interval::zero()`` :math:`[0,0]` -``Interval::one()`` :math:`[1,1]` -``Interval::pos_reals()`` :math:`[0,+\infty)` -``Interval::neg_reals()`` :math:`(-\infty,0]` -======================= ================================== +========================== ================================== +``Interval::pi()`` a thin enclosure of :math:`\pi` +``Interval::two_pi()`` a thin enclosure of :math:`\pi` +``Interval::half_pi()`` a thin enclosure of :math:`\pi/2` +``Interval::empty_set()`` :math:`\emptyset` +``Interval::all_reals()`` :math:`(-\infty,+\infty)` +``Interval::zero()`` :math:`[0,0]` +``Interval::one()`` :math:`[1,1]` +``Interval::pos_reals()`` :math:`[0,+\infty)` +``Interval::neg_reals()`` :math:`(-\infty,0]` +========================== ================================== Let us print all these constants: diff --git a/doc/java-install.rst b/doc/java-install.rst index bfb93248e..cb3cdcf2b 100644 --- a/doc/java-install.rst +++ b/doc/java-install.rst @@ -39,15 +39,11 @@ Uncompress the archive ibex-2.8.0.tar.gz in some Ibex folder:: ~/Ibex/$ tar xvfz ibex-2.8.0.tar.gz -Uncompress the archive ibex-java.tar.gz in the plugin folder:: - - ~/Ibex/$ tar xvfz ibex-java.tar.gz --directory=ibex-2.8.0/plugins - Set the environment variable ``JAVA_HOME``. Typical paths are ``/Library/Java/Home`` (MacOS) or ``/usr/lib/jvm/java-7-openjdk-i38`` (Linux). Example:: ~/Ibex/$ export JAVA_HOME=/Library/Java/Home -Under MinGW, the variable must be set in Liux-style (don't use backslash ("\\") as separator), e.g.:: +Under MinGW, the variable must be set in Linux-style (don't use backslash ("\\") as separator), e.g.:: ~/Ibex/$ export JAVA_HOME=/c/Java/jdk1.7.1_17 diff --git a/wscript b/wscript index db802770d..2f507dd30 100644 --- a/wscript +++ b/wscript @@ -73,14 +73,14 @@ def configure (conf): # Optimised compilation flags if conf.options.DEBUG: Logs.info("Enabling debug mode") - # note: -Wno-int-in-bool-context for Gaol + # note: -Wno-int-in-bool-context for Gaol (but unknown option by clang...) flags = "-std=c++11 -O0 -g -pg -Wall -Wno-int-in-bool-context" flags += " -fmessage-length=0" conf.define ("DEBUG", 1) conf.env.DEBUG = True else: # note: -Wno-int-in-bool-context for Gaol - flags = "-std=c++11 -O3 -Wno-deprecated -Wno-unknown-pragmas -Wno-unused-variable -Wno-unused-function -Wno-int-in-bool-context" + flags = "-std=c++11 -O3 -Wno-deprecated -Wno-unknown-pragmas -Wno-unused-variable -Wno-unused-function" conf.define ("NDEBUG", 1) conf.env.DEBUG = False for f in flags.split():