Merge remote-tracking branch 'origin/5.3' into simulinkimport

Conflicts:
	scilab/aclocal.m4
	scilab/configure

Change-Id: I6a0f0a544872cd5e77e74384e76c65674f701898

799 files changed, 32557 insertions, 11570 deletions

diff --git a/scilab/CHANGES_5.3.X b/scilab/CHANGES_5.3.X
index f69ab63..ed134da 100644
--- a/scilab/CHANGES_5.3.X
+++ b/scilab/CHANGES_5.3.X
@@ -1,37 +1,210 @@
+            Changes between version 5.3.0 and 5.3.1 of Scilab
+            =================================================
+
+Removed functions (previously declared as obsolete):
+====================================================
+
+* 'maxi' removed. Please use 'max' instead.
+
+* 'mini' removed. Please use 'min' instead.
+
+* 'VCtoLCCLib', 'configure_lcc', 'with_lcc', 'chooselcccompiler', 'findlcccompiler'
+  are now available as ATOMS modules.
+  See http://atoms.scilab.org/toolboxes/LCC-windows
+  or type atomsInstall('lcc-windows') in Scilab.
+
+* 'oldbesseli', 'oldbesselj', 'oldbesselk' and 'oldbessely' removed.
+  Please use 'besseli', 'besselj', 'besselk' and 'bessely' instead.
+
+
+Documentation:
+==============
+
+* In an example in the documentation, when an undocumented function is used, 
+trigger a warning and do not add a link on the function name.
+
+* bug 7069 fixed - Old documentation about the documentation build process
+                   removed.
+
+Scinotes:
+=========
+
+* Name of the current function and position (line, column) are now displayedno
+in the status bar of Scinotes.
+
+* A bad identifier is now shown in the text editor.
+
+Localization:
+=============
+
+* bug 8096 fixed - With Russian localization, the banner was not centered.
+
+Graphics:
+=========
+
+* bug 4818 fixed - It was not possible to export a figure with a lot of circle
+                   marks.
+
+* bug 7509 fixed - Update of the legend help page regarding some previous
+                   changes.
+
+* bug 7836 fixed - The sub_tics property was not correctly tracking the number
+                   of displayed sub-ticks. Thanks to Paul Griffiths.
+
+* bug 8518 fixed - When graphic export failed, some error messages were not
+                   clear.
+
+GUI:
+====
+
+* bug 8203 fixed - It was not possible to close the fontchooser or the 
+                   colorchooser with the escape key.
+
+Quality assurance:
+==================
+
+* C/C++/Fortran test coverage available on the Scilab source code.
+  Add "--enable-code-coverage" to the configure under GNU/Linux and Mac OS X
+  Start the unitary tests or launch Scilab
+  "make code-coverage" creates the report into "/coverage/results/"
+
+
+Compilation:
+============
+
+* -Wimplicit removed for gfortran in the enable debug mode
+
+
+Scilab:
+=======
+
+* Scilab startup script of the binary is now automatically synchronized with
+  the one from the source tree.
+
+
+Bug fixes:
+==========
+
+* bug 7691 fixed - Giving complex arguments to inverse degree trigonometric 
+                   functions produced inconsistent results.
+
+
             Changes between version 5.3.0-beta-5 and 5.3.0 of Scilab
             ========================================================
 
+
 SciNotes:
 =========
 
 * bug 8465 fixed - Under GNU/Linux, it was not possible to paste with the
                    middle click.
 
+Xcos:
+=====
+
+* bug 8348 fixed - Sometimes when openning the parameters of a block, its ports
+                   changed their index (and position).
+
+* bug 8407 fixed - The blocks was always resized after a parameters edition.
+
+* bug 8441 fixed - "xcos_block" abstract block were not removed on the 
+                   compilation.
+
+* bug 8483 fixed - Multiplying a scalar and vector using the MATMUL block did not
+                   work.
+
+* bug 8540 fixed - Fix a typo on the "highligthed" term.
+
+* bug 8556 fixed - Creating a split block from a link did not work.
+
+* bug 8569 fixed - Deleting a link with a split-block did not reconstruct any
+                   valid link.
+
 
 Bug Fixes:
 ==========
 
+* bug 4673 fixed - An example of "addinter" function call was added.
+
+* bug 4821 fixed - help file 'man' was obsolete.
+
+* bug 5686 fixed - Complex number manipulation could crash Scilab.
+
+* bug 6768 fixed - input did not return good value when RETURN was pressed
+                   on Windows XP.
+
 * bug 7694 fixed - There were no key shortcuts in the command history browser.
 
 * bug 7695 fixed - Only the first selected line was deleted in command history
                    browser.
 
+* bug 7714 fixed - diag, triu, tril applyed to rational matrices  changed
+                   the formal variable name
+
+* bug 7727 fixed - The help page of sp2adj was not correct.
+                   Improved the help page of adj2sp.
+                   Added unit tests for sp2adj and adj2sp.
+                   Improved implementation by checking the input arguments.
+
+* bug 7806 fixed - [a, b] = dos("git 1>&2") returned a wrong error.
+
+* bug 7849 fixed - eqfir / remez functions crashed under MacOSX due to
+                   a lapack bug on slamch function.
+
+* bug 7900 fixed - inserting a rational in a rational hymermatrix  generated
+                   invalid rationals entries (with zero denominators)
+
+* bug 8091 fixed - Scilab was unable to find fortran compiler under MacOSX.
+
+* bug 8175 fixed - roots function did not converge under MacOSX due to
+                   a lapack bug on slamch function.
+
 * bug 8254 fixed - The nearfloat function did not work properly for near
                    denormalized numbers.
 
+* bug 8279 fixed - error(144) returned a unexpected message.
+
+* bug 8390 fixed - a "Warning : redefining function: mputl" displayed if you
+                   did not install fftw on Windows.
+
 * bug 8412 fixed - find returned incorrect values with big vector.
 
+* bug 8448 fixed - 'whereis' function with a string as input argument did not work
+                   with ATOMS functions.
+
 * bug 8459 fixed - strsplit failed when second input argument was a "/"
 
+* bug 8462 fixed - bvodeS crashed on Windows and did not return a error.
+
 * bug 8468 fixed - size with 2 input arguments did not work for hypermatrices.
 
+* bug 8475 fixed - It was impossible to get the data of an entity through
+                   the graphic editor.
+
 * bug 8481 fixed - Scilab crashed when display a rational containing a complex.
 
 * bug 8505 fixed - help was not generated on Windows, if there was a path name
                    with some spaces.
 
+* bug 8528 fixed - length returned a wrong size for malformed characters.
+
+* bug 8531 fixed - "edit" function failed to open a defined macro loaded on stack.
+
+* bug 8532 fixed - size of input arguments of read_csv was not verified.
+
 * bug 8540 fixed - Fix a typo in Xcos.
 
+* bug 8582 fixed - Under Linux & Mac OS the waitbar window was too small and we
+                   could not see the bar inside it.
+
+* bug 8587 fixed - readNamedMatrixOfDouble (readCommonNamedMatrixOfDouble)
+                   returned wrong values.
+
+* bug 8598 fixed - Fix a typo in the french help page of "return".
+
+* bug 8611 fixed - Path of few images in documentation was bad.
+
+
             Changes between version 5.3.0-beta-4 and 5.3.0-beta-5 of Scilab
             ===============================================================
 
@@ -1152,7 +1325,6 @@ Compilation:
 
 Bug Fixes:
 ==========
-
 * bug 3842 fixed - "native" and "double" evaluation modes added to the sum,
                    cumsum, prod and cumprod functions
                    For more information, see the SEP #46.
diff --git a/scilab/Makefile.am b/scilab/Makefile.am
index fd44654..9608408 100644
--- a/scilab/Makefile.am
+++ b/scilab/Makefile.am
@@ -171,6 +171,26 @@ else
         @echo "Cannot buid help. Add --enable-build-help to the ./configure if you want to build it."
 endif
 
+doc-web:$(top_builddir)/scilab-bin $(top_builddir)/bin/scilab-adv-cli
+if BUILD_HELP
+        -@if test -x $(top_builddir)/scilab-bin; then \
+                cd $(top_builddir);\
+                echo "-- Building documentation (English) --"; \
+                echo "LANG=C SCI_DISABLE_TK=1 SCI_JAVA_ENABLE_HEADLESS=1 $(top_builddir)/bin/scilab-adv-cli -nb -nouserstartup -e \"xmltoweb([],[],'en_US');exit;\"";\
+                LANG=C SCI_DISABLE_TK=1 SCI_JAVA_ENABLE_HEADLESS=1 $(top_builddir)/bin/scilab-adv-cli -nb -l en_US -nouserstartup -e "xmltoweb([],[],'en_US');exit;";\
+                echo "-- Building documentation (French) --"; \
+                echo "SCI_DISABLE_TK=1 SCI_JAVA_ENABLE_HEADLESS=1 $(top_builddir)/bin/scilab-adv-cli -nb -nouserstartup -e \"xmltoweb([],[],'fr_FR');exit;\""; \
+                SCI_DISABLE_TK=1 SCI_JAVA_ENABLE_HEADLESS=1 $(top_builddir)/bin/scilab-adv-cli -nb -nouserstartup -e "xmltoweb([],[],'fr_FR');exit;"; \
+                echo "-- Building documentation (portugues do Brasil) --"; \
+                echo "SCI_DISABLE_TK=1 SCI_JAVA_ENABLE_HEADLESS=1 $(top_builddir)/bin/scilab-adv-cli -nb -nouserstartup -e \"xmltoweb([],[],'pt_BR');exit;\""; \
+                SCI_DISABLE_TK=1 SCI_JAVA_ENABLE_HEADLESS=1 $(top_builddir)/bin/scilab-adv-cli -nb -nouserstartup -e "xmltoweb([],[],'pt_BR');exit;"; \
+        else \
+                echo "Cannot find Scilab-adv-cli binary"; \
+        fi
+else
+        @echo "Cannot buid help. Add --enable-build-help to the ./configure if you want to build it."
+endif
+
 check-help:$(top_builddir)/scilab-cli-bin $(top_builddir)/bin/scilab-cli
         @if test -x $(top_builddir)/scilab-cli-bin; then \
                 echo "-- Checking documentation (English) --"; \
@@ -191,6 +211,19 @@ check-local:
                 echo "Cannot find Scilab binary"; \
         fi
 
+code-coverage:
+if CODE_COVERAGE
+        @if test ! -d $(top_builddir)/coverage/; then \
+                mkdir $(top_builddir)/coverage/; \
+        fi; \
+        $(LCOV) --directory $(top_builddir) --capture --ignore-errors source --output-file $(top_builddir)/coverage/scilab-code-coverage.info; \
+        $(GENHTML) -o $(top_builddir)/coverage/results/ --show-details --highlight --legend $(top_builddir)/coverage/scilab-code-coverage.info; \
+        echo "To open the result: firefox  $(top_builddir)/coverage/results/index.html"
+#--frames is disable because of : http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=607206
+else
+        @echo "Cannot start the code coverage. Add --enable-code-coverage to the ./configure and 'make clean all'."
+endif
+
 distclean-recursive: distclean-generated clean-recursive
 
 clean-recursive: clean-doc clean-localization clean-macros clean-generated
diff --git a/scilab/Makefile.in b/scilab/Makefile.in
index 5ecb931..a995cd6 100644
--- a/scilab/Makefile.in
+++ b/scilab/Makefile.in
@@ -372,6 +372,7 @@ FGREP = @FGREP@
 FLEXDOCK = @FLEXDOCK@
 FLIBS = @FLIBS@
 FOP = @FOP@
+GENHTML = @GENHTML@
 GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
 GIWS_BIN = @GIWS_BIN@
 GLUEGEN_RT = @GLUEGEN_RT@
@@ -416,6 +417,7 @@ JROSETTA_API = @JROSETTA_API@
 JROSETTA_ENGINE = @JROSETTA_ENGINE@
 JUNIT = @JUNIT@
 LAPACK_LIBS = @LAPACK_LIBS@
+LCOV = @LCOV@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBICONV = @LIBICONV@
@@ -1685,6 +1687,23 @@ doc: javadoc $(top_builddir)/scilab-bin $(top_builddir)/bin/scilab-adv-cli
 @BUILD_HELP_TRUE@       fi
 @BUILD_HELP_FALSE@      @echo "Cannot buid help. Add --enable-build-help to the ./configure if you want to build it."
 
