Merge remote branch 'origin/master' into textrendering

Conflicts: scilab/configure
author: Sylvestre Ledru <sylvestre.ledru@scilab.org> 2010-02-02 16:50:46 +0100
committer: Sylvestre Ledru <sylvestre.ledru@scilab.org> 2010-02-02 16:50:46 +0100
commit: 4543a005198ee3197c08e553378430c9bc590911 (patch)
tree: f48aacd7ed42e1a1b0f13d95fa7185fe4b6afde7
parent: 7262c7b88b413c8a0b09bb0a627d613cdca3f845 (diff)
parent: 97de4eee52d09735f550d4c632fba106d0cc1762 (diff)
download: scilab-4543a005198ee3197c08e553378430c9bc590911.zip
scilab-4543a005198ee3197c08e553378430c9bc590911.tar.gz
378 files changed, 8134 insertions, 2569 deletions
diff --git a/scilab/ACKNOWLEDGEMENTS b/scilab/ACKNOWLEDGEMENTS
index ccd3245..4fdc6fd 100644
--- a/scilab/ACKNOWLEDGEMENTS
+++ b/scilab/ACKNOWLEDGEMENTS
@@ -60,7 +60,7 @@ Scilab a better software.
        - Misc patches for Solaris/Opensolaris
 * Sébastien Jourdain from Artenum ( http://www.artenum.com )   
-        - Scilab Console console ( Jrosetta )
+        - Scilab Console ( Jrosetta )
 * Vincent Lejeune
        - Patches
diff --git a/scilab/CHANGES_5.2.X b/scilab/CHANGES_5.2.X
index e14ef4a..94b8207 100644
--- a/scilab/CHANGES_5.2.X
+++ b/scilab/CHANGES_5.2.X
@@ -17,7 +17,7 @@ Internationalization:
 * Ukrainian localization added (Thanks Yuri Chornoivan)
-* Many english typos have been fixed by (Thanks Yuri Chornoivan)
+* Many english typos have been fixed (Thanks Yuri Chornoivan)
 Xcos:
 =====
@@ -27,7 +27,7 @@ Xcos:
 * Superblock masks can now be used and a new window is created when user wants 
  to configure the variable settings.
-* Performance improvements under Linux
+* Some performance improvements under Linux
 * A rework to pass checkstyle metrics on the code has been started.
@@ -70,13 +70,17 @@ Xcos:
 * bug 5627 fixed - It was not possible to place a port in a non-conventionnal
                   side.
+* bug 5640 fixed - When launching Xcos: Toolbar and menubar didn't appear 
+                   before the focus is on the Xcos window.
 * bug 5660 fixed - An scicos block with negative simulation function type was 
                   not working (espacially the ESELECT_f block).
 * bug 5666 fixed - The CLKGOTO block wasn't valid anymore after setting
                   its parameters.
-* bug 5667 fixed - Simulation starts faster on Linux for huge diagram ( hdf5 export issue )
+* bug 5667 fixed - Simulation starts faster on Linux for huge diagram 
+                   (hdf5 export issue).
 * bug 5683 fixed - Xcos code updated to work with jgraphx >= 1.2.0.X
@@ -94,7 +98,14 @@ Xcos:
 * bug 6463 fixed - The jgraphx library has been updated to 1.2.0.7.
-* bug 6490 fixed - The multiple-point link didn't work accordingly to the zoom level.
+* bug 6474 fixed - demo_watertank.xcoscrashed when any block parameter dialog 
+                   was closed the second time.
+* bug 6490 fixed - The multiple-point link didn't work accordingly to the 
+                   zoom level.
+* bug 6540 fixed - We were unable to open a SuperBlock due to jgraphx serializer
+                   limitation.
 Atoms:
 ======
@@ -107,6 +118,8 @@ Atoms:
 * bug 6389 fixed - Atoms GUI : "Update" button just removed the selected module
                   but didn't update it.
+                   
+* bug 6518 fixed - atomsRepositoryAdd() didn't accept local repositories.
 Compilation:
 ============
@@ -127,6 +140,8 @@ Compilation:
 * bug 5503 fixed - add /usr/lib/*/ and /usr/lib64/*/ in the search path when
                   looking for Java libraries (Fedora 12 for example)
+* bug 5665 fixed - Under Linux, hdf5 module can now be compiled without Java
 * bug 6453 fixed - ImplicitPointerConversions was triggered by some Debian/
                   Ubuntu check tools
@@ -155,6 +170,8 @@ Bug fixes:
 * bug 5413 fixed - help_from_sci was replacing the < > in the examples by
                   &gt; and &lt; causing issues in the build of documentation.
+* bug 5436 fixed - The export to svg does not work with bar graphs.
 * bug 5513 fixed - 'input' failed after Ctrl+C was typed.
 * bug 5659 fixed - emptystr changed the value of an input variable.
@@ -229,6 +246,9 @@ Bug fixes:
 * bug 6491 fixed - libinter.h was not installed under Linux (SEP #35 updated)
+* bug 6521 fixed - 'getmd5' crashed with a wrong second input argument.
               Changes between version 5.2.0-beta1 and 5.2.0 of Scilab
               ==========================================================
diff --git a/scilab/CHANGES_5.3.X b/scilab/CHANGES_5.3.X
index 2f755f9..ab159f7 100644
--- a/scilab/CHANGES_5.3.X
+++ b/scilab/CHANGES_5.3.X
@@ -18,8 +18,20 @@ Xcos:
 =====
 * The default palettes can now be manipulated by the user.
-          
+Compilation:
+============
+* On Windows, Pentium III class (or equivalent) with SSE instructions is required.
+* Windows 2000 is no more supported as operating system.
+ 
 Bug fixes:
 ==========
 * bug 6419 fixed - gstacksize() There was no way to retrieve minimum from scilab.
+* bug 6484 fixed - file did not return filenale of a opened fortran file.
+* bug 6511 fixed - mseek and mtell did not manage files > 2 Gbytes on 64 bits.
diff --git a/scilab/Makefile.am b/scilab/Makefile.am
index baf1faa..15e99a9 100644
--- a/scilab/Makefile.am
+++ b/scilab/Makefile.am
@@ -97,11 +97,11 @@ all-local: $(TARGETS_ALL)
 rootdir=$(pkgdatadir)/etc/
 root_DATA = $(top_srcdir)/etc/scilab.start \
 $(top_srcdir)/etc/scilab.quit \
-$(top_srcdir)/etc/modules.xml \
-$(top_srcdir)/etc/classpath.xml \
-$(top_srcdir)/etc/librarypath.xml \
 $(top_srcdir)/etc/toolboxes.xml \
-$(top_srcdir)/etc/jvm_options.xml
+$(top_builddir)/etc/jvm_options.xml \
+$(top_builddir)/etc/modules.xml \
+$(top_builddir)/etc/classpath.xml \
+$(top_builddir)/etc/librarypath.xml
 infofilesdir=$(pkgdatadir)/
diff --git a/scilab/Makefile.in b/scilab/Makefile.in
index d8393fd..8907da8 100644
--- a/scilab/Makefile.in
+++ b/scilab/Makefile.in
@@ -336,6 +336,7 @@ AVALON_FRAMEWORK = @AVALON_FRAMEWORK@
 AWK = @AWK@
 BATIK = @BATIK@
 BLAS_LIBS = @BLAS_LIBS@
+BSH = @BSH@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
@@ -409,6 +410,7 @@ JLATEXMATH_FOP = @JLATEXMATH_FOP@
 JOGL = @JOGL@
 JROSETTA_API = @JROSETTA_API@
 JROSETTA_ENGINE = @JROSETTA_ENGINE@
+JUNIT = @JUNIT@
 LAPACK_LIBS = @LAPACK_LIBS@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
@@ -465,6 +467,7 @@ PVM_ENABLE = @PVM_ENABLE@
 PVM_INCLUDE = @PVM_INCLUDE@
 PVM_LIB = @PVM_LIB@
 PYTHON = @PYTHON@
+QDOX = @QDOX@
 RANLIB = @RANLIB@
 RELOCATABLE = @RELOCATABLE@
 RT_LIB = @RT_LIB@
@@ -483,6 +486,7 @@ SWIG_JAVA = @SWIG_JAVA@
 SWIG_RUNTIME_LIBS_DIR = @SWIG_RUNTIME_LIBS_DIR@
 TCLTK_LIBS = @TCLTK_LIBS@
 TCL_INC_PATH = @TCL_INC_PATH@
+TESTNG = @TESTNG@
 TK_INC_PATH = @TK_INC_PATH@
 UMFPACK_ENABLE = @UMFPACK_ENABLE@
 UMFPACK_LIB = @UMFPACK_LIB@
@@ -599,11 +603,11 @@ TARGETS_ALL = macros $(am__append_3)
 rootdir = $(pkgdatadir)/etc/
 root_DATA = $(top_srcdir)/etc/scilab.start \
 $(top_srcdir)/etc/scilab.quit \
-$(top_srcdir)/etc/modules.xml \
-$(top_srcdir)/etc/classpath.xml \
-$(top_srcdir)/etc/librarypath.xml \
 $(top_srcdir)/etc/toolboxes.xml \
-$(top_srcdir)/etc/jvm_options.xml
+$(top_builddir)/etc/jvm_options.xml \
+$(top_builddir)/etc/modules.xml \
+$(top_builddir)/etc/classpath.xml \
+$(top_builddir)/etc/librarypath.xml
 infofilesdir = $(pkgdatadir)/
 infofiles_DATA = $(top_srcdir)/CHANGES \
diff --git a/scilab/build.incl.xml b/scilab/build.incl.xml
index d05ed9b..c844f45 100644
--- a/scilab/build.incl.xml
+++ b/scilab/build.incl.xml
@@ -14,14 +14,23 @@
        <!-- The building directory -->
        <property name="build.dir" location="build/"/>
        
+        <!-- The building test directory -->
+        <property name="build.test.dir" location="build/test"/>
+        
        <!-- Where builded classes will be generated -->
        <property name="classes.dir" location="${build.dir}/classes" />
        
+        <!-- Where builded test classes will be generated -->
+        <property name="classes.test.dir" location="${build.test.dir}/classes" />
+        
        <!-- Where we store cache files -->
        <property name="cache.dir" location="${build.dir}/cachefile" />
        
        <!-- Where we can find the sources -->
        <property name="src.dir"  location="src/java/" />
+        <!-- Where we can find the test sources -->
+        <property name="src.test.dir"  location="tests/java/" />
        
        <!-- Check style definitions -->
        <property name = "checkstyle.config.file"      value = "${base.dir}/checkstyle/scilab_checkstyle_convention.xml" />
@@ -43,11 +52,21 @@
                <pathelement location="${commons-beanutils.jar}"/>
                <pathelement location="${antlr.jar}"/>
        </path>
-        
+        <path id="unittest.classpath">
+                <pathelement location="${testng.jar}"/>
+                <pathelement location="${bsh.jar}"/> 
+                <pathelement location="${junit.jar}"/>
+                <pathelement location="${qdox.jar}"/>
+        </path>
+  
        <path id="compile.classpath">
        
                <pathelement location="${library.xcos.dir}/${library.xcos.name}"/>
                <pathelement location="${library.hdf5.dir}/${library.hdf5.name}"/>
+                <pathelement location="${library.xpad.dir}/${library.xpad.name}"/>
                <pathelement location="${library.localization.dir}/${library.localization.name}"/>
                <pathelement location="${library.shell.dir}/${library.shell.name}"/>
                <pathelement location="${library.history_manager.dir}/${library.history_manager.name}"/>
@@ -63,7 +82,7 @@
                <pathelement location="${commons-logging.jar}"/>
                
                <pathelement location="${flexdock.jar}"/>
-                
                <pathelement location="${gluegen.jar}"/>
                
                <pathelement location="${jrosetta-API.jar}"/>
@@ -137,9 +156,22 @@
        <target name="checkstyle-clean">
                <delete dir="${checkstyle.report.dir}"/>
        </target>
-        
+        <target name="test" depends="compile-test">
+        <taskdef name="testng" classpathref="unittest.classpath" classname="org.testng.TestNGAntTask" />
+            <testng verbose="2"  haltonfailure="true">
+                  <classpath>
+                      <path refid="unittest.classpath" />
+                      <path refid="compile.classpath" />
+                      <pathelement location="${classes.test.dir}" />
+                    </classpath>
+                         <classfileset dir="${build.test.dir}" includes="**/*.class"/>
+           </testng>
+         </target>
        <target name="init">
                <mkdir dir="${classes.dir}"/>
+                <mkdir dir="${classes.test.dir}"/>
                <mkdir dir="${build.jar.dir}"/>
                        <!-- Create the time stamp -->
                <tstamp/>
@@ -148,6 +180,7 @@
        <!-- Clean sources -->
        <target name="clean" description="Clean built files">
                <delete dir="${build.dir}"/>
+                <delete dir="${build.test.dir}"/>
                <delete dir="${build.jar.dir}"/>
                <delete file="${build.jar.dir}/${library.name}"/>
        </target>
@@ -165,6 +198,24 @@
                        source="5"
                        />
        </target>
+        
+        <!-- Compile test sources -->
+        <target name="compile-test" description="Build tests" depends="jar">
+                <javac
+                        srcdir="${src.test.dir}" 
+                        destdir="${classes.test.dir}" 
+                        deprecation="on"
+                        debug="off"
+                        verbose="off"
+                        listfiles="on"
+                        source="5"
+                        >
+                  <classpath>
+                      <path refid="unittest.classpath" />
+                          <path refid="compile.classpath" />
+                    </classpath>
+                        </javac>
+        </target>
        <!-- Create the jar -->
        <target name="jar" description="Build the jar file" depends="compile">
diff --git a/scilab/configure b/scilab/configure
index c324017..e94faa6 100755
--- a/scilab/configure
+++ b/scilab/configure
@@ -741,6 +741,10 @@ JAVA_DEBUG_OPTIONS
 JAVA_HOME
 JAVA_JNI_LIBS
 JAVA_JNI_INCLUDE
+JUNIT
+BSH
+QDOX
+TESTNG
 ANTLR
 COMMONS_BEANUTILS
 CHECKSTYLE
@@ -9840,7 +9844,7 @@ $as_echo "$ac_java_classpath" >&6; }
 $as_echo_n "checking to see if the java compiler works... " >&6; }
    cat << \EOF > conftest.java