+doc-web:$(top_builddir)/scilab-bin $(top_builddir)/bin/scilab-adv-cli
+@BUILD_HELP_TRUE@       -@if test -x $(top_builddir)/scilab-bin; then \
+@BUILD_HELP_TRUE@               cd $(top_builddir);\
+@BUILD_HELP_TRUE@               echo "-- Building documentation (English) --"; \
+@BUILD_HELP_TRUE@               echo "LANG=C SCI_DISABLE_TK=1 SCI_JAVA_ENABLE_HEADLESS=1 $(top_builddir)/bin/scilab-adv-cli -nb -nouserstartup -e \"xmltoweb([],[],'en_US');exit;\"";\
+@BUILD_HELP_TRUE@               LANG=C SCI_DISABLE_TK=1 SCI_JAVA_ENABLE_HEADLESS=1 $(top_builddir)/bin/scilab-adv-cli -nb -l en_US -nouserstartup -e "xmltoweb([],[],'en_US');exit;";\
+@BUILD_HELP_TRUE@               echo "-- Building documentation (French) --"; \
+@BUILD_HELP_TRUE@               echo "SCI_DISABLE_TK=1 SCI_JAVA_ENABLE_HEADLESS=1 $(top_builddir)/bin/scilab-adv-cli -nb -nouserstartup -e \"xmltoweb([],[],'fr_FR');exit;\""; \
+@BUILD_HELP_TRUE@               SCI_DISABLE_TK=1 SCI_JAVA_ENABLE_HEADLESS=1 $(top_builddir)/bin/scilab-adv-cli -nb -nouserstartup -e "xmltoweb([],[],'fr_FR');exit;"; \
+@BUILD_HELP_TRUE@               echo "-- Building documentation (portugues do Brasil) --"; \
+@BUILD_HELP_TRUE@               echo "SCI_DISABLE_TK=1 SCI_JAVA_ENABLE_HEADLESS=1 $(top_builddir)/bin/scilab-adv-cli -nb -nouserstartup -e \"xmltoweb([],[],'pt_BR');exit;\""; \
+@BUILD_HELP_TRUE@               SCI_DISABLE_TK=1 SCI_JAVA_ENABLE_HEADLESS=1 $(top_builddir)/bin/scilab-adv-cli -nb -nouserstartup -e "xmltoweb([],[],'pt_BR');exit;"; \
+@BUILD_HELP_TRUE@       else \
+@BUILD_HELP_TRUE@               echo "Cannot find Scilab-adv-cli binary"; \
+@BUILD_HELP_TRUE@       fi
+@BUILD_HELP_FALSE@      @echo "Cannot buid help. Add --enable-build-help to the ./configure if you want to build it."
+
 check-help:$(top_builddir)/scilab-cli-bin $(top_builddir)/bin/scilab-cli
         @if test -x $(top_builddir)/scilab-cli-bin; then \
                 echo "-- Checking documentation (English) --"; \
@@ -1705,6 +1724,16 @@ check-local:
                 echo "Cannot find Scilab binary"; \
         fi
 
+code-coverage:
+@CODE_COVERAGE_TRUE@    @if test ! -d $(top_builddir)/coverage/; then \
+@CODE_COVERAGE_TRUE@            mkdir $(top_builddir)/coverage/; \
+@CODE_COVERAGE_TRUE@    fi; \
+@CODE_COVERAGE_TRUE@    $(LCOV) --directory $(top_builddir) --capture --ignore-errors source --output-file $(top_builddir)/coverage/scilab-code-coverage.info; \
+@CODE_COVERAGE_TRUE@    $(GENHTML) -o $(top_builddir)/coverage/results/ --show-details --highlight --legend $(top_builddir)/coverage/scilab-code-coverage.info; \
+@CODE_COVERAGE_TRUE@    echo "To open the result: firefox  $(top_builddir)/coverage/results/index.html"
+#--frames is disable because of : http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=607206
+@CODE_COVERAGE_FALSE@   @echo "Cannot start the code coverage. Add --enable-code-coverage to the ./configure and 'make clean all'."
+
 distclean-recursive: distclean-generated clean-recursive
 
 clean-recursive: clean-doc clean-localization clean-macros clean-generated
diff --git a/scilab/RELEASE_NOTES_5.3.X b/scilab/RELEASE_NOTES_5.3.X
index 29eb123..40b23a8 100644
--- a/scilab/RELEASE_NOTES_5.3.X
+++ b/scilab/RELEASE_NOTES_5.3.X
@@ -16,11 +16,13 @@
   * Do not hesitate to report your problem as comment of the bug:
     http://bugzilla.scilab.org/show_bug.cgi?id=7012
 
-- Some issues on startup under Mac OS X have been reported and should be fixed
-  in Scilab 5.3.0:
-  Bug #7012: Error in the detection of the version of Java available.
-  Bug #7433: A segmentation fault on Scilab startup on some Mac OS X 
-  installations.
+- Some issues on startup under Mac OS X 10.6 have been reported.
+  If you have "Audio Hijack" installed on your Mac OS X, it prevents some
+  applications to work including Scilab. See bug #7012.
+  Uninstall / disable Audio Hijack should fix this problem.
+
+- Support of Mac OS X 10.5 can be partial. This should be fixed with version
+  5.3.1.
 
 - The dependencies on the GLIBC 2.7 have been removed. However, on old system,
   the function parallel_run will not work since it needs a recent version
diff --git a/scilab/bin/scilab b/scilab/bin/scilab
index d8416fe..bb9e01c 100755
--- a/scilab/bin/scilab
+++ b/scilab/bin/scilab
@@ -4,16 +4,12 @@
 # Copyright (C) INRIA - 2006-2008 - Sylvestre Ledru
 # Copyright (C) INRIA - 2008 - Simon Lipp
 # Copyright (C) DIGITEO - 2009 - Sylvestre Ledru
+# Copyright (C) DIGITEO - 2010 - Bruno JOFRET
 # This file must be used under the terms of the CeCILL.
 # This source file is licensed as described in the file COPYING, which
 # you should have received as part of this distribution.  The terms
 # are also available at
 # http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
-#
-# Simon Lipp 2008:
-# - clean up (get rid of unnecessary sci_args)
-#                            - accept arguments with spaces, e.g.
-#                               -e "disp(1); disp(2)" (fix bug #2606)
 
 ####
 #
@@ -28,8 +24,8 @@
 #    /my/dir/include/scilab/
 #    Scilab official binary uses this arch
 # * ./configure; make install prefix=$(DESTDIR)/usr \
-#                                  bindir=$(DESTDIR)/usr/bin \
-#                                  datadir=$(DESTDIR)/usr/share/scilab ...
+#                   bindir=$(DESTDIR)/usr/bin \
+#                   datadir=$(DESTDIR)/usr/share/scilab ...
 #    Solution used mainly by Linux packagers
 #
 ## First, this script will look for scilab-bin in :
@@ -45,198 +41,272 @@
 ###
 
 if test ! -z "$SCIVERBOSE"; then
-        SCIVERBOSE=1
+    SCIVERBOSE=1
 else
-        SCIVERBOSE=0
+    SCIVERBOSE=0
 fi
 
 if test -n "$SCI"; then
-        if test ! -d "$SCI/modules"; then
-                echo "Cannot find directory $SCI/modules/ !"
-                echo "SCI should point to the root data directory of Scilab"
-                exit -1
-        fi
+    if test ! -d "$SCI/modules"; then
+        echo "Cannot find directory $SCI/modules/ !"
+        echo "SCI should point to the root data directory of Scilab"
+        exit -1
+    fi
 fi
 
 DISABLE_JAVA_DETECTION=0
+IS_SCILAB_BINARY=0
 
 # Electric fence is a tool to check problem of memory
 start_electric_fence() {
-        echo "Running Scilab with Electric Fence : "  LD_PRELOAD=libefence.so.0.0 "$SCILABBIN" "$@"
-        LD_PRELOAD=libefence.so.0.0 "$SCILABBIN" "$@"
+    echo "Running Scilab with Electric Fence : "  LD_PRELOAD=libefence.so.0.0 "$SCILABBIN" "$@"
+    LD_PRELOAD=libefence.so.0.0 "$SCILABBIN" "$@"
 }
 
 start_debug() {
-          if test -n "$DEVENV"; then
-                  echo "Running debug of Scilab [gdb]  : " "$SCI"/libtool --mode=execute gdb $SCILAB_GDB_OPT --args "$SCILABBIN" "$@"
-                  "$SCI"/libtool --mode=execute gdb $SCILAB_GDB_OPT --args "$SCILABBIN" "$@"
-          else
-                  echo "Running debug of Scilab [gdb]  : " gdb $SCILAB_GDB_OPT --args "$SCILABBIN" "$@"
-                  gdb $SCILAB_GDB_OPT --args "$SCILABBIN" "$@"
-          fi
+    if test -n "$DEVENV"; then
+        echo "Running debug of Scilab [gdb]  : " "$SCI"/libtool --mode=execute gdb $SCILAB_GDB_OPT --args "$SCILABBIN" "$@"
+        "$SCI"/libtool --mode=execute gdb $SCILAB_GDB_OPT --args "$SCILABBIN" "$@"
+    else
+        echo "Running debug of Scilab [gdb]  : " gdb $SCILAB_GDB_OPT --args "$SCILABBIN" "$@"
+        gdb $SCILAB_GDB_OPT --args "$SCILABBIN" "$@"
+    fi
 }
 
 start_debug_kdbg() {
-          if test -n "$DEVENV"; then
-                  echo "Running debug of Scilab [kdbg]  : " "$SCI"/libtool --mode=execute kdbg "$SCILABBIN"
-                  "$SCI"/libtool --mode=execute kdbg "$SCILABBIN"
-          else
-                  echo "Running debug of Scilab [kdbg]  : " kdbg "$SCILABBIN"
-                  kdbg "$SCILABBIN"
-          fi
+    if test -n "$DEVENV"; then
+        echo "Running debug of Scilab [kdbg]  : " "$SCI"/libtool --mode=execute kdbg "$SCILABBIN"
+        "$SCI"/libtool --mode=execute kdbg "$SCILABBIN"
+    else
+        echo "Running debug of Scilab [kdbg]  : " kdbg "$SCILABBIN"
+        kdbg "$SCILABBIN"
+    fi
 }
 
 start_profiling() {
-        VALGRIND_OPTIONS=" --show-below-main=yes --num-callers=12 --demangle=yes --leak-check=full --show-reachable=yes --smc-check=all --db-attach=yes --gen-suppressions=all -v --trace-redir=yes --show-below-main=yes --track-origins=yes --suppressions=$SCI/tools/profiling/valgrind.supp $SCILAB_VALGRIND_OPT"
-          if test -n "$DEVENV"; then
-                  echo "Running profiling of Scilab  : " "$SCI"/libtool --mode=execute valgrind $VALGRIND_OPTIONS "$SCILABBIN" "$@"
-                  "$SCI"/libtool --mode=execute valgrind $VALGRIND_OPTIONS "$SCILABBIN" "$@"
-          else
-                  echo "Running profiling of Scilab  : " valgrind $VALGRIND_OPTIONS "$SCILABBIN" "$@"
-                  valgrind $VALGRIND_OPTIONS "$SCILABBIN" "$@"
-          fi
+    VALGRIND_OPTIONS=" --show-below-main=yes --num-callers=12 --demangle=yes --leak-check=full --show-reachable=yes --smc-check=all --db-attach=yes --gen-suppressions=all -v --trace-redir=yes --show-below-main=yes --track-origins=yes --suppressions=$SCI/tools/profiling/valgrind.supp $SCILAB_VALGRIND_OPT"
+    if test -n "$DEVENV"; then
+        echo "Running profiling of Scilab  : " "$SCI"/libtool --mode=execute valgrind $VALGRIND_OPTIONS "$SCILABBIN" "$@"
+        "$SCI"/libtool --mode=execute valgrind $VALGRIND_OPTIONS "$SCILABBIN" "$@"
+    else
+        echo "Running profiling of Scilab  : " valgrind $VALGRIND_OPTIONS "$SCILABBIN" "$@"
+        valgrind $VALGRIND_OPTIONS "$SCILABBIN" "$@"
+    fi
 
 }
 
 start_profiling_visu() {
-        VALGRIND_VISU_OPTIONS=" --tool=callgrind --trace-children=yes --smc-check=all --trace-jump=yes --dump-line=yes --separate-threads=yes $SCILAB_VALGRIND_OPT"
+    VALGRIND_VISU_OPTIONS=" --tool=callgrind --trace-children=yes --smc-check=all --trace-jump=yes --dump-line=yes --separate-threads=yes $SCILAB_VALGRIND_OPT"
 #--dump-instr=yes
-        if test -n "$DEVENV"; then
-                echo "Running profiling visualization of Scilab  : " "$SCI"/libtool --mode=execute valgrind $VALGRIND_VISU_OPTIONS "$SCILABBIN" "$@"
-                "$SCI"/libtool --mode=execute valgrind $VALGRIND_VISU_OPTIONS "$SCILABBIN" "$@"
-        else
-                echo "Running profiling visualization of Scilab  : " valgrind $VALGRIND_VISU_OPTIONS "$SCILABBIN" "$@"
-                valgrind $VALGRIND_VISU_OPTIONS "$SCILABBIN" "$@"
-          fi
+    if test -n "$DEVENV"; then
+        echo "Running profiling visualization of Scilab  : " "$SCI"/libtool --mode=execute valgrind $VALGRIND_VISU_OPTIONS "$SCILABBIN" "$@"
+        "$SCI"/libtool --mode=execute valgrind $VALGRIND_VISU_OPTIONS "$SCILABBIN" "$@"
+    else
+        echo "Running profiling visualization of Scilab  : " valgrind $VALGRIND_VISU_OPTIONS "$SCILABBIN" "$@"
+        valgrind $VALGRIND_VISU_OPTIONS "$SCILABBIN" "$@"
+    fi
 }
 
 find_docbook_path() {
-        if test -z "$DOCBOOK_ROOT"; then
-                for dir in $SCI/thirdparty/docbook /usr/share/sgml/docbook/stylesheet/xsl/nwalsh /usr/share/docbook2X/xslt/man/ /usr/share/xml/docbook/stylesheet/nwalsh/ /usr/share/xml/docbook/stylesheet/nwalsh/current/ /sw/share/xml/xsl/docbook-xsl /usr/share/xml/docbook/xsl-stylesheets-*/ /usr/share/sgml/docbook/xsl-stylesheets-*/; do
-                        if test -r "$dir/javahelp/javahelp.xsl"; then
-                                if test -z "$DOCBOOK_ROOT"; then
-                                        DOCBOOK_ROOT=$dir
-                                        export DOCBOOK_ROOT
-                                fi
-                        fi
-                done
-        fi
-        if test $SCIVERBOSE -ne 0; then
-                echo "DOCBOOK : $DOCBOOK_ROOT"
-        fi
+    if test -z "$DOCBOOK_ROOT"; then
+        for dir in $SCI/thirdparty/docbook /usr/share/sgml/docbook/stylesheet/xsl/nwalsh /usr/share/docbook2X/xslt/man/ /usr/share/xml/docbook/stylesheet/nwalsh/ /usr/share/xml/docbook/stylesheet/nwalsh/current/ /sw/share/xml/xsl/docbook-xsl /usr/share/xml/docbook/xsl-stylesheets-*/ /usr/share/sgml/docbook/xsl-stylesheets-*/; do
+            if test -r "$dir/javahelp/javahelp.xsl"; then
+                if test -z "$DOCBOOK_ROOT"; then
+                    DOCBOOK_ROOT=$dir
+                    export DOCBOOK_ROOT
+                fi
+            fi
+        done
+    fi
+    if test $SCIVERBOSE -ne 0; then
+        echo "DOCBOOK : $DOCBOOK_ROOT"
+    fi
 }
 
 detect_type_of_scilab(){
 
-        progname="$0"
-        SCILAB_MODE="gui"
-        SCILABBIN="scilab-bin"
-
-        if (echo "$progname"|grep "scilab-adv-cli$" 2>&1 > /dev/null;) || (echo "$@"|grep "\-nw" 2>&1 > /dev/null;) then
-                SCILAB_MODE="nw"
-                # We are using scilab-bin here because we are going to force the arg -nw
-                SCILABBIN="scilab-bin"
-        fi
-
-        if (echo "$progname"|grep "scilab-cli$" 2>&1 > /dev/null;) || (echo "$@"|grep "\-nwni" 2>&1 > /dev/null;) then
-                SCILAB_MODE="nwni"
-                SCILABBIN="scilab-cli-bin"
-                DISABLE_JAVA_DETECTION=1
-        fi
-
-        if test $SCIVERBOSE -ne 0; then
-                echo "SCILABBIN : $SCILABBIN"
-                echo "DISABLE_JAVA_DETECTION : $DISABLE_JAVA_DETECTION"
-                echo "SCILAB_MODE : $SCILAB_MODE"
-        fi
+    progname="$0"
+    SCILAB_MODE="gui"
+    SCILABBIN="scilab-bin"
+
+    if (echo "$progname"|grep "scilab-adv-cli$" 2>&1 > /dev/null;) || (echo "$@"|grep "\-nw" 2>&1 > /dev/null;) then
+        SCILAB_MODE="nw"
+        # We are using scilab-bin here because we are going to force the arg -nw
+        SCILABBIN="scilab-bin"
+    fi
+
+    if (echo "$progname"|grep "scilab-cli$" 2>&1 > /dev/null;) || (echo "$@"|grep "\-nwni" 2>&1 > /dev/null;) then
+        SCILAB_MODE="nwni"
+        SCILABBIN="scilab-cli-bin"
+        DISABLE_JAVA_DETECTION=1
+    fi
+
+    if test $SCIVERBOSE -ne 0; then
+        echo "SCILABBIN : $SCILABBIN"
+        echo "DISABLE_JAVA_DETECTION : $DISABLE_JAVA_DETECTION"
+        echo "SCILAB_MODE : $SCILAB_MODE"
+    fi
+}
+
+detect_os() {
+
+    if test "${OS}" = ""; then
+        OS=`uname -s` # Retrieve the Operating System
+    fi
+    if test "${MODEL}" = ""; then
+        MODEL=`uname -m` # Retrieve the model
+    fi
+
+    if test $SCIVERBOSE -ne 0; then
+        echo "OS : $OS"
+        echo "MODEL : $MODEL"
+    fi
 }
 
 detect_type_of_scilab $@
 
+detect_os
+
 detect_scilab_path() {
 
-LOCALOLDPWD=`pwd`
-
-# Use scilab-bin in the current dir if it exists
-# If not, then start resolving symlinks until we find scilab-bin
-        found=0
-        progname="$0"
-        curdir=`dirname "$progname"`
-        PATH="$curdir:$PATH"
-
-        progbase=`basename "$progname"`
-        run_sci="$curdir/$SCILABBIN"
-        if test -x "$run_sci"; then # scilab-bin is in the /bin/ directory
-                cd "$curdir/../"
-                SCI=`pwd`
-                SCIBIN=$run_sci
-                found=1
-        else
-                run_sci="$curdir/../$SCILABBIN"
-                if test -x "$run_sci"; then # scilab-bin is in the / directory
-                # which is the case in a dev env
-                        cd "$curdir/../"
-                        SCI=`pwd`
-                        SCIBIN=$run_sci
-                        found=1
-                else
-                        here=`/bin/pwd`
-                        while test -h "$progname"; do
-                                bn=`basename "$progname"`
-                                cd `dirname "$progname"`
-                        # Browse the symlink to the real one
-                                progname=`/bin/ls -l "$bn" | sed -e 's/^.* -> //' `
-                                if test ! -x "$progname"; then
-                                        break
-                                fi
-                                curdir=`dirname "$progname"`
-                                if test -x "$curdir"; then
-                                        cd "$curdir/../"
-                                        SCI=`pwd`
-                                        SCIBIN="$curdir/$SCILABBIN"
-                                        found=1
-                                        break
-                                fi
-                        # The current file ($0), probably scilab is a symlink to the 
-                        # real one and here, it is the dev env
-                                run_sci="$curdir/../$SCILABBIN"
-                                if test -x "$run_sci"; then
-                                        cd "$curdir/../"
-                                        SCI=`pwd`
-                                        SCIBIN=$run_sci
-                                        found=1
-                                        break
-                                fi
-                        done
-                        cd "$here"
-                fi
-                if test $SCIVERBOSE -ne 0; then
-                        echo "I think I found Scilab here : $SCI"
-                fi
-        fi
-
-
-        if test -x "$SCI/bin/$SCILABBIN"; then
+    LOCALOLDPWD=`pwd`
+
+    # If we are running Scilab binary, it is trivial to set paths.
+    curdir=`dirname "$progname"`
+    if test -d $curdir/../thirdparty/ -a -d $curdir/../share/scilab; then
+        # We are in the Scilab binary
+        IS_SCILAB_BINARY=1
+        # export the bin directory to the PATH first (avoid to take the packaged version)
+        PATH="$curdir:$PATH"
+        cd "$curdir/../"
+        SCIBINARYBASE=$(pwd)
+        SCI=$SCIBINARYBASE/share/scilab/
+        export SCI
+        return
+    fi
+
+    # Use scilab-bin in the current dir if it exists
+    # If not, then start resolving symlinks until we find scilab-bin
+    found=0
+    progname="$0"
+    curdir=`dirname "$progname"`
+    PATH="$curdir:$PATH"
+
+    progbase=`basename "$progname"`
+    run_sci="$curdir/$SCILABBIN"
+    if test -x "$run_sci"; then # scilab-bin is in the /bin/ directory
+        cd "$curdir/../"
+        SCI=`pwd`
+        SCIBIN=$run_sci
+        found=1
+    else
+        run_sci="$curdir/../$SCILABBIN"
+        if test -x "$run_sci"; then # scilab-bin is in the / directory
+        # which is the case in a dev env
+            cd "$curdir/../"
+            SCI=`pwd`
+            SCIBIN=$run_sci
+            found=1
+        else
+            here=`/bin/pwd`
+            while test -h "$progname"; do
+                bn=`basename "$progname"`
+                cd `dirname "$progname"`
+            # Browse the symlink to the real one
+                progname=`/bin/ls -l "$bn" | sed -e 's/^.* -> //' `
+                if test ! -x "$progname"; then
+                    break
+                fi
+                curdir=`dirname "$progname"`
+                if test -x "$curdir"; then
+                    cd "$curdir/../"
+                    SCI=`pwd`
+                    SCIBIN="$curdir/$SCILABBIN"
+                    found=1
+                    break
+                fi
+            # The current file ($0), probably scilab is a symlink to the
+            # real one and here, it is the dev env
+                run_sci="$curdir/../$SCILABBIN"
+                if test -x "$run_sci"; then
+                    cd "$curdir/../"
+                    SCI=`pwd`
+                    SCIBIN=$run_sci
+                    found=1
+                    break
+                fi
+            done
+            cd "$here"
+        fi
+        if test $SCIVERBOSE -ne 0; then
+            echo "I think I found Scilab here : $SCI"
+        fi
+    fi
+
+
+    if test -x "$SCI/bin/$SCILABBIN"; then
 # real env
-                SCILABBIN=$SCI/bin/$SCILABBIN
-                SCI=$SCI/share/scilab/
-        else
-                if test -x "$SCI/$SCILABBIN"; then
-                # dev env
-                        SCILABBIN=$SCI/$SCILABBIN
-                        DEVENV=1
-                # add modelica in the path
-                        PATH="$PATH:$SCI/modules/scicos/"
-                else
-                        echo "Cannot find $SCILABBIN ..."
-                        exit 1
-                fi
-        fi
-
-        export SCI
+        SCILABBIN=$SCI/bin/$SCILABBIN
+        SCI=$SCI/share/scilab/
+    else
+        if test -x "$SCI/$SCILABBIN"; then
+        # dev env
+            SCILABBIN=$SCI/$SCILABBIN
+            DEVENV=1
+        # add modelica in the path
+            PATH="$PATH:$SCI/modules/scicos/"
+        else
+            echo "Cannot find $SCILABBIN ..."
+            exit 1
+        fi
+    fi
+
+    export SCI
 }
 
 detect_java_vm() {
+
+    JAVA_SHLIB="libjava.so"
+
+    if test $IS_SCILAB_BINARY -eq 1; then
+        # Scilab binary => no Java detection since we are using the embeded JRE
+        # Here, we are handling 3 cases: GNU/Linux 32bit, GNU/Linux 64bit,
+        # Mac OS X
+        case $OS in
+            "Linux")
+                case $MODEL in
+                    "x86_64")
+                        proc="amd64"
+                        ;;
+                    i?86)
+                        if test -d ${JRE_HOME}/lib/`uname -m` ; then
+                            proc=`uname -m`
+                        else
+                            proc="i386"
+                        fi
+                        ;;
+                    *)
+                        echo "Could not find the Java configuration for the model <${MODEL}>. Please contact us on http://bugzilla.scilab.org"
+                        ;;
+                esac
+                ;;
+            *darwin* | *Darwin*) # MacOS X
+        # For Mac OS X, Since path are different from the JVM normal tree,
+        # don't need to detect the CPU
+                JAVA_SHLIB="libjava.jnilib"
+        JAVA_HOME=$(/usr/libexec/java_home --arch x86_64 --failfast --version 1.6+)
+                DYLD_LIBRARY_PATH="$JAVA_HOME/../Libraries${DYLD_LIBRARY_PATH:+:$DYLD_LIBRARY_PATH}"
+                ;;
+
+            *)
+                echo "Could not find the Java configuration for the OS <${OS}>. Please contact us or submit a bug report with your detailed configuration http://bugzilla.scilab.org/"
+                echo "Fallback on the model <${MODEL}> found by uname -m"
+                proc=$MODEL
+                ;;
+        esac
+        JRE_HOME="$SCIBINARYBASE/thirdparty/java/"
+    else  # NOT IS_SCILAB_BINARY
+
 ############# JAVA DETECTION ##############
 # Basic inspiration from Eclipse
 #