-// #line 9843 "configure"
+// #line 9847 "configure"
 public class conftest {
@@ -9900,7 +9904,7 @@ $as_echo_n "checking type of jvm... " >&6; }
    if test "x$ac_java_jvm_name" = "x" ; then
    cat << \EOF > conftest.java
-// #line 9903 "configure"
+// #line 9907 "configure"
 import gnu.java.io.EncodingManager;
 public class conftest {
@@ -9958,7 +9962,7 @@ $as_echo_n "checking java API version... " >&6; }
    cat << \EOF > conftest.java
-// #line 9961 "configure"
+// #line 9965 "configure"
 import java.nio.charset.Charset;
 public class conftest {
@@ -9997,7 +10001,7 @@ EOF
    cat << \EOF > conftest.java
-// #line 10000 "configure"
+// #line 10004 "configure"
 import java.lang.StringBuilder;
 public class conftest {
@@ -11246,7 +11250,7 @@ $as_echo_n "checking jgraphx... " >&6; }
          export ac_java_classpath="$jar_resolved:$ac_java_classpath"
    cat << \EOF > conftest.java
-// #line 11249 "configure"
+// #line 11253 "configure"
 import com.mxgraph.model.mxCell;
 public class conftest {
@@ -11327,7 +11331,7 @@ $as_echo_n "checking minimal version (1.2.0.7) of jgraphx... " >&6; }
   export ac_java_classpath="$JGRAPHX:$ac_java_classpath"
    cat << \EOF > conftest.java
-// #line 11330 "configure"
+// #line 11334 "configure"
 import com.mxgraph.view.mxGraph;
 public class conftest {
@@ -11390,7 +11394,7 @@ $as_echo_n "checking flexdock... " >&6; }
          export ac_java_classpath="$jar_resolved:$ac_java_classpath"
    cat << \EOF > conftest.java
-// #line 11393 "configure"
+// #line 11397 "configure"
 import org.flexdock.docking.DockingManager;
 public class conftest {
@@ -11484,7 +11488,7 @@ $as_echo_n "checking looks... " >&6; }
          export ac_java_classpath="$jar_resolved:$ac_java_classpath"
    cat << \EOF > conftest.java
-// #line 11487 "configure"
+// #line 11491 "configure"
 import com.jgoodies.looks.common.RenderingUtils;
 public class conftest {
@@ -11578,7 +11582,7 @@ $as_echo_n "checking jgoodies-looks... " >&6; }
          export ac_java_classpath="$jar_resolved:$ac_java_classpath"
    cat << \EOF > conftest.java
-// #line 11581 "configure"
+// #line 11585 "configure"
 import com.jgoodies.looks.common.RenderingUtils;
 public class conftest {
@@ -11673,7 +11677,7 @@ $as_echo_n "checking skinlf... " >&6; }
          export ac_java_classpath="$jar_resolved:$ac_java_classpath"
    cat << \EOF > conftest.java
-// #line 11676 "configure"
+// #line 11680 "configure"
 import com.l2fprod.util.AccessUtils;
 public class conftest {
@@ -11767,7 +11771,7 @@ $as_echo_n "checking jogl... " >&6; }
          export ac_java_classpath="$jar_resolved:$ac_java_classpath"
    cat << \EOF > conftest.java
-// #line 11770 "configure"
+// #line 11774 "configure"
 import javax.media.opengl.glu.GLUnurbs;
 public class conftest {
@@ -11961,7 +11965,7 @@ $as_echo_n "checking gluegen-rt... " >&6; }
          export ac_java_classpath="$jar_resolved:$ac_java_classpath"
    cat << \EOF > conftest.java
-// #line 11964 "configure"
+// #line 11968 "configure"
 import com.sun.gluegen.runtime.CPU;
 public class conftest {
@@ -12110,7 +12114,7 @@ $as_echo_n "checking jhall... " >&6; }
          export ac_java_classpath="$jar_resolved:$ac_java_classpath"
    cat << \EOF > conftest.java
-// #line 12113 "configure"
+// #line 12117 "configure"
 import javax.help.JHelp;
 public class conftest {
@@ -12204,7 +12208,7 @@ $as_echo_n "checking javahelp2... " >&6; }
          export ac_java_classpath="$jar_resolved:$ac_java_classpath"
    cat << \EOF > conftest.java
-// #line 12207 "configure"
+// #line 12211 "configure"
 import javax.help.JHelp;
 public class conftest {
@@ -12299,7 +12303,7 @@ $as_echo_n "checking jrosetta-API... " >&6; }
          export ac_java_classpath="$jar_resolved:$ac_java_classpath"
    cat << \EOF > conftest.java
-// #line 12302 "configure"
+// #line 12306 "configure"
 import com.artenum.rosetta.interfaces.core.ConsoleConfiguration;
 public class conftest {
@@ -12393,7 +12397,7 @@ $as_echo_n "checking jrosetta-engine... " >&6; }
          export ac_java_classpath="$jar_resolved:$ac_java_classpath"
    cat << \EOF > conftest.java
-// #line 12396 "configure"
+// #line 12400 "configure"
 import com.artenum.rosetta.core.action.AbstractConsoleAction;
 public class conftest {
@@ -12488,7 +12492,7 @@ $as_echo_n "checking jhdf5... " >&6; }
          export ac_java_classpath="$jar_resolved:$ac_java_classpath"
    cat << \EOF > conftest.java
-// #line 12491 "configure"
+// #line 12495 "configure"
 import ncsa.hdf.hdf5lib.HDF5Constants;
 public class conftest {
@@ -12583,7 +12587,7 @@ $as_echo_n "checking commons-logging... " >&6; }
          export ac_java_classpath="$jar_resolved:$ac_java_classpath"
    cat << \EOF > conftest.java
-// #line 12586 "configure"
+// #line 12590 "configure"
 import org.apache.commons.logging.LogFactory;
 public class conftest {
@@ -12677,7 +12681,7 @@ $as_echo_n "checking jlatexmath... " >&6; }
          export ac_java_classpath="$jar_resolved:$ac_java_classpath"
    cat << \EOF > conftest.java
-// #line 12680 "configure"
+// #line 12684 "configure"
 import org.scilab.forge.jlatexmath.TeXFormula;
 public class conftest {
@@ -12758,7 +12762,7 @@ $as_echo_n "checking minimal version (0.8.8) of jlatexmath... " >&6; }
   export ac_java_classpath="$JLATEXMATH:$ac_java_classpath"
    cat << \EOF > conftest.java
-// #line 12761 "configure"
+// #line 12765 "configure"
 import org.scilab.forge.jlatexmath.TeXFormula;
 public class conftest {
@@ -12827,7 +12831,7 @@ $as_echo_n "checking checkstyle... " >&6; }
          export ac_java_classpath="$jar_resolved:$ac_java_classpath"
    cat << \EOF > conftest.java
-// #line 12830 "configure"
+// #line 12834 "configure"
 import com.puppycrawl.tools.checkstyle.CheckStyleTask;
 public class conftest {
@@ -12921,7 +12925,7 @@ $as_echo_n "checking commons-beanutils... " >&6; }
          export ac_java_classpath="$jar_resolved:$ac_java_classpath"
    cat << \EOF > conftest.java
-// #line 12924 "configure"
+// #line 12928 "configure"
 import org.apache.commons.beanutils.Converter;
 public class conftest {
@@ -13015,7 +13019,7 @@ $as_echo_n "checking antlr... " >&6; }
          export ac_java_classpath="$jar_resolved:$ac_java_classpath"
    cat << \EOF > conftest.java
-// #line 13018 "configure"
+// #line 13022 "configure"
 import antlr.TokenStreamException;
 public class conftest {
@@ -13089,6 +13093,383 @@ $as_echo "$as_me: WARNING: Could not find or use the Java package/jar antlr used
                ANTLR=$PACKAGE_JAR_FILE
+                # Test NG (java unitary test)
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking testng" >&5
+$as_echo_n "checking testng... " >&6; }
+        PACKAGE_JAR_FILE=
+        found_jar=no
+        saved_ac_java_classpath=$ac_java_classpath
+        DEFAULT_JAR_DIR="/usr/share/java/ /usr/lib/java/ /usr/share/java /usr/share/java/jar /opt/java/lib /usr/local/java /usr/local/java/jar /usr/local/share/java /usr/local/share/java/jar /usr/local/lib/java $(ls -d /usr/share/java/*/ 2>/dev/null) $(ls -d /usr/lib64/*/ 2>/dev/null) $(ls -d /usr/lib/*/ 2>/dev/null)"
+    for jardir in "`pwd`/thirdparty" "`pwd`/jar" $DEFAULT_JAR_DIR "$_user_libdir"; do
+      for jar in "$jardir/testng.jar" "$jardir/libtestng.jar" "$jardir/libtestng-java.jar" "$jardir/testng*.jar"; do
+#       jar=`echo $jar|sed -e 's/ /\\ /'`
+#       echo "protected $jar"
+#       jar_resolved=`ls $jar 2>/dev/null`
+#       echo "looking for $jar_resolved"
+# TODO check the behaviour when spaces
+        jar_resolved=`ls -r $jar 2>/dev/null`
+        if test -e "$jar_resolved"; then
+          export ac_java_classpath="$jar_resolved:$ac_java_classpath"
+    cat << \EOF > conftest.java
+// #line 13116 "configure"
+import org.testng.TestNG;
+public class conftest {
+    public static void main(String[] argv) {
+    }
+}
+EOF
+    CLASSPATH=$ac_java_classpath
+    export CLASSPATH
+    cmd="$JAVAC ${JAVAC_FLAGS} conftest.java"
+    if (echo $cmd >&5 ; eval $cmd >&5 2>&5) ; then
+       if test ""no"" = "no"; then
+           echo "yes" >&5
+            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $jar_resolved" >&5
+$as_echo "$jar_resolved" >&6; }
+            found_jar=yes
+            PACKAGE_JAR_FILE=$jar_resolved
+            break
+           else
+                   cmd="$JAVA conftest"
+                   if (echo $cmd >&5 ; eval $cmd >&5 2>&5); then
+                   echo "yes" >&5
+            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $jar_resolved" >&5
+$as_echo "$jar_resolved" >&6; }
+            found_jar=yes
+            PACKAGE_JAR_FILE=$jar_resolved
+            break
+                        else
+                        echo "configure: failed program was:" >&5
+                                cat conftest.java >&5
+                        echo "configure: CLASSPATH was $CLASSPATH" >&5
+            ac_java_classpath=$saved_ac_java_classpath
+                                                fi
+                fi
+    else
+        echo "configure: failed program was:" >&5
+        cat conftest.java >&5
+        echo "configure: CLASSPATH was $CLASSPATH" >&5
+            ac_java_classpath=$saved_ac_java_classpath
+            fi
+        fi
+      done
+      if test "$found_jar" = "yes"; then
+        break
+      fi
+    done
+    if test "$found_jar" = "no"; then
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+          if test ""yes"" = "yes"; then
+                { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Could not find or use the Java package/jar testng used by TestNG - Unit tests (looking for package org.testng.TestNG)" >&5
+$as_echo "$as_me: WARNING: Could not find or use the Java package/jar testng used by TestNG - Unit tests (looking for package org.testng.TestNG)" >&2;}
+          else
+                  as_fn_error "Could not find or use the Java package/jar testng used by TestNG - Unit tests (looking for package org.testng.TestNG)" "$LINENO" 5
+          fi
+    fi
+                TESTNG=$PACKAGE_JAR_FILE
+                # Qdox (parses declarations and Javadoc) - dependency of TestNG
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking qdox" >&5
+$as_echo_n "checking qdox... " >&6; }
+        PACKAGE_JAR_FILE=
+        found_jar=no
+        saved_ac_java_classpath=$ac_java_classpath
+        DEFAULT_JAR_DIR="/usr/share/java/ /usr/lib/java/ /usr/share/java /usr/share/java/jar /opt/java/lib /usr/local/java /usr/local/java/jar /usr/local/share/java /usr/local/share/java/jar /usr/local/lib/java $(ls -d /usr/share/java/*/ 2>/dev/null) $(ls -d /usr/lib64/*/ 2>/dev/null) $(ls -d /usr/lib/*/ 2>/dev/null)"
+    for jardir in "`pwd`/thirdparty" "`pwd`/jar" $DEFAULT_JAR_DIR "$_user_libdir"; do
+      for jar in "$jardir/qdox.jar" "$jardir/libqdox.jar" "$jardir/libqdox-java.jar" "$jardir/qdox*.jar"; do
+#       jar=`echo $jar|sed -e 's/ /\\ /'`
+#       echo "protected $jar"
+#       jar_resolved=`ls $jar 2>/dev/null`
+#       echo "looking for $jar_resolved"
+# TODO check the behaviour when spaces
+        jar_resolved=`ls -r $jar 2>/dev/null`
+        if test -e "$jar_resolved"; then
+          export ac_java_classpath="$jar_resolved:$ac_java_classpath"
+    cat << \EOF > conftest.java
+// #line 13210 "configure"
+import com.thoughtworks.qdox.tools.QDoxTester;
+public class conftest {
+    public static void main(String[] argv) {
+    }
+}
+EOF
+    CLASSPATH=$ac_java_classpath
+    export CLASSPATH
+    cmd="$JAVAC ${JAVAC_FLAGS} conftest.java"
+    if (echo $cmd >&5 ; eval $cmd >&5 2>&5) ; then
+       if test ""no"" = "no"; then
+           echo "yes" >&5
+            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $jar_resolved" >&5
+$as_echo "$jar_resolved" >&6; }
+            found_jar=yes
+            PACKAGE_JAR_FILE=$jar_resolved
+            break
+           else
+                   cmd="$JAVA conftest"
+                   if (echo $cmd >&5 ; eval $cmd >&5 2>&5); then
+                   echo "yes" >&5
+            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $jar_resolved" >&5
+$as_echo "$jar_resolved" >&6; }
+            found_jar=yes
+            PACKAGE_JAR_FILE=$jar_resolved
+            break
+                        else
+                        echo "configure: failed program was:" >&5
+                                cat conftest.java >&5
+                        echo "configure: CLASSPATH was $CLASSPATH" >&5
+            ac_java_classpath=$saved_ac_java_classpath
+                                                fi
+                fi
+    else
+        echo "configure: failed program was:" >&5
+        cat conftest.java >&5
+        echo "configure: CLASSPATH was $CLASSPATH" >&5
+            ac_java_classpath=$saved_ac_java_classpath
+            fi
+        fi
+      done
+      if test "$found_jar" = "yes"; then
+        break
+      fi
+    done
+    if test "$found_jar" = "no"; then
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+          if test ""yes"" = "yes"; then
+                { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Could not find or use the Java package/jar qdox used by Parses declarations and Javadoc  (looking for package com.thoughtworks.qdox.tools.QDoxTester)" >&5
+$as_echo "$as_me: WARNING: Could not find or use the Java package/jar qdox used by Parses declarations and Javadoc  (looking for package com.thoughtworks.qdox.tools.QDoxTester)" >&2;}
+          else
+                  as_fn_error "Could not find or use the Java package/jar qdox used by Parses declarations and Javadoc  (looking for package com.thoughtworks.qdox.tools.QDoxTester)" "$LINENO" 5
+          fi
+    fi
+                QDOX=$PACKAGE_JAR_FILE
+                # bsh (Java scripting environment) - dependency of TestNG
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking bsh" >&5
+$as_echo_n "checking bsh... " >&6; }
+        PACKAGE_JAR_FILE=
+        found_jar=no
+        saved_ac_java_classpath=$ac_java_classpath
+        DEFAULT_JAR_DIR="/usr/share/java/ /usr/lib/java/ /usr/share/java /usr/share/java/jar /opt/java/lib /usr/local/java /usr/local/java/jar /usr/local/share/java /usr/local/share/java/jar /usr/local/lib/java $(ls -d /usr/share/java/*/ 2>/dev/null) $(ls -d /usr/lib64/*/ 2>/dev/null) $(ls -d /usr/lib/*/ 2>/dev/null)"
+    for jardir in "`pwd`/thirdparty" "`pwd`/jar" $DEFAULT_JAR_DIR "$_user_libdir"; do
+      for jar in "$jardir/bsh.jar" "$jardir/libbsh.jar" "$jardir/libbsh-java.jar" "$jardir/bsh*.jar"; do
+#       jar=`echo $jar|sed -e 's/ /\\ /'`
+#       echo "protected $jar"
+#       jar_resolved=`ls $jar 2>/dev/null`
+#       echo "looking for $jar_resolved"
+# TODO check the behaviour when spaces
+        jar_resolved=`ls -r $jar 2>/dev/null`
+        if test -e "$jar_resolved"; then
+          export ac_java_classpath="$jar_resolved:$ac_java_classpath"
+    cat << \EOF > conftest.java
+// #line 13304 "configure"
+import bsh.Console;
+public class conftest {
+    public static void main(String[] argv) {
+    }
+}
+EOF
+    CLASSPATH=$ac_java_classpath
+    export CLASSPATH
+    cmd="$JAVAC ${JAVAC_FLAGS} conftest.java"
+    if (echo $cmd >&5 ; eval $cmd >&5 2>&5) ; then
+       if test ""no"" = "no"; then
+           echo "yes" >&5
+            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $jar_resolved" >&5
+$as_echo "$jar_resolved" >&6; }
+            found_jar=yes
+            PACKAGE_JAR_FILE=$jar_resolved
+            break
+           else
+                   cmd="$JAVA conftest"
+                   if (echo $cmd >&5 ; eval $cmd >&5 2>&5); then
+                   echo "yes" >&5
+            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $jar_resolved" >&5
+$as_echo "$jar_resolved" >&6; }
+            found_jar=yes
+            PACKAGE_JAR_FILE=$jar_resolved
+            break
+                        else
+                        echo "configure: failed program was:" >&5
+                                cat conftest.java >&5
+                        echo "configure: CLASSPATH was $CLASSPATH" >&5
+            ac_java_classpath=$saved_ac_java_classpath
+                                                fi
+                fi
+    else
+        echo "configure: failed program was:" >&5
+        cat conftest.java >&5
+        echo "configure: CLASSPATH was $CLASSPATH" >&5
+            ac_java_classpath=$saved_ac_java_classpath
+            fi
+        fi
+      done
+      if test "$found_jar" = "yes"; then
+        break
+      fi
+    done
+    if test "$found_jar" = "no"; then
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+          if test ""yes"" = "yes"; then
+                { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Could not find or use the Java package/jar bsh used by Java scripting environment (looking for package bsh.Console)" >&5
+$as_echo "$as_me: WARNING: Could not find or use the Java package/jar bsh used by Java scripting environment (looking for package bsh.Console)" >&2;}
+          else
+                  as_fn_error "Could not find or use the Java package/jar bsh used by Java scripting environment (looking for package bsh.Console)" "$LINENO" 5
+          fi
+    fi
+                BSH=$PACKAGE_JAR_FILE
+                # Junit - dependency of TestNG
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking junit" >&5
+$as_echo_n "checking junit... " >&6; }
+        PACKAGE_JAR_FILE=
+        found_jar=no
+        saved_ac_java_classpath=$ac_java_classpath
+        DEFAULT_JAR_DIR="/usr/share/java/ /usr/lib/java/ /usr/share/java /usr/share/java/jar /opt/java/lib /usr/local/java /usr/local/java/jar /usr/local/share/java /usr/local/share/java/jar /usr/local/lib/java $(ls -d /usr/share/java/*/ 2>/dev/null) $(ls -d /usr/lib64/*/ 2>/dev/null) $(ls -d /usr/lib/*/ 2>/dev/null)"
+    for jardir in "`pwd`/thirdparty" "`pwd`/jar" $DEFAULT_JAR_DIR "$_user_libdir"; do
+      for jar in "$jardir/junit.jar" "$jardir/libjunit.jar" "$jardir/libjunit-java.jar" "$jardir/junit*.jar"; do
+#       jar=`echo $jar|sed -e 's/ /\\ /'`
+#       echo "protected $jar"
+#       jar_resolved=`ls $jar 2>/dev/null`
+#       echo "looking for $jar_resolved"
+# TODO check the behaviour when spaces
+        jar_resolved=`ls -r $jar 2>/dev/null`
+        if test -e "$jar_resolved"; then
+          export ac_java_classpath="$jar_resolved:$ac_java_classpath"
+    cat << \EOF > conftest.java
+// #line 13398 "configure"
+import junit.framework.Assert;
+public class conftest {
+    public static void main(String[] argv) {
+    }
+}
+EOF
+    CLASSPATH=$ac_java_classpath
+    export CLASSPATH
+    cmd="$JAVAC ${JAVAC_FLAGS} conftest.java"
+    if (echo $cmd >&5 ; eval $cmd >&5 2>&5) ; then
+       if test ""no"" = "no"; then
+           echo "yes" >&5
+            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $jar_resolved" >&5
+$as_echo "$jar_resolved" >&6; }
+            found_jar=yes
+            PACKAGE_JAR_FILE=$jar_resolved
+            break
+           else
+                   cmd="$JAVA conftest"
+                   if (echo $cmd >&5 ; eval $cmd >&5 2>&5); then
+                   echo "yes" >&5
+            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $jar_resolved" >&5
+$as_echo "$jar_resolved" >&6; }
+            found_jar=yes
+            PACKAGE_JAR_FILE=$jar_resolved
+            break
+                        else
+                        echo "configure: failed program was:" >&5
+                                cat conftest.java >&5
+                        echo "configure: CLASSPATH was $CLASSPATH" >&5
+            ac_java_classpath=$saved_ac_java_classpath
+                                                fi
+                fi
+    else
+        echo "configure: failed program was:" >&5
+        cat conftest.java >&5
+        echo "configure: CLASSPATH was $CLASSPATH" >&5
+            ac_java_classpath=$saved_ac_java_classpath
+            fi
+        fi
+      done
+      if test "$found_jar" = "yes"; then
+        break
+      fi
+    done
+    if test "$found_jar" = "no"; then
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+          if test ""yes"" = "yes"; then
+                { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Could not find or use the Java package/jar junit used by Unitary tests (looking for package junit.framework.Assert)" >&5
+$as_echo "$as_me: WARNING: Could not find or use the Java package/jar junit used by Unitary tests (looking for package junit.framework.Assert)" >&2;}
+          else
+                  as_fn_error "Could not find or use the Java package/jar junit used by Unitary tests (looking for package junit.framework.Assert)" "$LINENO" 5
+          fi
+    fi
+                JUNIT=$PACKAGE_JAR_FILE
        else
                { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Sun javac not found: I will not build the java interface" >&5
 $as_echo "$as_me: WARNING: Sun javac not found: I will not build the java interface" >&2;}