@@ -251,13 +321,6 @@ detect_java_vm() {
 # 2 others) are available
 ###
 
-        if test "${OS}" = ""; then
-            OS=`uname -s` # Retrieve the Operating System
-        fi
-        if test "${MODEL}" = ""; then
-            MODEL=`uname -m` # Retrieve the model
-        fi
-
 # Get the proc name matching to the one of the JVM
 # Inspiration and data are from http://www.google.com/codesearch?hl=en&q=+java+ppc+libjava.so+show:a78sz0SP41k:zxNozD-vc0A:FWiIy7Hinmg&sa=N&cd=2&ct=rc&cs_p=http://fresh.t-systems-sfr.com/unix/src/misc/tclBlendSrc1.2.5.tar.gz&cs_f=tclBlend1.2.5/configure.in#a0
 # For Mac OS X, we will get stuff like that:
@@ -265,218 +328,247 @@ detect_java_vm() {
 # uname -m Darwin
 
 # If the user has the variable JAVA_HOME in the ENV
-        if test -n "$JAVA_HOME" ; then
-                if test $SCIVERBOSE -ne 0; then
-                        echo "Using specified vm: $JAVA_HOME"
-                fi
-                if test ! -x "$JAVA_HOME/bin/java" ; then
-                        echo "Cannot find $JAVA_HOME/bin/java"
-                        exit 1
-                fi
-        fi
-
-        if test -z "$JAVA_HOME"; then
+        if test -n "$JAVA_HOME" ; then
+            if test $SCIVERBOSE -ne 0; then
+                echo "Using specified vm: $JAVA_HOME"
+            fi
+            if test ! -x "$JAVA_HOME/bin/java" ; then
+                echo "Cannot find $JAVA_HOME/bin/java"
+                exit 1
+            fi
+        fi
+
         case $OS in
             *darwin* | *Darwin*)
+        if test -z "$JAVA_HOME"; then
                     # Apple thinks and does things different (it would be too easy otherwise)
-                    # They provide a script which returns the JAVA_HOME path
-                    JAVA_HOME=$(/usr/libexec/java_home --arch x86_64 --failfast --version 1.6+)
-            LD_LIBRARY_PATH="$JAVA_HOME/../Libraries${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}"
-                    if test $SCIVERBOSE -ne 0; then
-                        echo "Using default Mac OS X vm: $JAVA_HOME"
-                        echo "And LD_LIBRARY_PATH: $LD_LIBRARY_PATH"
-                    fi
-                    ;;
-                *)
-                                        ;;
-                        esac
-fi
+                    # They provide a script which returns the JAVA_HOME path
+                    JAVA_HOME=$(/usr/libexec/java_home --arch x86_64 --failfast --version 1.6+)
+        fi
+                LD_LIBRARY_PATH="$JAVA_HOME/../Libraries${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}"
+                DYLD_LIBRARY_PATH="$JAVA_HOME/../Libraries${DYLD_LIBRARY_PATH:+:$DYLD_LIBRARY_PATH}"
+                if test $SCIVERBOSE -ne 0; then
+                    echo "Using default Mac OS X vm: $JAVA_HOME"
+                    echo "And LD_LIBRARY_PATH: $LD_LIBRARY_PATH"
+                    echo "And DYLD_LIBRARY_PATH: $DYLD_LIBRARY_PATH"
+                fi
+                ;;
+            *)
+                ;;
+        esac
 
 # Browse "default directory" (if it means anything under Unix/Linux) of Java
 # to find where it could be !
-        if test -z "$JAVA_HOME"; then
-                JAVA_DEFAULT_DIR="/usr/lib/jvm/java-6-openjdk/ /usr/lib/jvm/java/ /usr/lib/jvm/java-6-sun/ /usr/lib/j2se/1.6 /usr/java/jdk1.6.0*/ /usr/java/jdk1.5.0*/ /usr/lib/j2sdk1.6-ibm /usr/lib/jvm/java-1.5.0-sun /usr/java/ /usr/lib/j2se/1.5 /usr/lib/j2se/1.4 /usr/java/jre1.6.0*/ /usr/java/jre1.5.0*/ /usr/lib/j2sdk1.5-ibm /usr/lib/j2sdk1.4-ibm /usr/lib/j2sdk1.5-sun /usr/lib/j2sdk1.4-sun /usr/lib/jvm/java-gcj /usr/lib/jvm/java-1.5.0-gcj/ /usr/lib/kaffe/pthreads /usr/lib/jvm/java-1.7.0-icedtea-*/ /usr/lib/jvm/jre/ /usr/local/diablo-jdk1.6.0/"
-                for JAVA_HOME in $JAVA_DEFAULT_DIR ; do
-                        if test $SCIVERBOSE -ne 0; then
-                                echo "Trying to find Java in $JAVA_HOME "
-                        fi
-                        if test -x "${JAVA_HOME}/bin/java" ; then
-                                export JAVA_HOME
-                                if test $SCIVERBOSE -ne 0; then
-                                        echo "found"
-                                fi
-                                break
-                        fi
-                done
-        fi
+        if test -z "$JAVA_HOME"; then
+            JAVA_DEFAULT_DIR="/usr/lib/jvm/java-6-openjdk/ /usr/lib/jvm/java/ /usr/lib/jvm/java-6-sun/ /usr/lib/j2se/1.6 /usr/java/jdk1.6.0*/ /usr/java/jdk1.5.0*/ /usr/lib/j2sdk1.6-ibm /usr/lib/jvm/java-1.5.0-sun /usr/java/ /usr/lib/j2se/1.5 /usr/lib/j2se/1.4 /usr/java/jre1.6.0*/ /usr/java/jre1.5.0*/ /usr/lib/j2sdk1.5-ibm /usr/lib/j2sdk1.4-ibm /usr/lib/j2sdk1.5-sun /usr/lib/j2sdk1.4-sun /usr/lib/jvm/java-gcj /usr/lib/jvm/java-1.5.0-gcj/ /usr/lib/kaffe/pthreads /usr/lib/jvm/java-1.7.0-icedtea-*/ /usr/lib/jvm/jre/ /usr/local/diablo-jdk1.6.0/"
+            for JAVA_HOME in $JAVA_DEFAULT_DIR ; do
+                if test $SCIVERBOSE -ne 0; then
+                    echo "Trying to find Java in $JAVA_HOME "
+                fi
+                if test -x "${JAVA_HOME}/bin/java" ; then
+                    export JAVA_HOME
+                    if test $SCIVERBOSE -ne 0; then
+                        echo "found"
+                    fi
+                    break
+                fi
+            done
+        fi
 
 # JAVA_HOME still haven't been found. Well, we can now try to find it in the path
 
-        if test -z "$JAVA_HOME"; then
-                PATH_SEPARATOR=:
-                as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-                if test $SCIVERBOSE -ne 0; then
-                        echo "Look the binary java in the PATH. If it is a symlink, try to resolve it"
-                fi
-                for DIR in $PATH; do
-                        if test -f $DIR/java; then
-
-                                _cur=$DIR/java
-                        # resolve symlink
-                        # Will probably bug if a file contains -> in the name
-                                while ls -ld "$_cur" 2>/dev/null | grep " -> " >/dev/null; do
-                                        _cur=`ls -ld "$_cur" | sed 's/.* -> //'`
-                                done
-                        # symlink resolved to the real file
-
-                        # Now, create JAVA_HOME
-                                TMP=`dirname $_cur`
-                                JAVA_HOME=`dirname $TMP`
-                                if test ! -z "$JAVA_HOME"; then
-                                        break;
-                                fi
-                        fi
-                done
-                IFS=$as_save_IFS
-        fi
-        if test ! -z "$JAVA_HOME"; then
-                if test $SCIVERBOSE -ne 0; then
-                        echo "JAVA_HOME : $JAVA_HOME"
-                fi
+        if test ! -z "$JAVA_HOME"; then
+            if test $SCIVERBOSE -ne 0; then
+                echo "Have not been able to find any Java VM on this computer. Some features may be broken."
+            fi
+        else
+
+            PATH_SEPARATOR=:
+            as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+            if test $SCIVERBOSE -ne 0; then
+                echo "Look the binary java in the PATH. If it is a symlink, try to resolve it"
+            fi
+            for DIR in $PATH; do
+                if test -f $DIR/java; then
+
+                    _cur=$DIR/java
+            # resolve symlink
+            # Will probably bug if a file contains -> in the name
+                    while ls -ld "$_cur" 2>/dev/null | grep " -> " >/dev/null; do
+                        _cur=`ls -ld "$_cur" | sed 's/.* -> //'`
+                    done
+            # symlink resolved to the real file
+
+            # Now, create JAVA_HOME
+                    TMP=`dirname $_cur`
+                    JAVA_HOME=`dirname $TMP`
+                    if test ! -z "$JAVA_HOME"; then
+                        break;
+                    fi
+                fi
+            done
+            IFS=$as_save_IFS
+        fi
+        if test ! -z "$JAVA_HOME"; then
+            if test $SCIVERBOSE -ne 0; then
+                echo "JAVA_HOME : $JAVA_HOME"
+            fi
 
 # Manage JRE & JDK because libjava.so and others are stored in the JRE
-                if test -d $JAVA_HOME/jre; then
-                        JRE_HOME=$JAVA_HOME/jre
-                else
-                        JRE_HOME=$JAVA_HOME
-                fi
+            if test -d $JAVA_HOME/jre; then
+                JRE_HOME=$JAVA_HOME/jre
+            else
+                JRE_HOME=$JAVA_HOME
+            fi
 
 # Configuring LD_LIBRARY_PATH for libjava.so libhpi.so and libxxxx.so
 
-                JAVA_SHLIB="libjava.so"
-
-                case $OS in
-                        "Linux")
-                                case $MODEL in
-                                        "x86_64")
-                                                proc="amd64"
-                                                ;;
-                                        i?86)
-
-                                                if test -d ${JRE_HOME}/lib/`uname -m` ; then
-                                                        proc=`uname -m`
-                                                else
-                                                        proc="i386"
-                                                fi
-                                                ;;
-                                        "alpha")
-                                                proc="alpha"
-                                                ;;
-                                        "sparc"|"sparc64")
-                                                proc="sparc"
-                                                ;;
-                                        sh*)
-                                                proc="sh"
-                                                ;;
-                                        "ia64")
-                                                proc="ia64"
-                                                ;;
-                                        "mips"|"mipsel") # under mipsel, uname -m is
-                                        # usually returning mips ...
-                                        # but binary are in mipsel
-                                                if test -d ${JRE_HOME}/lib/mipsel ; then
-                                                        proc="mipsel"
-                                                else
-                                                        proc="mips"
-                                                fi
-                                                ;;
-                                        "ppc"|"powerpc"|"ppc64")
-                                                proc="ppc"
-                                                ;;
-                                        "s390"|"s390x")
-                                                proc="s390"
-                                                ;;
-                                        armv*)
-                                                proc="arm"
-                                                ;;
-                                        *)
-                                                echo "Could not find the Java configuration for the model <${MODEL}>. Please contact us."
-                                                ;;
-                                esac
-                                ;;
-                        "HP-UX")
-                                JAVA_SHLIB="libjava.sl"
-                                proc="lib" # TODO : check if it is right or not ... seems not !
-                                ;;
-                        "IRIX")
-                                proc="lib32"
-                                ;;
-                        "SunOS")
-                        case $MODEL in
-                                        "i86pc") # solaris x86
-                                                proc="i386"
-                                                ;;
-                                # check for the 64 bits syntax
-                                        "sparc"|"sparc64")
-                                                proc="sparc"
-                                                ;;
-                                        *)
-                                                echo "Could not find the Java configuration for the model <${MODEL}>. Please contact us."
-                                                ;;
-                                esac
-                                ;;
-
-                        *win32* | *WIN32* | *CYGWIN_NT*)
-                                proc="win32"
-                                JAVA_SHLIB="jvm.dll"
-                                ;;
-                        *darwin* | *Darwin*) # MacOS X
+            case $OS in
+                "Linux")
+                    case $MODEL in
+                        "x86_64")
+                            proc="amd64"
+                            ;;
+                        i?86)
+
+                            if test -d ${JRE_HOME}/lib/`uname -m` ; then
+                                proc=`uname -m`
+                            else
+                                proc="i386"
+                            fi
+                            ;;
+                        "alpha")
+                            proc="alpha"
+                            ;;
+                        "sparc"|"sparc64")
+                            proc="sparc"
+                            ;;
+                        sh*)
+                            proc="sh"
+                            ;;
+                        "ia64")
+                            proc="ia64"
+                            ;;
+                        "mips"|"mipsel") # under mipsel, uname -m is
+                    # usually returning mips ...
+                    # but binary are in mipsel
+                            if test -d ${JRE_HOME}/lib/mipsel ; then
+                                proc="mipsel"
+                            else
+                                proc="mips"
+                            fi
+                            ;;
+                        "ppc"|"powerpc"|"ppc64")
+                            proc="ppc"
+                            ;;
+                        "s390"|"s390x")
+                            proc="s390"
+                            ;;
+                        armv*)
+                            proc="arm"
+                            ;;
+                        *)
+                            echo "Could not find the Java configuration for the model <${MODEL}>. Please contact us on http://bugzilla.scilab.org"
+                            ;;
+                    esac
+                    ;;
+                "HP-UX")
+                    JAVA_SHLIB="libjava.sl"
+                    proc="lib" # TODO : check if it is right or not ... seems not !
+                    ;;
+                "IRIX")
+                    proc="lib32"
+                    ;;
+                "SunOS")
+                    case $MODEL in
+                        "i86pc") # solaris x86
+                            proc="i386"
+                            ;;
+                # check for the 64 bits syntax
+                        "sparc"|"sparc64")
+                            proc="sparc"
+                            ;;
+                        *)
+                            echo "Could not find the Java configuration for the model <${MODEL}>. Please contact us."
+                            ;;
+                    esac
+                    ;;
+
+                *win32* | *WIN32* | *CYGWIN_NT*)
+                    proc="win32"
+                    JAVA_SHLIB="jvm.dll"
+                    ;;
+                *darwin* | *Darwin*) # MacOS X
         # For Mac OS X, Since path are different from the JVM normal tree,
-                # don't need to detect the CPU
-                                JAVA_SHLIB="libjava.jnilib"
-                                ;;
-                        *FreeBSD*)
-                                proc=$MODEL
-                                ;;
-                        *)
-                                echo "Could not find the Java configuration for the OS <${OS}>. Please contact us or submit a bug report with your detailed configuration http://bugzilla.scilab.org/"
-                echo "Fallback on the model <${MODEL}> found by uname -m"
-                proc=$MODEL
-                ;;
-                esac
-
+        # don't need to detect the CPU
+                    JAVA_SHLIB="libjava.jnilib"
+                    # Need to set DYLD_LIBRARY_PATH for Mac.
+            DYLD_LIBRARY_PATH="$JAVA_HOME/../Libraries${DYLD_LIBRARY_PATH:+:$DYLD_LIBRARY_PATH}"
+                    ;;
+                *FreeBSD*)
+                    proc=$MODEL
+                    ;;
+                *)
+                    echo "Could not find the Java configuration for the OS <${OS}>. Please contact us or submit a bug report with your detailed configuration http://bugzilla.scilab.org/"
+                    echo "Fallback on the model <${MODEL}> found by uname -m"
+                    proc=$MODEL
+                    ;;
+            esac
+        fi # JAVA_HOME provided but wrong
+    fi # IS_SCILAB_BINARY
 
 # Check if the lib exists or not (we should manage system where .so is not the
 # ext for library
-                LIBJAVA="$JRE_HOME/lib/$proc/$JAVA_SHLIB"
-                if test ! -f $LIBJAVA; then
-                        if test $SCIVERBOSE -ne 0; then
-                                echo "Cannot find $LIBJAVA"
-                        fi
-                else
-            CLASSPATH="$CLASSPATH:$SCI/modules/jvm/jar/org.scilab.modules.jvm.jar"
-                # @TODO This is the default path of the official sun JVM. 
-                # It is different for other implementation of the JVM....
-                    LD_LIBRARY_PATH="$JRE_HOME/lib/$proc/:$JRE_HOME/lib/$proc/server/:$JRE_HOME/lib/$proc/native_threads/${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}"
-                fi
-        else
-                if test $SCIVERBOSE -ne 0; then
-                        echo "Have not been able to find any Java VM on this computer. Some features may be broken."
-                fi
-        fi
+    LIBJAVA="$JRE_HOME/lib/$proc/$JAVA_SHLIB"
+    if test ! -f $LIBJAVA; then
+        if test $SCIVERBOSE -ne 0; then
+            echo "Cannot find $LIBJAVA"
+        fi
+    else
+        CLASSPATH="${CLASSPATH:+:$CLASSPATH}$SCI/modules/core/jar/org.scilab.modules.core.jar"
+        # @TODO This is the default path of the official sun JVM.
+        # It is different for other implementation of the JVM....
+        LD_LIBRARY_PATH="$JRE_HOME/lib/$proc/:$JRE_HOME/lib/$proc/server/:$JRE_HOME/lib/$proc/native_threads/${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}"
+    fi
 
 ####### END OF JAVA ENV DETECTION/SETTING ######
 }
 
 detect_scilab_path
 
-PATH="$SCI:$SCI/bin:$PATH"
-
 # If we are calling scilab-cli, no need to detect java.
 if test $DISABLE_JAVA_DETECTION -ne 1; then
-        detect_java_vm
+    detect_java_vm
 fi
 
+if test $IS_SCILAB_BINARY -eq 1; then
+
+    TCL_LIBRARY="$SCIBINARYBASE/thirdparty/tcl8.5"
+    Tk_LIBRARY="$SCIBINARYBASE/thirdparty/tk8.5"
+    LD_LIBRARY_PATH=$SCIBINARYBASE/lib/scilab:$SCIBINARYBASE/lib/thirdparty${LD_LIBRARY_PATH+:$LD_LIBRARY_PATH}
+    DOCBOOK_ROOT="$SCI/thirdparty/docbook"
+    PATH="$PATH:$SCI/modules/scicos/"
+
+    export DOCBOOK_ROOT
+    export PATH
+    export LD_LIBRARY_PATH
+    export TCL_LIBRARY
+    export Tk_LIBRARY
+
+    case $OS in
+    *darwin* | *Darwin*)
+        DYLD_LIBRARY_PATH=$SCIBINARYBASE/lib/scilab:$SCIBINARYBASE/lib/thirdparty${DYLD_LIBRARY_PATH+:$DYLD_LIBRARY_PATH}
+        export DYLD_LIBRARY_PATH
+        PATH="/sw/bin:/sw64/bin:$PATH"
+        export PATH
+        ;;
+    esac
+
+else
+    PATH="$SCI:$SCI/bin:$PATH"
+fi
+
+
 # See http://bugzilla.scilab.org/show_bug.cgi?id=3486
 # Some Java stuff raises spurious SIGSEGV. The problem is that when bug-buddy
 # is enabled, it catches the signal and terminate Scilab. We have to
@@ -487,9 +579,10 @@ GTK_MODULES=`echo $GTK_MODULES | sed s/gnomebreakpad//g`
 export GTK_MODULES
 
 if test $SCIVERBOSE -ne 0; then
-        echo "SCI : $SCI"
-        echo "SCIBIN : $SCIBIN"
-        echo "PATH : $PATH"
+    echo "SCI : $SCI"
+    echo "SCIBIN : $SCIBIN"
+    echo "PATH : $PATH"
+    echo "CLASSPATH : $CLASSPATH"
 fi
 
 # Returns to the original path
@@ -517,35 +610,38 @@ case $OS in
     *darwin* | *Darwin*) # MacOS X
         # When using some packaging tools like fink which are storing the info in /sw/lib
         LD_LIBRARY_PATH="/sw/lib/${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}"
-        # Export the path to the Scilab lib when Scilab has been install ...
-        # to a Mac os x specific variable used by the linker before LD_LIBRARY_PATH
-                DYLD_LIBRARY_PATH=$SCI/../../lib/scilab/${DYLD_LIBRARY_PATH:+:$DYLD_LIBRARY_PATH}:
-                # Crappy workaround for the dynamic load of sundials under Mac OS X
-                # in the source tree version. This does not occur in the binary
-                # thanks to the previous declaration on ../../lib/scilab
-                # See bug #4949
-                if test -d "$SCI/modules/scicos_blocks/.libs/"; then
-                        DYLD_LIBRARY_PATH=$SCI/modules/scicos_blocks/.libs/${DYLD_LIBRARY_PATH:+:$DYLD_LIBRARY_PATH}
-                fi
-                if test -d "$SCI/modules/scicos/.libs/"; then
-                        DYLD_LIBRARY_PATH=$SCI/modules/scicos/.libs/${DYLD_LIBRARY_PATH:+:$DYLD_LIBRARY_PATH}
-                fi
-                export DYLD_LIBRARY_PATH
+    # Export the path to the Scilab lib when Scilab has been install ...
+    # to a Mac os x specific variable used by the linker before LD_LIBRARY_PATH
+        DYLD_LIBRARY_PATH=$SCI/../../lib/scilab/${DYLD_LIBRARY_PATH:+:$DYLD_LIBRARY_PATH}:
+        # Crappy workaround for the dynamic load of sundials under Mac OS X
+        # in the source tree version. This does not occur in the binary
+        # thanks to the previous declaration on ../../lib/scilab
+        # See bug #4949
+        if test -d "$SCI/modules/scicos_blocks/.libs/"; then
+            DYLD_LIBRARY_PATH=$SCI/modules/scicos_blocks/.libs/${DYLD_LIBRARY_PATH:+:$DYLD_LIBRARY_PATH}
+        fi
+        if test -d "$SCI/modules/scicos/.libs/"; then
+            DYLD_LIBRARY_PATH=$SCI/modules/scicos/.libs/${DYLD_LIBRARY_PATH:+:$DYLD_LIBRARY_PATH}
+        fi
+        export DYLD_LIBRARY_PATH
         ;;
     *)
 esac
 
 
 if test $SCIVERBOSE -ne 0; then
-        echo "LD_LIBRARY_PATH : $LD_LIBRARY_PATH"
-        if test ! -z "$DYLD_LIBRARY_PATH"; then
-            echo "DYLD_LIBRARY_PATH: $DYLD_LIBRARY_PATH"
-        fi
+    echo "LD_LIBRARY_PATH : $LD_LIBRARY_PATH"
+    if test ! -z "$DYLD_LIBRARY_PATH"; then
+        echo "DYLD_LIBRARY_PATH: $DYLD_LIBRARY_PATH"
+    fi
 fi
 export LD_LIBRARY_PATH
 export PATH
 
-find_docbook_path
+if test $IS_SCILAB_BINARY -ne 1; then
+# We are not using the Scilab binary, find out where docbook is.
+    find_docbook_path
+fi
 
 do_scilex()
 {
@@ -555,115 +651,117 @@ do_scilex()
 
 do_help()
 {
-        echo "Usage:"
-        echo     "scilab <arguments>"
-        echo     " "
-        echo     "      Possible arguments are:"
-        echo     "      -display Display: for use under Xwindow systems to set a specific X server display."
-        echo     "      -d Display      : equivalent to -display Display."
-        echo     "      -e Instruction  : execute the scilab instruction given in Instruction argument."
-        echo     "                        -e and -f arguments are mutually exclusive."
-        echo     "      -f File         : execute the scilab script given in File argument."
-        echo     "                        -e and -f arguments are mutually exclusive."
-        echo     "      -l Lang         : set the current language. Lang can be equal to fr or en."
-        echo     "      -mem N          : set the initial stacksize, for use with -ns argument."
-        echo     "      -nb             : do not display the Scilab banner at starting time."
-        echo     "      -ns             : do not execute scilab.start startup file. This argument will disable many features in Scilab (Only use if you know what you are doing)."
-        echo     "      -nouserstartup  : do not execute the user startup files SCIHOME/.scilab or SCIHOME/scilab.ini."
-        echo     "      -nw             : start Scilab without dedicated Scilab Window."
-        echo     "      -nwni           : start Scilab without the GUI, graphic and help features (batch mode). This argument disables the need of Java."
-        echo     "      -nogui          : See -nwni"
-        echo     "      -args           : accept all extra arguments and make them available through sciargs"
-        echo     "      -version        : print product version and exit."
-        echo     "      -h/--help       : display help about this command."
-        echo     "      --texmacs       : reserved for TeXMacs."
-        echo     " "
-        echo     "Developer arguments:"
-        echo     "      -debug          : Start Scilab under gdb (Unix/linux only)."
-        echo     "                        define the variable SCILAB_GDB_OPT to add custom arguments to gdb."
-        echo     "      -debug-kdbg     : Start Scilab under kdbg (Unix/linux only)."
-        echo     "      -profiling      : Start Scilab under valgrind (Unix/linux only)."
-        echo     "                        define the variable SCILAB_VALGRIND_OPT to add custom arguments to"
-        echo     "                        valgrind (and override the existing valgrind arguments)."
-        echo     "      -profiling-visu : Start Scilab under callgrind (Unix/linux only)."
-        echo     "                        define the variable SCILAB_VALGRIND_OPT to add custom arguments to"
-        echo     "                        callgrind (and override the existing callgrind arguments)."
-        echo     "      -electric-fence : Start Scilab with the Electric Fence (Unix/linux only)."
-        echo     " "
-        echo     "      All these arguments can be retrieved by the Scilab function sciargs."
-        echo     " "
-        exit
+    echo "Usage:"
+    echo     "scilab <arguments>"
+    echo     " "
+    echo     "      Possible arguments are:"
+    echo     "      -display Display: for use under Xwindow systems to set a specific X server display."
+    echo     "      -d Display      : equivalent to -display Display."
+    echo     "      -e Instruction  : execute the scilab instruction given in Instruction argument."
+    echo     "                        -e and -f arguments are mutually exclusive."
+    echo     "      -f File         : execute the scilab script given in File argument."
+    echo     "                        -e and -f arguments are mutually exclusive."
+    echo     "      -l Lang         : set the current language. Lang can be equal to fr or en."
+    echo     "      -mem N          : set the initial stacksize, for use with -ns argument."
+    echo     "      -nb             : do not display the Scilab banner at starting time."
+    echo     "      -ns             : do not execute scilab.start startup file. This argument will disable many features in Scilab (Only use if you know what you are doing)."
+    echo     "      -nouserstartup  : do not execute the user startup files SCIHOME/.scilab or SCIHOME/scilab.ini."
+    echo     "      -nw             : start Scilab without dedicated Scilab Window."
+    echo     "      -nwni           : start Scilab without the GUI, graphic and help features (batch mode). This argument disables the need of Java."
+    echo     "      -nogui          : See -nwni"
+    echo     "      -args           : accept all extra arguments and make them available through sciargs"
+    echo     "      -version        : print product version and exit."
+    echo     "      -h/--help       : display help about this command."
+    echo     "      --texmacs       : reserved for TeXMacs."
+    echo     " "
+if test $IS_SCILAB_BINARY -eq 0; then
+    echo     "Developer arguments:"
+    echo     "      -debug          : Start Scilab under gdb (Unix/linux only)."
+    echo     "                        define the variable SCILAB_GDB_OPT to add custom arguments to gdb."
+    echo     "      -debug-kdbg     : Start Scilab under kdbg (Unix/linux only)."
+    echo     "      -profiling      : Start Scilab under valgrind (Unix/linux only)."
+    echo     "                        define the variable SCILAB_VALGRIND_OPT to add custom arguments to"
+    echo     "                        valgrind (and override the existing valgrind arguments)."
+    echo     "      -profiling-visu : Start Scilab under callgrind (Unix/linux only)."
+    echo     "                        define the variable SCILAB_VALGRIND_OPT to add custom arguments to"
+    echo     "                        callgrind (and override the existing callgrind arguments)."
+    echo     "      -electric-fence : Start Scilab with the Electric Fence (Unix/linux only)."
+    echo     " "
+fi
+    echo     "      All these arguments can be retrieved by the Scilab function sciargs."
+    echo     " "
+    exit
 }
 
 do_compile()
 {
-        umask 002
-        rm -f report
-        name=`basename $1 .sci`
-        echo generating $name.bin
-        echo "predef();exec('$name.sci');save('$name.bin');quit"\
-              | $SCILABBIN -ns -nwni | sed 1,8d 1>report 2>&1
-        if (grep error report 1> /dev/null  2>&1);
-        then cat report;echo " "
-           echo see `pwd`/report for more informations
-           grep libok report>/dev/null;
-        else rm -f report;
-        fi
-        umask 022
-        exit 0
+    umask 002
+    rm -f report
+    name=`basename $1 .sci`
+    echo generating $name.bin
+    echo "predef();exec('$name.sci');save('$name.bin');quit"\
+          | $SCILABBIN -ns -nwni | sed 1,8d 1>report 2>&1
+    if (grep error report 1> /dev/null  2>&1);
+    then cat report;echo " "
+        echo see `pwd`/report for more information
+        grep libok report>/dev/null;
+    else rm -f report;
+    fi
+    umask 022
+    exit 0
 }
 
 do_lib()
 {
-        umask 002
-        rm -f report
-        echo "$1=lib('$2/');save('$2/lib',$1);quit"\
-              | $SCILABBIN -ns -nwni |sed 1,/--\>/d 1>report 2>&1
-        if (grep error report 1> /dev/null  2>&1);
-        then cat report;echo " "
-                echo see `pwd`/report for more informations
-                grep libok report>/dev/null;
-        else rm -f report;
-        fi
-        umask 022
-        exit 0
+    umask 002
+    rm -f report
+    echo "$1=lib('$2/');save('$2/lib',$1);quit"\
+          | $SCILABBIN -ns -nwni |sed 1,/--\>/d 1>report 2>&1
+    if (grep error report 1> /dev/null  2>&1);
+    then cat report;echo " "
+        echo see `pwd`/report for more information
+        grep libok report>/dev/null;
+    else rm -f report;
+    fi
+    umask 022
+    exit 0
 }
 
 MORE_OPT=""
 if test "$SCILAB_MODE" = "nw"; then
-        MORE_OPT="-nw"
+    MORE_OPT="-nw"
 fi
 
 # calling Scilab with no argument or special cases of calling Scilab
 rest="no"
 case $# in
     0) # No arg, run Scilab