@@ -21062,7 +21443,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 21065 "configure"
+#line 21446 "configure"
 #include "confdefs.h"
 #include "$CHK_TCL_INCLUDE_PATH/$CHK_TCL_INC_NAME"
@@ -21374,7 +21755,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 21377 "configure"
+#line 21758 "configure"
 #include "confdefs.h"
 #include "$CHK_TK_INCLUDE_PATH/$CHK_TK_INC_NAME"
@@ -21955,7 +22336,7 @@ $as_echo_n "checking batik-all... " >&6; }
          export ac_java_classpath="$jar_resolved:$ac_java_classpath"
    cat << \EOF > conftest.java
-// #line 21958 "configure"
+// #line 22339 "configure"
 import org.apache.batik.parser.Parser;
 public class conftest {
@@ -22049,7 +22430,7 @@ $as_echo_n "checking batik... " >&6; }
          export ac_java_classpath="$jar_resolved:$ac_java_classpath"
    cat << \EOF > conftest.java
-// #line 22052 "configure"
+// #line 22433 "configure"
 import org.apache.batik.parser.Parser;
 public class conftest {
@@ -22145,7 +22526,7 @@ $as_echo_n "checking saxon... " >&6; }
          export ac_java_classpath="$jar_resolved:$ac_java_classpath"
    cat << \EOF > conftest.java
-// #line 22148 "configure"
+// #line 22529 "configure"
 import com.icl.saxon.Loader;
 public class conftest {
@@ -22239,7 +22620,7 @@ $as_echo_n "checking fop... " >&6; }
          export ac_java_classpath="$jar_resolved:$ac_java_classpath"
    cat << \EOF > conftest.java
-// #line 22242 "configure"
+// #line 22623 "configure"
 import org.apache.fop.pdf.PDFInfo;
 public class conftest {
@@ -22333,7 +22714,7 @@ $as_echo_n "checking jeuclid-core... " >&6; }
          export ac_java_classpath="$jar_resolved:$ac_java_classpath"
    cat << \EOF > conftest.java
-// #line 22336 "configure"
+// #line 22717 "configure"
 import net.sourceforge.jeuclid.LayoutContext;
 public class conftest {
@@ -22427,7 +22808,7 @@ $as_echo_n "checking commons-io... " >&6; }
          export ac_java_classpath="$jar_resolved:$ac_java_classpath"
    cat << \EOF > conftest.java
-// #line 22430 "configure"
+// #line 22811 "configure"
 import org.apache.commons.io.output.CountingOutputStream;
 public class conftest {
@@ -22521,7 +22902,7 @@ $as_echo_n "checking xmlgraphics-commons... " >&6; }
          export ac_java_classpath="$jar_resolved:$ac_java_classpath"
    cat << \EOF > conftest.java
-// #line 22524 "configure"
+// #line 22905 "configure"
 import org.apache.xmlgraphics.util.Service;
 public class conftest {
@@ -22615,7 +22996,7 @@ $as_echo_n "checking xml-apis-ext... " >&6; }
          export ac_java_classpath="$jar_resolved:$ac_java_classpath"
    cat << \EOF > conftest.java
-// #line 22618 "configure"
+// #line 22999 "configure"
 import org.w3c.dom.svg.SVGDocument;
 public class conftest {
@@ -22709,7 +23090,7 @@ $as_echo_n "checking xml-commons-apis-ext... " >&6; }
          export ac_java_classpath="$jar_resolved:$ac_java_classpath"
    cat << \EOF > conftest.java
-// #line 22712 "configure"
+// #line 23093 "configure"
 import org.w3c.dom.svg.SVGDocument;
 public class conftest {
@@ -22806,7 +23187,7 @@ $as_echo_n "checking jlatexmath-fop... " >&6; }
          export ac_java_classpath="$jar_resolved:$ac_java_classpath"
    cat << \EOF > conftest.java
-// #line 22809 "configure"
+// #line 23190 "configure"
 import org.scilab.forge.jlatexmath.fop.JLaTeXMathObj;
 public class conftest {
@@ -22900,7 +23281,7 @@ $as_echo_n "checking avalon-framework... " >&6; }
          export ac_java_classpath="$jar_resolved:$ac_java_classpath"
    cat << \EOF > conftest.java