-                do_scilex $MORE_OPT
+        do_scilex $MORE_OPT
         ;;
     2) # Only two arg
         case $1 in
             -comp)
-                                do_compile $2
+                do_compile $2
                 ;;
             *)
-                                rest="yes"
+                rest="yes"
                 ;;
         esac
         ;;
     3)
         case $1 in
             -lib)
-                                do_lib $2 $3
+                do_lib $2 $3
                 ;;
             *)
-                                rest="yes"
+                rest="yes"
                 ;;
         esac
         ;;
     *)
         case $1 in
             *)
-                                rest="yes"
+                rest="yes"
                 ;;
         esac
         ;;
@@ -672,85 +770,85 @@ esac
 # really calling Scilab with arguments
 
 if test "$rest" = "yes"; then
-  debug=
-  debug_kdbg=
-  profiling=
-  profiling_visu=
-  electric_fence=
-  prevarg=
-  for sciarg in "$@"
-  do
+    debug=
+    debug_kdbg=
+    profiling=
+    profiling_visu=
+    electric_fence=
+    prevarg=
+    for sciarg in "$@"
+    do
 
     # If the previous argument needs an argument, skip current one.
-    if test -n "$prevarg"; then
-      prevarg=
-      continue
-    fi
+        if test -n "$prevarg"; then
+            prevarg=
+            continue
+        fi
 
-    case $sciarg in
-      -nogui|-version|-ns|-nb|-nw|-nouserstartup|--texmacs|-nwni)
-              ;;
-      -psn_*)
-            # Under Mac OS X, .app is adding the arg -psn_0_xxxx
-            # (psn = ProcessSerialNumber). It is not used (but could be in the future)
-            ;;
-      -display|-f|-l|-e|-d|-mem)
-              prevarg=1
-              ;;
-          -args) # Accept extra arguments
-                  extraarg=1
-                  ;;
-      -debug)
-          DEBUG="-debug"
-          ;;
-      -debug-kdbg)
-          DEBUG_KDBG="-debug-kdbg"
-          ;;
-      -profiling)
-          PROFILING="-profiling"
-          ;;
-      -profiling-visu)
-          PROFILING_VISU="-profiling-visu"
-          ;;
-      -electric-fence)
-          ELECTRIC_FENCE="-electric-fence"
-          ;;
-      -h|--help)
-          do_help
-          ;;
-                *)
-                        foundUnknownArg=1
-                  # Do nothing. Gives unknown args to Scilab binaries if -a is provided
-                  ;;
-    esac
-  done
+        case $sciarg in
+            -nogui|-version|-ns|-nb|-nw|-nouserstartup|--texmacs|-nwni)
+                ;;
+            -psn_*)
+        # Under Mac OS X, .app is adding the arg -psn_0_xxxx
+        # (psn = ProcessSerialNumber). It is not used (but could be in the future)
+                ;;
+            -display|-f|-l|-e|-d|-mem)
+                prevarg=1
+                ;;
+            -args) # Accept extra arguments
+                extraarg=1
+                ;;
+            -debug)
+                DEBUG="-debug"
+                ;;
+            -debug-kdbg)
+                DEBUG_KDBG="-debug-kdbg"
+                ;;
+            -profiling)
+                PROFILING="-profiling"
+                ;;
+            -profiling-visu)
+                PROFILING_VISU="-profiling-visu"
+                ;;
+            -electric-fence)
+                ELECTRIC_FENCE="-electric-fence"
+                ;;
+            -h|--help)
+                do_help
+                ;;
+            *)
+                foundUnknownArg=1
+          # Do nothing. Gives unknown args to Scilab binaries if -a is provided
+                ;;
+        esac
+    done
 
 
 # If the argument -a is not provided (extraarg) and we found unknown args
 # fail and provide help
-  if test -z "$extraarg" -a -n "$foundUnknownArg"; then
-          do_help
-  fi
-
-  if test -n "$DEBUG"; then
-          start_debug "$@" $MORE_OPT
-  else
-  if test -n "$DEBUG_KDBG"; then
-          start_debug_kdbg "$@" $MORE_OPT
-  else
-        if test -n "$PROFILING"; then
-                start_profiling "$@" $MORE_OPT
-        else
-                if test -n "$PROFILING_VISU"; then
-                        start_profiling_visu "$@" $MORE_OPT
-                else
-                        if test -n "$ELECTRIC_FENCE"; then
-                                start_electric_fence "$@" $MORE_OPT
-                        else
-                                do_scilex "$@" $MORE_OPT
-                        fi # not electric fense
-                fi # not profiling visu
-        fi # not profiling
-  fi # not debug kdbg
-  fi # not debug
+    if test -z "$extraarg" -a -n "$foundUnknownArg"; then
+        do_help
+    fi
+
+    if test -n "$DEBUG"; then
+        start_debug "$@" $MORE_OPT
+    else
+        if test -n "$DEBUG_KDBG"; then
+            start_debug_kdbg "$@" $MORE_OPT
+        else
+            if test -n "$PROFILING"; then
+                start_profiling "$@" $MORE_OPT
+            else
+                if test -n "$PROFILING_VISU"; then
+                    start_profiling_visu "$@" $MORE_OPT
+                else
+                    if test -n "$ELECTRIC_FENCE"; then
+                        start_electric_fence "$@" $MORE_OPT
+                    else
+                        do_scilex "$@" $MORE_OPT
+                    fi # not electric fense
+                fi # not profiling visu
+            fi # not profiling
+        fi # not debug kdbg
+    fi # not debug
 fi # if rest
diff --git a/scilab/build.incl.xml b/scilab/build.incl.xml
index 00d35ef..fcf03f5 100644
--- a/scilab/build.incl.xml
+++ b/scilab/build.incl.xml
@@ -182,7 +182,7 @@
       <classfileset dir="${build.test.dir}" includes="**/*.class"/>
       <jvmarg value="-DdisableLoadJNIScilab=1"/>
       <jvmarg value="-DSCI=${base.dir}"/>
-      <jvmarg value="-Djava.library.path=${base.dir}/modules/.libs/:${base.dir}/modules/javasci/.libs/"/>
+      <jvmarg value="-Djava.library.path=${base.dir}/modules/.libs/:${base.dir}/modules/javasci/.libs/:/usr/lib/jni/"/>
     </testng>
   </target>
 
diff --git a/scilab/configure b/scilab/configure
index 23f881d..b4496fd 100755
--- a/scilab/configure
+++ b/scilab/configure
@@ -790,6 +790,10 @@ USE_DYNAMIC_STACK_FALSE
 USE_DYNAMIC_STACK_TRUE
 IS_64_BITS_CPU_FALSE
 IS_64_BITS_CPU_TRUE
+CODE_COVERAGE_FALSE
+CODE_COVERAGE_TRUE
+GENHTML
+LCOV
 IS_MIPS_SGI_IRIX_FALSE
 IS_MIPS_SGI_IRIX_TRUE
 IS_SOLARIS_FALSE
@@ -924,6 +928,7 @@ enable_debug_CXX
 enable_debug_java
 enable_debug_fortran
 enable_debug_linker
+enable_code_coverage
 enable_stopOnWarning
 with_gcc
 with_g77
@@ -1636,6 +1641,7 @@ Optional Features:
   --enable-debug-fortran  Do not optimize and print warning messages (Fortran
                           code)
   --enable-debug-linker   Print warning messages from the linker (ld)
+  --enable-code-coverage  Enable code coverage
   --enable-stop-on-warning
                           Stop the compilation on the first warning found in
                           the C/C++ code
@@ -5540,6 +5546,12 @@ if test "${enable_debug_linker+set}" = set; then :
 fi
 
 
+# Check whether --enable-code-coverage was given.
+if test "${enable_code_coverage+set}" = set; then :
+  enableval=$enable_code_coverage;
+fi
+
+
 # Check whether --enable-stopOnWarning was given.
 if test "${enable_stopOnWarning+set}" = set; then :
   enableval=$enable_stopOnWarning;
@@ -8946,6 +8958,12 @@ fi
 ######################
 
 if test -n "$F77"; then
+
+   # enable the code coverage
+   if test "$enable_code_coverage" = yes; then
+    FFLAGS="$FFLAGS -fprofile-arcs -ftest-coverage"
+   fi
+
    if test "$enable_debug_fortran" = yes; then
         # -D_FORTIFY_SOURCE=2
         ac_ext=f
@@ -8953,7 +8971,7 @@ ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5'
 ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_f77_compiler_gnu
 
-        for flag in -g -Wall -Wimplicit -Wsurprising ; do
+        for flag in -g -Wall -Wsurprising; do
                 case " ${FFLAGS} " in
                         *\ ${flag}\ *)
                                 # flag is already present
@@ -9116,6 +9134,12 @@ fi
 case "$CXX" in
          g++-* | g++ | ccache*g++ | ccache*g++-* )
    ## With GNU C++ Compiler
+
+   # enable the code coverage
+   if test "$enable_code_coverage" = yes; then
+    CPPFLAGS="$CPPFLAGS -fprofile-arcs -ftest-coverage"
+   fi
+
    if test "$enable_debug_CXX" = yes; then
           CPPFLAGS="$CPPFLAGS -pipe -Wshadow -Wpointer-arith -Wcast-align -Wreturn-type -Wswitch -Wtrigraphs -Wcomment -W -Wchar-subscripts -Wformat -Wparentheses -Wsign-compare -Wwrite-strings -Wunused -Wno-strict-aliasing -Wextra -Wall -g3"
           case "$host" in
@@ -9148,6 +9172,12 @@ esac
 case "$CC" in
          gcc-* | gcc | ccache*gcc | ccache*gcc-* )
    ## With GNU Compiler
+
+   # enable the code coverage
+   if test "$enable_code_coverage" = yes; then
+    CFLAGS="$CFLAGS -fprofile-arcs -ftest-coverage"
+   fi
+
    if test "$enable_debug_C" = yes; then
           CFLAGS="$CFLAGS -pipe -Wformat -Wshadow -Wfloat-equal -Wpointer-arith -Wcast-align -Wmissing-prototypes -Wmissing-declarations  -Wstrict-prototypes  -Wmissing-noreturn -Wendif-labels -Wpointer-arith -Wbad-function-cast -Wcast-qual -Wwrite-strings -Winline -Wredundant-decls -Wall -Wchar-subscripts -Wextra  -Wuninitialized -Wno-format-y2k -Wmissing-format-attribute -Wno-missing-field-initializers -Wno-strict-aliasing  -Wold-style-definition -g3"
           # used to be -O
@@ -9271,6 +9301,104 @@ esac
 ;; # end of not a gcc compiler
 esac
 
+# enable the code coverage
+if test "$enable_code_coverage" = yes; then
+   # Extract the first word of "lcov", so it can be a program name with args.
+set dummy lcov; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_path_LCOV+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $LCOV in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_LCOV="$LCOV" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_path_LCOV="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  ;;
+esac
+fi
+LCOV=$ac_cv_path_LCOV
+if test -n "$LCOV"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LCOV" >&5
+$as_echo "$LCOV" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+   if test -z "$LCOV" ; then
+                as_fn_error $? "Cannot find lcov. Please install it (package lcov under Debian) or remove the option --enable-code-coverage" "$LINENO" 5
+   fi
+   # Extract the first word of "genhtml", so it can be a program name with args.
+set dummy genhtml; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_path_GENHTML+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $GENHTML in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_GENHTML="$GENHTML" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_path_GENHTML="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  ;;
+esac
+fi
+GENHTML=$ac_cv_path_GENHTML
+if test -n "$GENHTML"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GENHTML" >&5
+$as_echo "$GENHTML" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+   if test -z "$GENHTML" ; then
+                as_fn_error $? "Cannot find genhtml. Please install it (package lcov under Debian) or remove the option --enable-code-coverage" "$LINENO" 5
+   fi
+   LDFLAGS="$LDFLAGS -coverage"
+fi
+ if test "$enable_code_coverage" = yes; then
+  CODE_COVERAGE_TRUE=
+  CODE_COVERAGE_FALSE='#'
+else
+  CODE_COVERAGE_TRUE='#'
+  CODE_COVERAGE_FALSE=
+fi
+
 
 # flag for possible compilations in configure
 CFLAGS="$CFLAGS "'-I$(top_srcdir)/modules/core/includes/ -I$(top_srcdir)/libs/MALLOC/includes/ -I$(top_srcdir)/modules/localization/includes/'
@@ -9920,7 +10048,7 @@ $as_echo "$ac_java_classpath" >&6; }
 $as_echo_n "checking to see if the java compiler works... " >&6; }
 
     cat << \EOF > conftest.java
-// #line 9923 "configure"
+// #line 10051 "configure"
 
 
 public class conftest {
@@ -9986,7 +10114,7 @@ $as_echo_n "checking type of jvm... " >&6; }
     if test "x$ac_java_jvm_name" = "x" ; then
 
     cat << \EOF > conftest.java
-// #line 9989 "configure"
+// #line 10117 "configure"
 import gnu.java.io.EncodingManager;
 
 public class conftest {
@@ -10050,7 +10178,7 @@ $as_echo_n "checking java API version... " >&6; }
 
 
     cat << \EOF > conftest.java