-// #line 22903 "configure"
+// #line 23284 "configure"
 import org.apache.avalon.framework.configuration.ConfigurationException;
 public class conftest {
@@ -29165,7 +29546,7 @@ else
  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
  lt_status=$lt_dlunknown
  cat > conftest.$ac_ext <<_LT_EOF
-#line 29168 "configure"
+#line 29549 "configure"
 #include "confdefs.h"
 #if HAVE_DLFCN_H
@@ -29271,7 +29652,7 @@ else
  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
  lt_status=$lt_dlunknown
  cat > conftest.$ac_ext <<_LT_EOF
-#line 29274 "configure"
+#line 29655 "configure"
 #include "confdefs.h"
 #if HAVE_DLFCN_H
@@ -38717,6 +39098,7 @@ echo "Code quality (optional):"
 echo "  Checkstyle .......... = $CHECKSTYLE"
 echo "  Commons-beanutils ... = $COMMONS_BEANUTILS"
 echo "  Antlr ............... = $ANTLR"
+echo "  TestNG .............. = $TESTNG"
 echo "  splint .............. = $SPLINT"
 echo ""
diff --git a/scilab/configure.ac b/scilab/configure.ac
index ec22f07..76b9329 100644
--- a/scilab/configure.ac
+++ b/scilab/configure.ac
@@ -787,6 +787,27 @@ if test "$with_javasci" != no -o "$with_gui" != no -o "$enable_build_help" != no
                ANTLR=$PACKAGE_JAR_FILE
                AC_SUBST(ANTLR)
+                # Test NG (java unitary test)
+                AC_JAVA_CHECK_PACKAGE([testng],[org.testng.TestNG],[TestNG - Unit tests],"yes")
+                TESTNG=$PACKAGE_JAR_FILE
+                AC_SUBST(TESTNG)
+                # Qdox (parses declarations and Javadoc) - dependency of TestNG
+                AC_JAVA_CHECK_PACKAGE([qdox],[com.thoughtworks.qdox.tools.QDoxTester],[Parses declarations and Javadoc ],"yes")
+                QDOX=$PACKAGE_JAR_FILE
+                AC_SUBST(QDOX)
+                # bsh (Java scripting environment) - dependency of TestNG
+                AC_JAVA_CHECK_PACKAGE([bsh],[bsh.Console],[Java scripting environment],"yes")
+                BSH=$PACKAGE_JAR_FILE
+                AC_SUBST(BSH)
+                # Junit - dependency of TestNG
+                AC_JAVA_CHECK_PACKAGE([junit],[junit.framework.Assert],[Unitary tests],"yes")
+                JUNIT=$PACKAGE_JAR_FILE
+                AC_SUBST(JUNIT)
        else
                AC_MSG_WARN([Sun javac not found: I will not build the java interface])
                if test "$ac_java_jvm_name" != ""; then
@@ -1819,6 +1840,7 @@ echo "Code quality (optional):"
 echo "  Checkstyle .......... = $CHECKSTYLE"
 echo "  Commons-beanutils ... = $COMMONS_BEANUTILS"
 echo "  Antlr ............... = $ANTLR"
+echo "  TestNG .............. = $TESTNG"
 echo "  splint .............. = $SPLINT"
 echo "" 
diff --git a/scilab/contrib/Makefile.in b/scilab/contrib/Makefile.in
index 4c67c54..03b64a8 100644
--- a/scilab/contrib/Makefile.in
+++ b/scilab/contrib/Makefile.in
@@ -79,6 +79,7 @@ AVALON_FRAMEWORK = @AVALON_FRAMEWORK@
 AWK = @AWK@
 BATIK = @BATIK@
 BLAS_LIBS = @BLAS_LIBS@
+BSH = @BSH@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
@@ -152,6 +153,7 @@ JLATEXMATH_FOP = @JLATEXMATH_FOP@
 JOGL = @JOGL@
 JROSETTA_API = @JROSETTA_API@
 JROSETTA_ENGINE = @JROSETTA_ENGINE@
+JUNIT = @JUNIT@
 LAPACK_LIBS = @LAPACK_LIBS@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
@@ -208,6 +210,7 @@ PVM_ENABLE = @PVM_ENABLE@
 PVM_INCLUDE = @PVM_INCLUDE@
 PVM_LIB = @PVM_LIB@
 PYTHON = @PYTHON@
+QDOX = @QDOX@
 RANLIB = @RANLIB@
 RELOCATABLE = @RELOCATABLE@
 RT_LIB = @RT_LIB@
@@ -226,6 +229,7 @@ SWIG_JAVA = @SWIG_JAVA@
 SWIG_RUNTIME_LIBS_DIR = @SWIG_RUNTIME_LIBS_DIR@
 TCLTK_LIBS = @TCLTK_LIBS@
 TCL_INC_PATH = @TCL_INC_PATH@
+TESTNG = @TESTNG@
 TK_INC_PATH = @TK_INC_PATH@
 UMFPACK_ENABLE = @UMFPACK_ENABLE@
 UMFPACK_LIB = @UMFPACK_LIB@
diff --git a/scilab/libs/DetectFrameWork2/DetectFramework.vcproj b/scilab/libs/DetectFrameWork2/DetectFramework.vcproj
index 69d0214..9fef28c 100644
--- a/scilab/libs/DetectFrameWork2/DetectFramework.vcproj
+++ b/scilab/libs/DetectFrameWork2/DetectFramework.vcproj
@@ -43,7 +43,7 @@
                        />
                        <Tool
                                Name="VCCLCompilerTool"
-                                AdditionalOptions="/arch:IA32"
+                                AdditionalOptions=""
                                Optimization="0"
                                PreprocessorDefinitions="EXPORT_DETECTFRAMEWORK_DLL"
                                MinimalRebuild="true"
@@ -198,7 +198,7 @@
                        />
                        <Tool
                                Name="VCCLCompilerTool"
-                                AdditionalOptions="/arch:IA32"
+                                AdditionalOptions=""
                                WholeProgramOptimization="false"
                                PreprocessorDefinitions="EXPORT_DETECTFRAMEWORK_DLL"
                                RuntimeLibrary="2"
diff --git a/scilab/libs/GetWindowsVersion/GetWindowsVersion.vcproj b/scilab/libs/GetWindowsVersion/GetWindowsVersion.vcproj
index cb9a48b..cab6d1b 100644
--- a/scilab/libs/GetWindowsVersion/GetWindowsVersion.vcproj
+++ b/scilab/libs/GetWindowsVersion/GetWindowsVersion.vcproj
@@ -43,7 +43,7 @@
                        />
                        <Tool
                                Name="VCCLCompilerTool"
-                                AdditionalOptions="/arch:IA32"
+                                AdditionalOptions=""
                                Optimization="0"
                                PreprocessorDefinitions="EXPORT_GETWINDOWSVERSION_DLL"
                                MinimalRebuild="true"
@@ -198,7 +198,7 @@
                        />
                        <Tool
                                Name="VCCLCompilerTool"
-                                AdditionalOptions="/arch:IA32"
+                                AdditionalOptions=""
                                WholeProgramOptimization="false"
                                PreprocessorDefinitions="EXPORT_GETWINDOWSVERSION_DLL"
                                RuntimeLibrary="2"
diff --git a/scilab/libs/LibScilab/LibScilab.vcproj b/scilab/libs/LibScilab/LibScilab.vcproj
index 681876e..20fd76a 100644
--- a/scilab/libs/LibScilab/LibScilab.vcproj
+++ b/scilab/libs/LibScilab/LibScilab.vcproj
@@ -56,7 +56,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                ExecutionBucket="5"
-                                AdditionalOptions="/arch:IA32"
+                                AdditionalOptions=""
                                Optimization="0"
                                AdditionalIncludeDirectories=""
                                PreprocessorDefinitions="_;LIBSCILAB_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE"
@@ -271,7 +271,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                ExecutionBucket="5"
-                                AdditionalOptions="/arch:IA32"
+                                AdditionalOptions=""
                                Optimization="2"
                                InlineFunctionExpansion="1"
                                FavorSizeOrSpeed="1"
diff --git a/scilab/libs/MALLOC/MALLOC.vcproj b/scilab/libs/MALLOC/MALLOC.vcproj
index d4bcffd..d3ed257 100644
--- a/scilab/libs/MALLOC/MALLOC.vcproj
+++ b/scilab/libs/MALLOC/MALLOC.vcproj
@@ -43,7 +43,7 @@
                        />
                        <Tool
                                Name="VCCLCompilerTool"
-                                AdditionalOptions="/arch:IA32"
+                                AdditionalOptions=""
                                Optimization="0"
                                AdditionalIncludeDirectories="includes"
                                PreprocessorDefinitions="EXPORT_MALLOC_DLL"
@@ -204,7 +204,7 @@
                        />
                        <Tool
                                Name="VCCLCompilerTool"
-                                AdditionalOptions="/arch:IA32"
+                                AdditionalOptions=""
                                WholeProgramOptimization="false"
                                AdditionalIncludeDirectories="includes"
                                PreprocessorDefinitions="EXPORT_MALLOC_DLL"
diff --git a/scilab/libs/MALLOC/Makefile.in b/scilab/libs/MALLOC/Makefile.in
index 2cb91ac..9576cb6 100644
--- a/scilab/libs/MALLOC/Makefile.in
+++ b/scilab/libs/MALLOC/Makefile.in
@@ -145,6 +145,7 @@ AVALON_FRAMEWORK = @AVALON_FRAMEWORK@
 AWK = @AWK@
 BATIK = @BATIK@
 BLAS_LIBS = @BLAS_LIBS@
+BSH = @BSH@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
@@ -218,6 +219,7 @@ JLATEXMATH_FOP = @JLATEXMATH_FOP@
 JOGL = @JOGL@
 JROSETTA_API = @JROSETTA_API@
 JROSETTA_ENGINE = @JROSETTA_ENGINE@
+JUNIT = @JUNIT@
 LAPACK_LIBS = @LAPACK_LIBS@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
@@ -274,6 +276,7 @@ PVM_ENABLE = @PVM_ENABLE@
 PVM_INCLUDE = @PVM_INCLUDE@
 PVM_LIB = @PVM_LIB@
 PYTHON = @PYTHON@
+QDOX = @QDOX@
 RANLIB = @RANLIB@
 RELOCATABLE = @RELOCATABLE@
 RT_LIB = @RT_LIB@
@@ -292,6 +295,7 @@ SWIG_JAVA = @SWIG_JAVA@
 SWIG_RUNTIME_LIBS_DIR = @SWIG_RUNTIME_LIBS_DIR@
 TCLTK_LIBS = @TCLTK_LIBS@
 TCL_INC_PATH = @TCL_INC_PATH@
+TESTNG = @TESTNG@
 TK_INC_PATH = @TK_INC_PATH@
 UMFPACK_ENABLE = @UMFPACK_ENABLE@
 UMFPACK_LIB = @UMFPACK_LIB@
diff --git a/scilab/libs/Makefile.in b/scilab/libs/Makefile.in
index 342ee4a..0d257a9 100644
--- a/scilab/libs/Makefile.in
+++ b/scilab/libs/Makefile.in
@@ -117,6 +117,7 @@ AVALON_FRAMEWORK = @AVALON_FRAMEWORK@
 AWK = @AWK@
 BATIK = @BATIK@
 BLAS_LIBS = @BLAS_LIBS@
+BSH = @BSH@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
@@ -190,6 +191,7 @@ JLATEXMATH_FOP = @JLATEXMATH_FOP@
 JOGL = @JOGL@
 JROSETTA_API = @JROSETTA_API@
 JROSETTA_ENGINE = @JROSETTA_ENGINE@
+JUNIT = @JUNIT@
 LAPACK_LIBS = @LAPACK_LIBS@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
@@ -246,6 +248,7 @@ PVM_ENABLE = @PVM_ENABLE@
 PVM_INCLUDE = @PVM_INCLUDE@
 PVM_LIB = @PVM_LIB@
 PYTHON = @PYTHON@
+QDOX = @QDOX@
 RANLIB = @RANLIB@
 RELOCATABLE = @RELOCATABLE@
 RT_LIB = @RT_LIB@
@@ -264,6 +267,7 @@ SWIG_JAVA = @SWIG_JAVA@
 SWIG_RUNTIME_LIBS_DIR = @SWIG_RUNTIME_LIBS_DIR@
 TCLTK_LIBS = @TCLTK_LIBS@
 TCL_INC_PATH = @TCL_INC_PATH@
+TESTNG = @TESTNG@
 TK_INC_PATH = @TK_INC_PATH@
 UMFPACK_ENABLE = @UMFPACK_ENABLE@
 UMFPACK_LIB = @UMFPACK_LIB@
diff --git a/scilab/libs/doublylinkedlist/Makefile.in b/scilab/libs/doublylinkedlist/Makefile.in
index 875f246..7a473fb 100644
--- a/scilab/libs/doublylinkedlist/Makefile.in
+++ b/scilab/libs/doublylinkedlist/Makefile.in
@@ -147,6 +147,7 @@ AVALON_FRAMEWORK = @AVALON_FRAMEWORK@
 AWK = @AWK@
 BATIK = @BATIK@
 BLAS_LIBS = @BLAS_LIBS@
+BSH = @BSH@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
@@ -220,6 +221,7 @@ JLATEXMATH_FOP = @JLATEXMATH_FOP@
 JOGL = @JOGL@
 JROSETTA_API = @JROSETTA_API@
 JROSETTA_ENGINE = @JROSETTA_ENGINE@
+JUNIT = @JUNIT@
 LAPACK_LIBS = @LAPACK_LIBS@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
@@ -276,6 +278,7 @@ PVM_ENABLE = @PVM_ENABLE@
 PVM_INCLUDE = @PVM_INCLUDE@
 PVM_LIB = @PVM_LIB@
 PYTHON = @PYTHON@
+QDOX = @QDOX@
 RANLIB = @RANLIB@
 RELOCATABLE = @RELOCATABLE@
 RT_LIB = @RT_LIB@
@@ -294,6 +297,7 @@ SWIG_JAVA = @SWIG_JAVA@
 SWIG_RUNTIME_LIBS_DIR = @SWIG_RUNTIME_LIBS_DIR@
 TCLTK_LIBS = @TCLTK_LIBS@
 TCL_INC_PATH = @TCL_INC_PATH@
+TESTNG = @TESTNG@
 TK_INC_PATH = @TK_INC_PATH@
 UMFPACK_ENABLE = @UMFPACK_ENABLE@
 UMFPACK_LIB = @UMFPACK_LIB@
diff --git a/scilab/libs/doublylinkedlist/doublylinkedlist.vcproj b/scilab/libs/doublylinkedlist/doublylinkedlist.vcproj
index 162a6df..1ae8ed3 100644
--- a/scilab/libs/doublylinkedlist/doublylinkedlist.vcproj
+++ b/scilab/libs/doublylinkedlist/doublylinkedlist.vcproj
@@ -43,7 +43,7 @@
                        />
                        <Tool
                                Name="VCCLCompilerTool"
-                                AdditionalOptions="/arch:IA32"
+                                AdditionalOptions=""
                                Optimization="0"
                                AdditionalIncludeDirectories="includes;../../modules/core/includes;../MALLOC/includes"
                                PreprocessorDefinitions="EXPORT_DOUBLYLINKEDLIST_DLL;_CRT_SECURE_NO_WARNINGS"
@@ -206,7 +206,7 @@
                        />
                        <Tool
                                Name="VCCLCompilerTool"
-                                AdditionalOptions="/arch:IA32"
+                                AdditionalOptions=""
                                WholeProgramOptimization="false"
                                AdditionalIncludeDirectories="includes;../../modules/core/includes;../MALLOC/includes"
                                PreprocessorDefinitions="EXPORT_DOUBLYLINKEDLIST_DLL;_CRT_SECURE_NO_WARNINGS"
diff --git a/scilab/libs/dynamiclibrary/Makefile.in b/scilab/libs/dynamiclibrary/Makefile.in
index 1f847cb..e24d8b5 100644
--- a/scilab/libs/dynamiclibrary/Makefile.in
+++ b/scilab/libs/dynamiclibrary/Makefile.in
@@ -147,6 +147,7 @@ AVALON_FRAMEWORK = @AVALON_FRAMEWORK@
 AWK = @AWK@
 BATIK = @BATIK@
 BLAS_LIBS = @BLAS_LIBS@
+BSH = @BSH@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
@@ -220,6 +221,7 @@ JLATEXMATH_FOP = @JLATEXMATH_FOP@
 JOGL = @JOGL@
 JROSETTA_API = @JROSETTA_API@
 JROSETTA_ENGINE = @JROSETTA_ENGINE@
+JUNIT = @JUNIT@
 LAPACK_LIBS = @LAPACK_LIBS@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
@@ -276,6 +278,7 @@ PVM_ENABLE = @PVM_ENABLE@
 PVM_INCLUDE = @PVM_INCLUDE@
 PVM_LIB = @PVM_LIB@
 PYTHON = @PYTHON@
+QDOX = @QDOX@
 RANLIB = @RANLIB@
 RELOCATABLE = @RELOCATABLE@
 RT_LIB = @RT_LIB@
@@ -294,6 +297,7 @@ SWIG_JAVA = @SWIG_JAVA@
 SWIG_RUNTIME_LIBS_DIR = @SWIG_RUNTIME_LIBS_DIR@
 TCLTK_LIBS = @TCLTK_LIBS@
 TCL_INC_PATH = @TCL_INC_PATH@
+TESTNG = @TESTNG@
 TK_INC_PATH = @TK_INC_PATH@
 UMFPACK_ENABLE = @UMFPACK_ENABLE@
 UMFPACK_LIB = @UMFPACK_LIB@
diff --git a/scilab/libs/dynamiclibrary/dynamiclibrary.vcproj b/scilab/libs/dynamiclibrary/dynamiclibrary.vcproj
index 3012df6..f1a78aa 100644
--- a/scilab/libs/dynamiclibrary/dynamiclibrary.vcproj
+++ b/scilab/libs/dynamiclibrary/dynamiclibrary.vcproj
@@ -43,7 +43,7 @@
                        />
                        <Tool
                                Name="VCCLCompilerTool"
-                                AdditionalOptions="/arch:IA32"
+                                AdditionalOptions=""
                                Optimization="0"
                                AdditionalIncludeDirectories="includes;../../modules/core/includes;"
                                PreprocessorDefinitions="EXPORT_DYNAMICLIBRARY_DLL;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE"
@@ -204,7 +204,7 @@
                        />
                        <Tool
                                Name="VCCLCompilerTool"
-                                AdditionalOptions="/arch:IA32"
+                                AdditionalOptions=""
                                WholeProgramOptimization="false"
                                AdditionalIncludeDirectories="includes;../../modules/core/includes;"
                                PreprocessorDefinitions="EXPORT_DYNAMICLIBRARY_DLL;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE"
diff --git a/scilab/libs/hashtable/Makefile.in b/scilab/libs/hashtable/Makefile.in
index 1d1af52..945643f 100644
--- a/scilab/libs/hashtable/Makefile.in
+++ b/scilab/libs/hashtable/Makefile.in
@@ -145,6 +145,7 @@ AVALON_FRAMEWORK = @AVALON_FRAMEWORK@
 AWK = @AWK@
 BATIK = @BATIK@
 BLAS_LIBS = @BLAS_LIBS@
+BSH = @BSH@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
@@ -218,6 +219,7 @@ JLATEXMATH_FOP = @JLATEXMATH_FOP@
 JOGL = @JOGL@
 JROSETTA_API = @JROSETTA_API@
 JROSETTA_ENGINE = @JROSETTA_ENGINE@
+JUNIT = @JUNIT@
 LAPACK_LIBS = @LAPACK_LIBS@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
@@ -274,6 +276,7 @@ PVM_ENABLE = @PVM_ENABLE@
 PVM_INCLUDE = @PVM_INCLUDE@
 PVM_LIB = @PVM_LIB@
 PYTHON = @PYTHON@
+QDOX = @QDOX@
 RANLIB = @RANLIB@
 RELOCATABLE = @RELOCATABLE@
 RT_LIB = @RT_LIB@
@@ -292,6 +295,7 @@ SWIG_JAVA = @SWIG_JAVA@
 SWIG_RUNTIME_LIBS_DIR = @SWIG_RUNTIME_LIBS_DIR@
 TCLTK_LIBS = @TCLTK_LIBS@
 TCL_INC_PATH = @TCL_INC_PATH@
+TESTNG = @TESTNG@
 TK_INC_PATH = @TK_INC_PATH@
 UMFPACK_ENABLE = @UMFPACK_ENABLE@
 UMFPACK_LIB = @UMFPACK_LIB@
diff --git a/scilab/libs/hashtable/hashtable.vcproj b/scilab/libs/hashtable/hashtable.vcproj
index 1bd2139..db06f19 100644
--- a/scilab/libs/hashtable/hashtable.vcproj
+++ b/scilab/libs/hashtable/hashtable.vcproj
@@ -44,7 +44,7 @@
                        />
                        <Tool
                                Name="VCCLCompilerTool"
-                                AdditionalOptions="/arch:IA32"
+                                AdditionalOptions=""
                                Optimization="0"
                                AdditionalIncludeDirectories=""
                                PreprocessorDefinitions="_DLL;_DEBUG;_CRT_SECURE_NO_DEPRECATE;FORDLL"
@@ -224,7 +224,7 @@
                        />
                        <Tool
                                Name="VCCLCompilerTool"
-                                AdditionalOptions="/arch:IA32"
+                                AdditionalOptions=""
                                Optimization="2"
                                InlineFunctionExpansion="1"
                                FavorSizeOrSpeed="1"
diff --git a/scilab/libs/libst/Makefile.in b/scilab/libs/libst/Makefile.in
index 8d075dc..ca1b3d5 100644
--- a/scilab/libs/libst/Makefile.in
+++ b/scilab/libs/libst/Makefile.in
@@ -141,6 +141,7 @@ AVALON_FRAMEWORK = @AVALON_FRAMEWORK@
 AWK = @AWK@
 BATIK = @BATIK@
 BLAS_LIBS = @BLAS_LIBS@
+BSH = @BSH@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
@@ -214,6 +215,7 @@ JLATEXMATH_FOP = @JLATEXMATH_FOP@
 JOGL = @JOGL@
 JROSETTA_API = @JROSETTA_API@
 JROSETTA_ENGINE = @JROSETTA_ENGINE@
+JUNIT = @JUNIT@
 LAPACK_LIBS = @LAPACK_LIBS@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
@@ -270,6 +272,7 @@ PVM_ENABLE = @PVM_ENABLE@
 PVM_INCLUDE = @PVM_INCLUDE@
 PVM_LIB = @PVM_LIB@
 PYTHON = @PYTHON@
+QDOX = @QDOX@
 RANLIB = @RANLIB@
 RELOCATABLE = @RELOCATABLE@
 RT_LIB = @RT_LIB@
@@ -288,6 +291,7 @@ SWIG_JAVA = @SWIG_JAVA@
 SWIG_RUNTIME_LIBS_DIR = @SWIG_RUNTIME_LIBS_DIR@
 TCLTK_LIBS = @TCLTK_LIBS@
 TCL_INC_PATH = @TCL_INC_PATH@
+TESTNG = @TESTNG@
 TK_INC_PATH = @TK_INC_PATH@
 UMFPACK_ENABLE = @UMFPACK_ENABLE@
 UMFPACK_LIB = @UMFPACK_LIB@
diff --git a/scilab/libs/libst/libst.vcproj b/scilab/libs/libst/libst.vcproj
index e125d66..4d5ff37 100644
--- a/scilab/libs/libst/libst.vcproj
+++ b/scilab/libs/libst/libst.vcproj
@@ -44,7 +44,7 @@
                        />
                        <Tool
                                Name="VCCLCompilerTool"
-                                AdditionalOptions="/arch:IA32"
+                                AdditionalOptions=""
                                Optimization="0"
                                AdditionalIncludeDirectories="../intl"
                                PreprocessorDefinitions="_DLL;_DEBUG;_CRT_SECURE_NO_DEPRECATE;FORDLL"
@@ -226,7 +226,7 @@
                        />
                        <Tool
                                Name="VCCLCompilerTool"
-                                AdditionalOptions="/arch:IA32"
+                                AdditionalOptions=""
                                Optimization="2"
                                InlineFunctionExpansion="1"
                                FavorSizeOrSpeed="1"
diff --git a/scilab/modules/Makefile.in b/scilab/modules/Makefile.in
index a849dc9..c6e0393 100644
--- a/scilab/modules/Makefile.in
+++ b/scilab/modules/Makefile.in
@@ -203,6 +203,7 @@ AVALON_FRAMEWORK = @AVALON_FRAMEWORK@
 AWK = @AWK@
 BATIK = @BATIK@
 BLAS_LIBS = @BLAS_LIBS@
+BSH = @BSH@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
@@ -276,6 +277,7 @@ JLATEXMATH_FOP = @JLATEXMATH_FOP@
 JOGL = @JOGL@
 JROSETTA_API = @JROSETTA_API@
 JROSETTA_ENGINE = @JROSETTA_ENGINE@
+JUNIT = @JUNIT@
 LAPACK_LIBS = @LAPACK_LIBS@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
@@ -332,6 +334,7 @@ PVM_ENABLE = @PVM_ENABLE@
 PVM_INCLUDE = @PVM_INCLUDE@
 PVM_LIB = @PVM_LIB@
 PYTHON = @PYTHON@
+QDOX = @QDOX@
 RANLIB = @RANLIB@
 RELOCATABLE = @RELOCATABLE@
 RT_LIB = @RT_LIB@
@@ -350,6 +353,7 @@ SWIG_JAVA = @SWIG_JAVA@
 SWIG_RUNTIME_LIBS_DIR = @SWIG_RUNTIME_LIBS_DIR@
 TCLTK_LIBS = @TCLTK_LIBS@
 TCL_INC_PATH = @TCL_INC_PATH@
+TESTNG = @TESTNG@
 TK_INC_PATH = @TK_INC_PATH@
 UMFPACK_ENABLE = @UMFPACK_ENABLE@
 UMFPACK_LIB = @UMFPACK_LIB@
diff --git a/scilab/modules/action_binding/Makefile.in b/scilab/modules/action_binding/Makefile.in
index 7b87f9b..9347215 100644
--- a/scilab/modules/action_binding/Makefile.in
+++ b/scilab/modules/action_binding/Makefile.in
@@ -168,6 +168,7 @@ AVALON_FRAMEWORK = @AVALON_FRAMEWORK@
 AWK = @AWK@
 BATIK = @BATIK@
 BLAS_LIBS = @BLAS_LIBS@
+BSH = @BSH@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
@@ -241,6 +242,7 @@ JLATEXMATH_FOP = @JLATEXMATH_FOP@
 JOGL = @JOGL@
 JROSETTA_API = @JROSETTA_API@
 JROSETTA_ENGINE = @JROSETTA_ENGINE@
+JUNIT = @JUNIT@
 LAPACK_LIBS = @LAPACK_LIBS@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
@@ -297,6 +299,7 @@ PVM_ENABLE = @PVM_ENABLE@
 PVM_INCLUDE = @PVM_INCLUDE@
 PVM_LIB = @PVM_LIB@
 PYTHON = @PYTHON@
+QDOX = @QDOX@
 RANLIB = @RANLIB@
 RELOCATABLE = @RELOCATABLE@
 RT_LIB = @RT_LIB@
@@ -315,6 +318,7 @@ SWIG_JAVA = @SWIG_JAVA@
 SWIG_RUNTIME_LIBS_DIR = @SWIG_RUNTIME_LIBS_DIR@
 TCLTK_LIBS = @TCLTK_LIBS@
 TCL_INC_PATH = @TCL_INC_PATH@
+TESTNG = @TESTNG@
 TK_INC_PATH = @TK_INC_PATH@
 UMFPACK_ENABLE = @UMFPACK_ENABLE@
 UMFPACK_LIB = @UMFPACK_LIB@
diff --git a/scilab/modules/action_binding/src/c/action_binding.vcproj b/scilab/modules/action_binding/src/c/action_binding.vcproj
index 44af0c9..ec1cd96 100644
--- a/scilab/modules/action_binding/src/c/action_binding.vcproj
+++ b/scilab/modules/action_binding/src/c/action_binding.vcproj
@@ -43,7 +43,7 @@
                        />
                        <Tool
                                Name="VCCLCompilerTool"
-                                AdditionalOptions="/arch:IA32"
+                                AdditionalOptions=""
                                Optimization="0"
                                AdditionalIncludeDirectories=".;../../includes;../jni;../../../../libs/MALLOC/includes;../../../output_stream/includes;../../../core/includes;../../../jvm/includes;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../localization/includes;../../../../libs/intl"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;ACTION_BINDING_EXPORTS"
@@ -212,7 +212,7 @@
                        />
                        <Tool
                                Name="VCCLCompilerTool"
-                                AdditionalOptions="/arch:IA32"
+                                AdditionalOptions=""
                                InlineFunctionExpansion="1"
                                FavorSizeOrSpeed="1"
                                WholeProgramOptimization="false"
diff --git a/scilab/modules/api_scilab/Makefile.in b/scilab/modules/api_scilab/Makefile.in
index 2ef28f1..a599d7c 100644
--- a/scilab/modules/api_scilab/Makefile.in
+++ b/scilab/modules/api_scilab/Makefile.in
@@ -162,6 +162,7 @@ AVALON_FRAMEWORK = @AVALON_FRAMEWORK@
 AWK = @AWK@
 BATIK = @BATIK@
 BLAS_LIBS = @BLAS_LIBS@
+BSH = @BSH@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
@@ -235,6 +236,7 @@ JLATEXMATH_FOP = @JLATEXMATH_FOP@
 JOGL = @JOGL@
 JROSETTA_API = @JROSETTA_API@
 JROSETTA_ENGINE = @JROSETTA_ENGINE@
+JUNIT = @JUNIT@
 LAPACK_LIBS = @LAPACK_LIBS@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
@@ -291,6 +293,7 @@ PVM_ENABLE = @PVM_ENABLE@
 PVM_INCLUDE = @PVM_INCLUDE@
 PVM_LIB = @PVM_LIB@
 PYTHON = @PYTHON@
+QDOX = @QDOX@
 RANLIB = @RANLIB@
 RELOCATABLE = @RELOCATABLE@
 RT_LIB = @RT_LIB@
@@ -309,6 +312,7 @@ SWIG_JAVA = @SWIG_JAVA@
 SWIG_RUNTIME_LIBS_DIR = @SWIG_RUNTIME_LIBS_DIR@
 TCLTK_LIBS = @TCLTK_LIBS@
 TCL_INC_PATH = @TCL_INC_PATH@
+TESTNG = @TESTNG@
 TK_INC_PATH = @TK_INC_PATH@
 UMFPACK_ENABLE = @UMFPACK_ENABLE@
 UMFPACK_LIB = @UMFPACK_LIB@
diff --git a/scilab/modules/api_scilab/api_scilab.vcproj b/scilab/modules/api_scilab/api_scilab.vcproj
index 440447d..376d4f9 100644
--- a/scilab/modules/api_scilab/api_scilab.vcproj
+++ b/scilab/modules/api_scilab/api_scilab.vcproj
@@ -43,7 +43,7 @@
                        />
                        <Tool
                                Name="VCCLCompilerTool"
-                                AdditionalOptions="/arch:IA32"
+                                AdditionalOptions=""
                                Optimization="0"
                                AdditionalIncludeDirectories="includes;src/c;../core/includes;../call_scilab/includes;../string/includes;../../libs/MALLOC/includes;../output_stream/includes;../localization/includes;../../libs/intl;../windows_tools/includes"
                                PreprocessorDefinitions="FORDLL;_DEBUG;_WINDOWS;_USRDLL;API_SCILAB_EXPORTS;_CRT_SECURE_NO_DEPRECATE"
@@ -210,7 +210,7 @@
                        />
                        <Tool
                                Name="VCCLCompilerTool"
-                                AdditionalOptions="/arch:IA32"
+                                AdditionalOptions=""
                                InlineFunctionExpansion="1"
                                FavorSizeOrSpeed="1"
                                WholeProgramOptimization="false"
diff --git a/scilab/modules/api_scilab/help/en_US/boolean/A_isBooleanType.xml b/scilab/modules/api_scilab/help/en_US/boolean/A_isBooleanType.xml
new file mode 100644
index 0000000..98b31bf
--- /dev/null
+++ b/scilab/modules/api_scilab/help/en_US/boolean/A_isBooleanType.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+ * Copyright (C) 2009  - DIGITEO - Antoine ELIAS
+ * 
+ * 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
+ *
+ -->
+<refentry version="5.0-subset Scilab" xml:id="isBooleanType"
+          xml:lang="en" xmlns="http://docbook.org/ns/docbook"
+          xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:svg="http://www.w3.org/2000/svg"
+          xmlns:ns5="http://www.w3.org/1999/xhtml"
+          xmlns:mml="http://www.w3.org/1998/Math/MathML"
+          xmlns:db="http://docbook.org/ns/docbook">
+    <refnamediv>
+        <refname>isBooleanType</refname>
+        <refpurpose>
+            Check if it is a boolean variable.
+        </refpurpose>
+    </refnamediv>
+    <refsynopsisdiv>
+      <title>Calling Sequence</title>
+        <synopsis>int isBooleanType(void* _pvCtx, int* _piAddress)</synopsis>
+    </refsynopsisdiv>
+    <refsection>
+        <title>Parameters</title>
+        <variablelist>
+            <varlistentry>
+                <term>_pvCtx</term>
+                <listitem>
+                    <para>
+                        Scilab environment pointer, pass in "pvApiCtx" provided by api_scilab.h.
+                    </para>
+                </listitem>
+            </varlistentry>
+            <varlistentry>
+                <term>_piAddress</term>
+                <listitem>
+                    <para>
+                        Position in the Scilab memory where you want to put the variable.
+                    </para>
+                </listitem>
+            </varlistentry>
+        </variablelist>
+    </refsection>
+        <refsection>
+                <title>Return value</title>
+                <para>1 if variable is a boolean type, otherwise 0</para>
+        </refsection>
+</refentry>
diff --git a/scilab/modules/api_scilab/help/en_US/boolean/B_getScalarBoolean.xml b/scilab/modules/api_scilab/help/en_US/boolean/B_getScalarBoolean.xml
new file mode 100644
index 0000000..3f6b038
--- /dev/null
+++ b/scilab/modules/api_scilab/help/en_US/boolean/B_getScalarBoolean.xml
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+ * Copyright (C) 2009  - DIGITEO - Antoine ELIAS
+ * 
+ * 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
+ *
+ -->
+<refentry version="5.0-subset Scilab" xml:id="getScalarBoolean"
+          xml:lang="en" xmlns="http://docbook.org/ns/docbook"
+          xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:svg="http://www.w3.org/2000/svg"
+          xmlns:ns5="http://www.w3.org/1999/xhtml"
+          xmlns:mml="http://www.w3.org/1998/Math/MathML"
+          xmlns:db="http://docbook.org/ns/docbook">
+        <refnamediv>
+                <refname>getScalarBoolean</refname>
+                <refpurpose>
+                        Read scalar boolean data from a gateway argument.
+                </refpurpose>
+        </refnamediv>
+        <refsynopsisdiv>
+                <title>Calling Sequence</title>
+                <synopsis>int getScalarBoolean(void* _pvCtx, int* _piAddress, int* _piBool)</synopsis>
+        </refsynopsisdiv>
+        <refsection>
+                <title>Parameters</title>
+                <variablelist>
+                        <varlistentry>
+                                <term>_pvCtx</term>
+                                <listitem>
+                                        <para>
+                                                Scilab environment pointer, pass in "pvApiCtx" provided by api_scilab.h.
+                                        </para>
+                                </listitem>
+                        </varlistentry>
+                        <varlistentry>
+                                <term>_piAddress</term>
+                                <listitem>
+                                        <para>
+                                                Address of the Scilab variable.
+                                        </para>
+                                </listitem>
+                        </varlistentry>
+                        <varlistentry>
+                                <term>_piBool</term>
+                                <listitem>
+                                        <para>
+                                                Return boolean value.
+                                        </para>
+                                </listitem>
+                        </varlistentry>
+                </variablelist>
+        </refsection>
+        <refsection>
+                <title>Return value</title>
+                <para>if successful 0, otherwise print error(s) message(s) in the Scilab console and returns first error number.</para>
+        </refsection>
+</refentry>
diff --git a/scilab/modules/api_scilab/help/en_US/boolean/C_createScalarBoolean.xml b/scilab/modules/api_scilab/help/en_US/boolean/C_createScalarBoolean.xml
new file mode 100644
index 0000000..b2158b9
--- /dev/null
+++ b/scilab/modules/api_scilab/help/en_US/boolean/C_createScalarBoolean.xml
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+ * Copyright (C) 2009  - DIGITEO - Antoine ELIAS
+ * 
+ * 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
+ *
+ -->
+<refentry version="5.0-subset Scilab" xml:id="createScalarBoolean"
+          xml:lang="en" xmlns="http://docbook.org/ns/docbook"
+          xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:svg="http://www.w3.org/2000/svg"
+          xmlns:ns5="http://www.w3.org/1999/xhtml"
+          xmlns:mml="http://www.w3.org/1998/Math/MathML"
+          xmlns:db="http://docbook.org/ns/docbook">
+    <refnamediv>
+        <refname>createScalarBoolean</refname>
+        <refpurpose>
+            Create scalar boolean variable in Scilab memory.
+        </refpurpose>
+    </refnamediv>
+    <refsynopsisdiv>
+      <title>Calling Sequence</title>
+        <synopsis>int createScalarBoolean(void* _pvCtx, int _iVar, int _iBool)</synopsis>
+    </refsynopsisdiv>
+    <refsection>
+        <title>Parameters</title>
+        <variablelist>
+            <varlistentry>
+                <term>_pvCtx</term>
+                <listitem>
+                    <para>
+                        Scilab environment pointer, pass in "pvApiCtx" provided by api_scilab.h.
+                    </para>
+                </listitem>
+            </varlistentry>
+            <varlistentry>
+                <term>_iVar</term>
+                <listitem>
+                    <para>
+                        Position in the Scilab memory where you want to put the variable.
+                    </para>
+                </listitem>
+            </varlistentry>
+            <varlistentry>
+                <term>_iBool</term>
+                <listitem>
+                    <para>
+                        Boolean value.
+                    </para>
+                </listitem>
+            </varlistentry>
+        </variablelist>
+    </refsection>
+        <refsection>
+                <title>Return value</title>
+                <para>if successful 0, otherwise print error(s) message(s) in the Scilab console and returns first error number.</para>
+        </refsection>
+</refentry>
diff --git a/scilab/modules/api_scilab/help/en_US/boolean/D_booleanExample.xml b/scilab/modules/api_scilab/help/en_US/boolean/D_booleanExample.xml
new file mode 100644
index 0000000..8dcce87
--- /dev/null
+++ b/scilab/modules/api_scilab/help/en_US/boolean/D_booleanExample.xml
@@ -0,0 +1,122 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+ * Copyright (C) 2009  - DIGITEO - Antoine ELIAS
+ * 
+ * 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
+ *
+ -->
+<refentry version="5.0-subset Scilab" xml:id="booleanExample"
+          xml:lang="en" xmlns="http://docbook.org/ns/docbook"
+          xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:svg="http://www.w3.org/2000/svg"
+          xmlns:ns5="http://www.w3.org/1999/xhtml"
+          xmlns:mml="http://www.w3.org/1998/Math/MathML"
+          xmlns:db="http://docbook.org/ns/docbook">
+        <refnamediv>
+                <refname>boolean example</refname>
+                <refpurpose>
+                        Boolean use case.
+                </refpurpose>
+        </refnamediv>
+        <refsection>
+                <title>Description</title>
+                <para>This example shows how to get a boolean variable and return it to Scilab.</para>
+        </refsection>
+        <refsection>
+                <!--File_gateway: SCI/modules/api_scilab/tests/unit_tests/booleanExample.c-->
+                <!--File_scilab: SCI/modules/api_scilab/tests/unit_tests/booleanExample.tst-->
+                <!--Lib_name: booleanExample-->
+                <!--Func_list: booleanExample-->
+                <title>Gateway Source</title>
+                <programlisting role="code_gateway">
+                        <![CDATA[ 
+int booleanExample(char *fname,unsigned long fname_len)
+{
+    SciErr sciErr;
+    int* piAddr = NULL;
+    int iType   = 0;
+    int iRet    = 0;
+    CheckRhs(1,1);
+    CheckLhs(0,1);
+    sciErr = getVarAddressFromPosition(pvApiCtx, 1, &piAddr);
+    if(sciErr.iErr)
+    {
+        printError(&sciErr, 0);
+        return 0;
+    }
+    if(isBooleanType(pvApiCtx, piAddr))
+    {
+        if(isScalar(pvApiCtx, piAddr))
+        {
+            int iBool = 0;
+            iRet = getScalarBoolean(pvApiCtx, piAddr, &iBool);
+            if(iRet)
+            {
+                return 0;
+            }
+            iRet = createScalarBoolean(pvApiCtx, Rhs + 1, iBool);
+            if(iRet)
+            {
+                return 0;
+            }
+        }
+        else
+        {
+        int iRows       = 0;
+        int iCols       = 0;
+        int *piBool     = NULL;
+        sciErr = getMatrixOfBoolean(pvApiCtx, piAddr, &iRows, &iCols, &piBool);
+        if(sciErr.iErr)
+        {
+            printError(&sciErr, 0);
+            return 0;
+        }
+        sciErr = createMatrixOfBoolean(pvApiCtx, Rhs + 1, iRows, iCols, piBool);
+        if(sciErr.iErr)
+        {
+            printError(&sciErr, 0);
+            return 0;
+        }
+    }
+        LhsVar(1) = Rhs + 1;
+    }
+    else
+    {
+        LhsVar(1) = 0;
+    }
+    return 0;
+}
+ ]]>
+                </programlisting>
+        </refsection>
+        <refsection>
+                <title>Scilab test script</title>
+                <programlisting role="code_scilab">
+                        <![CDATA[ 
+a = %t;
+b = %f;
+c = [a,b;b,a;a,b;b,a];
+d = c';
+booleanExample(a) == a
+booleanExample(b) == b
+booleanExample(c) == c
+booleanExample(d) == d
+ ]]>
+                </programlisting>
+        </refsection>
+</refentry>
diff --git a/scilab/modules/api_scilab/help/en_US/boolean_sparse/A_isBooleanSparseType.xml b/scilab/modules/api_scilab/help/en_US/boolean_sparse/A_isBooleanSparseType.xml
new file mode 100644
index 0000000..97d2b83
--- /dev/null
+++ b/scilab/modules/api_scilab/help/en_US/boolean_sparse/A_isBooleanSparseType.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+ * Copyright (C) 2009  - DIGITEO - Antoine ELIAS
+ * 
+ * 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
+ *
+ -->
+<refentry version="5.0-subset Scilab" xml:id="isBooleanSparseType"
+          xml:lang="en" xmlns="http://docbook.org/ns/docbook"
+          xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:svg="http://www.w3.org/2000/svg"
+          xmlns:ns5="http://www.w3.org/1999/xhtml"
+          xmlns:mml="http://www.w3.org/1998/Math/MathML"
+          xmlns:db="http://docbook.org/ns/docbook">
+    <refnamediv>
+        <refname>isBooleanSparseType</refname>
+        <refpurpose>
+            Check if it is a boolean sparse variable.
+        </refpurpose>
+    </refnamediv>
+    <refsynopsisdiv>
+      <title>Calling Sequence</title>
+        <synopsis>int isBooleanSparseType(void* _pvCtx, int* _piAddress)</synopsis>
+    </refsynopsisdiv>
+    <refsection>
+        <title>Parameters</title>
+        <variablelist>
+            <varlistentry>
+                <term>_pvCtx</term>
+                <listitem>
+                    <para>
+                        Scilab environment pointer, pass in "pvApiCtx" provided by api_scilab.h.
+                    </para>
+                </listitem>
+            </varlistentry>
+            <varlistentry>
+                <term>_piAddress</term>
+                <listitem>
+                    <para>
+                        Position in the Scilab memory where you want to put the variable.
+                    </para>
+                </listitem>
+            </varlistentry>
+        </variablelist>
+    </refsection>
+        <refsection>
+                <title>Return value</title>
+                <para>1 if variable is a boolean sparse type, otherwise 0</para>
+        </refsection>
+</refentry>
diff --git a/scilab/modules/api_scilab/help/en_US/boolean_sparse/B_getAllocatedBooleanSparseMatrix.xml b/scilab/modules/api_scilab/help/en_US/boolean_sparse/B_getAllocatedBooleanSparseMatrix.xml
new file mode 100644
index 0000000..28b85f6
--- /dev/null
+++ b/scilab/modules/api_scilab/help/en_US/boolean_sparse/B_getAllocatedBooleanSparseMatrix.xml
@@ -0,0 +1,97 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+ * Copyright (C) 2009  - DIGITEO - Antoine ELIAS
+ * 
+ * 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
+ *
+ -->
+<refentry version="5.0-subset Scilab" xml:id="getAllocatedBooleanSparseMatrix"
+          xml:lang="en" xmlns="http://docbook.org/ns/docbook"
+          xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:svg="http://www.w3.org/2000/svg"
+          xmlns:ns5="http://www.w3.org/1999/xhtml"
+          xmlns:mml="http://www.w3.org/1998/Math/MathML"
+          xmlns:db="http://docbook.org/ns/docbook">
+        <refnamediv>
+                <refname>getAllocatedBooleanSparseMatrix</refname>
+                <refpurpose>
+                        Get sparse matrix attributs.
+                </refpurpose>
+        </refnamediv>
+        <refsynopsisdiv>
+                <title>Calling Sequence</title>
+                <synopsis>int getAllocatedBooleanSparseMatrix(void* _pvCtx, int* _piAddress, int* _piRows, int* _piCols, int* _piNbItem, int** _piNbItemRow, int** _piColPos)</synopsis>
+        </refsynopsisdiv>
+        <refsection>
+                <title>Parameters</title>
+                <variablelist>
+                        <varlistentry>
+                                <term>_pvCtx</term>
+                                <listitem>
+                                        <para>
+                                                Scilab environment pointer, pass in "pvApiCtx" provided by api_scilab.h.
+                                        </para>
+                                </listitem>
+                        </varlistentry>
+                        <varlistentry>
+                                <term>_piAddress</term>
+                                <listitem>
+                                        <para>
+                                                Address of the Scilab variable.
+                                        </para>
+                                </listitem>
+                        </varlistentry>
+            <varlistentry>
+                <term>_piRows</term>
+                <listitem>
+                    <para>
+                        Return number of rows of the variable.
+                    </para>
+                </listitem>
+            </varlistentry>
+            <varlistentry>
+                <term>_piCols</term>
+                <listitem>
+                    <para>
+                        Return number of columns of the variable.
+                    </para>
+                </listitem>
+            </varlistentry>
+            <varlistentry>
+                <term>_piNbItem</term>
+                <listitem>
+                    <para>
+                        Return number of non %f value.
+                    </para>
+                </listitem>
+            </varlistentry>
+            <varlistentry>
+                <term>_piNbItemRow</term>
+                <listitem>
+                    <para>
+                        Return number of item in each rows (size: *_piRows).
+                    </para>
+                </listitem>
+            </varlistentry>
+            <varlistentry>
+                <term>_piColPos</term>
+                <listitem>
+                    <para>
+                        Return column position for each item (size: *_piNbItem).
+                    </para>
+                </listitem>
+            </varlistentry>
+        </variablelist>
+        </refsection>
+        <refsection>
+                <title>Return value</title>
+                <para>if successful 0, otherwise print error(s) message(s) in the Scilab console and returns first error number.</para>
+        </refsection>
+</refentry>
diff --git a/scilab/modules/api_scilab/help/en_US/boolean_sparse/CHAPTER b/scilab/modules/api_scilab/help/en_US/boolean_sparse/CHAPTER
new file mode 100644
index 0000000..5484471
--- /dev/null
+++ b/scilab/modules/api_scilab/help/en_US/boolean_sparse/CHAPTER
@@ -0,0 +1 @@
+title = Boolean Sparse
+\ No newline at end of file
diff --git a/scilab/modules/api_scilab/help/en_US/boolean_sparse/C_freeAllocatedBooleanSparse.xml b/scilab/modules/api_scilab/help/en_US/boolean_sparse/C_freeAllocatedBooleanSparse.xml
new file mode 100644
index 0000000..d4115c38
--- /dev/null
+++ b/scilab/modules/api_scilab/help/en_US/boolean_sparse/C_freeAllocatedBooleanSparse.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+ * Copyright (C) 2009  - DIGITEO - Antoine ELIAS
+ * 
+ * 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
+ *
+ -->
+<refentry version="5.0-subset Scilab" xml:id="freeAllocatedBooleanSparse"
+          xml:lang="en" xmlns="http://docbook.org/ns/docbook"
+          xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:svg="http://www.w3.org/2000/svg"
+          xmlns:ns5="http://www.w3.org/1999/xhtml"
+          xmlns:mml="http://www.w3.org/1998/Math/MathML"
+          xmlns:db="http://docbook.org/ns/docbook">
+        <refnamediv>
+                <refname>freeAllocatedBooleanSparse</refname>
+                <refpurpose>
+            Free memory allocated by getAllocatedBooleanSparseMatrix function.
+        </refpurpose>
+        </refnamediv>
+        <refsynopsisdiv>
+                <title>Calling Sequence</title>
+                <synopsis>void freeAllocatedBooleanSparse(int* _piNbItemRow, int* _piColPos)</synopsis>
+        </refsynopsisdiv>
+        <refsection>
+                <title>Parameters</title>
+                <variablelist>
+                        <varlistentry>
+                                <term>_piNbItemRow</term>
+                                <listitem>
+                                        <para>
+                        Pointer "_piNbItemRow" allocated by getAllocatedBooleanSparseMatrix.
+                    </para>
+                                </listitem>
+                        </varlistentry>
+                        <varlistentry>
+                                <term>_piColPos</term>
+                                <listitem>
+                                        <para>
+                        Pointer "_piColPos" allocated by getAllocatedBooleanSparseMatrix.
+                    </para>
+                                </listitem>
+                        </varlistentry>
+                </variablelist>
+        </refsection>
+</refentry>
diff --git a/scilab/modules/api_scilab/help/en_US/boolean_sparse/D_booleanSparseExample.xml b/scilab/modules/api_scilab/help/en_US/boolean_sparse/D_booleanSparseExample.xml
new file mode 100644
index 0000000..081188d
--- /dev/null
+++ b/scilab/modules/api_scilab/help/en_US/boolean_sparse/D_booleanSparseExample.xml
@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+ * Copyright (C) 2009  - DIGITEO - Antoine ELIAS
+ * 
+ * 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
+ *
+ -->
+<refentry version="5.0-subset Scilab" xml:id="booleanSparseExample"
+          xml:lang="en" xmlns="http://docbook.org/ns/docbook"
+          xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:svg="http://www.w3.org/2000/svg"
+          xmlns:ns5="http://www.w3.org/1999/xhtml"
+          xmlns:mml="http://www.w3.org/1998/Math/MathML"
+          xmlns:db="http://docbook.org/ns/docbook">
+        <refnamediv>
+                <refname>boolean sparse example</refname>
+                <refpurpose>
+                        Boolean sparse use case.
+                </refpurpose>
+        </refnamediv>
+        <refsection>
+                <title>Description</title>
+                <para>This example shows how to get a boolean sparse variable and return it to Scilab.</para>
+        </refsection>
+        <refsection>
+                <!--File_gateway: SCI/modules/api_scilab/tests/unit_tests/booleanSparseExample.c-->
+                <!--File_scilab: SCI/modules/api_scilab/tests/unit_tests/booleanSparseExample.tst-->
+                <!--Lib_name: booleanSparseExample-->
+                <!--Func_list: booleanSparseExample-->
+                <title>Gateway Source</title>
+                <programlisting role="code_gateway">
+                        <![CDATA[ 
+int booleanSparseExample(char *fname,unsigned long fname_len)
+{
+        SciErr sciErr;
+        int* piAddr             = NULL;
+        int iType               = 0;
+        int iRet                = 0;
+        CheckRhs(1,1);
+        CheckLhs(0,1);
+        sciErr = getVarAddressFromPosition(pvApiCtx, 1, &piAddr);
+        if(sciErr.iErr)
+        {
+                        printError(&sciErr, 0);
+                        return 0;
+        }
+        if(isBooleanSparseType(pvApiCtx, piAddr))
+        {
+                int iRows                       = 0;
+                int iCols                       = 0;
+                int iNbItem                     = 0;
+                int* piNbItemRow        = NULL;
+                int* piColPos           = NULL;
+                iRet = getAllocatedBooleanSparseMatrix(pvApiCtx, piAddr, &iRows, &iCols, &iNbItem, &piNbItemRow, &piColPos);
+                if(iRet)
+                {
+                        freeAllocatedBooleanSparse(piNbItemRow, piColPos);
+                        return iRet;
+                }
+                sciErr = createBooleanSparseMatrix(pvApiCtx, Rhs + 1, iRows, iCols, iNbItem, piNbItemRow, piColPos);
+                if(sciErr.iErr)
+                {
+                        freeAllocatedBooleanSparse(piNbItemRow, piColPos);
+                        printError(&sciErr, 0);
+                        return sciErr.iErr;
+                }
+                freeAllocatedBooleanSparse(piNbItemRow, piColPos);
+                LhsVar(1) = Rhs + 1;
+        }
+        return 0;
+}
+ ]]>
+                </programlisting>
+        </refsection>
+        <refsection>
+                <title>Scilab test script</title>
+                <programlisting role="code_scilab">
+                        <![CDATA[ 
+bsp = sparse([1,1;2,2;3,3],[%t,%t,%t]);
+or(booleanSparseExample(bsp) == bsp)
+ ]]>
+                </programlisting>
+        </refsection>
+</refentry>
diff --git a/scilab/modules/api_scilab/help/en_US/double/A_isDoubleType.xml b/scilab/modules/api_scilab/help/en_US/double/A_isDoubleType.xml
new file mode 100644
index 0000000..aec6559
--- /dev/null
+++ b/scilab/modules/api_scilab/help/en_US/double/A_isDoubleType.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+ * Copyright (C) 2009  - DIGITEO - Antoine ELIAS
+ * 
+ * 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
+ *
+ -->
+<refentry version="5.0-subset Scilab" xml:id="isDoubleType"
+          xml:lang="en" xmlns="http://docbook.org/ns/docbook"
+          xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:svg="http://www.w3.org/2000/svg"
+          xmlns:ns5="http://www.w3.org/1999/xhtml"
+          xmlns:mml="http://www.w3.org/1998/Math/MathML"
+          xmlns:db="http://docbook.org/ns/docbook">
+    <refnamediv>
+        <refname>isDoubleType</refname>
+        <refpurpose>
+            Check if it is a double variable.
+        </refpurpose>
+    </refnamediv>
+    <refsynopsisdiv>
+        <title>Calling Sequence</title>
+        <synopsis>int isDoubleType(void* _pvCtx, int* _piAddress)</synopsis>
+    </refsynopsisdiv>
+    <refsection>
+        <title>Parameters</title>
+        <variablelist>
+            <varlistentry>
+                <term>_pvCtx</term>
+                <listitem>
+                    <para>
+                        Scilab environment pointer, pass in "pvApiCtx" provided by api_scilab.h.
+                    </para>
+                </listitem>
+            </varlistentry>
+            <varlistentry>
+                <term>_piAddress</term>
+                <listitem>
+                    <para>
+                        Position in the Scilab memory where you want to put the variable.
+                    </para>
+                </listitem>
+            </varlistentry>
+        </variablelist>
+    </refsection>
+    <refsection>
+        <title>Return value</title>
+        <para>1 if variable is a double type, otherwise 0</para>
+    </refsection>
+</refentry>
diff --git a/scilab/modules/api_scilab/help/en_US/double/B_getScalarDouble.xml b/scilab/modules/api_scilab/help/en_US/double/B_getScalarDouble.xml
new file mode 100644
index 0000000..4066dad
--- /dev/null
+++ b/scilab/modules/api_scilab/help/en_US/double/B_getScalarDouble.xml
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+ * Copyright (C) 2009  - DIGITEO - Antoine ELIAS
+ * 
+ * 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
+ *
+ -->
+<refentry version="5.0-subset Scilab" xml:id="getScalarDouble"
+          xml:lang="en" xmlns="http://docbook.org/ns/docbook"
+          xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:svg="http://www.w3.org/2000/svg"
+          xmlns:ns5="http://www.w3.org/1999/xhtml"
+          xmlns:mml="http://www.w3.org/1998/Math/MathML"
+          xmlns:db="http://docbook.org/ns/docbook">
+    <refnamediv>
+        <refname>getScalarDouble</refname>
+        <refpurpose>
+            Get scalar double variable.
+        </refpurpose>
+    </refnamediv>
+    <refsynopsisdiv>
+      <title>Calling Sequence</title>
+        <synopsis>int getScalarDouble(void* _pvCtx, int* _piAddress, double* _pdblReal)</synopsis>
+    </refsynopsisdiv>
+    <refsection>
+        <title>Parameters</title>
+        <variablelist>
+            <varlistentry>
+                <term>_pvCtx</term>
+                <listitem>
+                    <para>
+                        Scilab environment pointer, pass in "pvApiCtx" provided by api_scilab.h.
+                    </para>
+                </listitem>
+            </varlistentry>
+            <varlistentry>
+                <term>_piAddress</term>
+                <listitem>
+                    <para>
+                        Address of the Scilab variable.
+                    </para>
+                </listitem>
+            </varlistentry>
+            <varlistentry>
+                <term>_pdblReal</term>
+                <listitem>
+                    <para>
+                        Double value.
+                    </para>
+                </listitem>
+            </varlistentry>
+        </variablelist>
+    </refsection>
+        <refsection>
+                <title>Return value</title>
+                <para>if successful 0, otherwise print error(s) message(s) in the Scilab console and returns first error number.</para>
+        </refsection>
+</refentry>
diff --git a/scilab/modules/api_scilab/help/en_US/double/C_getScalarComplexDouble.xml b/scilab/modules/api_scilab/help/en_US/double/C_getScalarComplexDouble.xml
new file mode 100644
index 0000000..cba6872
--- /dev/null
+++ b/scilab/modules/api_scilab/help/en_US/double/C_getScalarComplexDouble.xml
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+ * Copyright (C) 2009  - DIGITEO - Antoine ELIAS
+ * 
+ * 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
+ *
+ -->
+<refentry version="5.0-subset Scilab" xml:id="getScalarComplexDouble"
+          xml:lang="en" xmlns="http://docbook.org/ns/docbook"
+          xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:svg="http://www.w3.org/2000/svg"
+          xmlns:ns5="http://www.w3.org/1999/xhtml"
+          xmlns:mml="http://www.w3.org/1998/Math/MathML"
+          xmlns:db="http://docbook.org/ns/docbook">
+    <refnamediv>
+        <refname>getScalarComplexDouble</refname>
+        <refpurpose>
+            Get scalar complex double variable.
+        </refpurpose>
+    </refnamediv>
+    <refsynopsisdiv>
+      <title>Calling Sequence</title>
+        <synopsis>int getScalarComplexDouble(void* _pvCtx, int* _piAddress, double* _pdblReal, double* _pdblImg)</synopsis>
+    </refsynopsisdiv>
+    <refsection>
+        <title>Parameters</title>
+        <variablelist>
+            <varlistentry>
+                <term>_pvCtx</term>
+                <listitem>
+                    <para>
+                        Scilab environment pointer, pass in "pvApiCtx" provided by api_scilab.h.
+                    </para>
+                </listitem>
+            </varlistentry>
+            <varlistentry>
+                <term>_piAddress</term>
+                <listitem>
+                    <para>
+                        Position in the Scilab memory where you want to put the variable.
+                    </para>
+                </listitem>
+            </varlistentry>
+            <varlistentry>
+                <term>_pdblReal</term>
+                <listitem>
+                    <para>
+                        Real part value.
+                    </para>
+                </listitem>
+            </varlistentry>
+            <varlistentry>
+                <term>_pdblImg</term>
+                <listitem>
+                    <para>
+                        Imaginary part value.
+                    </para>
+                </listitem>
+            </varlistentry>
+        </variablelist>
+    </refsection>
+    <refsection>
+        <title>Return value</title>
+        <para>if successful 0, otherwise print error(s) message(s) in the Scilab console and returns first error number.</para>
+    </refsection>
+</refentry>
diff --git a/scilab/modules/api_scilab/help/en_US/double/D_createScalarDouble.xml b/scilab/modules/api_scilab/help/en_US/double/D_createScalarDouble.xml
new file mode 100644
index 0000000..970f346
--- /dev/null
+++ b/scilab/modules/api_scilab/help/en_US/double/D_createScalarDouble.xml
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+ * Copyright (C) 2009  - DIGITEO - Antoine ELIAS
+ * 
+ * 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
+ *
+ -->
+<refentry version="5.0-subset Scilab" xml:id="createScalarDouble"
+          xml:lang="en" xmlns="http://docbook.org/ns/docbook"
+          xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:svg="http://www.w3.org/2000/svg"
+          xmlns:ns5="http://www.w3.org/1999/xhtml"
+          xmlns:mml="http://www.w3.org/1998/Math/MathML"
+          xmlns:db="http://docbook.org/ns/docbook">
+    <refnamediv>
+        <refname>createScalarDouble</refname>
+        <refpurpose>
+            Create a scalar double in Scilab memory.
+        </refpurpose>
+    </refnamediv>
+    <refsynopsisdiv>
+      <title>Calling Sequence</title>
+        <synopsis>int createScalarDouble(void* _pvCtx, int _iVar, double _dblReal)</synopsis>
+    </refsynopsisdiv>
+    <refsection>
+        <title>Parameters</title>
+        <variablelist>
+            <varlistentry>
+                <term>_pvCtx</term>
+                <listitem>
+                    <para>
+                        Scilab environment pointer, pass in "pvApiCtx" provided by api_scilab.h.
+                    </para>
+                </listitem>
+            </varlistentry>
+            <varlistentry>
+                <term>_iVar</term>
+                <listitem>
+                    <para>
+                        Position in the Scilab memory where you want to put the variable.
+                    </para>
+                </listitem>
+            </varlistentry>
+            <varlistentry>
+                <term>_dblReal</term>
+                <listitem>
+                    <para>
+                        Double value.
+                    </para>
+                </listitem>
+            </varlistentry>
+        </variablelist>
+    </refsection>
+    <refsection>
+        <title>Return value</title>
+        <para>if successful 0, otherwise print error(s) message(s) in the Scilab console and returns first error number.</para>
+    </refsection>
+</refentry>
diff --git a/scilab/modules/api_scilab/help/en_US/double/E_createScalarComplexDouble.xml b/scilab/modules/api_scilab/help/en_US/double/E_createScalarComplexDouble.xml
new file mode 100644
index 0000000..4c48ca9
--- /dev/null
+++ b/scilab/modules/api_scilab/help/en_US/double/E_createScalarComplexDouble.xml
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+ * Copyright (C) 2009  - DIGITEO - Antoine ELIAS
+ * 
+ * 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
+ *
+ -->
+<refentry version="5.0-subset Scilab" xml:id="createScalarComplexDouble"
+          xml:lang="en" xmlns="http://docbook.org/ns/docbook"
+          xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:svg="http://www.w3.org/2000/svg"
+          xmlns:ns5="http://www.w3.org/1999/xhtml"
+          xmlns:mml="http://www.w3.org/1998/Math/MathML"
+          xmlns:db="http://docbook.org/ns/docbook">
+    <refnamediv>
+        <refname>createScalarComplexDouble</refname>
+        <refpurpose>
+            Create a scalar complex double in Scilab memory.
+        </refpurpose>
+    </refnamediv>
+    <refsynopsisdiv>
+        <title>Calling Sequence</title>
+        <synopsis>int createScalarComplexDouble(void* _pvCtx, int _iVar, double _dblReal, double _dblImg)</synopsis>
+    </refsynopsisdiv>
+    <refsection>
+        <title>Parameters</title>
+        <variablelist>
+            <varlistentry>
+                <term>_pvCtx</term>
+                <listitem>
+                    <para>
+                        Scilab environment pointer, pass in "pvApiCtx" provided by api_scilab.h.
+                    </para>
+                </listitem>
+            </varlistentry>
+            <varlistentry>
+                <term>_iVar</term>
+                <listitem>
+                    <para>
+                        Position in the Scilab memory where you want to put the variable.
+                    </para>
+                </listitem>
+            </varlistentry>
+            <varlistentry>
+                <term>_dblReal</term>
+                <listitem>
+                    <para>
+                        Real part value.
+                    </para>
+                </listitem>
+            </varlistentry>
+            <varlistentry>
+                <term>_dblImg</term>
+                <listitem>
+                    <para>
+                        imaginary part value.
+                    </para>
+                </listitem>
+            </varlistentry>
+        </variablelist>
+    </refsection>
+    <refsection>
+        <title>Return value</title>
+        <para>if successful 0, otherwise print error(s) message(s) in the Scilab console and returns first error number.</para>
+    </refsection>
+</refentry>
diff --git a/scilab/modules/api_scilab/help/en_US/double/F_doubleExample.xml b/scilab/modules/api_scilab/help/en_US/double/F_doubleExample.xml
new file mode 100644
index 0000000..1ffed71
--- /dev/null
+++ b/scilab/modules/api_scilab/help/en_US/double/F_doubleExample.xml
@@ -0,0 +1,163 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+ * Copyright (C) 2009  - DIGITEO - Antoine ELIAS
+ * 
+ * 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
+ *
+ -->
+<refentry version="5.0-subset Scilab" xml:id="doubleExample"
+          xml:lang="en" xmlns="http://docbook.org/ns/docbook"
+          xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:svg="http://www.w3.org/2000/svg"
+          xmlns:ns5="http://www.w3.org/1999/xhtml"
+          xmlns:mml="http://www.w3.org/1998/Math/MathML"
+          xmlns:db="http://docbook.org/ns/docbook">
+        <refnamediv>
+                <refname>double example</refname>
+                <refpurpose>
+                        Double use case.
+                </refpurpose>
+        </refnamediv>
+        <refsection>
+                <title>Description</title>
+                <para>This example shows how to get a double variable and return it to Scilab.</para>
+        </refsection>
+        <refsection>
+                <!--File_gateway: SCI/modules/api_scilab/tests/unit_tests/doubleExample.c-->
+                <!--File_scilab: SCI/modules/api_scilab/tests/unit_tests/doubleExample.tst-->
+                <!--Lib_name: doubleExample-->
+                <!--Func_list: doubleExample-->
+                <title>Gateway Source</title>
+                <programlisting role="code_gateway">
+                        <![CDATA[ 
+int doubleExample(char *fname,unsigned long fname_len)
+{
+        SciErr sciErr;
+        int* piAddr             = NULL;
+        int iType               = 0;
+        int iRet                = 0;
+        CheckRhs(1,1);
+        CheckLhs(0,1);
+        sciErr = getVarAddressFromPosition(pvApiCtx, 1, &piAddr);
+        if(sciErr.iErr)
+        {
+        printError(&sciErr, 0);
+                return 0;
+        }
+        if(isEmptyMatrix(pvApiCtx, piAddr))
+        {
+                iRet = createEmptyMatrix(pvApiCtx, Rhs + 1);
+                if(iRet)
+                {
+                        return iRet;
+                }
+        }
+        else if(isDoubleType(pvApiCtx, piAddr))
+        {
+                if(isScalar(pvApiCtx, piAddr))
+                {
+                        double dblReal  = 0;
+                        double dblImg           = 0;
+                        if(isVarComplex(pvApiCtx, piAddr))
+                        {
+                                iRet = getScalarComplexDouble(pvApiCtx, piAddr, &dblReal, &dblImg);
+                                if(iRet)
+                                {
+                                        return iRet;
+                                }
+                                iRet = createScalarComplexDouble(pvApiCtx, Rhs + 1, dblReal, dblImg);
+                                if(iRet)
+                                {
+                                        return iRet;
+                                }
+                        }
+                        else
+                        {
+                                iRet = getScalarDouble(pvApiCtx, piAddr, &dblReal);
+                                if(iRet)
+                                {
+                                        return iRet;
+                                }
+                                iRet = createScalarDouble(pvApiCtx, Rhs + 1, dblReal);
+                                if(iRet)
+                                {
+                                        return iRet;
+                                }
+                        }
+                }
+                else
+                {
+                        int iRows                       = 0;
+                        int iCols                       = 0;
+                        double* pdblReal        = NULL;
+                        double* pdblImg         = NULL;
+                        if(isVarComplex(pvApiCtx, piAddr))
+                        {
+                                sciErr = getComplexMatrixOfDouble(pvApiCtx, piAddr, &iRows, &iCols, &pdblReal, &pdblImg);
+                                if(sciErr.iErr)
+                                {
+                                        printError(&sciErr, 0);
+                                        return sciErr.iErr;
+                                }
+                                sciErr = createComplexMatrixOfDouble(pvApiCtx, Rhs + 1, iRows, iCols, pdblReal, pdblImg);
+                                if(sciErr.iErr)
+                                {
+                                        printError(&sciErr, 0);
+                                        return sciErr.iErr;
+                                }
+                        }
+                        else
+                        {
+                                sciErr = getMatrixOfDouble(pvApiCtx, piAddr, &iRows, &iCols, &pdblReal);
+                                if(sciErr.iErr)
+                                {
+                                        printError(&sciErr, 0);
+                                        return sciErr.iErr;
+                                }
+                                sciErr = createMatrixOfDouble(pvApiCtx, Rhs + 1, iRows, iCols, pdblReal);
+                                if(sciErr.iErr)
+                                {
+                                        printError(&sciErr, 0);
+                                        return sciErr.iErr;
+                                }
+                        }
+                }
+        }
+        return 0;
+}
+ ]]>
+                </programlisting>
+        </refsection>
+        <refsection>
+                <title>Scilab test script</title>
+                <programlisting role="code_scilab">
+                        <![CDATA[ 
+a = 1;
+b = %i;
author	Sylvestre Ledru <sylvestre.ledru@scilab.org>	2010-02-02 16:50:46 +0100
committer	Sylvestre Ledru <sylvestre.ledru@scilab.org>	2010-02-02 16:50:46 +0100
commit	4543a005198ee3197c08e553378430c9bc590911 (patch)
tree	f48aacd7ed42e1a1b0f13d95fa7185fe4b6afde7
parent	7262c7b88b413c8a0b09bb0a627d613cdca3f845 (diff)
parent	97de4eee52d09735f550d4c632fba106d0cc1762 (diff)
download	scilab-4543a005198ee3197c08e553378430c9bc590911.zip scilab-4543a005198ee3197c08e553378430c9bc590911.tar.gz