-// #line 10053 "configure"
+// #line 10181 "configure"
 import java.nio.charset.Charset;
 
 public class conftest {
@@ -10095,7 +10223,7 @@ EOF
 
 
     cat << \EOF > conftest.java
-// #line 10098 "configure"
+// #line 10226 "configure"
 import java.lang.StringBuilder;
 
 public class conftest {
@@ -11464,7 +11592,7 @@ $as_echo_n "checking jgraphx... " >&6; }
           export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 11467 "configure"
+// #line 11595 "configure"
 import com.mxgraph.model.mxCell;
 
 public class conftest {
@@ -11558,7 +11686,7 @@ $as_echo_n "checking minimal version (1.4.1.0) of jgraphx... " >&6; }
    if test "x=" == "x"; then
 
     cat << \EOF > conftest.java
-// #line 11561 "configure"
+// #line 11689 "configure"
 import com.mxgraph.view.mxGraph;
 
 public class conftest {
@@ -11609,7 +11737,7 @@ EOF
    else
 
     cat << \EOF > conftest.java
-// #line 11612 "configure"
+// #line 11740 "configure"
 import com.mxgraph.view.mxGraph;
 
 public class conftest {
@@ -11682,7 +11810,7 @@ $as_echo_n "checking flexdock... " >&6; }
           export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 11685 "configure"
+// #line 11813 "configure"
 import org.flexdock.docking.DockingManager;
 
 public class conftest {
@@ -11776,7 +11904,7 @@ $as_echo_n "checking minimal version (0.5.2) of flexdock... " >&6; }
    if test "x" == "x"; then
 
     cat << \EOF > conftest.java
-// #line 11779 "configure"
+// #line 11907 "configure"
 import org.flexdock.util.Utilities;
 
 public class conftest {
@@ -11827,7 +11955,7 @@ EOF
    else
 
     cat << \EOF > conftest.java
-// #line 11830 "configure"
+// #line 11958 "configure"
 import org.flexdock.util.Utilities;
 
 public class conftest {
@@ -11900,7 +12028,7 @@ $as_echo_n "checking looks... " >&6; }
           export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 11903 "configure"
+// #line 12031 "configure"
 import com.jgoodies.looks.common.RenderingUtils;
 
 public class conftest {
@@ -12007,7 +12135,7 @@ $as_echo_n "checking jgoodies-looks... " >&6; }
           export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 12010 "configure"
+// #line 12138 "configure"
 import com.jgoodies.looks.common.RenderingUtils;
 
 public class conftest {
@@ -12115,7 +12243,7 @@ $as_echo_n "checking skinlf... " >&6; }
           export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 12118 "configure"
+// #line 12246 "configure"
 import com.l2fprod.util.AccessUtils;
 
 public class conftest {
@@ -12222,7 +12350,7 @@ $as_echo_n "checking jogl... " >&6; }
           export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 12225 "configure"
+// #line 12353 "configure"
 import javax.media.opengl.glu.GLUnurbs;
 
 public class conftest {
@@ -12434,7 +12562,7 @@ $as_echo_n "checking gluegen-rt... " >&6; }
           export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 12437 "configure"
+// #line 12565 "configure"
 import com.sun.gluegen.runtime.CPU;
 
 public class conftest {
@@ -12595,7 +12723,7 @@ $as_echo_n "checking jhall... " >&6; }
           export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 12598 "configure"
+// #line 12726 "configure"
 import javax.help.JHelp;
 
 public class conftest {
@@ -12702,7 +12830,7 @@ $as_echo_n "checking javahelp2... " >&6; }
           export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 12705 "configure"
+// #line 12833 "configure"
 import javax.help.JHelp;
 
 public class conftest {
@@ -12810,7 +12938,7 @@ $as_echo_n "checking jrosetta-API... " >&6; }
           export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 12813 "configure"
+// #line 12941 "configure"
 import com.artenum.rosetta.interfaces.core.ConsoleConfiguration;
 
 public class conftest {
@@ -12917,7 +13045,7 @@ $as_echo_n "checking jrosetta-engine... " >&6; }
           export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 12920 "configure"
+// #line 13048 "configure"
 import com.artenum.rosetta.core.action.AbstractConsoleAction;
 
 public class conftest {
@@ -13026,7 +13154,7 @@ $as_echo_n "checking jeuclid-core... " >&6; }
           export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 13029 "configure"
+// #line 13157 "configure"
 import net.sourceforge.jeuclid.LayoutContext;
 
 public class conftest {
@@ -13135,7 +13263,7 @@ $as_echo_n "checking fop... " >&6; }
           export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 13138 "configure"
+// #line 13266 "configure"
 import org.apache.fop.pdf.PDFInfo;
 
 public class conftest {
@@ -13242,7 +13370,7 @@ $as_echo_n "checking batik-all... " >&6; }
           export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 13245 "configure"
+// #line 13373 "configure"
 import org.apache.batik.parser.Parser;
 
 public class conftest {
@@ -13349,7 +13477,7 @@ $as_echo_n "checking batik... " >&6; }
           export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 13352 "configure"
+// #line 13480 "configure"
 import org.apache.batik.parser.Parser;
 
 public class conftest {
@@ -13443,7 +13571,7 @@ $as_echo_n "checking minimal version (1.7) of batik... " >&6; }
    if test "x" == "x"; then
 
     cat << \EOF > conftest.java
-// #line 13446 "configure"
+// #line 13574 "configure"
 import org.apache.batik.Version;
 
 public class conftest {
@@ -13494,7 +13622,7 @@ EOF
    else
 
     cat << \EOF > conftest.java
-// #line 13497 "configure"
+// #line 13625 "configure"
 import org.apache.batik.Version;
 
 public class conftest {
@@ -13567,7 +13695,7 @@ $as_echo_n "checking commons-io... " >&6; }
           export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 13570 "configure"
+// #line 13698 "configure"
 import org.apache.commons.io.output.CountingOutputStream;
 
 public class conftest {
@@ -13674,7 +13802,7 @@ $as_echo_n "checking xmlgraphics-commons... " >&6; }
           export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 13677 "configure"
+// #line 13805 "configure"
 import org.apache.xmlgraphics.util.Service;
 
 public class conftest {
@@ -13781,7 +13909,7 @@ $as_echo_n "checking avalon-framework... " >&6; }
           export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 13784 "configure"
+// #line 13912 "configure"
 import org.apache.avalon.framework.configuration.ConfigurationException;
 
 public class conftest {
@@ -13888,7 +14016,7 @@ $as_echo_n "checking xml-apis-ext... " >&6; }
           export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 13891 "configure"
+// #line 14019 "configure"
 import org.w3c.dom.svg.SVGDocument;
 
 public class conftest {
@@ -13995,7 +14123,7 @@ $as_echo_n "checking xml-commons-apis-ext... " >&6; }
           export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 13998 "configure"
+// #line 14126 "configure"
 import org.w3c.dom.svg.SVGDocument;
 
 public class conftest {
@@ -14106,7 +14234,7 @@ $as_echo_n "checking commons-logging... " >&6; }
           export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 14109 "configure"
+// #line 14237 "configure"
 import org.apache.commons.logging.LogFactory;
 
 public class conftest {
@@ -14213,7 +14341,7 @@ $as_echo_n "checking jlatexmath... " >&6; }
           export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 14216 "configure"
+// #line 14344 "configure"
 import org.scilab.forge.jlatexmath.TeXFormula;
 
 public class conftest {
@@ -14307,7 +14435,7 @@ $as_echo_n "checking minimal version (0.9.3) of jlatexmath... " >&6; }
    if test "x" == "x"; then
 
     cat << \EOF > conftest.java
-// #line 14310 "configure"
+// #line 14438 "configure"
 import org.scilab.forge.jlatexmath.TeXFormula;
 
 public class conftest {
@@ -14358,7 +14486,7 @@ EOF
    else
 
     cat << \EOF > conftest.java
-// #line 14361 "configure"
+// #line 14489 "configure"
 import org.scilab.forge.jlatexmath.TeXFormula;
 
 public class conftest {
@@ -14437,7 +14565,7 @@ $as_echo_n "checking checkstyle... " >&6; }
           export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 14440 "configure"
+// #line 14568 "configure"
 import com.puppycrawl.tools.checkstyle.CheckStyleTask;
 
 public class conftest {
@@ -14544,7 +14672,7 @@ $as_echo_n "checking commons-beanutils... " >&6; }
           export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 14547 "configure"
+// #line 14675 "configure"
 import org.apache.commons.beanutils.Converter;
 
 public class conftest {
@@ -14651,7 +14779,7 @@ $as_echo_n "checking antlr... " >&6; }
           export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 14654 "configure"
+// #line 14782 "configure"
 import antlr.TokenStreamException;
 
 public class conftest {
@@ -14758,7 +14886,7 @@ $as_echo_n "checking testng... " >&6; }
           export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 14761 "configure"
+// #line 14889 "configure"
 import org.testng.TestNG;
 
 public class conftest {
@@ -14865,7 +14993,7 @@ $as_echo_n "checking qdox... " >&6; }
           export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 14868 "configure"
+// #line 14996 "configure"
 import com.thoughtworks.qdox.tools.QDoxTester;
 
 public class conftest {
@@ -14972,7 +15100,7 @@ $as_echo_n "checking bsh... " >&6; }
           export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 14975 "configure"
+// #line 15103 "configure"
 import bsh.Console;
 
 public class conftest {
@@ -15079,7 +15207,7 @@ $as_echo_n "checking junit... " >&6; }
           export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 15082 "configure"
+// #line 15210 "configure"
 import junit.framework.Assert;
 
 public class conftest {
@@ -15186,7 +15314,7 @@ $as_echo_n "checking ccsm-commons... " >&6; }
           export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 15189 "configure"
+// #line 15317 "configure"
 import edu.tum.cs.commons.logging.*;
 
 public class conftest {
@@ -15293,7 +15421,7 @@ $as_echo_n "checking simulink... " >&6; }
           export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 15296 "configure"
+// #line 15424 "configure"
 import edu.tum.cs.simulink.model.*;
 
 public class conftest {
@@ -15400,7 +15528,7 @@ $as_echo_n "checking cup-runtime... " >&6; }
           export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 15403 "configure"
+// #line 15531 "configure"
 import java_cup.runtime.*;
 
 public class conftest {
@@ -19420,7 +19548,7 @@ $as_echo_n "checking jhdf5... " >&6; }
           export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 19423 "configure"
+// #line 19551 "configure"
 import ncsa.hdf.hdf5lib.HDF5Constants;
 
 public class conftest {
@@ -19569,7 +19697,7 @@ $as_echo_n "checking minimal version (1.8.4) of hdf5... " >&6; }
    if test "x" == "x"; then
 
     cat << \EOF > conftest.java
-// #line 19572 "configure"
+// #line 19700 "configure"
 import ncsa.hdf.hdf5lib.H5;
 
 public class conftest {
@@ -19624,7 +19752,7 @@ EOF
    else
 
     cat << \EOF > conftest.java
-// #line 19627 "configure"
+// #line 19755 "configure"
 import ncsa.hdf.hdf5lib.H5;
 
 public class conftest {
@@ -24193,7 +24321,7 @@ CPPFLAGS="$CPPFLAGS -I$CHK_TCL_INCLUDE_PATH"
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking if tcl is version $CHK_TCL_MAJOR.$CHK_TCL_MINOR or later" >&5
 $as_echo_n "checking if tcl is version $CHK_TCL_MAJOR.$CHK_TCL_MINOR or later... " >&6; }
 cat > conftest.$ac_ext <<EOF
-#line 24196 "configure"
+#line 24324 "configure"
 #include "confdefs.h"
 
 #include "$CHK_TCL_INCLUDE_PATH/$CHK_TCL_INC_NAME"
@@ -24503,7 +24631,7 @@ CPPFLAGS="$CPPFLAGS $TCL_INC_PATH -I$CHK_TK_INCLUDE_PATH $X_CFLAGS"
 $as_echo_n "checking if tk is version $CHK_TK_MAJOR.$CHK_TK_MINOR or later... " >&6; }
 
 cat > conftest.$ac_ext <<EOF
-#line 24506 "configure"
+#line 24634 "configure"
 #include "confdefs.h"
 
 #include "$CHK_TK_INCLUDE_PATH/$CHK_TK_INC_NAME"
@@ -25084,7 +25212,7 @@ $as_echo_n "checking saxon... " >&6; }
           export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 25087 "configure"
+// #line 25215 "configure"
 import com.icl.saxon.Loader;
 
 public class conftest {
@@ -25191,7 +25319,7 @@ $as_echo_n "checking jlatexmath-fop... " >&6; }
           export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 25194 "configure"
+// #line 25322 "configure"
 import org.scilab.forge.jlatexmath.fop.JLaTeXMathObj;
 
 public class conftest {
@@ -31492,7 +31620,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 31495 "configure"
+#line 31623 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -31598,7 +31726,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 31601 "configure"
+#line 31729 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -37802,6 +37930,10 @@ if test -z "${IS_MIPS_SGI_IRIX_TRUE}" && test -z "${IS_MIPS_SGI_IRIX_FALSE}"; th
   as_fn_error $? "conditional \"IS_MIPS_SGI_IRIX\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
+if test -z "${CODE_COVERAGE_TRUE}" && test -z "${CODE_COVERAGE_FALSE}"; then
+  as_fn_error $? "conditional \"CODE_COVERAGE\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
 if test -z "${IS_64_BITS_CPU_TRUE}" && test -z "${IS_64_BITS_CPU_FALSE}"; then
   as_fn_error $? "conditional \"IS_64_BITS_CPU\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -40932,6 +41064,15 @@ fi
 fi
 
 echo ""
+if test "$enable_code_coverage" = yes;  then
+   echo "Code coverage configuration:"
+   echo "  LCOV .............. = $LCOV"
+   echo "  GENHTML ........... = $GENHTML"
+else
+   echo "Not using code coverage"
+fi
+
+echo ""
 if test $OPENMP_ENABLE = yes; then
    echo "OpenMP Configuration:"
    echo "OpenMP CFLAGS ...... = $OPENMP_CFLAGS"
diff --git a/scilab/configure.ac b/scilab/configure.ac
index 87fa550..2ed08e3 100644
--- a/scilab/configure.ac
+++ b/scilab/configure.ac
@@ -96,6 +96,9 @@ AC_ARG_ENABLE(debug-fortran,
 AC_ARG_ENABLE(debug-linker,
    AC_HELP_STRING([--enable-debug-linker],[Print warning messages from the linker (ld)]))
 
+AC_ARG_ENABLE(code-coverage,
+   AC_HELP_STRING([--enable-code-coverage],[Enable code coverage]))
+
 AC_ARG_ENABLE(stopOnWarning,
    AC_HELP_STRING([--enable-stop-on-warning],[Stop the compilation on the first warning found in the C/C++ code]))
 
@@ -355,10 +358,16 @@ fi
 
 if test -n "$F77"; then
 dnl @TODO : Maybe we should check that it is actually gfortran
+
+   # enable the code coverage
+   if test "$enable_code_coverage" = yes; then
+    FFLAGS="$FFLAGS -fprofile-arcs -ftest-coverage"
+   fi
+
    if test "$enable_debug_fortran" = yes; then
         # -D_FORTIFY_SOURCE=2
         AC_LANG_PUSH([Fortran 77])
-        for flag in -g -Wall -Wimplicit -Wsurprising ; do
+        for flag in -g -Wall -Wsurprising; do
                 case " ${FFLAGS} " in
                         *\ ${flag}\ *)
                                 # flag is already present
@@ -470,6 +479,12 @@ fi
 case "$CXX" in
          g++-* | g++ | ccache*g++ | ccache*g++-* )
    ## With GNU C++ Compiler
+
+   # enable the code coverage
+   if test "$enable_code_coverage" = yes; then
+    CPPFLAGS="$CPPFLAGS -fprofile-arcs -ftest-coverage"
+   fi
+
    if test "$enable_debug_CXX" = yes; then
           CPPFLAGS="$CPPFLAGS -pipe -Wshadow -Wpointer-arith -Wcast-align -Wreturn-type -Wswitch -Wtrigraphs -Wcomment -W -Wchar-subscripts -Wformat -Wparentheses -Wsign-compare -Wwrite-strings -Wunused -Wno-strict-aliasing -Wextra -Wall -g3"
           case "$host" in
@@ -502,6 +517,12 @@ esac
 case "$CC" in
          gcc-* | gcc | ccache*gcc | ccache*gcc-* )
    ## With GNU Compiler
+
+   # enable the code coverage
+   if test "$enable_code_coverage" = yes; then
+    CFLAGS="$CFLAGS -fprofile-arcs -ftest-coverage"
+   fi
+
    if test "$enable_debug_C" = yes; then
           CFLAGS="$CFLAGS -pipe -Wformat -Wshadow -Wfloat-equal -Wpointer-arith -Wcast-align -Wmissing-prototypes -Wmissing-declarations  -Wstrict-prototypes  -Wmissing-noreturn -Wendif-labels -Wpointer-arith -Wbad-function-cast -Wcast-qual -Wwrite-strings -Winline -Wredundant-decls -Wall -Wchar-subscripts -Wextra  -Wuninitialized -Wno-format-y2k -Wmissing-format-attribute -Wno-missing-field-initializers -Wno-strict-aliasing  -Wold-style-definition -g3"
           # used to be -O
@@ -624,6 +645,19 @@ esac
 ;; # end of not a gcc compiler
 esac
 
+# enable the code coverage
+if test "$enable_code_coverage" = yes; then
+   AC_PATH_PROG(LCOV, lcov)
+   if test -z "$LCOV" ; then
+                AC_MSG_ERROR([Cannot find lcov. Please install it (package lcov under Debian) or remove the option --enable-code-coverage])
+   fi
+   AC_PATH_PROG(GENHTML, genhtml)
+   if test -z "$GENHTML" ; then
+                AC_MSG_ERROR([Cannot find genhtml. Please install it (package lcov under Debian) or remove the option --enable-code-coverage])
+   fi
+   LDFLAGS="$LDFLAGS -coverage"
+fi
+AM_CONDITIONAL(CODE_COVERAGE, test "$enable_code_coverage" = yes)
 
 # flag for possible compilations in configure
 CFLAGS="$CFLAGS "'-I$(top_srcdir)/modules/core/includes/ -I$(top_srcdir)/libs/MALLOC/includes/ -I$(top_srcdir)/modules/localization/includes/'
@@ -1875,6 +1909,15 @@ fi
 fi
 
 echo ""
+if test "$enable_code_coverage" = yes;  then
+   echo "Code coverage configuration:"
+   echo "  LCOV .............. = $LCOV"
+   echo "  GENHTML ........... = $GENHTML"
+else
+   echo "Not using code coverage"
+fi
+
+echo ""
 if test $OPENMP_ENABLE = yes; then
    echo "OpenMP Configuration:"
    echo "OpenMP CFLAGS ...... = $OPENMP_CFLAGS"
diff --git a/scilab/contrib/Makefile.in b/scilab/contrib/Makefile.in
index 930564c..9459645 100644
--- a/scilab/contrib/Makefile.in
+++ b/scilab/contrib/Makefile.in
@@ -115,6 +115,7 @@ FGREP = @FGREP@
 FLEXDOCK = @FLEXDOCK@
 FLIBS = @FLIBS@
 FOP = @FOP@
+GENHTML = @GENHTML@
 GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
 GIWS_BIN = @GIWS_BIN@
 GLUEGEN_RT = @GLUEGEN_RT@
@@ -159,6 +160,7 @@ JROSETTA_API = @JROSETTA_API@
 JROSETTA_ENGINE = @JROSETTA_ENGINE@
 JUNIT = @JUNIT@
 LAPACK_LIBS = @LAPACK_LIBS@
+LCOV = @LCOV@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBICONV = @LIBICONV@
diff --git a/scilab/libs/GetWindowsVersion/GetWindowsVersion.rc b/scilab/libs/GetWindowsVersion/GetWindowsVersion.rc
index fee4959..864b775 100644
--- a/scilab/libs/GetWindowsVersion/GetWindowsVersion.rc
+++ b/scilab/libs/GetWindowsVersion/GetWindowsVersion.rc
@@ -48,8 +48,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 5,3,0,0
- PRODUCTVERSION 5,3,0,0
+ FILEVERSION 5,3,1,0
+ PRODUCTVERSION 5,3,1,0
  FILEFLAGSMASK 0x17L
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -65,12 +65,12 @@ BEGIN
         BLOCK "040c04b0"
         BEGIN
             VALUE "FileDescription", "GetWindowsVersion library for Scilab 5.x"
-            VALUE "FileVersion", "5, 3, 0, 0"
+            VALUE "FileVersion", "5, 3, 1, 0"
             VALUE "InternalName", "GetWindowsVersion library for Scilab 5.x"
-            VALUE "LegalCopyright", "Copyright (C) 2010"
+            VALUE "LegalCopyright", "Copyright (C) 2011"
             VALUE "OriginalFilename", "GetWindowsVersion.dll"
             VALUE "ProductName", "GetWindowsVersion library for Scilab 5.x"
-            VALUE "ProductVersion", "5, 3, 0, 0"
+            VALUE "ProductVersion", "5, 3, 1, 0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/scilab/libs/LibScilab/libscilab.rc b/scilab/libs/LibScilab/libscilab.rc
index 930f66b..0a89a1d 100644
--- a/scilab/libs/LibScilab/libscilab.rc
+++ b/scilab/libs/LibScilab/libscilab.rc
@@ -49,8 +49,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 5,3,0,0
- PRODUCTVERSION 5,3,0,0
+ FILEVERSION 5,3,1,0
+ PRODUCTVERSION 5,3,1,0
  FILEFLAGSMASK 0x17L
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -66,12 +66,12 @@ BEGIN
         BLOCK "040c04b0"
         BEGIN
             VALUE "FileDescription", "Scilab library"
-            VALUE "FileVersion", "5, 3, 0, 0"
+            VALUE "FileVersion", "5, 3, 1, 0"
             VALUE "InternalName", "Scilab library"
-            VALUE "LegalCopyright", "Copyright (C) 2010"
+            VALUE "LegalCopyright", "Copyright (C) 2011"
             VALUE "OriginalFilename", "libscilab.dll"
             VALUE "ProductName", "Scilab library (Intel Fortran)"
-            VALUE "ProductVersion", "5, 3, 0, 0"
+            VALUE "ProductVersion", "5, 3, 1, 0"
         END
     END