summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--scilab/ACKNOWLEDGEMENTS2
-rw-r--r--scilab/CHANGES_5.2.X28
-rw-r--r--scilab/CHANGES_5.3.X14
-rw-r--r--scilab/Makefile.am8
-rw-r--r--scilab/Makefile.in12
-rw-r--r--scilab/build.incl.xml57
-rwxr-xr-xscilab/configure458
-rw-r--r--scilab/configure.ac22
-rw-r--r--scilab/contrib/Makefile.in4
-rw-r--r--scilab/libs/DetectFrameWork2/DetectFramework.vcproj4
-rw-r--r--scilab/libs/GetWindowsVersion/GetWindowsVersion.vcproj4
-rw-r--r--scilab/libs/LibScilab/LibScilab.vcproj4
-rw-r--r--scilab/libs/MALLOC/MALLOC.vcproj4
-rw-r--r--scilab/libs/MALLOC/Makefile.in4
-rw-r--r--scilab/libs/Makefile.in4
-rw-r--r--scilab/libs/doublylinkedlist/Makefile.in4
-rw-r--r--scilab/libs/doublylinkedlist/doublylinkedlist.vcproj4
-rw-r--r--scilab/libs/dynamiclibrary/Makefile.in4
-rw-r--r--scilab/libs/dynamiclibrary/dynamiclibrary.vcproj4
-rw-r--r--scilab/libs/hashtable/Makefile.in4
-rw-r--r--scilab/libs/hashtable/hashtable.vcproj4
-rw-r--r--scilab/libs/libst/Makefile.in4
-rw-r--r--scilab/libs/libst/libst.vcproj4
-rw-r--r--scilab/modules/Makefile.in4
-rw-r--r--scilab/modules/action_binding/Makefile.in4
-rw-r--r--scilab/modules/action_binding/src/c/action_binding.vcproj4
-rw-r--r--scilab/modules/api_scilab/Makefile.in4
-rw-r--r--scilab/modules/api_scilab/api_scilab.vcproj4
-rw-r--r--scilab/modules/api_scilab/help/en_US/boolean/A_isBooleanType.xml57
-rw-r--r--scilab/modules/api_scilab/help/en_US/boolean/B_getScalarBoolean.xml65
-rw-r--r--scilab/modules/api_scilab/help/en_US/boolean/C_createScalarBoolean.xml65
-rw-r--r--scilab/modules/api_scilab/help/en_US/boolean/D_booleanExample.xml122
-rw-r--r--scilab/modules/api_scilab/help/en_US/boolean_sparse/A_isBooleanSparseType.xml57
-rw-r--r--scilab/modules/api_scilab/help/en_US/boolean_sparse/B_getAllocatedBooleanSparseMatrix.xml97
-rw-r--r--scilab/modules/api_scilab/help/en_US/boolean_sparse/CHAPTER1
-rw-r--r--scilab/modules/api_scilab/help/en_US/boolean_sparse/C_freeAllocatedBooleanSparse.xml53
-rw-r--r--scilab/modules/api_scilab/help/en_US/boolean_sparse/D_booleanSparseExample.xml98
-rw-r--r--scilab/modules/api_scilab/help/en_US/double/A_isDoubleType.xml57
-rw-r--r--scilab/modules/api_scilab/help/en_US/double/B_getScalarDouble.xml65
-rw-r--r--scilab/modules/api_scilab/help/en_US/double/C_getScalarComplexDouble.xml73
-rw-r--r--scilab/modules/api_scilab/help/en_US/double/D_createScalarDouble.xml65
-rw-r--r--scilab/modules/api_scilab/help/en_US/double/E_createScalarComplexDouble.xml73
-rw-r--r--scilab/modules/api_scilab/help/en_US/double/F_doubleExample.xml163
-rw-r--r--scilab/modules/api_scilab/help/en_US/integer/A_isIntegerType.xml57
-rw-r--r--scilab/modules/api_scilab/help/en_US/integer/B_getScalarInteger.xml110
-rw-r--r--scilab/modules/api_scilab/help/en_US/integer/C_createScalarInteger.xml110
-rw-r--r--scilab/modules/api_scilab/help/en_US/integer/D_intergerExample.xml344
-rw-r--r--scilab/modules/api_scilab/help/en_US/list_management/CHAPTER1
-rw-r--r--scilab/modules/api_scilab/help/en_US/low_level_functions/CHAPTER1
-rw-r--r--scilab/modules/api_scilab/help/en_US/low_level_functions/boolean_reading_api.xml (renamed from scilab/modules/api_scilab/help/en_US/boolean_reading_api.xml)0
-rw-r--r--scilab/modules/api_scilab/help/en_US/low_level_functions/boolean_writing_api.xml (renamed from scilab/modules/api_scilab/help/en_US/boolean_writing_api.xml)0
-rw-r--r--scilab/modules/api_scilab/help/en_US/low_level_functions/bsparse_reading_api.xml (renamed from scilab/modules/api_scilab/help/en_US/bsparse_reading_api.xml)0
-rw-r--r--scilab/modules/api_scilab/help/en_US/low_level_functions/bsparse_writing_api.xml (renamed from scilab/modules/api_scilab/help/en_US/bsparse_writing_api.xml)0
-rw-r--r--scilab/modules/api_scilab/help/en_US/low_level_functions/common_getvaraddr_api.xml (renamed from scilab/modules/api_scilab/help/en_US/common_getvaraddr_api.xml)0
-rw-r--r--scilab/modules/api_scilab/help/en_US/low_level_functions/common_getvardimension_api.xml (renamed from scilab/modules/api_scilab/help/en_US/common_getvardimension_api.xml)0
-rw-r--r--scilab/modules/api_scilab/help/en_US/low_level_functions/common_getvartype_api.xml (renamed from scilab/modules/api_scilab/help/en_US/common_getvartype_api.xml)0
-rw-r--r--scilab/modules/api_scilab/help/en_US/low_level_functions/common_iscomplex_api.xml (renamed from scilab/modules/api_scilab/help/en_US/common_iscomplex_api.xml)0
-rw-r--r--scilab/modules/api_scilab/help/en_US/low_level_functions/common_isvarmatrixtype_api.xml (renamed from scilab/modules/api_scilab/help/en_US/common_isvarmatrixtype_api.xml)0
-rw-r--r--scilab/modules/api_scilab/help/en_US/low_level_functions/double_reading_api.xml (renamed from scilab/modules/api_scilab/help/en_US/double_reading_api.xml)0
-rw-r--r--scilab/modules/api_scilab/help/en_US/low_level_functions/double_writing_api.xml (renamed from scilab/modules/api_scilab/help/en_US/double_writing_api.xml)0
-rw-r--r--scilab/modules/api_scilab/help/en_US/low_level_functions/int_getmatrixofintegerprecision_api.xml (renamed from scilab/modules/api_scilab/help/en_US/int_getmatrixofintegerprecision_api.xml)0
-rw-r--r--scilab/modules/api_scilab/help/en_US/low_level_functions/integer_reading_api.xml (renamed from scilab/modules/api_scilab/help/en_US/integer_reading_api.xml)0
-rw-r--r--scilab/modules/api_scilab/help/en_US/low_level_functions/integer_writing_api.xml (renamed from scilab/modules/api_scilab/help/en_US/integer_writing_api.xml)0
-rw-r--r--scilab/modules/api_scilab/help/en_US/low_level_functions/pointer_reading_api.xml (renamed from scilab/modules/api_scilab/help/en_US/pointer_reading_api.xml)0
-rw-r--r--scilab/modules/api_scilab/help/en_US/low_level_functions/pointer_writing_api.xml (renamed from scilab/modules/api_scilab/help/en_US/pointer_writing_api.xml)0
-rw-r--r--scilab/modules/api_scilab/help/en_US/low_level_functions/poly_getpolyvariablename_api.xml (renamed from scilab/modules/api_scilab/help/en_US/poly_getpolyvariablename_api.xml)0
-rw-r--r--scilab/modules/api_scilab/help/en_US/low_level_functions/poly_reading_api.xml (renamed from scilab/modules/api_scilab/help/en_US/poly_reading_api.xml)0
-rw-r--r--scilab/modules/api_scilab/help/en_US/low_level_functions/poly_writing_api.xml (renamed from scilab/modules/api_scilab/help/en_US/poly_writing_api.xml)0
-rw-r--r--scilab/modules/api_scilab/help/en_US/low_level_functions/sparse_reading_api.xml (renamed from scilab/modules/api_scilab/help/en_US/sparse_reading_api.xml)0
-rw-r--r--scilab/modules/api_scilab/help/en_US/low_level_functions/sparse_writing_api.xml (renamed from scilab/modules/api_scilab/help/en_US/sparse_writing_api.xml)0
-rw-r--r--scilab/modules/api_scilab/help/en_US/low_level_functions/string_reading_api.xml (renamed from scilab/modules/api_scilab/help/en_US/string_reading_api.xml)0
-rw-r--r--scilab/modules/api_scilab/help/en_US/low_level_functions/string_writing_api.xml (renamed from scilab/modules/api_scilab/help/en_US/string_writing_api.xml)0
-rw-r--r--scilab/modules/api_scilab/help/en_US/polynom/A_isPolyType.xml57
-rw-r--r--scilab/modules/api_scilab/help/en_US/polynom/B_getAllocatedSinglePoly.xml73
-rw-r--r--scilab/modules/api_scilab/help/en_US/polynom/C_getAllocatedSingleComplexPoly.xml81
-rw-r--r--scilab/modules/api_scilab/help/en_US/polynom/D_getAllocatedMatrixOfPoly.xml89
-rw-r--r--scilab/modules/api_scilab/help/en_US/polynom/E_getAllocatedMatrixOfComplexPoly.xml97
-rw-r--r--scilab/modules/api_scilab/help/en_US/polynom/F_freeAllocatedSinglePoly.xml45
-rw-r--r--scilab/modules/api_scilab/help/en_US/polynom/G_freeAllocatedSingleComplexPoly.xml53
-rw-r--r--scilab/modules/api_scilab/help/en_US/polynom/H_freeAllocatedMatrixOfPoly.xml45
-rw-r--r--scilab/modules/api_scilab/help/en_US/polynom/I_freeAllocatedMatrixOfComplexPoly.xml45
-rw-r--r--scilab/modules/api_scilab/help/en_US/polynom/J_polyExample.xml183
-rw-r--r--scilab/modules/api_scilab/help/en_US/sparse/A_isSparseType.xml57
-rw-r--r--scilab/modules/api_scilab/help/en_US/sparse/B_getAllocatedSparseMatrix.xml105
-rw-r--r--scilab/modules/api_scilab/help/en_US/sparse/C_getAllocatedComplexSparseMatrix.xml113
-rw-r--r--scilab/modules/api_scilab/help/en_US/sparse/D_freeAllocatedSparseMatrix.xml61
-rw-r--r--scilab/modules/api_scilab/help/en_US/sparse/E_freeAllocatedComplexSparseMatrix.xml69
-rw-r--r--scilab/modules/api_scilab/help/en_US/sparse/F_sparseExample.xml125
-rw-r--r--scilab/modules/api_scilab/help/en_US/string/A_isStringType.xml57
-rw-r--r--scilab/modules/api_scilab/help/en_US/string/B_getAllocatedSingleString.xml74
-rw-r--r--scilab/modules/api_scilab/help/en_US/string/C_getAllocatedMatrixOfString.xml90
-rw-r--r--scilab/modules/api_scilab/help/en_US/string/D_createSingleString.xml74
-rw-r--r--scilab/modules/api_scilab/help/en_US/string/E_freeAllocatedSingleString.xml54
-rw-r--r--scilab/modules/api_scilab/help/en_US/string/F_freeAllocatedMatrixOfString.xml70
-rw-r--r--scilab/modules/api_scilab/help/en_US/string/G_stringExample.xml123
-rw-r--r--scilab/modules/api_scilab/includes/api_int.h32
-rw-r--r--scilab/modules/api_scilab/src/cpp/api_common.cpp2
-rw-r--r--scilab/modules/api_scilab/src/cpp/api_int.cpp64
-rw-r--r--scilab/modules/api_scilab/src/cpp/api_poly.cpp12
-rw-r--r--scilab/modules/api_scilab/src/cpp/api_sparse.cpp8
-rw-r--r--scilab/modules/arnoldi/Makefile.in4
-rw-r--r--scilab/modules/arnoldi/arnoldi.vcproj4
-rw-r--r--scilab/modules/atoms/Makefile.in4
-rw-r--r--scilab/modules/atoms/macros/atomsInstall.sci54
-rw-r--r--scilab/modules/atoms/macros/atomsRemove.sci16
-rw-r--r--scilab/modules/atoms/macros/atomsRepositoryAdd.sci2
-rw-r--r--scilab/modules/atoms/macros/atoms_gui/cbAtomsGui.sci40
-rw-r--r--scilab/modules/atoms/macros/atoms_internals/atomsDESCRIPTIONget.sci50
-rw-r--r--scilab/modules/atoms/macros/atoms_internals/atomsDESCRIPTIONread.sci36
-rw-r--r--scilab/modules/atoms/macros/atoms_internals/atomsDownload.sci22
-rw-r--r--scilab/modules/atoms/macros/atoms_internals/atomsExtract.sci16
-rw-r--r--scilab/modules/atoms/macros/atoms_internals/atomsGetPlatform.sci53
-rw-r--r--scilab/modules/atoms/tests/unit_tests/atomsInstall.dia.ref14
-rw-r--r--scilab/modules/atoms/tests/unit_tests/atomsInstall.tst22
-rw-r--r--scilab/modules/atoms/tests/unit_tests/toolbox_7_1.0-1.bin.zipbin0 -> 37127 bytes
-rw-r--r--scilab/modules/boolean/Makefile.in4
-rw-r--r--scilab/modules/boolean/src/c/boolean.vcproj4
-rw-r--r--scilab/modules/boolean/src/fortran/boolean_f.vfproj4
-rw-r--r--scilab/modules/cacsd/Makefile.in4
-rw-r--r--scilab/modules/cacsd/src/c/cacsd.vcproj4
-rw-r--r--scilab/modules/cacsd/src/fortran/cacsd_f.vfproj4
-rw-r--r--scilab/modules/cacsd/src/slicot/slicot_f/slicot_f.vfproj4
-rw-r--r--scilab/modules/call_scilab/Makefile.in4
-rw-r--r--scilab/modules/call_scilab/call_scilab.vcproj4
-rw-r--r--scilab/modules/compatibility_functions/Makefile.in4
-rw-r--r--scilab/modules/completion/Makefile.in4
-rw-r--r--scilab/modules/completion/src/c/completion.vcproj4
-rw-r--r--scilab/modules/completion/src/nocompletion/nocompletion.vcproj4
-rw-r--r--scilab/modules/console/Makefile.am6
-rw-r--r--scilab/modules/console/Makefile.in10
-rw-r--r--scilab/modules/console/src/c/console.vcproj4
-rw-r--r--scilab/modules/console/src/noconsole/noconsole.vcproj4
-rw-r--r--scilab/modules/core/Makefile.in4
-rw-r--r--scilab/modules/core/sci_gateway/c/sci_getmd5.c163
-rw-r--r--scilab/modules/core/src/c/core.vcproj4
-rw-r--r--scilab/modules/core/src/c/getdynamicDebugInfo_Windows.c36
-rw-r--r--scilab/modules/core/src/c/getstaticDebugInfo_Windows.c34
-rw-r--r--scilab/modules/core/src/c/getstaticdebuginfo.c3
-rw-r--r--scilab/modules/core/src/cpp/hashtable_core.cpp1
-rw-r--r--scilab/modules/core/src/fortran/core_f.vfproj4
-rw-r--r--scilab/modules/core/tests/nonreg_tests/bug_6521.dia.ref15
-rw-r--r--scilab/modules/core/tests/nonreg_tests/bug_6521.tst17
-rw-r--r--scilab/modules/data_structures/Makefile.in4
-rw-r--r--scilab/modules/data_structures/macros/struct.sci10
-rw-r--r--scilab/modules/data_structures/src/c/data_structures.vcproj4
-rw-r--r--scilab/modules/data_structures/src/fortran/data_structures_f.vfproj4
-rw-r--r--scilab/modules/demo_tools/Makefile.in4
-rw-r--r--scilab/modules/development_tools/Makefile.in4
-rw-r--r--scilab/modules/development_tools/src/fake/Makefile.in4
-rw-r--r--scilab/modules/differential_equations/Makefile.in4
-rw-r--r--scilab/modules/differential_equations/src/c/differential_equations.vcproj4
-rw-r--r--scilab/modules/differential_equations/src/fortran/differential_equations_f.vfproj4
-rw-r--r--scilab/modules/double/Makefile.in4
-rw-r--r--scilab/modules/double/src/c/double.vcproj4
-rw-r--r--scilab/modules/double/src/fortran/double_f.vfproj4
-rw-r--r--scilab/modules/dynamic_link/Makefile.in4
-rw-r--r--scilab/modules/dynamic_link/src/c/dynamic_link.vcproj4
-rw-r--r--scilab/modules/dynamic_link/src/fortran/dynamic_link_f.vfproj4
-rw-r--r--scilab/modules/elementary_functions/Makefile.in4
-rw-r--r--scilab/modules/elementary_functions/src/c/elementary_functions.vcproj4
-rw-r--r--scilab/modules/elementary_functions/src/fortran/eispack/eispack_f.vfproj4
-rw-r--r--scilab/modules/elementary_functions/src/fortran/elementary_functions_f.vfproj4
-rw-r--r--scilab/modules/elementary_functions/src/fortran/linpack/linpack_f.vfproj4
-rw-r--r--scilab/modules/elementary_functions/src/fortran/slatec/slatec_f.vfproj4
-rw-r--r--scilab/modules/fftw/Makefile.in4
-rw-r--r--scilab/modules/fftw/fftw.vcproj4
-rw-r--r--scilab/modules/fftw/src/nofftw/nofftw.vcproj4
-rw-r--r--scilab/modules/fileio/Makefile.in4
-rw-r--r--scilab/modules/fileio/fileio.vcproj4
-rw-r--r--scilab/modules/fileio/includes/filesmanagement.h58
-rw-r--r--scilab/modules/fileio/src/c/filesmanagement.c218
-rw-r--r--scilab/modules/fileio/src/c/mseek.c22
-rw-r--r--scilab/modules/fileio/src/c/mtell.c12
-rw-r--r--scilab/modules/fileio/tests/nonreg_tests/bug_6484.dia.ref22
-rw-r--r--scilab/modules/fileio/tests/nonreg_tests/bug_6484.tst24
-rw-r--r--scilab/modules/fileio/tests/nonreg_tests/bug_6511.tst44
-rw-r--r--scilab/modules/functions/Makefile.in4
-rw-r--r--scilab/modules/functions/src/c/functions.vcproj4
-rw-r--r--scilab/modules/functions/src/fortran/functions_f.vfproj4
-rw-r--r--scilab/modules/genetic_algorithms/Makefile.in4
-rw-r--r--scilab/modules/graphic_export/Makefile.in4
-rw-r--r--scilab/modules/graphic_export/graphic_export.vcproj4
-rw-r--r--scilab/modules/graphic_export/src/java/org/scilab/modules/graphic_export/GL2PSRenderer.java9
-rw-r--r--scilab/modules/graphic_export/src/nographic_export/nographic_export.vcproj4
-rw-r--r--scilab/modules/graphic_export/tests/nonreg_tests/bug_5436.tst33
-rw-r--r--scilab/modules/graphics/Makefile.in4
-rw-r--r--scilab/modules/graphics/graphics.vcproj4
-rw-r--r--scilab/modules/graphics/src/nographics/nographics.vcproj4
-rw-r--r--scilab/modules/gui/Makefile.in4
-rw-r--r--scilab/modules/gui/src/c/gui.vcproj4
-rw-r--r--scilab/modules/hdf5/Makefile.am17
-rw-r--r--scilab/modules/hdf5/Makefile.in41
-rw-r--r--scilab/modules/hdf5/src/c/h5_readDataFromFile.c24
-rw-r--r--scilab/modules/hdf5/src/c/h5_writeDataToFile.c18
-rw-r--r--scilab/modules/hdf5/src/c/hdf5.vcproj4
-rw-r--r--scilab/modules/hdf5/tests/java/testScilabBoolean.java75
-rw-r--r--scilab/modules/hdf5/tests/java/testScilabDouble.java104
-rw-r--r--scilab/modules/hdf5/tests/java/testScilabGraph.java185
-rw-r--r--scilab/modules/hdf5/tests/java/testScilabList.java68
-rw-r--r--scilab/modules/hdf5/tests/java/testScilabString.java84
-rw-r--r--scilab/modules/hdf5/tests/unit_tests/testScilabBoolean.java74
-rw-r--r--scilab/modules/hdf5/tests/unit_tests/testScilabDouble.java111
-rw-r--r--scilab/modules/hdf5/tests/unit_tests/testScilabGraph.java182
-rw-r--r--scilab/modules/hdf5/tests/unit_tests/testScilabList.java64
-rw-r--r--scilab/modules/hdf5/tests/unit_tests/testScilabString.java82
-rw-r--r--scilab/modules/helptools/Makefile.in4
-rw-r--r--scilab/modules/helptools/helptools.iss11
-rw-r--r--scilab/modules/helptools/src/c/helptools.vcproj4
-rw-r--r--scilab/modules/history_manager/Makefile.in4
-rw-r--r--scilab/modules/history_manager/src/c/history_manager.vcproj4
-rw-r--r--scilab/modules/history_manager/src/nohistory_manager/nohistory_manager.vcproj4
-rw-r--r--scilab/modules/integer/Makefile.in4
-rw-r--r--scilab/modules/integer/src/c/integer.vcproj4
-rw-r--r--scilab/modules/integer/src/fortran/integer_f.vfproj4
-rw-r--r--scilab/modules/interpolation/Makefile.in4
-rw-r--r--scilab/modules/interpolation/src/c/interpolation.vcproj4
-rw-r--r--scilab/modules/interpolation/src/fortran/interpolation_f.vfproj4
-rw-r--r--scilab/modules/intersci/Makefile.in4
-rw-r--r--scilab/modules/intersci/src/exe/intersciexe/intersciexe.vcproj4
-rw-r--r--scilab/modules/intersci/src/exe/interscin/interscin.vcproj4
-rw-r--r--scilab/modules/intersci/src/lib/intersci.vcproj4
-rw-r--r--scilab/modules/io/Makefile.in4
-rw-r--r--scilab/modules/io/sci_gateway/c/sci_file.c335
-rw-r--r--scilab/modules/io/src/c/io.vcproj4
-rw-r--r--scilab/modules/io/src/fortran/io_f.vfproj4
-rw-r--r--scilab/modules/io/tests/unit_tests/file.dia.ref47
-rw-r--r--scilab/modules/io/tests/unit_tests/file.tst48
-rw-r--r--scilab/modules/javasci/Javasci.vcproj4
-rw-r--r--scilab/modules/javasci/Makefile.in4
-rw-r--r--scilab/modules/jvm/Makefile.in4
-rw-r--r--scilab/modules/jvm/libjvm.vcproj4
-rw-r--r--scilab/modules/linear_algebra/Makefile.in4
-rw-r--r--scilab/modules/linear_algebra/src/c/linear_algebra.vcproj4
-rw-r--r--scilab/modules/linear_algebra/src/fortran/linear_algebra_f.vfproj4
-rw-r--r--scilab/modules/localization/Makefile.in4
-rw-r--r--scilab/modules/localization/src/localization.vcproj4
-rw-r--r--scilab/modules/m2sci/Makefile.in4
-rw-r--r--scilab/modules/maple2scilab/Makefile.in4
-rw-r--r--scilab/modules/matio/Makefile.in4
-rw-r--r--scilab/modules/matio/matio.vcproj4
-rw-r--r--scilab/modules/mexlib/Makefile.in4
-rw-r--r--scilab/modules/mexlib/src/libmat/libmat.vcproj4
-rw-r--r--scilab/modules/mexlib/src/libmex/libmex.vcproj4
-rw-r--r--scilab/modules/mexlib/src/libmx/libmx.vcproj4
-rw-r--r--scilab/modules/optimization/Makefile.in4
-rw-r--r--scilab/modules/optimization/src/c/optimization.vcproj4
-rw-r--r--scilab/modules/optimization/src/fortran/optimization_f.vfproj4
-rw-r--r--scilab/modules/output_stream/Makefile.in4
-rw-r--r--scilab/modules/output_stream/src/c/output_stream.vcproj4
-rw-r--r--scilab/modules/output_stream/src/fortran/output_stream_f.vfproj4
-rw-r--r--scilab/modules/overloading/Makefile.in4
-rw-r--r--scilab/modules/parameters/Makefile.in4
-rw-r--r--scilab/modules/polynomials/Makefile.in4
-rw-r--r--scilab/modules/polynomials/src/c/polynomials.vcproj4
-rw-r--r--scilab/modules/polynomials/src/fortran/polynomials_f.vfproj4
-rw-r--r--scilab/modules/polynomials/src/fortran/rpoly.f9
-rw-r--r--scilab/modules/pvm/Makefile.in4
-rw-r--r--scilab/modules/pvm/pvm.vcproj4
-rw-r--r--scilab/modules/pvm/src/nopvm/nopvm.vcproj4
-rw-r--r--scilab/modules/randlib/Makefile.in4
-rw-r--r--scilab/modules/randlib/src/c/randlib.vcproj4
-rw-r--r--scilab/modules/randlib/src/fortran/randlib_f.vfproj4
-rw-r--r--scilab/modules/randlib/src/norandlib/norandlib.vcproj4
-rw-r--r--scilab/modules/renderer/Makefile.in4
-rw-r--r--scilab/modules/renderer/renderer.vcproj4
-rw-r--r--scilab/modules/scicos/Makefile.in4
-rw-r--r--scilab/modules/scicos/src/c/noscicos/noscicos.vcproj4
-rw-r--r--scilab/modules/scicos/src/c/scicos.vcproj4
-rw-r--r--scilab/modules/scicos/src/fortran/scicos_f.vfproj4
-rw-r--r--scilab/modules/scicos/src/scicos_sundials/scicos_sundials.vcproj4
-rw-r--r--scilab/modules/scicos_blocks/Makefile.in4
-rw-r--r--scilab/modules/scicos_blocks/src/c/scicos_blocks.vcproj4
-rw-r--r--scilab/modules/scicos_blocks/src/fortran/scicos_blocks_f.vfproj4
-rw-r--r--scilab/modules/shell/Makefile.in4
-rw-r--r--scilab/modules/shell/src/c/shell.vcproj4
-rw-r--r--scilab/modules/signal_processing/Makefile.in4
-rw-r--r--scilab/modules/signal_processing/src/c/signal_processing.vcproj4
-rw-r--r--scilab/modules/signal_processing/src/fortran/signal_processing_f.vfproj4
-rw-r--r--scilab/modules/simulated_annealing/Makefile.in4
-rw-r--r--scilab/modules/sound/Makefile.in4
-rw-r--r--scilab/modules/sound/sound.vcproj4
-rw-r--r--scilab/modules/sound/src/nosound/nosound.vcproj4
-rw-r--r--scilab/modules/sparse/Makefile.in4
-rw-r--r--scilab/modules/sparse/src/c/sparse.vcproj4
-rw-r--r--scilab/modules/sparse/src/fortran/sparse_f.vfproj4
-rw-r--r--scilab/modules/special_functions/Makefile.in4
-rw-r--r--scilab/modules/special_functions/src/c/special_functions.vcproj4
-rw-r--r--scilab/modules/special_functions/src/fortran/special_functions_f.vfproj4
-rw-r--r--scilab/modules/spreadsheet/Makefile.in4
-rw-r--r--scilab/modules/spreadsheet/spreadsheet.vcproj4
-rw-r--r--scilab/modules/spreadsheet/src/nospreadsheet/nospreadsheet.vcproj4
-rw-r--r--scilab/modules/statistics/Makefile.in4
-rw-r--r--scilab/modules/statistics/src/c/statistics.vcproj4
-rw-r--r--scilab/modules/statistics/src/dcdflib/dcd_f/dcd_DLL.vfproj4
-rw-r--r--scilab/modules/string/Makefile.in4
-rw-r--r--scilab/modules/string/src/c/string.vcproj4
-rw-r--r--scilab/modules/string/src/fortran/string_f.vfproj4
-rw-r--r--scilab/modules/symbolic/Makefile.in4
-rw-r--r--scilab/modules/symbolic/src/c/symbolic.vcproj4
-rw-r--r--scilab/modules/symbolic/src/fortran/symbolic_f.vfproj4
-rw-r--r--scilab/modules/tclsci/Makefile.in4
-rw-r--r--scilab/modules/tclsci/src/notclsci/notclsci.vcproj4
-rw-r--r--scilab/modules/tclsci/tclsci.vcproj4
-rw-r--r--scilab/modules/texmacs/Makefile.in4
-rw-r--r--scilab/modules/time/Makefile.in4
-rw-r--r--scilab/modules/time/time.vcproj4
-rw-r--r--scilab/modules/umfpack/Makefile.in4
-rw-r--r--scilab/modules/umfpack/src/c/umfpack.vcproj4
-rw-r--r--scilab/modules/umfpack/src/noumfpack/noumfpack.vcproj4
-rw-r--r--scilab/modules/windows_tools/Makefile.in4
-rw-r--r--scilab/modules/windows_tools/src/c/CScilex/CScilex.c8
-rw-r--r--scilab/modules/windows_tools/src/c/CScilex/CScilex.vcproj4
-rw-r--r--scilab/modules/windows_tools/src/c/WScilex/WScilex.c8
-rw-r--r--scilab/modules/windows_tools/src/c/WScilex/WScilex.vcproj4
-rw-r--r--scilab/modules/windows_tools/src/c/httpdownloadfile.c5
-rw-r--r--scilab/modules/windows_tools/src/c/scilab_windows/scilab_windows.vcproj4
-rw-r--r--scilab/modules/windows_tools/src/c/windows_tools.vcproj4
-rw-r--r--scilab/modules/windows_tools/src/nowindows_tools/nowindows_tools.vcproj4
-rw-r--r--scilab/modules/xcos/Makefile.in4
-rw-r--r--scilab/modules/xcos/etc/Xcos-style.xml4
-rw-r--r--scilab/modules/xcos/src/c/xcos.vcproj4
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/graph/ScilabComponent.java31
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/graph/ScilabGraph.java51
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/graph/event/ArrowKeyListener.java174
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/graph/utils/ScilabConstants.java4
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/XcosTab.java414
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/actions/FitDiagramToViewAction.java4
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/actions/StopAction.java1
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/AfficheBlock.java1
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/BasicBlock.java180
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/BlockFactory.java39
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/ConstBlock.java2
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/SplitBlock.java94
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/SuperBlock.java328
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/TextBlock.java118
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/actions/RegionToSuperblockAction.java74
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/actions/SuperblockMaskCreateAction.java5
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/actions/SuperblockMaskCustomizeAction.java29
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/actions/SuperblockMaskRemoveAction.java5
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/io/ContextUpdate.java36
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/io/EventInBlock.java1
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/io/EventOutBlock.java1
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/io/ExplicitInBlock.java1
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/io/ExplicitOutBlock.java1
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/io/ImplicitInBlock.java1
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/io/ImplicitOutBlock.java1
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/positionning/GroundBlock.java4
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/positionning/VoltageSensorBlock.java27
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/graph/PaletteDiagram.java74
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/graph/XcosDiagram.java1
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/io/BasicBlockInfo.java345
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/io/BlockReader.java69
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/io/BlockWriter.java80
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/io/XcosCodec.java30
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/io/XcosDiagramCodec.java41
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/palette/Palette.java18
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/palette/PaletteConfigurator.java96
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/palette/listener/PaletteManagerMouseListener.java9
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/palette/listener/PaletteManagerTreeSelectionListener.java42
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/palette/model/PaletteManagerModel.java65
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/palette/view/ModifiedFlowLayout.java99
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/palette/view/PaletteComponent.java (renamed from scilab/modules/xcos/src/java/org/scilab/modules/xcos/utils/XcosComponent.java)9
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/palette/view/PaletteConfiguratorListView.java101
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/palette/view/PaletteConfiguratorView.java80
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/palette/view/PaletteView.java84
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/utils/ConfigXcosManager.java11
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/utils/XcosConstants.java7
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/utils/XcosMessages.java2
-rw-r--r--scilab/modules/xcos/tests/nonreg_tests/bug_5411.tst27
-rw-r--r--scilab/modules/xcos/tests/nonreg_tests/bug_6474.tst31
-rw-r--r--scilab/modules/xpad/Makefile.in4
-rw-r--r--scilab/modules/xpad/src/c/xpad.vcproj4
-rw-r--r--scilab/modules/xpad/src/java/org/scilab/modules/xpad/style/CommentManager.java12
-rw-r--r--scilab/modules/xpad/src/java/org/scilab/modules/xpad/utils/ConfigXpadManager.java2
-rw-r--r--scilab/scilab-lib.properties.in10
-rw-r--r--scilab/scilab-lib.properties.vc8
-rw-r--r--scilab/tools/Dumpexts/Dumpexts.vcproj4
-rw-r--r--scilab/tools/SetupAtlas/SetupAtlas.vcproj4
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.
60 - Misc patches for Solaris/Opensolaris 60 - Misc patches for Solaris/Opensolaris
61 61
62* Sébastien Jourdain from Artenum ( http://www.artenum.com ) 62* Sébastien Jourdain from Artenum ( http://www.artenum.com )
63 - Scilab Console console ( Jrosetta ) 63 - Scilab Console ( Jrosetta )
64 64
65* Vincent Lejeune 65* Vincent Lejeune
66 - Patches 66 - 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:
17 17
18* Ukrainian localization added (Thanks Yuri Chornoivan) 18* Ukrainian localization added (Thanks Yuri Chornoivan)
19 19
20* Many english typos have been fixed by (Thanks Yuri Chornoivan) 20* Many english typos have been fixed (Thanks Yuri Chornoivan)
21 21
22Xcos: 22Xcos:
23===== 23=====
@@ -27,7 +27,7 @@ Xcos:
27* Superblock masks can now be used and a new window is created when user wants 27* Superblock masks can now be used and a new window is created when user wants
28 to configure the variable settings. 28 to configure the variable settings.
29 29
30* Performance improvements under Linux 30* Some performance improvements under Linux
31 31
32* A rework to pass checkstyle metrics on the code has been started. 32* A rework to pass checkstyle metrics on the code has been started.
33 33
@@ -70,13 +70,17 @@ Xcos:
70* bug 5627 fixed - It was not possible to place a port in a non-conventionnal 70* bug 5627 fixed - It was not possible to place a port in a non-conventionnal
71 side. 71 side.
72 72
73* bug 5640 fixed - When launching Xcos: Toolbar and menubar didn't appear
74 before the focus is on the Xcos window.
75
73* bug 5660 fixed - An scicos block with negative simulation function type was 76* bug 5660 fixed - An scicos block with negative simulation function type was
74 not working (espacially the ESELECT_f block). 77 not working (espacially the ESELECT_f block).
75 78
76* bug 5666 fixed - The CLKGOTO block wasn't valid anymore after setting 79* bug 5666 fixed - The CLKGOTO block wasn't valid anymore after setting
77 its parameters. 80 its parameters.
78 81
79* bug 5667 fixed - Simulation starts faster on Linux for huge diagram ( hdf5 export issue ) 82* bug 5667 fixed - Simulation starts faster on Linux for huge diagram
83 (hdf5 export issue).
80 84
81* bug 5683 fixed - Xcos code updated to work with jgraphx >= 1.2.0.X 85* bug 5683 fixed - Xcos code updated to work with jgraphx >= 1.2.0.X
82 86
@@ -94,7 +98,14 @@ Xcos:
94 98
95* bug 6463 fixed - The jgraphx library has been updated to 1.2.0.7. 99* bug 6463 fixed - The jgraphx library has been updated to 1.2.0.7.
96 100
97* bug 6490 fixed - The multiple-point link didn't work accordingly to the zoom level. 101* bug 6474 fixed - demo_watertank.xcoscrashed when any block parameter dialog
102 was closed the second time.
103
104* bug 6490 fixed - The multiple-point link didn't work accordingly to the
105 zoom level.
106
107* bug 6540 fixed - We were unable to open a SuperBlock due to jgraphx serializer
108 limitation.
98 109
99Atoms: 110Atoms:
100====== 111======
@@ -107,6 +118,8 @@ Atoms:
107 118
108* bug 6389 fixed - Atoms GUI : "Update" button just removed the selected module 119* bug 6389 fixed - Atoms GUI : "Update" button just removed the selected module
109 but didn't update it. 120 but didn't update it.
121
122* bug 6518 fixed - atomsRepositoryAdd() didn't accept local repositories.
110 123
111Compilation: 124Compilation:
112============ 125============
@@ -127,6 +140,8 @@ Compilation:
127* bug 5503 fixed - add /usr/lib/*/ and /usr/lib64/*/ in the search path when 140* bug 5503 fixed - add /usr/lib/*/ and /usr/lib64/*/ in the search path when
128 looking for Java libraries (Fedora 12 for example) 141 looking for Java libraries (Fedora 12 for example)
129 142
143* bug 5665 fixed - Under Linux, hdf5 module can now be compiled without Java
144
130* bug 6453 fixed - ImplicitPointerConversions was triggered by some Debian/ 145* bug 6453 fixed - ImplicitPointerConversions was triggered by some Debian/
131 Ubuntu check tools 146 Ubuntu check tools
132 147
@@ -155,6 +170,8 @@ Bug fixes:
155* bug 5413 fixed - help_from_sci was replacing the < > in the examples by 170* bug 5413 fixed - help_from_sci was replacing the < > in the examples by
156 &gt; and &lt; causing issues in the build of documentation. 171 &gt; and &lt; causing issues in the build of documentation.
157 172
173* bug 5436 fixed - The export to svg does not work with bar graphs.
174
158* bug 5513 fixed - 'input' failed after Ctrl+C was typed. 175* bug 5513 fixed - 'input' failed after Ctrl+C was typed.
159 176
160* bug 5659 fixed - emptystr changed the value of an input variable. 177* bug 5659 fixed - emptystr changed the value of an input variable.
@@ -229,6 +246,9 @@ Bug fixes:
229 246
230* bug 6491 fixed - libinter.h was not installed under Linux (SEP #35 updated) 247* bug 6491 fixed - libinter.h was not installed under Linux (SEP #35 updated)
231 248
249* bug 6521 fixed - 'getmd5' crashed with a wrong second input argument.
250
251
232 Changes between version 5.2.0-beta1 and 5.2.0 of Scilab 252 Changes between version 5.2.0-beta1 and 5.2.0 of Scilab
233 ========================================================== 253 ==========================================================
234 254
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:
18===== 18=====
19 19
20* The default palettes can now be manipulated by the user. 20* The default palettes can now be manipulated by the user.
21 21
22Compilation:
23============
24
25* On Windows, Pentium III class (or equivalent) with SSE instructions is required.
26
27* Windows 2000 is no more supported as operating system.
28
29
22Bug fixes: 30Bug fixes:
23========== 31==========
24 32
25* bug 6419 fixed - gstacksize() There was no way to retrieve minimum from scilab. 33* bug 6419 fixed - gstacksize() There was no way to retrieve minimum from scilab.
34
35* bug 6484 fixed - file did not return filenale of a opened fortran file.
36
37* 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)
97rootdir=$(pkgdatadir)/etc/ 97rootdir=$(pkgdatadir)/etc/
98root_DATA = $(top_srcdir)/etc/scilab.start \ 98root_DATA = $(top_srcdir)/etc/scilab.start \
99$(top_srcdir)/etc/scilab.quit \ 99$(top_srcdir)/etc/scilab.quit \
100$(top_srcdir)/etc/modules.xml \
101$(top_srcdir)/etc/classpath.xml \
102$(top_srcdir)/etc/librarypath.xml \
103$(top_srcdir)/etc/toolboxes.xml \ 100$(top_srcdir)/etc/toolboxes.xml \
104$(top_srcdir)/etc/jvm_options.xml 101$(top_builddir)/etc/jvm_options.xml \
102$(top_builddir)/etc/modules.xml \
103$(top_builddir)/etc/classpath.xml \
104$(top_builddir)/etc/librarypath.xml
105 105
106 106
107infofilesdir=$(pkgdatadir)/ 107infofilesdir=$(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@
336AWK = @AWK@ 336AWK = @AWK@
337BATIK = @BATIK@ 337BATIK = @BATIK@
338BLAS_LIBS = @BLAS_LIBS@ 338BLAS_LIBS = @BLAS_LIBS@
339BSH = @BSH@
339CC = @CC@ 340CC = @CC@
340CCDEPMODE = @CCDEPMODE@ 341CCDEPMODE = @CCDEPMODE@
341CFLAGS = @CFLAGS@ 342CFLAGS = @CFLAGS@
@@ -409,6 +410,7 @@ JLATEXMATH_FOP = @JLATEXMATH_FOP@
409JOGL = @JOGL@ 410JOGL = @JOGL@
410JROSETTA_API = @JROSETTA_API@ 411JROSETTA_API = @JROSETTA_API@
411JROSETTA_ENGINE = @JROSETTA_ENGINE@ 412JROSETTA_ENGINE = @JROSETTA_ENGINE@
413JUNIT = @JUNIT@
412LAPACK_LIBS = @LAPACK_LIBS@ 414LAPACK_LIBS = @LAPACK_LIBS@
413LD = @LD@ 415LD = @LD@
414LDFLAGS = @LDFLAGS@ 416LDFLAGS = @LDFLAGS@
@@ -465,6 +467,7 @@ PVM_ENABLE = @PVM_ENABLE@
465PVM_INCLUDE = @PVM_INCLUDE@ 467PVM_INCLUDE = @PVM_INCLUDE@
466PVM_LIB = @PVM_LIB@ 468PVM_LIB = @PVM_LIB@
467PYTHON = @PYTHON@ 469PYTHON = @PYTHON@
470QDOX = @QDOX@
468RANLIB = @RANLIB@ 471RANLIB = @RANLIB@
469RELOCATABLE = @RELOCATABLE@ 472RELOCATABLE = @RELOCATABLE@
470RT_LIB = @RT_LIB@ 473RT_LIB = @RT_LIB@
@@ -483,6 +486,7 @@ SWIG_JAVA = @SWIG_JAVA@
483SWIG_RUNTIME_LIBS_DIR = @SWIG_RUNTIME_LIBS_DIR@ 486SWIG_RUNTIME_LIBS_DIR = @SWIG_RUNTIME_LIBS_DIR@
484TCLTK_LIBS = @TCLTK_LIBS@ 487TCLTK_LIBS = @TCLTK_LIBS@
485TCL_INC_PATH = @TCL_INC_PATH@ 488TCL_INC_PATH = @TCL_INC_PATH@
489TESTNG = @TESTNG@
486TK_INC_PATH = @TK_INC_PATH@ 490TK_INC_PATH = @TK_INC_PATH@
487UMFPACK_ENABLE = @UMFPACK_ENABLE@ 491UMFPACK_ENABLE = @UMFPACK_ENABLE@
488UMFPACK_LIB = @UMFPACK_LIB@ 492UMFPACK_LIB = @UMFPACK_LIB@
@@ -599,11 +603,11 @@ TARGETS_ALL = macros $(am__append_3)
599rootdir = $(pkgdatadir)/etc/ 603rootdir = $(pkgdatadir)/etc/
600root_DATA = $(top_srcdir)/etc/scilab.start \ 604root_DATA = $(top_srcdir)/etc/scilab.start \
601$(top_srcdir)/etc/scilab.quit \ 605$(top_srcdir)/etc/scilab.quit \
602$(top_srcdir)/etc/modules.xml \
603$(top_srcdir)/etc/classpath.xml \
604$(top_srcdir)/etc/librarypath.xml \
605$(top_srcdir)/etc/toolboxes.xml \ 606$(top_srcdir)/etc/toolboxes.xml \
606$(top_srcdir)/etc/jvm_options.xml 607$(top_builddir)/etc/jvm_options.xml \
608$(top_builddir)/etc/modules.xml \
609$(top_builddir)/etc/classpath.xml \
610$(top_builddir)/etc/librarypath.xml
607 611
608infofilesdir = $(pkgdatadir)/ 612infofilesdir = $(pkgdatadir)/
609infofiles_DATA = $(top_srcdir)/CHANGES \ 613infofiles_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 @@
14 <!-- The building directory --> 14 <!-- The building directory -->
15 <property name="build.dir" location="build/"/> 15 <property name="build.dir" location="build/"/>
16 16
17 <!-- The building test directory -->
18 <property name="build.test.dir" location="build/test"/>
19
17 <!-- Where builded classes will be generated --> 20 <!-- Where builded classes will be generated -->
18 <property name="classes.dir" location="${build.dir}/classes" /> 21 <property name="classes.dir" location="${build.dir}/classes" />
19 22
23 <!-- Where builded test classes will be generated -->
24 <property name="classes.test.dir" location="${build.test.dir}/classes" />
25
20 <!-- Where we store cache files --> 26 <!-- Where we store cache files -->
21 <property name="cache.dir" location="${build.dir}/cachefile" /> 27 <property name="cache.dir" location="${build.dir}/cachefile" />
22 28
23 <!-- Where we can find the sources --> 29 <!-- Where we can find the sources -->
24 <property name="src.dir" location="src/java/" /> 30 <property name="src.dir" location="src/java/" />
31
32 <!-- Where we can find the test sources -->
33 <property name="src.test.dir" location="tests/java/" />
25 34
26 <!-- Check style definitions --> 35 <!-- Check style definitions -->
27 <property name = "checkstyle.config.file" value = "${base.dir}/checkstyle/scilab_checkstyle_convention.xml" /> 36 <property name = "checkstyle.config.file" value = "${base.dir}/checkstyle/scilab_checkstyle_convention.xml" />
@@ -43,11 +52,21 @@
43 <pathelement location="${commons-beanutils.jar}"/> 52 <pathelement location="${commons-beanutils.jar}"/>
44 <pathelement location="${antlr.jar}"/> 53 <pathelement location="${antlr.jar}"/>
45 </path> 54 </path>
46 55
56 <path id="unittest.classpath">
57 <pathelement location="${testng.jar}"/>
58 <pathelement location="${bsh.jar}"/>
59 <pathelement location="${junit.jar}"/>
60 <pathelement location="${qdox.jar}"/>
61 </path>
62
63
64
47 <path id="compile.classpath"> 65 <path id="compile.classpath">
48 66
49 <pathelement location="${library.xcos.dir}/${library.xcos.name}"/> 67 <pathelement location="${library.xcos.dir}/${library.xcos.name}"/>
50 <pathelement location="${library.hdf5.dir}/${library.hdf5.name}"/> 68 <pathelement location="${library.hdf5.dir}/${library.hdf5.name}"/>
69 <pathelement location="${library.xpad.dir}/${library.xpad.name}"/>
51 <pathelement location="${library.localization.dir}/${library.localization.name}"/> 70 <pathelement location="${library.localization.dir}/${library.localization.name}"/>
52 <pathelement location="${library.shell.dir}/${library.shell.name}"/> 71 <pathelement location="${library.shell.dir}/${library.shell.name}"/>
53 <pathelement location="${library.history_manager.dir}/${library.history_manager.name}"/> 72 <pathelement location="${library.history_manager.dir}/${library.history_manager.name}"/>
@@ -63,7 +82,7 @@
63 <pathelement location="${commons-logging.jar}"/> 82 <pathelement location="${commons-logging.jar}"/>
64 83
65 <pathelement location="${flexdock.jar}"/> 84 <pathelement location="${flexdock.jar}"/>
66 85
67 <pathelement location="${gluegen.jar}"/> 86 <pathelement location="${gluegen.jar}"/>
68 87
69 <pathelement location="${jrosetta-API.jar}"/> 88 <pathelement location="${jrosetta-API.jar}"/>
@@ -137,9 +156,22 @@
137 <target name="checkstyle-clean"> 156 <target name="checkstyle-clean">
138 <delete dir="${checkstyle.report.dir}"/> 157 <delete dir="${checkstyle.report.dir}"/>
139 </target> 158 </target>
140 159
160 <target name="test" depends="compile-test">
161 <taskdef name="testng" classpathref="unittest.classpath" classname="org.testng.TestNGAntTask" />
162 <testng verbose="2" haltonfailure="true">
163 <classpath>
164 <path refid="unittest.classpath" />
165 <path refid="compile.classpath" />
166 <pathelement location="${classes.test.dir}" />
167 </classpath>
168 <classfileset dir="${build.test.dir}" includes="**/*.class"/>
169 </testng>
170 </target>
171
141 <target name="init"> 172 <target name="init">
142 <mkdir dir="${classes.dir}"/> 173 <mkdir dir="${classes.dir}"/>
174 <mkdir dir="${classes.test.dir}"/>
143 <mkdir dir="${build.jar.dir}"/> 175 <mkdir dir="${build.jar.dir}"/>
144 <!-- Create the time stamp --> 176 <!-- Create the time stamp -->
145 <tstamp/> 177 <tstamp/>
@@ -148,6 +180,7 @@
148 <!-- Clean sources --> 180 <!-- Clean sources -->
149 <target name="clean" description="Clean built files"> 181 <target name="clean" description="Clean built files">
150 <delete dir="${build.dir}"/> 182 <delete dir="${build.dir}"/>
183 <delete dir="${build.test.dir}"/>
151 <delete dir="${build.jar.dir}"/> 184 <delete dir="${build.jar.dir}"/>
152 <delete file="${build.jar.dir}/${library.name}"/> 185 <delete file="${build.jar.dir}/${library.name}"/>
153 </target> 186 </target>
@@ -165,6 +198,24 @@
165 source="5" 198 source="5"
166 /> 199 />
167 </target> 200 </target>
201
202 <!-- Compile test sources -->
203 <target name="compile-test" description="Build tests" depends="jar">
204 <javac
205 srcdir="${src.test.dir}"
206 destdir="${classes.test.dir}"
207 deprecation="on"
208 debug="off"
209 verbose="off"
210 listfiles="on"
211 source="5"
212 >
213 <classpath>
214 <path refid="unittest.classpath" />
215 <path refid="compile.classpath" />
216 </classpath>
217 </javac>
218 </target>
168 219
169 <!-- Create the jar --> 220 <!-- Create the jar -->
170 <target name="jar" description="Build the jar file" depends="compile"> 221 <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
741JAVA_HOME 741JAVA_HOME
742JAVA_JNI_LIBS 742JAVA_JNI_LIBS
743JAVA_JNI_INCLUDE 743JAVA_JNI_INCLUDE
744JUNIT
745BSH
746QDOX
747TESTNG
744ANTLR 748ANTLR
745COMMONS_BEANUTILS 749COMMONS_BEANUTILS
746CHECKSTYLE 750CHECKSTYLE
@@ -9840,7 +9844,7 @@ $as_echo "$ac_java_classpath" >&6; }
9840$as_echo_n "checking to see if the java compiler works... " >&6; } 9844$as_echo_n "checking to see if the java compiler works... " >&6; }
9841 9845
9842 cat << \EOF > conftest.java 9846 cat << \EOF > conftest.java
9843// #line 9843 "configure" 9847// #line 9847 "configure"
9844 9848
9845 9849
9846public class conftest { 9850public class conftest {
@@ -9900,7 +9904,7 @@ $as_echo_n "checking type of jvm... " >&6; }
9900 if test "x$ac_java_jvm_name" = "x" ; then 9904 if test "x$ac_java_jvm_name" = "x" ; then
9901 9905
9902 cat << \EOF > conftest.java 9906 cat << \EOF > conftest.java
9903// #line 9903 "configure" 9907// #line 9907 "configure"
9904import gnu.java.io.EncodingManager; 9908import gnu.java.io.EncodingManager;
9905 9909
9906public class conftest { 9910public class conftest {
@@ -9958,7 +9962,7 @@ $as_echo_n "checking java API version... " >&6; }
9958 9962
9959 9963
9960 cat << \EOF > conftest.java 9964 cat << \EOF > conftest.java
9961// #line 9961 "configure" 9965// #line 9965 "configure"
9962import java.nio.charset.Charset; 9966import java.nio.charset.Charset;
9963 9967
9964public class conftest { 9968public class conftest {
@@ -9997,7 +10001,7 @@ EOF
9997 10001
9998 10002
9999 cat << \EOF > conftest.java 10003 cat << \EOF > conftest.java
10000// #line 10000 "configure" 10004// #line 10004 "configure"
10001import java.lang.StringBuilder; 10005import java.lang.StringBuilder;
10002 10006
10003public class conftest { 10007public class conftest {
@@ -11246,7 +11250,7 @@ $as_echo_n "checking jgraphx... " >&6; }
11246 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 11250 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
11247 11251
11248 cat << \EOF > conftest.java 11252 cat << \EOF > conftest.java
11249// #line 11249 "configure" 11253// #line 11253 "configure"
11250import com.mxgraph.model.mxCell; 11254import com.mxgraph.model.mxCell;
11251 11255
11252public class conftest { 11256public class conftest {
@@ -11327,7 +11331,7 @@ $as_echo_n "checking minimal version (1.2.0.7) of jgraphx... " >&6; }
11327 export ac_java_classpath="$JGRAPHX:$ac_java_classpath" 11331 export ac_java_classpath="$JGRAPHX:$ac_java_classpath"
11328 11332
11329 cat << \EOF > conftest.java 11333 cat << \EOF > conftest.java
11330// #line 11330 "configure" 11334// #line 11334 "configure"
11331import com.mxgraph.view.mxGraph; 11335import com.mxgraph.view.mxGraph;
11332 11336
11333public class conftest { 11337public class conftest {
@@ -11390,7 +11394,7 @@ $as_echo_n "checking flexdock... " >&6; }
11390 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 11394 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
11391 11395
11392 cat << \EOF > conftest.java 11396 cat << \EOF > conftest.java
11393// #line 11393 "configure" 11397// #line 11397 "configure"
11394import org.flexdock.docking.DockingManager; 11398import org.flexdock.docking.DockingManager;
11395 11399
11396public class conftest { 11400public class conftest {
@@ -11484,7 +11488,7 @@ $as_echo_n "checking looks... " >&6; }
11484 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 11488 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
11485 11489
11486 cat << \EOF > conftest.java 11490 cat << \EOF > conftest.java
11487// #line 11487 "configure" 11491// #line 11491 "configure"
11488import com.jgoodies.looks.common.RenderingUtils; 11492import com.jgoodies.looks.common.RenderingUtils;
11489 11493
11490public class conftest { 11494public class conftest {
@@ -11578,7 +11582,7 @@ $as_echo_n "checking jgoodies-looks... " >&6; }
11578 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 11582 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
11579 11583
11580 cat << \EOF > conftest.java 11584 cat << \EOF > conftest.java
11581// #line 11581 "configure" 11585// #line 11585 "configure"
11582import com.jgoodies.looks.common.RenderingUtils; 11586import com.jgoodies.looks.common.RenderingUtils;
11583 11587
11584public class conftest { 11588public class conftest {
@@ -11673,7 +11677,7 @@ $as_echo_n "checking skinlf... " >&6; }
11673 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 11677 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
11674 11678
11675 cat << \EOF > conftest.java 11679 cat << \EOF > conftest.java
11676// #line 11676 "configure" 11680// #line 11680 "configure"
11677import com.l2fprod.util.AccessUtils; 11681import com.l2fprod.util.AccessUtils;
11678 11682
11679public class conftest { 11683public class conftest {
@@ -11767,7 +11771,7 @@ $as_echo_n "checking jogl... " >&6; }
11767 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 11771 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
11768 11772
11769 cat << \EOF > conftest.java 11773 cat << \EOF > conftest.java
11770// #line 11770 "configure" 11774// #line 11774 "configure"
11771import javax.media.opengl.glu.GLUnurbs; 11775import javax.media.opengl.glu.GLUnurbs;
11772 11776
11773public class conftest { 11777public class conftest {
@@ -11961,7 +11965,7 @@ $as_echo_n "checking gluegen-rt... " >&6; }
11961 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 11965 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
11962 11966
11963 cat << \EOF > conftest.java 11967 cat << \EOF > conftest.java
11964// #line 11964 "configure" 11968// #line 11968 "configure"
11965import com.sun.gluegen.runtime.CPU; 11969import com.sun.gluegen.runtime.CPU;
11966 11970
11967public class conftest { 11971public class conftest {
@@ -12110,7 +12114,7 @@ $as_echo_n "checking jhall... " >&6; }
12110 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 12114 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
12111 12115
12112 cat << \EOF > conftest.java 12116 cat << \EOF > conftest.java
12113// #line 12113 "configure" 12117// #line 12117 "configure"
12114import javax.help.JHelp; 12118import javax.help.JHelp;
12115 12119
12116public class conftest { 12120public class conftest {
@@ -12204,7 +12208,7 @@ $as_echo_n "checking javahelp2... " >&6; }
12204 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 12208 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
12205 12209
12206 cat << \EOF > conftest.java 12210 cat << \EOF > conftest.java
12207// #line 12207 "configure" 12211// #line 12211 "configure"
12208import javax.help.JHelp; 12212import javax.help.JHelp;
12209 12213
12210public class conftest { 12214public class conftest {
@@ -12299,7 +12303,7 @@ $as_echo_n "checking jrosetta-API... " >&6; }
12299 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 12303 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
12300 12304
12301 cat << \EOF > conftest.java 12305 cat << \EOF > conftest.java
12302// #line 12302 "configure" 12306// #line 12306 "configure"
12303import com.artenum.rosetta.interfaces.core.ConsoleConfiguration; 12307import com.artenum.rosetta.interfaces.core.ConsoleConfiguration;
12304 12308
12305public class conftest { 12309public class conftest {
@@ -12393,7 +12397,7 @@ $as_echo_n "checking jrosetta-engine... " >&6; }
12393 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 12397 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
12394 12398
12395 cat << \EOF > conftest.java 12399 cat << \EOF > conftest.java
12396// #line 12396 "configure" 12400// #line 12400 "configure"
12397import com.artenum.rosetta.core.action.AbstractConsoleAction; 12401import com.artenum.rosetta.core.action.AbstractConsoleAction;
12398 12402
12399public class conftest { 12403public class conftest {
@@ -12488,7 +12492,7 @@ $as_echo_n "checking jhdf5... " >&6; }
12488 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 12492 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
12489 12493
12490 cat << \EOF > conftest.java 12494 cat << \EOF > conftest.java
12491// #line 12491 "configure" 12495// #line 12495 "configure"
12492import ncsa.hdf.hdf5lib.HDF5Constants; 12496import ncsa.hdf.hdf5lib.HDF5Constants;
12493 12497
12494public class conftest { 12498public class conftest {
@@ -12583,7 +12587,7 @@ $as_echo_n "checking commons-logging... " >&6; }
12583 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 12587 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
12584 12588
12585 cat << \EOF > conftest.java 12589 cat << \EOF > conftest.java
12586// #line 12586 "configure" 12590// #line 12590 "configure"
12587import org.apache.commons.logging.LogFactory; 12591import org.apache.commons.logging.LogFactory;
12588 12592
12589public class conftest { 12593public class conftest {
@@ -12677,7 +12681,7 @@ $as_echo_n "checking jlatexmath... " >&6; }
12677 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 12681 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
12678 12682
12679 cat << \EOF > conftest.java 12683 cat << \EOF > conftest.java
12680// #line 12680 "configure" 12684// #line 12684 "configure"
12681import org.scilab.forge.jlatexmath.TeXFormula; 12685import org.scilab.forge.jlatexmath.TeXFormula;
12682 12686
12683public class conftest { 12687public class conftest {
@@ -12758,7 +12762,7 @@ $as_echo_n "checking minimal version (0.8.8) of jlatexmath... " >&6; }
12758 export ac_java_classpath="$JLATEXMATH:$ac_java_classpath" 12762 export ac_java_classpath="$JLATEXMATH:$ac_java_classpath"
12759 12763
12760 cat << \EOF > conftest.java 12764 cat << \EOF > conftest.java
12761// #line 12761 "configure" 12765// #line 12765 "configure"
12762import org.scilab.forge.jlatexmath.TeXFormula; 12766import org.scilab.forge.jlatexmath.TeXFormula;
12763 12767
12764public class conftest { 12768public class conftest {
@@ -12827,7 +12831,7 @@ $as_echo_n "checking checkstyle... " >&6; }
12827 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 12831 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
12828 12832
12829 cat << \EOF > conftest.java 12833 cat << \EOF > conftest.java
12830// #line 12830 "configure" 12834// #line 12834 "configure"
12831import com.puppycrawl.tools.checkstyle.CheckStyleTask; 12835import com.puppycrawl.tools.checkstyle.CheckStyleTask;
12832 12836
12833public class conftest { 12837public class conftest {
@@ -12921,7 +12925,7 @@ $as_echo_n "checking commons-beanutils... " >&6; }
12921 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 12925 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
12922 12926
12923 cat << \EOF > conftest.java 12927 cat << \EOF > conftest.java
12924// #line 12924 "configure" 12928// #line 12928 "configure"
12925import org.apache.commons.beanutils.Converter; 12929import org.apache.commons.beanutils.Converter;
12926 12930
12927public class conftest { 12931public class conftest {
@@ -13015,7 +13019,7 @@ $as_echo_n "checking antlr... " >&6; }
13015 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 13019 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
13016 13020
13017 cat << \EOF > conftest.java 13021 cat << \EOF > conftest.java
13018// #line 13018 "configure" 13022// #line 13022 "configure"
13019import antlr.TokenStreamException; 13023import antlr.TokenStreamException;
13020 13024
13021public class conftest { 13025public class conftest {
@@ -13089,6 +13093,383 @@ $as_echo "$as_me: WARNING: Could not find or use the Java package/jar antlr used
13089 ANTLR=$PACKAGE_JAR_FILE 13093 ANTLR=$PACKAGE_JAR_FILE
13090 13094
13091 13095
13096 # Test NG (java unitary test)
13097
13098 { $as_echo "$as_me:${as_lineno-$LINENO}: checking testng" >&5
13099$as_echo_n "checking testng... " >&6; }
13100 PACKAGE_JAR_FILE=
13101 found_jar=no
13102 saved_ac_java_classpath=$ac_java_classpath
13103 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)"
13104 for jardir in "`pwd`/thirdparty" "`pwd`/jar" $DEFAULT_JAR_DIR "$_user_libdir"; do
13105 for jar in "$jardir/testng.jar" "$jardir/libtestng.jar" "$jardir/libtestng-java.jar" "$jardir/testng*.jar"; do
13106# jar=`echo $jar|sed -e 's/ /\\ /'`
13107# echo "protected $jar"
13108# jar_resolved=`ls $jar 2>/dev/null`
13109# echo "looking for $jar_resolved"
13110# TODO check the behaviour when spaces
13111 jar_resolved=`ls -r $jar 2>/dev/null`
13112 if test -e "$jar_resolved"; then
13113 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
13114
13115 cat << \EOF > conftest.java
13116// #line 13116 "configure"
13117import org.testng.TestNG;
13118
13119public class conftest {
13120 public static void main(String[] argv) {
13121
13122 }
13123}
13124EOF
13125
13126 CLASSPATH=$ac_java_classpath
13127 export CLASSPATH
13128 cmd="$JAVAC ${JAVAC_FLAGS} conftest.java"
13129 if (echo $cmd >&5 ; eval $cmd >&5 2>&5) ; then
13130 if test ""no"" = "no"; then
13131 echo "yes" >&5
13132
13133 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $jar_resolved" >&5
13134$as_echo "$jar_resolved" >&6; }
13135 found_jar=yes
13136 PACKAGE_JAR_FILE=$jar_resolved
13137 break
13138
13139 else
13140 cmd="$JAVA conftest"
13141 if (echo $cmd >&5 ; eval $cmd >&5 2>&5); then
13142 echo "yes" >&5
13143
13144 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $jar_resolved" >&5
13145$as_echo "$jar_resolved" >&6; }
13146 found_jar=yes
13147 PACKAGE_JAR_FILE=$jar_resolved
13148 break
13149
13150 else
13151 echo "configure: failed program was:" >&5
13152 cat conftest.java >&5
13153 echo "configure: CLASSPATH was $CLASSPATH" >&5
13154
13155 ac_java_classpath=$saved_ac_java_classpath
13156
13157
13158 fi
13159 fi
13160 else
13161 echo "configure: failed program was:" >&5
13162 cat conftest.java >&5
13163 echo "configure: CLASSPATH was $CLASSPATH" >&5
13164
13165 ac_java_classpath=$saved_ac_java_classpath
13166
13167
13168 fi
13169
13170 fi
13171 done
13172 if test "$found_jar" = "yes"; then
13173 break
13174 fi
13175 done
13176 if test "$found_jar" = "no"; then
13177 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
13178$as_echo "no" >&6; }
13179 if test ""yes"" = "yes"; then
13180 { $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
13181$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;}
13182 else
13183 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
13184 fi
13185 fi
13186
13187 TESTNG=$PACKAGE_JAR_FILE
13188
13189
13190 # Qdox (parses declarations and Javadoc) - dependency of TestNG
13191
13192 { $as_echo "$as_me:${as_lineno-$LINENO}: checking qdox" >&5
13193$as_echo_n "checking qdox... " >&6; }
13194 PACKAGE_JAR_FILE=
13195 found_jar=no
13196 saved_ac_java_classpath=$ac_java_classpath
13197 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)"
13198 for jardir in "`pwd`/thirdparty" "`pwd`/jar" $DEFAULT_JAR_DIR "$_user_libdir"; do
13199 for jar in "$jardir/qdox.jar" "$jardir/libqdox.jar" "$jardir/libqdox-java.jar" "$jardir/qdox*.jar"; do
13200# jar=`echo $jar|sed -e 's/ /\\ /'`
13201# echo "protected $jar"
13202# jar_resolved=`ls $jar 2>/dev/null`
13203# echo "looking for $jar_resolved"
13204# TODO check the behaviour when spaces
13205 jar_resolved=`ls -r $jar 2>/dev/null`
13206 if test -e "$jar_resolved"; then
13207 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
13208
13209 cat << \EOF > conftest.java
13210// #line 13210 "configure"
13211import com.thoughtworks.qdox.tools.QDoxTester;
13212
13213public class conftest {
13214 public static void main(String[] argv) {
13215
13216 }
13217}
13218EOF
13219
13220 CLASSPATH=$ac_java_classpath
13221 export CLASSPATH
13222 cmd="$JAVAC ${JAVAC_FLAGS} conftest.java"
13223 if (echo $cmd >&5 ; eval $cmd >&5 2>&5) ; then
13224 if test ""no"" = "no"; then
13225 echo "yes" >&5
13226
13227 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $jar_resolved" >&5
13228$as_echo "$jar_resolved" >&6; }
13229 found_jar=yes
13230 PACKAGE_JAR_FILE=$jar_resolved
13231 break
13232
13233 else
13234 cmd="$JAVA conftest"
13235 if (echo $cmd >&5 ; eval $cmd >&5 2>&5); then
13236 echo "yes" >&5
13237
13238 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $jar_resolved" >&5
13239$as_echo "$jar_resolved" >&6; }
13240 found_jar=yes
13241 PACKAGE_JAR_FILE=$jar_resolved
13242 break
13243
13244 else
13245 echo "configure: failed program was:" >&5
13246 cat conftest.java >&5
13247 echo "configure: CLASSPATH was $CLASSPATH" >&5
13248
13249 ac_java_classpath=$saved_ac_java_classpath
13250
13251
13252 fi
13253 fi
13254 else
13255 echo "configure: failed program was:" >&5
13256 cat conftest.java >&5
13257 echo "configure: CLASSPATH was $CLASSPATH" >&5
13258
13259 ac_java_classpath=$saved_ac_java_classpath
13260
13261
13262 fi
13263
13264 fi
13265 done
13266 if test "$found_jar" = "yes"; then
13267 break
13268 fi
13269 done
13270 if test "$found_jar" = "no"; then
13271 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
13272$as_echo "no" >&6; }
13273 if test ""yes"" = "yes"; then
13274 { $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
13275$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;}
13276 else
13277 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
13278 fi
13279 fi
13280
13281 QDOX=$PACKAGE_JAR_FILE
13282
13283
13284 # bsh (Java scripting environment) - dependency of TestNG
13285
13286 { $as_echo "$as_me:${as_lineno-$LINENO}: checking bsh" >&5
13287$as_echo_n "checking bsh... " >&6; }
13288 PACKAGE_JAR_FILE=
13289 found_jar=no
13290 saved_ac_java_classpath=$ac_java_classpath
13291 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)"
13292 for jardir in "`pwd`/thirdparty" "`pwd`/jar" $DEFAULT_JAR_DIR "$_user_libdir"; do
13293 for jar in "$jardir/bsh.jar" "$jardir/libbsh.jar" "$jardir/libbsh-java.jar" "$jardir/bsh*.jar"; do
13294# jar=`echo $jar|sed -e 's/ /\\ /'`
13295# echo "protected $jar"
13296# jar_resolved=`ls $jar 2>/dev/null`
13297# echo "looking for $jar_resolved"
13298# TODO check the behaviour when spaces
13299 jar_resolved=`ls -r $jar 2>/dev/null`
13300 if test -e "$jar_resolved"; then
13301 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
13302
13303 cat << \EOF > conftest.java
13304// #line 13304 "configure"
13305import bsh.Console;
13306
13307public class conftest {
13308 public static void main(String[] argv) {
13309
13310 }
13311}
13312EOF
13313
13314 CLASSPATH=$ac_java_classpath
13315 export CLASSPATH
13316 cmd="$JAVAC ${JAVAC_FLAGS} conftest.java"
13317 if (echo $cmd >&5 ; eval $cmd >&5 2>&5) ; then
13318 if test ""no"" = "no"; then
13319 echo "yes" >&5
13320
13321 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $jar_resolved" >&5
13322$as_echo "$jar_resolved" >&6; }
13323 found_jar=yes
13324 PACKAGE_JAR_FILE=$jar_resolved
13325 break
13326
13327 else
13328 cmd="$JAVA conftest"
13329 if (echo $cmd >&5 ; eval $cmd >&5 2>&5); then
13330 echo "yes" >&5
13331
13332 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $jar_resolved" >&5
13333$as_echo "$jar_resolved" >&6; }
13334 found_jar=yes
13335 PACKAGE_JAR_FILE=$jar_resolved
13336 break
13337
13338 else
13339 echo "configure: failed program was:" >&5
13340 cat conftest.java >&5
13341 echo "configure: CLASSPATH was $CLASSPATH" >&5
13342
13343 ac_java_classpath=$saved_ac_java_classpath
13344
13345
13346 fi
13347 fi
13348 else
13349 echo "configure: failed program was:" >&5
13350 cat conftest.java >&5
13351 echo "configure: CLASSPATH was $CLASSPATH" >&5
13352
13353 ac_java_classpath=$saved_ac_java_classpath
13354
13355
13356 fi
13357
13358 fi
13359 done
13360 if test "$found_jar" = "yes"; then
13361 break
13362 fi
13363 done
13364 if test "$found_jar" = "no"; then
13365 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
13366$as_echo "no" >&6; }
13367 if test ""yes"" = "yes"; then
13368 { $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
13369$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;}
13370 else
13371 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
13372 fi
13373 fi
13374
13375 BSH=$PACKAGE_JAR_FILE
13376
13377
13378 # Junit - dependency of TestNG
13379
13380 { $as_echo "$as_me:${as_lineno-$LINENO}: checking junit" >&5
13381$as_echo_n "checking junit... " >&6; }
13382 PACKAGE_JAR_FILE=
13383 found_jar=no
13384 saved_ac_java_classpath=$ac_java_classpath
13385 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)"
13386 for jardir in "`pwd`/thirdparty" "`pwd`/jar" $DEFAULT_JAR_DIR "$_user_libdir"; do
13387 for jar in "$jardir/junit.jar" "$jardir/libjunit.jar" "$jardir/libjunit-java.jar" "$jardir/junit*.jar"; do
13388# jar=`echo $jar|sed -e 's/ /\\ /'`
13389# echo "protected $jar"
13390# jar_resolved=`ls $jar 2>/dev/null`
13391# echo "looking for $jar_resolved"
13392# TODO check the behaviour when spaces
13393 jar_resolved=`ls -r $jar 2>/dev/null`
13394 if test -e "$jar_resolved"; then
13395 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
13396
13397 cat << \EOF > conftest.java
13398// #line 13398 "configure"
13399import junit.framework.Assert;
13400
13401public class conftest {
13402 public static void main(String[] argv) {
13403
13404 }
13405}
13406EOF
13407
13408 CLASSPATH=$ac_java_classpath
13409 export CLASSPATH
13410 cmd="$JAVAC ${JAVAC_FLAGS} conftest.java"
13411 if (echo $cmd >&5 ; eval $cmd >&5 2>&5) ; then
13412 if test ""no"" = "no"; then
13413 echo "yes" >&5
13414
13415 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $jar_resolved" >&5
13416$as_echo "$jar_resolved" >&6; }
13417 found_jar=yes
13418 PACKAGE_JAR_FILE=$jar_resolved
13419 break
13420
13421 else
13422 cmd="$JAVA conftest"
13423 if (echo $cmd >&5 ; eval $cmd >&5 2>&5); then
13424 echo "yes" >&5
13425
13426 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $jar_resolved" >&5
13427$as_echo "$jar_resolved" >&6; }
13428 found_jar=yes
13429 PACKAGE_JAR_FILE=$jar_resolved
13430 break
13431
13432 else
13433 echo "configure: failed program was:" >&5
13434 cat conftest.java >&5
13435 echo "configure: CLASSPATH was $CLASSPATH" >&5
13436
13437 ac_java_classpath=$saved_ac_java_classpath
13438
13439
13440 fi
13441 fi
13442 else
13443 echo "configure: failed program was:" >&5
13444 cat conftest.java >&5
13445 echo "configure: CLASSPATH was $CLASSPATH" >&5
13446
13447 ac_java_classpath=$saved_ac_java_classpath
13448
13449
13450 fi
13451
13452 fi
13453 done
13454 if test "$found_jar" = "yes"; then
13455 break
13456 fi
13457 done
13458 if test "$found_jar" = "no"; then
13459 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
13460$as_echo "no" >&6; }
13461 if test ""yes"" = "yes"; then
13462 { $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
13463$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;}
13464 else
13465 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
13466 fi
13467 fi
13468
13469 JUNIT=$PACKAGE_JAR_FILE
13470
13471
13472
13092 else 13473 else
13093 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Sun javac not found: I will not build the java interface" >&5 13474 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Sun javac not found: I will not build the java interface" >&5
13094$as_echo "$as_me: WARNING: Sun javac not found: I will not build the java interface" >&2;} 13475$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"
21062{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if tcl is version $CHK_TCL_MAJOR.$CHK_TCL_MINOR or later" >&5 21443{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if tcl is version $CHK_TCL_MAJOR.$CHK_TCL_MINOR or later" >&5
21063$as_echo_n "checking if tcl is version $CHK_TCL_MAJOR.$CHK_TCL_MINOR or later... " >&6; } 21444$as_echo_n "checking if tcl is version $CHK_TCL_MAJOR.$CHK_TCL_MINOR or later... " >&6; }
21064cat > conftest.$ac_ext <<EOF 21445cat > conftest.$ac_ext <<EOF
21065#line 21065 "configure" 21446#line 21446 "configure"
21066#include "confdefs.h" 21447#include "confdefs.h"
21067 21448
21068#include "$CHK_TCL_INCLUDE_PATH/$CHK_TCL_INC_NAME" 21449#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"
21374$as_echo_n "checking if tk is version $CHK_TK_MAJOR.$CHK_TK_MINOR or later... " >&6; } 21755$as_echo_n "checking if tk is version $CHK_TK_MAJOR.$CHK_TK_MINOR or later... " >&6; }
21375 21756
21376cat > conftest.$ac_ext <<EOF 21757cat > conftest.$ac_ext <<EOF
21377#line 21377 "configure" 21758#line 21758 "configure"
21378#include "confdefs.h" 21759#include "confdefs.h"
21379 21760
21380#include "$CHK_TK_INCLUDE_PATH/$CHK_TK_INC_NAME" 21761#include "$CHK_TK_INCLUDE_PATH/$CHK_TK_INC_NAME"
@@ -21955,7 +22336,7 @@ $as_echo_n "checking batik-all... " >&6; }
21955 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 22336 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
21956 22337
21957 cat << \EOF > conftest.java 22338 cat << \EOF > conftest.java
21958// #line 21958 "configure" 22339// #line 22339 "configure"
21959import org.apache.batik.parser.Parser; 22340import org.apache.batik.parser.Parser;
21960 22341
21961public class conftest { 22342public class conftest {
@@ -22049,7 +22430,7 @@ $as_echo_n "checking batik... " >&6; }
22049 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 22430 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
22050 22431
22051 cat << \EOF > conftest.java 22432 cat << \EOF > conftest.java
22052// #line 22052 "configure" 22433// #line 22433 "configure"
22053import org.apache.batik.parser.Parser; 22434import org.apache.batik.parser.Parser;
22054 22435
22055public class conftest { 22436public class conftest {
@@ -22145,7 +22526,7 @@ $as_echo_n "checking saxon... " >&6; }
22145 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 22526 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
22146 22527
22147 cat << \EOF > conftest.java 22528 cat << \EOF > conftest.java
22148// #line 22148 "configure" 22529// #line 22529 "configure"
22149import com.icl.saxon.Loader; 22530import com.icl.saxon.Loader;
22150 22531
22151public class conftest { 22532public class conftest {
@@ -22239,7 +22620,7 @@ $as_echo_n "checking fop... " >&6; }
22239 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 22620 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
22240 22621
22241 cat << \EOF > conftest.java 22622 cat << \EOF > conftest.java
22242// #line 22242 "configure" 22623// #line 22623 "configure"
22243import org.apache.fop.pdf.PDFInfo; 22624import org.apache.fop.pdf.PDFInfo;
22244 22625
22245public class conftest { 22626public class conftest {
@@ -22333,7 +22714,7 @@ $as_echo_n "checking jeuclid-core... " >&6; }
22333 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 22714 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
22334 22715
22335 cat << \EOF > conftest.java 22716 cat << \EOF > conftest.java
22336// #line 22336 "configure" 22717// #line 22717 "configure"
22337import net.sourceforge.jeuclid.LayoutContext; 22718import net.sourceforge.jeuclid.LayoutContext;
22338 22719
22339public class conftest { 22720public class conftest {
@@ -22427,7 +22808,7 @@ $as_echo_n "checking commons-io... " >&6; }
22427 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 22808 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
22428 22809
22429 cat << \EOF > conftest.java 22810 cat << \EOF > conftest.java
22430// #line 22430 "configure" 22811// #line 22811 "configure"
22431import org.apache.commons.io.output.CountingOutputStream; 22812import org.apache.commons.io.output.CountingOutputStream;
22432 22813
22433public class conftest { 22814public class conftest {
@@ -22521,7 +22902,7 @@ $as_echo_n "checking xmlgraphics-commons... " >&6; }
22521 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 22902 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
22522 22903
22523 cat << \EOF > conftest.java 22904 cat << \EOF > conftest.java
22524// #line 22524 "configure" 22905// #line 22905 "configure"
22525import org.apache.xmlgraphics.util.Service; 22906import org.apache.xmlgraphics.util.Service;
22526 22907
22527public class conftest { 22908public class conftest {
@@ -22615,7 +22996,7 @@ $as_echo_n "checking xml-apis-ext... " >&6; }
22615 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 22996 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
22616 22997
22617 cat << \EOF > conftest.java 22998 cat << \EOF > conftest.java
22618// #line 22618 "configure" 22999// #line 22999 "configure"
22619import org.w3c.dom.svg.SVGDocument; 23000import org.w3c.dom.svg.SVGDocument;
22620 23001
22621public class conftest { 23002public class conftest {
@@ -22709,7 +23090,7 @@ $as_echo_n "checking xml-commons-apis-ext... " >&6; }
22709 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 23090 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
22710 23091
22711 cat << \EOF > conftest.java 23092 cat << \EOF > conftest.java
22712// #line 22712 "configure" 23093// #line 23093 "configure"
22713import org.w3c.dom.svg.SVGDocument; 23094import org.w3c.dom.svg.SVGDocument;
22714 23095
22715public class conftest { 23096public class conftest {
@@ -22806,7 +23187,7 @@ $as_echo_n "checking jlatexmath-fop... " >&6; }
22806 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 23187 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
22807 23188
22808 cat << \EOF > conftest.java 23189 cat << \EOF > conftest.java
22809// #line 22809 "configure" 23190// #line 23190 "configure"
22810import org.scilab.forge.jlatexmath.fop.JLaTeXMathObj; 23191import org.scilab.forge.jlatexmath.fop.JLaTeXMathObj;
22811 23192
22812public class conftest { 23193public class conftest {
@@ -22900,7 +23281,7 @@ $as_echo_n "checking avalon-framework... " >&6; }
22900 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 23281 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
22901 23282
22902 cat << \EOF > conftest.java 23283 cat << \EOF > conftest.java
22903// #line 22903 "configure" 23284// #line 23284 "configure"
22904import org.apache.avalon.framework.configuration.ConfigurationException; 23285import org.apache.avalon.framework.configuration.ConfigurationException;
22905 23286
22906public class conftest { 23287public class conftest {
@@ -29165,7 +29546,7 @@ else
29165 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 29546 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
29166 lt_status=$lt_dlunknown 29547 lt_status=$lt_dlunknown
29167 cat > conftest.$ac_ext <<_LT_EOF 29548 cat > conftest.$ac_ext <<_LT_EOF
29168#line 29168 "configure" 29549#line 29549 "configure"
29169#include "confdefs.h" 29550#include "confdefs.h"
29170 29551
29171#if HAVE_DLFCN_H 29552#if HAVE_DLFCN_H
@@ -29271,7 +29652,7 @@ else
29271 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 29652 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
29272 lt_status=$lt_dlunknown 29653 lt_status=$lt_dlunknown
29273 cat > conftest.$ac_ext <<_LT_EOF 29654 cat > conftest.$ac_ext <<_LT_EOF
29274#line 29274 "configure" 29655#line 29655 "configure"
29275#include "confdefs.h" 29656#include "confdefs.h"
29276 29657
29277#if HAVE_DLFCN_H 29658#if HAVE_DLFCN_H
@@ -38717,6 +39098,7 @@ echo "Code quality (optional):"
38717echo " Checkstyle .......... = $CHECKSTYLE" 39098echo " Checkstyle .......... = $CHECKSTYLE"
38718echo " Commons-beanutils ... = $COMMONS_BEANUTILS" 39099echo " Commons-beanutils ... = $COMMONS_BEANUTILS"
38719echo " Antlr ............... = $ANTLR" 39100echo " Antlr ............... = $ANTLR"
39101echo " TestNG .............. = $TESTNG"
38720echo " splint .............. = $SPLINT" 39102echo " splint .............. = $SPLINT"
38721 39103
38722echo "" 39104echo ""
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
787 ANTLR=$PACKAGE_JAR_FILE 787 ANTLR=$PACKAGE_JAR_FILE
788 AC_SUBST(ANTLR) 788 AC_SUBST(ANTLR)
789 789
790 # Test NG (java unitary test)
791 AC_JAVA_CHECK_PACKAGE([testng],[org.testng.TestNG],[TestNG - Unit tests],"yes")
792 TESTNG=$PACKAGE_JAR_FILE
793 AC_SUBST(TESTNG)
794
795 # Qdox (parses declarations and Javadoc) - dependency of TestNG
796 AC_JAVA_CHECK_PACKAGE([qdox],[com.thoughtworks.qdox.tools.QDoxTester],[Parses declarations and Javadoc ],"yes")
797 QDOX=$PACKAGE_JAR_FILE
798 AC_SUBST(QDOX)
799
800 # bsh (Java scripting environment) - dependency of TestNG
801 AC_JAVA_CHECK_PACKAGE([bsh],[bsh.Console],[Java scripting environment],"yes")
802 BSH=$PACKAGE_JAR_FILE
803 AC_SUBST(BSH)
804
805 # Junit - dependency of TestNG
806 AC_JAVA_CHECK_PACKAGE([junit],[junit.framework.Assert],[Unitary tests],"yes")
807 JUNIT=$PACKAGE_JAR_FILE
808 AC_SUBST(JUNIT)
809
810
790 else 811 else
791 AC_MSG_WARN([Sun javac not found: I will not build the java interface]) 812 AC_MSG_WARN([Sun javac not found: I will not build the java interface])
792 if test "$ac_java_jvm_name" != ""; then 813 if test "$ac_java_jvm_name" != ""; then
@@ -1819,6 +1840,7 @@ echo "Code quality (optional):"
1819echo " Checkstyle .......... = $CHECKSTYLE" 1840echo " Checkstyle .......... = $CHECKSTYLE"
1820echo " Commons-beanutils ... = $COMMONS_BEANUTILS" 1841echo " Commons-beanutils ... = $COMMONS_BEANUTILS"
1821echo " Antlr ............... = $ANTLR" 1842echo " Antlr ............... = $ANTLR"
1843echo " TestNG .............. = $TESTNG"
1822echo " splint .............. = $SPLINT" 1844echo " splint .............. = $SPLINT"
1823 1845
1824echo "" 1846echo ""
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@
79AWK = @AWK@ 79AWK = @AWK@
80BATIK = @BATIK@ 80BATIK = @BATIK@
81BLAS_LIBS = @BLAS_LIBS@ 81BLAS_LIBS = @BLAS_LIBS@
82BSH = @BSH@
82CC = @CC@ 83CC = @CC@
83CCDEPMODE = @CCDEPMODE@ 84CCDEPMODE = @CCDEPMODE@
84CFLAGS = @CFLAGS@ 85CFLAGS = @CFLAGS@
@@ -152,6 +153,7 @@ JLATEXMATH_FOP = @JLATEXMATH_FOP@
152JOGL = @JOGL@ 153JOGL = @JOGL@
153JROSETTA_API = @JROSETTA_API@ 154JROSETTA_API = @JROSETTA_API@
154JROSETTA_ENGINE = @JROSETTA_ENGINE@ 155JROSETTA_ENGINE = @JROSETTA_ENGINE@
156JUNIT = @JUNIT@
155LAPACK_LIBS = @LAPACK_LIBS@ 157LAPACK_LIBS = @LAPACK_LIBS@
156LD = @LD@ 158LD = @LD@
157LDFLAGS = @LDFLAGS@ 159LDFLAGS = @LDFLAGS@
@@ -208,6 +210,7 @@ PVM_ENABLE = @PVM_ENABLE@
208PVM_INCLUDE = @PVM_INCLUDE@ 210PVM_INCLUDE = @PVM_INCLUDE@
209PVM_LIB = @PVM_LIB@ 211PVM_LIB = @PVM_LIB@
210PYTHON = @PYTHON@ 212PYTHON = @PYTHON@
213QDOX = @QDOX@
211RANLIB = @RANLIB@ 214RANLIB = @RANLIB@
212RELOCATABLE = @RELOCATABLE@ 215RELOCATABLE = @RELOCATABLE@
213RT_LIB = @RT_LIB@ 216RT_LIB = @RT_LIB@
@@ -226,6 +229,7 @@ SWIG_JAVA = @SWIG_JAVA@
226SWIG_RUNTIME_LIBS_DIR = @SWIG_RUNTIME_LIBS_DIR@ 229SWIG_RUNTIME_LIBS_DIR = @SWIG_RUNTIME_LIBS_DIR@
227TCLTK_LIBS = @TCLTK_LIBS@ 230TCLTK_LIBS = @TCLTK_LIBS@
228TCL_INC_PATH = @TCL_INC_PATH@ 231TCL_INC_PATH = @TCL_INC_PATH@
232TESTNG = @TESTNG@
229TK_INC_PATH = @TK_INC_PATH@ 233TK_INC_PATH = @TK_INC_PATH@
230UMFPACK_ENABLE = @UMFPACK_ENABLE@ 234UMFPACK_ENABLE = @UMFPACK_ENABLE@
231UMFPACK_LIB = @UMFPACK_LIB@ 235UMFPACK_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 @@
43 /> 43 />
44 <Tool 44 <Tool
45 Name="VCCLCompilerTool" 45 Name="VCCLCompilerTool"
46 AdditionalOptions="/arch:IA32" 46 AdditionalOptions=""
47 Optimization="0" 47 Optimization="0"
48 PreprocessorDefinitions="EXPORT_DETECTFRAMEWORK_DLL" 48 PreprocessorDefinitions="EXPORT_DETECTFRAMEWORK_DLL"
49 MinimalRebuild="true" 49 MinimalRebuild="true"
@@ -198,7 +198,7 @@
198 /> 198 />
199 <Tool 199 <Tool
200 Name="VCCLCompilerTool" 200 Name="VCCLCompilerTool"
201 AdditionalOptions="/arch:IA32" 201 AdditionalOptions=""
202 WholeProgramOptimization="false" 202 WholeProgramOptimization="false"
203 PreprocessorDefinitions="EXPORT_DETECTFRAMEWORK_DLL" 203 PreprocessorDefinitions="EXPORT_DETECTFRAMEWORK_DLL"
204 RuntimeLibrary="2" 204 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 @@
43 /> 43 />
44 <Tool 44 <Tool
45 Name="VCCLCompilerTool" 45 Name="VCCLCompilerTool"
46 AdditionalOptions="/arch:IA32" 46 AdditionalOptions=""
47 Optimization="0" 47 Optimization="0"
48 PreprocessorDefinitions="EXPORT_GETWINDOWSVERSION_DLL" 48 PreprocessorDefinitions="EXPORT_GETWINDOWSVERSION_DLL"
49 MinimalRebuild="true" 49 MinimalRebuild="true"
@@ -198,7 +198,7 @@
198 /> 198 />
199 <Tool 199 <Tool
200 Name="VCCLCompilerTool" 200 Name="VCCLCompilerTool"
201 AdditionalOptions="/arch:IA32" 201 AdditionalOptions=""
202 WholeProgramOptimization="false" 202 WholeProgramOptimization="false"
203 PreprocessorDefinitions="EXPORT_GETWINDOWSVERSION_DLL" 203 PreprocessorDefinitions="EXPORT_GETWINDOWSVERSION_DLL"
204 RuntimeLibrary="2" 204 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 @@
56 <Tool 56 <Tool
57 Name="VCCLCompilerTool" 57 Name="VCCLCompilerTool"
58 ExecutionBucket="5" 58 ExecutionBucket="5"
59 AdditionalOptions="/arch:IA32" 59 AdditionalOptions=""
60 Optimization="0" 60 Optimization="0"
61 AdditionalIncludeDirectories="" 61 AdditionalIncludeDirectories=""
62 PreprocessorDefinitions="_;LIBSCILAB_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE" 62 PreprocessorDefinitions="_;LIBSCILAB_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE"
@@ -271,7 +271,7 @@
271 <Tool 271 <Tool
272 Name="VCCLCompilerTool" 272 Name="VCCLCompilerTool"
273 ExecutionBucket="5" 273 ExecutionBucket="5"
274 AdditionalOptions="/arch:IA32" 274 AdditionalOptions=""
275 Optimization="2" 275 Optimization="2"
276 InlineFunctionExpansion="1" 276 InlineFunctionExpansion="1"
277 FavorSizeOrSpeed="1" 277 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 @@
43 /> 43 />
44 <Tool 44 <Tool
45 Name="VCCLCompilerTool" 45 Name="VCCLCompilerTool"
46 AdditionalOptions="/arch:IA32" 46 AdditionalOptions=""
47 Optimization="0" 47 Optimization="0"
48 AdditionalIncludeDirectories="includes" 48 AdditionalIncludeDirectories="includes"
49 PreprocessorDefinitions="EXPORT_MALLOC_DLL" 49 PreprocessorDefinitions="EXPORT_MALLOC_DLL"
@@ -204,7 +204,7 @@
204 /> 204 />
205 <Tool 205 <Tool
206 Name="VCCLCompilerTool" 206 Name="VCCLCompilerTool"
207 AdditionalOptions="/arch:IA32" 207 AdditionalOptions=""
208 WholeProgramOptimization="false" 208 WholeProgramOptimization="false"
209 AdditionalIncludeDirectories="includes" 209 AdditionalIncludeDirectories="includes"
210 PreprocessorDefinitions="EXPORT_MALLOC_DLL" 210 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@
145AWK = @AWK@ 145AWK = @AWK@
146BATIK = @BATIK@ 146BATIK = @BATIK@
147BLAS_LIBS = @BLAS_LIBS@ 147BLAS_LIBS = @BLAS_LIBS@
148BSH = @BSH@
148CC = @CC@ 149CC = @CC@
149CCDEPMODE = @CCDEPMODE@ 150CCDEPMODE = @CCDEPMODE@
150CFLAGS = @CFLAGS@ 151CFLAGS = @CFLAGS@
@@ -218,6 +219,7 @@ JLATEXMATH_FOP = @JLATEXMATH_FOP@
218JOGL = @JOGL@ 219JOGL = @JOGL@
219JROSETTA_API = @JROSETTA_API@ 220JROSETTA_API = @JROSETTA_API@
220JROSETTA_ENGINE = @JROSETTA_ENGINE@ 221JROSETTA_ENGINE = @JROSETTA_ENGINE@
222JUNIT = @JUNIT@
221LAPACK_LIBS = @LAPACK_LIBS@ 223LAPACK_LIBS = @LAPACK_LIBS@
222LD = @LD@ 224LD = @LD@
223LDFLAGS = @LDFLAGS@ 225LDFLAGS = @LDFLAGS@
@@ -274,6 +276,7 @@ PVM_ENABLE = @PVM_ENABLE@
274PVM_INCLUDE = @PVM_INCLUDE@ 276PVM_INCLUDE = @PVM_INCLUDE@
275PVM_LIB = @PVM_LIB@ 277PVM_LIB = @PVM_LIB@
276PYTHON = @PYTHON@ 278PYTHON = @PYTHON@
279QDOX = @QDOX@
277RANLIB = @RANLIB@ 280RANLIB = @RANLIB@
278RELOCATABLE = @RELOCATABLE@ 281RELOCATABLE = @RELOCATABLE@
279RT_LIB = @RT_LIB@ 282RT_LIB = @RT_LIB@
@@ -292,6 +295,7 @@ SWIG_JAVA = @SWIG_JAVA@
292SWIG_RUNTIME_LIBS_DIR = @SWIG_RUNTIME_LIBS_DIR@ 295SWIG_RUNTIME_LIBS_DIR = @SWIG_RUNTIME_LIBS_DIR@
293TCLTK_LIBS = @TCLTK_LIBS@ 296TCLTK_LIBS = @TCLTK_LIBS@
294TCL_INC_PATH = @TCL_INC_PATH@ 297TCL_INC_PATH = @TCL_INC_PATH@
298TESTNG = @TESTNG@
295TK_INC_PATH = @TK_INC_PATH@ 299TK_INC_PATH = @TK_INC_PATH@
296UMFPACK_ENABLE = @UMFPACK_ENABLE@ 300UMFPACK_ENABLE = @UMFPACK_ENABLE@
297UMFPACK_LIB = @UMFPACK_LIB@ 301UMFPACK_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@
117AWK = @AWK@ 117AWK = @AWK@
118BATIK = @BATIK@ 118BATIK = @BATIK@
119BLAS_LIBS = @BLAS_LIBS@ 119BLAS_LIBS = @BLAS_LIBS@
120BSH = @BSH@
120CC = @CC@ 121CC = @CC@
121CCDEPMODE = @CCDEPMODE@ 122CCDEPMODE = @CCDEPMODE@
122CFLAGS = @CFLAGS@ 123CFLAGS = @CFLAGS@
@@ -190,6 +191,7 @@ JLATEXMATH_FOP = @JLATEXMATH_FOP@
190JOGL = @JOGL@ 191JOGL = @JOGL@
191JROSETTA_API = @JROSETTA_API@ 192JROSETTA_API = @JROSETTA_API@
192JROSETTA_ENGINE = @JROSETTA_ENGINE@ 193JROSETTA_ENGINE = @JROSETTA_ENGINE@
194JUNIT = @JUNIT@
193LAPACK_LIBS = @LAPACK_LIBS@ 195LAPACK_LIBS = @LAPACK_LIBS@
194LD = @LD@ 196LD = @LD@
195LDFLAGS = @LDFLAGS@ 197LDFLAGS = @LDFLAGS@
@@ -246,6 +248,7 @@ PVM_ENABLE = @PVM_ENABLE@
246PVM_INCLUDE = @PVM_INCLUDE@ 248PVM_INCLUDE = @PVM_INCLUDE@
247PVM_LIB = @PVM_LIB@ 249PVM_LIB = @PVM_LIB@
248PYTHON = @PYTHON@ 250PYTHON = @PYTHON@
251QDOX = @QDOX@
249RANLIB = @RANLIB@ 252RANLIB = @RANLIB@
250RELOCATABLE = @RELOCATABLE@ 253RELOCATABLE = @RELOCATABLE@
251RT_LIB = @RT_LIB@ 254RT_LIB = @RT_LIB@
@@ -264,6 +267,7 @@ SWIG_JAVA = @SWIG_JAVA@
264SWIG_RUNTIME_LIBS_DIR = @SWIG_RUNTIME_LIBS_DIR@ 267SWIG_RUNTIME_LIBS_DIR = @SWIG_RUNTIME_LIBS_DIR@
265TCLTK_LIBS = @TCLTK_LIBS@ 268TCLTK_LIBS = @TCLTK_LIBS@
266TCL_INC_PATH = @TCL_INC_PATH@ 269TCL_INC_PATH = @TCL_INC_PATH@
270TESTNG = @TESTNG@
267TK_INC_PATH = @TK_INC_PATH@ 271TK_INC_PATH = @TK_INC_PATH@
268UMFPACK_ENABLE = @UMFPACK_ENABLE@ 272UMFPACK_ENABLE = @UMFPACK_ENABLE@
269UMFPACK_LIB = @UMFPACK_LIB@ 273UMFPACK_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@
147AWK = @AWK@ 147AWK = @AWK@
148BATIK = @BATIK@ 148BATIK = @BATIK@
149BLAS_LIBS = @BLAS_LIBS@ 149BLAS_LIBS = @BLAS_LIBS@
150BSH = @BSH@
150CC = @CC@ 151CC = @CC@
151CCDEPMODE = @CCDEPMODE@ 152CCDEPMODE = @CCDEPMODE@
152CFLAGS = @CFLAGS@ 153CFLAGS = @CFLAGS@
@@ -220,6 +221,7 @@ JLATEXMATH_FOP = @JLATEXMATH_FOP@
220JOGL = @JOGL@ 221JOGL = @JOGL@
221JROSETTA_API = @JROSETTA_API@ 222JROSETTA_API = @JROSETTA_API@
222JROSETTA_ENGINE = @JROSETTA_ENGINE@ 223JROSETTA_ENGINE = @JROSETTA_ENGINE@
224JUNIT = @JUNIT@
223LAPACK_LIBS = @LAPACK_LIBS@ 225LAPACK_LIBS = @LAPACK_LIBS@
224LD = @LD@ 226LD = @LD@
225LDFLAGS = @LDFLAGS@ 227LDFLAGS = @LDFLAGS@
@@ -276,6 +278,7 @@ PVM_ENABLE = @PVM_ENABLE@
276PVM_INCLUDE = @PVM_INCLUDE@ 278PVM_INCLUDE = @PVM_INCLUDE@
277PVM_LIB = @PVM_LIB@ 279PVM_LIB = @PVM_LIB@
278PYTHON = @PYTHON@ 280PYTHON = @PYTHON@
281QDOX = @QDOX@
279RANLIB = @RANLIB@ 282RANLIB = @RANLIB@
280RELOCATABLE = @RELOCATABLE@ 283RELOCATABLE = @RELOCATABLE@
281RT_LIB = @RT_LIB@ 284RT_LIB = @RT_LIB@
@@ -294,6 +297,7 @@ SWIG_JAVA = @SWIG_JAVA@
294SWIG_RUNTIME_LIBS_DIR = @SWIG_RUNTIME_LIBS_DIR@ 297SWIG_RUNTIME_LIBS_DIR = @SWIG_RUNTIME_LIBS_DIR@
295TCLTK_LIBS = @TCLTK_LIBS@ 298TCLTK_LIBS = @TCLTK_LIBS@
296TCL_INC_PATH = @TCL_INC_PATH@ 299TCL_INC_PATH = @TCL_INC_PATH@
300TESTNG = @TESTNG@
297TK_INC_PATH = @TK_INC_PATH@ 301TK_INC_PATH = @TK_INC_PATH@
298UMFPACK_ENABLE = @UMFPACK_ENABLE@ 302UMFPACK_ENABLE = @UMFPACK_ENABLE@
299UMFPACK_LIB = @UMFPACK_LIB@ 303UMFPACK_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 @@
43 /> 43 />
44 <Tool 44 <Tool
45 Name="VCCLCompilerTool" 45 Name="VCCLCompilerTool"
46 AdditionalOptions="/arch:IA32" 46 AdditionalOptions=""
47 Optimization="0" 47 Optimization="0"
48 AdditionalIncludeDirectories="includes;../../modules/core/includes;../MALLOC/includes" 48 AdditionalIncludeDirectories="includes;../../modules/core/includes;../MALLOC/includes"
49 PreprocessorDefinitions="EXPORT_DOUBLYLINKEDLIST_DLL;_CRT_SECURE_NO_WARNINGS" 49 PreprocessorDefinitions="EXPORT_DOUBLYLINKEDLIST_DLL;_CRT_SECURE_NO_WARNINGS"
@@ -206,7 +206,7 @@
206 /> 206 />
207 <Tool 207 <Tool
208 Name="VCCLCompilerTool" 208 Name="VCCLCompilerTool"
209 AdditionalOptions="/arch:IA32" 209 AdditionalOptions=""
210 WholeProgramOptimization="false" 210 WholeProgramOptimization="false"
211 AdditionalIncludeDirectories="includes;../../modules/core/includes;../MALLOC/includes" 211 AdditionalIncludeDirectories="includes;../../modules/core/includes;../MALLOC/includes"
212 PreprocessorDefinitions="EXPORT_DOUBLYLINKEDLIST_DLL;_CRT_SECURE_NO_WARNINGS" 212 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@
147AWK = @AWK@ 147AWK = @AWK@
148BATIK = @BATIK@ 148BATIK = @BATIK@
149BLAS_LIBS = @BLAS_LIBS@ 149BLAS_LIBS = @BLAS_LIBS@
150BSH = @BSH@
150CC = @CC@ 151CC = @CC@
151CCDEPMODE = @CCDEPMODE@ 152CCDEPMODE = @CCDEPMODE@
152CFLAGS = @CFLAGS@ 153CFLAGS = @CFLAGS@
@@ -220,6 +221,7 @@ JLATEXMATH_FOP = @JLATEXMATH_FOP@
220JOGL = @JOGL@ 221JOGL = @JOGL@
221JROSETTA_API = @JROSETTA_API@ 222JROSETTA_API = @JROSETTA_API@
222JROSETTA_ENGINE = @JROSETTA_ENGINE@ 223JROSETTA_ENGINE = @JROSETTA_ENGINE@
224JUNIT = @JUNIT@
223LAPACK_LIBS = @LAPACK_LIBS@ 225LAPACK_LIBS = @LAPACK_LIBS@
224LD = @LD@ 226LD = @LD@
225LDFLAGS = @LDFLAGS@ 227LDFLAGS = @LDFLAGS@
@@ -276,6 +278,7 @@ PVM_ENABLE = @PVM_ENABLE@
276PVM_INCLUDE = @PVM_INCLUDE@ 278PVM_INCLUDE = @PVM_INCLUDE@
277PVM_LIB = @PVM_LIB@ 279PVM_LIB = @PVM_LIB@
278PYTHON = @PYTHON@ 280PYTHON = @PYTHON@
281QDOX = @QDOX@
279RANLIB = @RANLIB@ 282RANLIB = @RANLIB@
280RELOCATABLE = @RELOCATABLE@ 283RELOCATABLE = @RELOCATABLE@
281RT_LIB = @RT_LIB@ 284RT_LIB = @RT_LIB@
@@ -294,6 +297,7 @@ SWIG_JAVA = @SWIG_JAVA@
294SWIG_RUNTIME_LIBS_DIR = @SWIG_RUNTIME_LIBS_DIR@ 297SWIG_RUNTIME_LIBS_DIR = @SWIG_RUNTIME_LIBS_DIR@
295TCLTK_LIBS = @TCLTK_LIBS@ 298TCLTK_LIBS = @TCLTK_LIBS@
296TCL_INC_PATH = @TCL_INC_PATH@ 299TCL_INC_PATH = @TCL_INC_PATH@
300TESTNG = @TESTNG@
297TK_INC_PATH = @TK_INC_PATH@ 301TK_INC_PATH = @TK_INC_PATH@
298UMFPACK_ENABLE = @UMFPACK_ENABLE@ 302UMFPACK_ENABLE = @UMFPACK_ENABLE@
299UMFPACK_LIB = @UMFPACK_LIB@ 303UMFPACK_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 @@
43 /> 43 />
44 <Tool 44 <Tool
45 Name="VCCLCompilerTool" 45 Name="VCCLCompilerTool"
46 AdditionalOptions="/arch:IA32" 46 AdditionalOptions=""
47 Optimization="0" 47 Optimization="0"
48 AdditionalIncludeDirectories="includes;../../modules/core/includes;" 48 AdditionalIncludeDirectories="includes;../../modules/core/includes;"
49 PreprocessorDefinitions="EXPORT_DYNAMICLIBRARY_DLL;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE" 49 PreprocessorDefinitions="EXPORT_DYNAMICLIBRARY_DLL;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE"
@@ -204,7 +204,7 @@
204 /> 204 />
205 <Tool 205 <Tool
206 Name="VCCLCompilerTool" 206 Name="VCCLCompilerTool"
207 AdditionalOptions="/arch:IA32" 207 AdditionalOptions=""
208 WholeProgramOptimization="false" 208 WholeProgramOptimization="false"
209 AdditionalIncludeDirectories="includes;../../modules/core/includes;" 209 AdditionalIncludeDirectories="includes;../../modules/core/includes;"
210 PreprocessorDefinitions="EXPORT_DYNAMICLIBRARY_DLL;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE" 210 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@
145AWK = @AWK@ 145AWK = @AWK@
146BATIK = @BATIK@ 146BATIK = @BATIK@
147BLAS_LIBS = @BLAS_LIBS@ 147BLAS_LIBS = @BLAS_LIBS@
148BSH = @BSH@
148CC = @CC@ 149CC = @CC@
149CCDEPMODE = @CCDEPMODE@ 150CCDEPMODE = @CCDEPMODE@
150CFLAGS = @CFLAGS@ 151CFLAGS = @CFLAGS@
@@ -218,6 +219,7 @@ JLATEXMATH_FOP = @JLATEXMATH_FOP@
218JOGL = @JOGL@ 219JOGL = @JOGL@
219JROSETTA_API = @JROSETTA_API@ 220JROSETTA_API = @JROSETTA_API@
220JROSETTA_ENGINE = @JROSETTA_ENGINE@ 221JROSETTA_ENGINE = @JROSETTA_ENGINE@
222JUNIT = @JUNIT@
221LAPACK_LIBS = @LAPACK_LIBS@ 223LAPACK_LIBS = @LAPACK_LIBS@
222LD = @LD@ 224LD = @LD@
223LDFLAGS = @LDFLAGS@ 225LDFLAGS = @LDFLAGS@
@@ -274,6 +276,7 @@ PVM_ENABLE = @PVM_ENABLE@
274PVM_INCLUDE = @PVM_INCLUDE@ 276PVM_INCLUDE = @PVM_INCLUDE@
275PVM_LIB = @PVM_LIB@ 277PVM_LIB = @PVM_LIB@
276PYTHON = @PYTHON@ 278PYTHON = @PYTHON@
279QDOX = @QDOX@
277RANLIB = @RANLIB@ 280RANLIB = @RANLIB@
278RELOCATABLE = @RELOCATABLE@ 281RELOCATABLE = @RELOCATABLE@
279RT_LIB = @RT_LIB@ 282RT_LIB = @RT_LIB@
@@ -292,6 +295,7 @@ SWIG_JAVA = @SWIG_JAVA@
292SWIG_RUNTIME_LIBS_DIR = @SWIG_RUNTIME_LIBS_DIR@ 295SWIG_RUNTIME_LIBS_DIR = @SWIG_RUNTIME_LIBS_DIR@
293TCLTK_LIBS = @TCLTK_LIBS@ 296TCLTK_LIBS = @TCLTK_LIBS@
294TCL_INC_PATH = @TCL_INC_PATH@ 297TCL_INC_PATH = @TCL_INC_PATH@
298TESTNG = @TESTNG@
295TK_INC_PATH = @TK_INC_PATH@ 299TK_INC_PATH = @TK_INC_PATH@
296UMFPACK_ENABLE = @UMFPACK_ENABLE@ 300UMFPACK_ENABLE = @UMFPACK_ENABLE@
297UMFPACK_LIB = @UMFPACK_LIB@ 301UMFPACK_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 @@
44 /> 44 />
45 <Tool 45 <Tool
46 Name="VCCLCompilerTool" 46 Name="VCCLCompilerTool"
47 AdditionalOptions="/arch:IA32" 47 AdditionalOptions=""
48 Optimization="0" 48 Optimization="0"
49 AdditionalIncludeDirectories="" 49 AdditionalIncludeDirectories=""
50 PreprocessorDefinitions="_DLL;_DEBUG;_CRT_SECURE_NO_DEPRECATE;FORDLL" 50 PreprocessorDefinitions="_DLL;_DEBUG;_CRT_SECURE_NO_DEPRECATE;FORDLL"
@@ -224,7 +224,7 @@
224 /> 224 />
225 <Tool 225 <Tool
226 Name="VCCLCompilerTool" 226 Name="VCCLCompilerTool"
227 AdditionalOptions="/arch:IA32" 227 AdditionalOptions=""
228 Optimization="2" 228 Optimization="2"
229 InlineFunctionExpansion="1" 229 InlineFunctionExpansion="1"
230 FavorSizeOrSpeed="1" 230 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@
141AWK = @AWK@ 141AWK = @AWK@
142BATIK = @BATIK@ 142BATIK = @BATIK@
143BLAS_LIBS = @BLAS_LIBS@ 143BLAS_LIBS = @BLAS_LIBS@
144BSH = @BSH@
144CC = @CC@ 145CC = @CC@
145CCDEPMODE = @CCDEPMODE@ 146CCDEPMODE = @CCDEPMODE@
146CFLAGS = @CFLAGS@ 147CFLAGS = @CFLAGS@
@@ -214,6 +215,7 @@ JLATEXMATH_FOP = @JLATEXMATH_FOP@
214JOGL = @JOGL@ 215JOGL = @JOGL@
215JROSETTA_API = @JROSETTA_API@ 216JROSETTA_API = @JROSETTA_API@
216JROSETTA_ENGINE = @JROSETTA_ENGINE@ 217JROSETTA_ENGINE = @JROSETTA_ENGINE@
218JUNIT = @JUNIT@
217LAPACK_LIBS = @LAPACK_LIBS@ 219LAPACK_LIBS = @LAPACK_LIBS@
218LD = @LD@ 220LD = @LD@
219LDFLAGS = @LDFLAGS@ 221LDFLAGS = @LDFLAGS@
@@ -270,6 +272,7 @@ PVM_ENABLE = @PVM_ENABLE@
270PVM_INCLUDE = @PVM_INCLUDE@ 272PVM_INCLUDE = @PVM_INCLUDE@
271PVM_LIB = @PVM_LIB@ 273PVM_LIB = @PVM_LIB@
272PYTHON = @PYTHON@ 274PYTHON = @PYTHON@
275QDOX = @QDOX@
273RANLIB = @RANLIB@ 276RANLIB = @RANLIB@
274RELOCATABLE = @RELOCATABLE@ 277RELOCATABLE = @RELOCATABLE@
275RT_LIB = @RT_LIB@ 278RT_LIB = @RT_LIB@
@@ -288,6 +291,7 @@ SWIG_JAVA = @SWIG_JAVA@
288SWIG_RUNTIME_LIBS_DIR = @SWIG_RUNTIME_LIBS_DIR@ 291SWIG_RUNTIME_LIBS_DIR = @SWIG_RUNTIME_LIBS_DIR@
289TCLTK_LIBS = @TCLTK_LIBS@ 292TCLTK_LIBS = @TCLTK_LIBS@
290TCL_INC_PATH = @TCL_INC_PATH@ 293TCL_INC_PATH = @TCL_INC_PATH@
294TESTNG = @TESTNG@
291TK_INC_PATH = @TK_INC_PATH@ 295TK_INC_PATH = @TK_INC_PATH@
292UMFPACK_ENABLE = @UMFPACK_ENABLE@ 296UMFPACK_ENABLE = @UMFPACK_ENABLE@
293UMFPACK_LIB = @UMFPACK_LIB@ 297UMFPACK_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 @@
44 /> 44 />
45 <Tool 45 <Tool
46 Name="VCCLCompilerTool" 46 Name="VCCLCompilerTool"
47 AdditionalOptions="/arch:IA32" 47 AdditionalOptions=""
48 Optimization="0" 48 Optimization="0"
49 AdditionalIncludeDirectories="../intl" 49 AdditionalIncludeDirectories="../intl"
50 PreprocessorDefinitions="_DLL;_DEBUG;_CRT_SECURE_NO_DEPRECATE;FORDLL" 50 PreprocessorDefinitions="_DLL;_DEBUG;_CRT_SECURE_NO_DEPRECATE;FORDLL"
@@ -226,7 +226,7 @@
226 /> 226 />
227 <Tool 227 <Tool
228 Name="VCCLCompilerTool" 228 Name="VCCLCompilerTool"
229 AdditionalOptions="/arch:IA32" 229 AdditionalOptions=""
230 Optimization="2" 230 Optimization="2"
231 InlineFunctionExpansion="1" 231 InlineFunctionExpansion="1"
232 FavorSizeOrSpeed="1" 232 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@
203AWK = @AWK@ 203AWK = @AWK@
204BATIK = @BATIK@ 204BATIK = @BATIK@
205BLAS_LIBS = @BLAS_LIBS@ 205BLAS_LIBS = @BLAS_LIBS@
206BSH = @BSH@
206CC = @CC@ 207CC = @CC@
207CCDEPMODE = @CCDEPMODE@ 208CCDEPMODE = @CCDEPMODE@
208CFLAGS = @CFLAGS@ 209CFLAGS = @CFLAGS@
@@ -276,6 +277,7 @@ JLATEXMATH_FOP = @JLATEXMATH_FOP@
276JOGL = @JOGL@ 277JOGL = @JOGL@
277JROSETTA_API = @JROSETTA_API@ 278JROSETTA_API = @JROSETTA_API@
278JROSETTA_ENGINE = @JROSETTA_ENGINE@ 279JROSETTA_ENGINE = @JROSETTA_ENGINE@
280JUNIT = @JUNIT@
279LAPACK_LIBS = @LAPACK_LIBS@ 281LAPACK_LIBS = @LAPACK_LIBS@
280LD = @LD@ 282LD = @LD@
281LDFLAGS = @LDFLAGS@ 283LDFLAGS = @LDFLAGS@
@@ -332,6 +334,7 @@ PVM_ENABLE = @PVM_ENABLE@
332PVM_INCLUDE = @PVM_INCLUDE@ 334PVM_INCLUDE = @PVM_INCLUDE@
333PVM_LIB = @PVM_LIB@ 335PVM_LIB = @PVM_LIB@
334PYTHON = @PYTHON@ 336PYTHON = @PYTHON@
337QDOX = @QDOX@
335RANLIB = @RANLIB@ 338RANLIB = @RANLIB@
336RELOCATABLE = @RELOCATABLE@ 339RELOCATABLE = @RELOCATABLE@
337RT_LIB = @RT_LIB@ 340RT_LIB = @RT_LIB@
@@ -350,6 +353,7 @@ SWIG_JAVA = @SWIG_JAVA@
350SWIG_RUNTIME_LIBS_DIR = @SWIG_RUNTIME_LIBS_DIR@ 353SWIG_RUNTIME_LIBS_DIR = @SWIG_RUNTIME_LIBS_DIR@
351TCLTK_LIBS = @TCLTK_LIBS@ 354TCLTK_LIBS = @TCLTK_LIBS@
352TCL_INC_PATH = @TCL_INC_PATH@ 355TCL_INC_PATH = @TCL_INC_PATH@
356TESTNG = @TESTNG@
353TK_INC_PATH = @TK_INC_PATH@ 357TK_INC_PATH = @TK_INC_PATH@
354UMFPACK_ENABLE = @UMFPACK_ENABLE@ 358UMFPACK_ENABLE = @UMFPACK_ENABLE@
355UMFPACK_LIB = @UMFPACK_LIB@ 359UMFPACK_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@
168AWK = @AWK@ 168AWK = @AWK@
169BATIK = @BATIK@ 169BATIK = @BATIK@
170BLAS_LIBS = @BLAS_LIBS@ 170BLAS_LIBS = @BLAS_LIBS@
171BSH = @BSH@
171CC = @CC@ 172CC = @CC@
172CCDEPMODE = @CCDEPMODE@ 173CCDEPMODE = @CCDEPMODE@
173CFLAGS = @CFLAGS@ 174CFLAGS = @CFLAGS@
@@ -241,6 +242,7 @@ JLATEXMATH_FOP = @JLATEXMATH_FOP@
241JOGL = @JOGL@ 242JOGL = @JOGL@
242JROSETTA_API = @JROSETTA_API@ 243JROSETTA_API = @JROSETTA_API@
243JROSETTA_ENGINE = @JROSETTA_ENGINE@ 244JROSETTA_ENGINE = @JROSETTA_ENGINE@
245JUNIT = @JUNIT@
244LAPACK_LIBS = @LAPACK_LIBS@ 246LAPACK_LIBS = @LAPACK_LIBS@
245LD = @LD@ 247LD = @LD@
246LDFLAGS = @LDFLAGS@ 248LDFLAGS = @LDFLAGS@
@@ -297,6 +299,7 @@ PVM_ENABLE = @PVM_ENABLE@
297PVM_INCLUDE = @PVM_INCLUDE@ 299PVM_INCLUDE = @PVM_INCLUDE@
298PVM_LIB = @PVM_LIB@ 300PVM_LIB = @PVM_LIB@
299PYTHON = @PYTHON@ 301PYTHON = @PYTHON@
302QDOX = @QDOX@
300RANLIB = @RANLIB@ 303RANLIB = @RANLIB@
301RELOCATABLE = @RELOCATABLE@ 304RELOCATABLE = @RELOCATABLE@
302RT_LIB = @RT_LIB@ 305RT_LIB = @RT_LIB@
@@ -315,6 +318,7 @@ SWIG_JAVA = @SWIG_JAVA@
315SWIG_RUNTIME_LIBS_DIR = @SWIG_RUNTIME_LIBS_DIR@ 318SWIG_RUNTIME_LIBS_DIR = @SWIG_RUNTIME_LIBS_DIR@
316TCLTK_LIBS = @TCLTK_LIBS@ 319TCLTK_LIBS = @TCLTK_LIBS@
317TCL_INC_PATH = @TCL_INC_PATH@ 320TCL_INC_PATH = @TCL_INC_PATH@
321TESTNG = @TESTNG@
318TK_INC_PATH = @TK_INC_PATH@ 322TK_INC_PATH = @TK_INC_PATH@
319UMFPACK_ENABLE = @UMFPACK_ENABLE@ 323UMFPACK_ENABLE = @UMFPACK_ENABLE@
320UMFPACK_LIB = @UMFPACK_LIB@ 324UMFPACK_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 @@
43 /> 43 />
44 <Tool 44 <Tool
45 Name="VCCLCompilerTool" 45 Name="VCCLCompilerTool"
46 AdditionalOptions="/arch:IA32" 46 AdditionalOptions=""
47 Optimization="0" 47 Optimization="0"
48 AdditionalIncludeDirectories=".;../../includes;../jni;../../../../libs/MALLOC/includes;../../../output_stream/includes;../../../core/includes;../../../jvm/includes;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../localization/includes;../../../../libs/intl" 48 AdditionalIncludeDirectories=".;../../includes;../jni;../../../../libs/MALLOC/includes;../../../output_stream/includes;../../../core/includes;../../../jvm/includes;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../localization/includes;../../../../libs/intl"
49 PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;ACTION_BINDING_EXPORTS" 49 PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;ACTION_BINDING_EXPORTS"
@@ -212,7 +212,7 @@
212 /> 212 />
213 <Tool 213 <Tool
214 Name="VCCLCompilerTool" 214 Name="VCCLCompilerTool"
215 AdditionalOptions="/arch:IA32" 215 AdditionalOptions=""
216 InlineFunctionExpansion="1" 216 InlineFunctionExpansion="1"
217 FavorSizeOrSpeed="1" 217 FavorSizeOrSpeed="1"
218 WholeProgramOptimization="false" 218 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@
162AWK = @AWK@ 162AWK = @AWK@
163BATIK = @BATIK@ 163BATIK = @BATIK@
164BLAS_LIBS = @BLAS_LIBS@ 164BLAS_LIBS = @BLAS_LIBS@
165BSH = @BSH@
165CC = @CC@ 166CC = @CC@
166CCDEPMODE = @CCDEPMODE@ 167CCDEPMODE = @CCDEPMODE@
167CFLAGS = @CFLAGS@ 168CFLAGS = @CFLAGS@
@@ -235,6 +236,7 @@ JLATEXMATH_FOP = @JLATEXMATH_FOP@
235JOGL = @JOGL@ 236JOGL = @JOGL@
236JROSETTA_API = @JROSETTA_API@ 237JROSETTA_API = @JROSETTA_API@
237JROSETTA_ENGINE = @JROSETTA_ENGINE@ 238JROSETTA_ENGINE = @JROSETTA_ENGINE@
239JUNIT = @JUNIT@
238LAPACK_LIBS = @LAPACK_LIBS@ 240LAPACK_LIBS = @LAPACK_LIBS@
239LD = @LD@ 241LD = @LD@
240LDFLAGS = @LDFLAGS@ 242LDFLAGS = @LDFLAGS@
@@ -291,6 +293,7 @@ PVM_ENABLE = @PVM_ENABLE@
291PVM_INCLUDE = @PVM_INCLUDE@ 293PVM_INCLUDE = @PVM_INCLUDE@
292PVM_LIB = @PVM_LIB@ 294PVM_LIB = @PVM_LIB@
293PYTHON = @PYTHON@ 295PYTHON = @PYTHON@
296QDOX = @QDOX@
294RANLIB = @RANLIB@ 297RANLIB = @RANLIB@
295RELOCATABLE = @RELOCATABLE@ 298RELOCATABLE = @RELOCATABLE@
296RT_LIB = @RT_LIB@ 299RT_LIB = @RT_LIB@
@@ -309,6 +312,7 @@ SWIG_JAVA = @SWIG_JAVA@
309SWIG_RUNTIME_LIBS_DIR = @SWIG_RUNTIME_LIBS_DIR@ 312SWIG_RUNTIME_LIBS_DIR = @SWIG_RUNTIME_LIBS_DIR@
310TCLTK_LIBS = @TCLTK_LIBS@ 313TCLTK_LIBS = @TCLTK_LIBS@
311TCL_INC_PATH = @TCL_INC_PATH@ 314TCL_INC_PATH = @TCL_INC_PATH@
315TESTNG = @TESTNG@
312TK_INC_PATH = @TK_INC_PATH@ 316TK_INC_PATH = @TK_INC_PATH@
313UMFPACK_ENABLE = @UMFPACK_ENABLE@ 317UMFPACK_ENABLE = @UMFPACK_ENABLE@
314UMFPACK_LIB = @UMFPACK_LIB@ 318UMFPACK_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 @@
43 /> 43 />
44 <Tool 44 <Tool
45 Name="VCCLCompilerTool" 45 Name="VCCLCompilerTool"
46 AdditionalOptions="/arch:IA32" 46 AdditionalOptions=""
47 Optimization="0" 47 Optimization="0"
48 AdditionalIncludeDirectories="includes;src/c;../core/includes;../call_scilab/includes;../string/includes;../../libs/MALLOC/includes;../output_stream/includes;../localization/includes;../../libs/intl;../windows_tools/includes" 48 AdditionalIncludeDirectories="includes;src/c;../core/includes;../call_scilab/includes;../string/includes;../../libs/MALLOC/includes;../output_stream/includes;../localization/includes;../../libs/intl;../windows_tools/includes"
49 PreprocessorDefinitions="FORDLL;_DEBUG;_WINDOWS;_USRDLL;API_SCILAB_EXPORTS;_CRT_SECURE_NO_DEPRECATE" 49 PreprocessorDefinitions="FORDLL;_DEBUG;_WINDOWS;_USRDLL;API_SCILAB_EXPORTS;_CRT_SECURE_NO_DEPRECATE"
@@ -210,7 +210,7 @@
210 /> 210 />
211 <Tool 211 <Tool
212 Name="VCCLCompilerTool" 212 Name="VCCLCompilerTool"
213 AdditionalOptions="/arch:IA32" 213 AdditionalOptions=""
214 InlineFunctionExpansion="1" 214 InlineFunctionExpansion="1"
215 FavorSizeOrSpeed="1" 215 FavorSizeOrSpeed="1"
216 WholeProgramOptimization="false" 216 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 @@
1<?xml version="1.0" encoding="utf-8"?>
2<!--
3 * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
4 * Copyright (C) 2009 - DIGITEO - Antoine ELIAS
5 *
6 * This file must be used under the terms of the CeCILL.
7 * This source file is licensed as described in the file COPYING, which
8 * you should have received as part of this distribution. The terms
9 * are also available at
10 * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
11 *
12 -->
13<refentry version="5.0-subset Scilab" xml:id="isBooleanType"
14 xml:lang="en" xmlns="http://docbook.org/ns/docbook"
15 xmlns:xlink="http://www.w3.org/1999/xlink"
16 xmlns:svg="http://www.w3.org/2000/svg"
17 xmlns:ns5="http://www.w3.org/1999/xhtml"
18 xmlns:mml="http://www.w3.org/1998/Math/MathML"
19 xmlns:db="http://docbook.org/ns/docbook">
20
21 <refnamediv>
22 <refname>isBooleanType</refname>
23
24 <refpurpose>
25 Check if it is a boolean variable.
26 </refpurpose>
27 </refnamediv>
28 <refsynopsisdiv>
29 <title>Calling Sequence</title>
30 <synopsis>int isBooleanType(void* _pvCtx, int* _piAddress)</synopsis>
31 </refsynopsisdiv>
32 <refsection>
33 <title>Parameters</title>
34 <variablelist>
35 <varlistentry>
36 <term>_pvCtx</term>
37 <listitem>
38 <para>
39 Scilab environment pointer, pass in "pvApiCtx" provided by api_scilab.h.
40 </para>
41 </listitem>
42 </varlistentry>
43 <varlistentry>
44 <term>_piAddress</term>
45 <listitem>
46 <para>
47 Position in the Scilab memory where you want to put the variable.
48 </para>
49 </listitem>
50 </varlistentry>
51 </variablelist>
52 </refsection>
53 <refsection>
54 <title>Return value</title>
55 <para>1 if variable is a boolean type, otherwise 0</para>
56 </refsection>
57</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 @@
1<?xml version="1.0" encoding="utf-8"?>
2<!--
3 * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
4 * Copyright (C) 2009 - DIGITEO - Antoine ELIAS
5 *
6 * This file must be used under the terms of the CeCILL.
7 * This source file is licensed as described in the file COPYING, which
8 * you should have received as part of this distribution. The terms
9 * are also available at
10 * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
11 *
12 -->
13<refentry version="5.0-subset Scilab" xml:id="getScalarBoolean"
14 xml:lang="en" xmlns="http://docbook.org/ns/docbook"
15 xmlns:xlink="http://www.w3.org/1999/xlink"
16 xmlns:svg="http://www.w3.org/2000/svg"
17 xmlns:ns5="http://www.w3.org/1999/xhtml"
18 xmlns:mml="http://www.w3.org/1998/Math/MathML"
19 xmlns:db="http://docbook.org/ns/docbook">
20
21 <refnamediv>
22 <refname>getScalarBoolean</refname>
23
24 <refpurpose>
25 Read scalar boolean data from a gateway argument.
26 </refpurpose>
27 </refnamediv>
28 <refsynopsisdiv>
29 <title>Calling Sequence</title>
30 <synopsis>int getScalarBoolean(void* _pvCtx, int* _piAddress, int* _piBool)</synopsis>
31 </refsynopsisdiv>
32 <refsection>
33 <title>Parameters</title>
34 <variablelist>
35 <varlistentry>
36 <term>_pvCtx</term>
37 <listitem>
38 <para>
39 Scilab environment pointer, pass in "pvApiCtx" provided by api_scilab.h.
40 </para>
41 </listitem>
42 </varlistentry>
43 <varlistentry>
44 <term>_piAddress</term>
45 <listitem>
46 <para>
47 Address of the Scilab variable.
48 </para>
49 </listitem>
50 </varlistentry>
51 <varlistentry>
52 <term>_piBool</term>
53 <listitem>
54 <para>
55 Return boolean value.
56 </para>
57 </listitem>
58 </varlistentry>
59 </variablelist>
60 </refsection>
61 <refsection>
62 <title>Return value</title>
63 <para>if successful 0, otherwise print error(s) message(s) in the Scilab console and returns first error number.</para>
64 </refsection>
65</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 @@
1<?xml version="1.0" encoding="utf-8"?>
2<!--
3 * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
4 * Copyright (C) 2009 - DIGITEO - Antoine ELIAS
5 *
6 * This file must be used under the terms of the CeCILL.
7 * This source file is licensed as described in the file COPYING, which
8 * you should have received as part of this distribution. The terms
9 * are also available at
10 * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
11 *
12 -->
13<refentry version="5.0-subset Scilab" xml:id="createScalarBoolean"
14 xml:lang="en" xmlns="http://docbook.org/ns/docbook"
15 xmlns:xlink="http://www.w3.org/1999/xlink"
16 xmlns:svg="http://www.w3.org/2000/svg"
17 xmlns:ns5="http://www.w3.org/1999/xhtml"
18 xmlns:mml="http://www.w3.org/1998/Math/MathML"
19 xmlns:db="http://docbook.org/ns/docbook">
20
21 <refnamediv>
22 <refname>createScalarBoolean</refname>
23
24 <refpurpose>
25 Create scalar boolean variable in Scilab memory.
26 </refpurpose>
27 </refnamediv>
28 <refsynopsisdiv>
29 <title>Calling Sequence</title>
30 <synopsis>int createScalarBoolean(void* _pvCtx, int _iVar, int _iBool)</synopsis>
31 </refsynopsisdiv>
32 <refsection>
33 <title>Parameters</title>
34 <variablelist>
35 <varlistentry>
36 <term>_pvCtx</term>
37 <listitem>
38 <para>
39 Scilab environment pointer, pass in "pvApiCtx" provided by api_scilab.h.
40 </para>
41 </listitem>
42 </varlistentry>
43 <varlistentry>
44 <term>_iVar</term>
45 <listitem>
46 <para>
47 Position in the Scilab memory where you want to put the variable.
48 </para>
49 </listitem>
50 </varlistentry>
51 <varlistentry>
52 <term>_iBool</term>
53 <listitem>
54 <para>
55 Boolean value.
56 </para>
57 </listitem>
58 </varlistentry>
59 </variablelist>
60 </refsection>
61 <refsection>
62 <title>Return value</title>
63 <para>if successful 0, otherwise print error(s) message(s) in the Scilab console and returns first error number.</para>
64 </refsection>
65</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 @@
1<?xml version="1.0" encoding="utf-8"?>
2<!--
3 * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
4 * Copyright (C) 2009 - DIGITEO - Antoine ELIAS
5 *
6 * This file must be used under the terms of the CeCILL.
7 * This source file is licensed as described in the file COPYING, which
8 * you should have received as part of this distribution. The terms
9 * are also available at
10 * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
11 *
12 -->
13<refentry version="5.0-subset Scilab" xml:id="booleanExample"
14 xml:lang="en" xmlns="http://docbook.org/ns/docbook"
15 xmlns:xlink="http://www.w3.org/1999/xlink"
16 xmlns:svg="http://www.w3.org/2000/svg"
17 xmlns:ns5="http://www.w3.org/1999/xhtml"
18 xmlns:mml="http://www.w3.org/1998/Math/MathML"
19 xmlns:db="http://docbook.org/ns/docbook">
20 <refnamediv>
21 <refname>boolean example</refname>
22
23 <refpurpose>
24 Boolean use case.
25 </refpurpose>
26 </refnamediv>
27
28 <refsection>
29 <title>Description</title>
30 <para>This example shows how to get a boolean variable and return it to Scilab.</para>
31 </refsection>
32 <refsection>
33 <!--File_gateway: SCI/modules/api_scilab/tests/unit_tests/booleanExample.c-->
34 <!--File_scilab: SCI/modules/api_scilab/tests/unit_tests/booleanExample.tst-->
35 <!--Lib_name: booleanExample-->
36 <!--Func_list: booleanExample-->
37 <title>Gateway Source</title>
38 <programlisting role="code_gateway">
39 <![CDATA[
40int booleanExample(char *fname,unsigned long fname_len)
41{
42 SciErr sciErr;
43 int* piAddr = NULL;
44 int iType = 0;
45 int iRet = 0;
46
47 CheckRhs(1,1);
48 CheckLhs(0,1);
49
50 sciErr = getVarAddressFromPosition(pvApiCtx, 1, &piAddr);
51 if(sciErr.iErr)
52 {
53 printError(&sciErr, 0);
54 return 0;
55 }
56
57 if(isBooleanType(pvApiCtx, piAddr))
58 {
59 if(isScalar(pvApiCtx, piAddr))
60 {
61 int iBool = 0;
62 iRet = getScalarBoolean(pvApiCtx, piAddr, &iBool);
63 if(iRet)
64 {
65 return 0;
66 }
67
68 iRet = createScalarBoolean(pvApiCtx, Rhs + 1, iBool);
69 if(iRet)
70 {
71 return 0;
72 }
73 }
74 else
75 {
76 int iRows = 0;
77 int iCols = 0;
78 int *piBool = NULL;
79
80 sciErr = getMatrixOfBoolean(pvApiCtx, piAddr, &iRows, &iCols, &piBool);
81 if(sciErr.iErr)
82 {
83 printError(&sciErr, 0);
84 return 0;
85 }
86
87 sciErr = createMatrixOfBoolean(pvApiCtx, Rhs + 1, iRows, iCols, piBool);
88 if(sciErr.iErr)
89 {
90 printError(&sciErr, 0);
91 return 0;
92 }
93 }
94 LhsVar(1) = Rhs + 1;
95 }
96 else
97 {
98 LhsVar(1) = 0;
99 }
100 return 0;
101}
102 ]]>
103 </programlisting>
104 </refsection>
105
106 <refsection>
107 <title>Scilab test script</title>
108 <programlisting role="code_scilab">
109 <![CDATA[
110a = %t;
111b = %f;
112c = [a,b;b,a;a,b;b,a];
113d = c';
114
115booleanExample(a) == a
116booleanExample(b) == b
117booleanExample(c) == c
118booleanExample(d) == d
119 ]]>
120 </programlisting>
121 </refsection>
122</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 @@
1<?xml version="1.0" encoding="utf-8"?>
2<!--
3 * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
4 * Copyright (C) 2009 - DIGITEO - Antoine ELIAS
5 *
6 * This file must be used under the terms of the CeCILL.
7 * This source file is licensed as described in the file COPYING, which
8 * you should have received as part of this distribution. The terms
9 * are also available at
10 * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
11 *
12 -->
13<refentry version="5.0-subset Scilab" xml:id="isBooleanSparseType"
14 xml:lang="en" xmlns="http://docbook.org/ns/docbook"
15 xmlns:xlink="http://www.w3.org/1999/xlink"
16 xmlns:svg="http://www.w3.org/2000/svg"
17 xmlns:ns5="http://www.w3.org/1999/xhtml"
18 xmlns:mml="http://www.w3.org/1998/Math/MathML"
19 xmlns:db="http://docbook.org/ns/docbook">
20
21 <refnamediv>
22 <refname>isBooleanSparseType</refname>
23
24 <refpurpose>
25 Check if it is a boolean sparse variable.
26 </refpurpose>
27 </refnamediv>
28 <refsynopsisdiv>
29 <title>Calling Sequence</title>
30 <synopsis>int isBooleanSparseType(void* _pvCtx, int* _piAddress)</synopsis>
31 </refsynopsisdiv>
32 <refsection>
33 <title>Parameters</title>
34 <variablelist>
35 <varlistentry>
36 <term>_pvCtx</term>
37 <listitem>
38 <para>
39 Scilab environment pointer, pass in "pvApiCtx" provided by api_scilab.h.
40 </para>
41 </listitem>
42 </varlistentry>
43 <varlistentry>
44 <term>_piAddress</term>
45 <listitem>
46 <para>
47 Position in the Scilab memory where you want to put the variable.
48 </para>
49 </listitem>
50 </varlistentry>
51 </variablelist>
52 </refsection>
53 <refsection>
54 <title>Return value</title>
55 <para>1 if variable is a boolean sparse type, otherwise 0</para>
56 </refsection>
57</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 @@
1<?xml version="1.0" encoding="utf-8"?>
2<!--
3 * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
4 * Copyright (C) 2009 - DIGITEO - Antoine ELIAS
5 *
6 * This file must be used under the terms of the CeCILL.
7 * This source file is licensed as described in the file COPYING, which
8 * you should have received as part of this distribution. The terms
9 * are also available at
10 * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
11 *
12 -->
13<refentry version="5.0-subset Scilab" xml:id="getAllocatedBooleanSparseMatrix"
14 xml:lang="en" xmlns="http://docbook.org/ns/docbook"
15 xmlns:xlink="http://www.w3.org/1999/xlink"
16 xmlns:svg="http://www.w3.org/2000/svg"
17 xmlns:ns5="http://www.w3.org/1999/xhtml"
18 xmlns:mml="http://www.w3.org/1998/Math/MathML"
19 xmlns:db="http://docbook.org/ns/docbook">
20
21 <refnamediv>
22 <refname>getAllocatedBooleanSparseMatrix</refname>
23
24 <refpurpose>
25 Get sparse matrix attributs.
26 </refpurpose>
27 </refnamediv>
28 <refsynopsisdiv>
29 <title>Calling Sequence</title>
30 <synopsis>int getAllocatedBooleanSparseMatrix(void* _pvCtx, int* _piAddress, int* _piRows, int* _piCols, int* _piNbItem, int** _piNbItemRow, int** _piColPos)</synopsis>
31 </refsynopsisdiv>
32 <refsection>
33 <title>Parameters</title>
34 <variablelist>
35 <varlistentry>
36 <term>_pvCtx</term>
37 <listitem>
38 <para>
39 Scilab environment pointer, pass in "pvApiCtx" provided by api_scilab.h.
40 </para>
41 </listitem>
42 </varlistentry>
43 <varlistentry>
44 <term>_piAddress</term>
45 <listitem>
46 <para>
47 Address of the Scilab variable.
48 </para>
49 </listitem>
50 </varlistentry>
51 <varlistentry>
52 <term>_piRows</term>
53 <listitem>
54 <para>
55 Return number of rows of the variable.
56 </para>
57 </listitem>
58 </varlistentry>
59 <varlistentry>
60 <term>_piCols</term>
61 <listitem>
62 <para>
63 Return number of columns of the variable.
64 </para>
65 </listitem>
66 </varlistentry>
67 <varlistentry>
68 <term>_piNbItem</term>
69 <listitem>
70 <para>
71 Return number of non %f value.
72 </para>
73 </listitem>
74 </varlistentry>
75 <varlistentry>
76 <term>_piNbItemRow</term>
77 <listitem>
78 <para>
79 Return number of item in each rows (size: *_piRows).
80 </para>
81 </listitem>
82 </varlistentry>
83 <varlistentry>
84 <term>_piColPos</term>
85 <listitem>
86 <para>
87 Return column position for each item (size: *_piNbItem).
88 </para>
89 </listitem>
90 </varlistentry>
91 </variablelist>
92 </refsection>
93 <refsection>
94 <title>Return value</title>
95 <para>if successful 0, otherwise print error(s) message(s) in the Scilab console and returns first error number.</para>
96 </refsection>
97</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 @@
1<?xml version="1.0" encoding="utf-8"?>
2<!--
3 * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
4 * Copyright (C) 2009 - DIGITEO - Antoine ELIAS
5 *
6 * This file must be used under the terms of the CeCILL.
7 * This source file is licensed as described in the file COPYING, which
8 * you should have received as part of this distribution. The terms
9 * are also available at
10 * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
11 *
12 -->
13<refentry version="5.0-subset Scilab" xml:id="freeAllocatedBooleanSparse"
14 xml:lang="en" xmlns="http://docbook.org/ns/docbook"
15 xmlns:xlink="http://www.w3.org/1999/xlink"
16 xmlns:svg="http://www.w3.org/2000/svg"
17 xmlns:ns5="http://www.w3.org/1999/xhtml"
18 xmlns:mml="http://www.w3.org/1998/Math/MathML"
19 xmlns:db="http://docbook.org/ns/docbook">
20
21 <refnamediv>
22 <refname>freeAllocatedBooleanSparse</refname>
23
24 <refpurpose>
25 Free memory allocated by getAllocatedBooleanSparseMatrix function.
26 </refpurpose>
27 </refnamediv>
28 <refsynopsisdiv>
29 <title>Calling Sequence</title>
30 <synopsis>void freeAllocatedBooleanSparse(int* _piNbItemRow, int* _piColPos)</synopsis>
31 </refsynopsisdiv>
32 <refsection>
33 <title>Parameters</title>
34 <variablelist>
35 <varlistentry>
36 <term>_piNbItemRow</term>
37 <listitem>
38 <para>
39 Pointer "_piNbItemRow" allocated by getAllocatedBooleanSparseMatrix.
40 </para>
41 </listitem>
42 </varlistentry>
43 <varlistentry>
44 <term>_piColPos</term>
45 <listitem>
46 <para>
47 Pointer "_piColPos" allocated by getAllocatedBooleanSparseMatrix.
48 </para>
49 </listitem>
50 </varlistentry>
51 </variablelist>
52 </refsection>
53</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 @@
1<?xml version="1.0" encoding="utf-8"?>
2<!--
3 * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
4 * Copyright (C) 2009 - DIGITEO - Antoine ELIAS
5 *
6 * This file must be used under the terms of the CeCILL.
7 * This source file is licensed as described in the file COPYING, which
8 * you should have received as part of this distribution. The terms
9 * are also available at
10 * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
11 *
12 -->
13<refentry version="5.0-subset Scilab" xml:id="booleanSparseExample"
14 xml:lang="en" xmlns="http://docbook.org/ns/docbook"
15 xmlns:xlink="http://www.w3.org/1999/xlink"
16 xmlns:svg="http://www.w3.org/2000/svg"
17 xmlns:ns5="http://www.w3.org/1999/xhtml"
18 xmlns:mml="http://www.w3.org/1998/Math/MathML"
19 xmlns:db="http://docbook.org/ns/docbook">
20 <refnamediv>
21 <refname>boolean sparse example</refname>
22
23 <refpurpose>
24 Boolean sparse use case.
25 </refpurpose>
26 </refnamediv>
27
28 <refsection>
29 <title>Description</title>
30 <para>This example shows how to get a boolean sparse variable and return it to Scilab.</para>
31 </refsection>
32 <refsection>
33 <!--File_gateway: SCI/modules/api_scilab/tests/unit_tests/booleanSparseExample.c-->
34 <!--File_scilab: SCI/modules/api_scilab/tests/unit_tests/booleanSparseExample.tst-->
35 <!--Lib_name: booleanSparseExample-->
36 <!--Func_list: booleanSparseExample-->
37 <title>Gateway Source</title>
38 <programlisting role="code_gateway">
39 <![CDATA[
40int booleanSparseExample(char *fname,unsigned long fname_len)
41{
42 SciErr sciErr;
43 int* piAddr = NULL;
44 int iType = 0;
45 int iRet = 0;
46
47 CheckRhs(1,1);
48 CheckLhs(0,1);
49
50 sciErr = getVarAddressFromPosition(pvApiCtx, 1, &piAddr);
51 if(sciErr.iErr)
52 {
53 printError(&sciErr, 0);
54 return 0;
55 }
56
57 if(isBooleanSparseType(pvApiCtx, piAddr))
58 {
59 int iRows = 0;
60 int iCols = 0;
61 int iNbItem = 0;
62 int* piNbItemRow = NULL;
63 int* piColPos = NULL;
64
65 iRet = getAllocatedBooleanSparseMatrix(pvApiCtx, piAddr, &iRows, &iCols, &iNbItem, &piNbItemRow, &piColPos);
66 if(iRet)
67 {
68 freeAllocatedBooleanSparse(piNbItemRow, piColPos);
69 return iRet;
70 }
71
72 sciErr = createBooleanSparseMatrix(pvApiCtx, Rhs + 1, iRows, iCols, iNbItem, piNbItemRow, piColPos);
73 if(sciErr.iErr)
74 {
75 freeAllocatedBooleanSparse(piNbItemRow, piColPos);
76 printError(&sciErr, 0);
77 return sciErr.iErr;
78 }
79
80 freeAllocatedBooleanSparse(piNbItemRow, piColPos);
81 LhsVar(1) = Rhs + 1;
82 }
83 return 0;
84}
85 ]]>
86 </programlisting>
87 </refsection>
88
89 <refsection>
90 <title>Scilab test script</title>
91 <programlisting role="code_scilab">
92 <![CDATA[
93bsp = sparse([1,1;2,2;3,3],[%t,%t,%t]);
94or(booleanSparseExample(bsp) == bsp)
95 ]]>
96 </programlisting>
97 </refsection>
98</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 @@
1<?xml version="1.0" encoding="utf-8"?>
2<!--
3 * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
4 * Copyright (C) 2009 - DIGITEO - Antoine ELIAS
5 *
6 * This file must be used under the terms of the CeCILL.
7 * This source file is licensed as described in the file COPYING, which
8 * you should have received as part of this distribution. The terms
9 * are also available at
10 * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
11 *
12 -->
13<refentry version="5.0-subset Scilab" xml:id="isDoubleType"
14 xml:lang="en" xmlns="http://docbook.org/ns/docbook"
15 xmlns:xlink="http://www.w3.org/1999/xlink"
16 xmlns:svg="http://www.w3.org/2000/svg"
17 xmlns:ns5="http://www.w3.org/1999/xhtml"
18 xmlns:mml="http://www.w3.org/1998/Math/MathML"
19 xmlns:db="http://docbook.org/ns/docbook">
20
21 <refnamediv>
22 <refname>isDoubleType</refname>
23
24 <refpurpose>
25 Check if it is a double variable.
26 </refpurpose>
27 </refnamediv>
28 <refsynopsisdiv>
29 <title>Calling Sequence</title>
30 <synopsis>int isDoubleType(void* _pvCtx, int* _piAddress)</synopsis>
31 </refsynopsisdiv>
32 <refsection>
33 <title>Parameters</title>
34 <variablelist>
35 <varlistentry>
36 <term>_pvCtx</term>
37 <listitem>
38 <para>
39 Scilab environment pointer, pass in "pvApiCtx" provided by api_scilab.h.
40 </para>
41 </listitem>
42 </varlistentry>
43 <varlistentry>
44 <term>_piAddress</term>
45 <listitem>
46 <para>
47 Position in the Scilab memory where you want to put the variable.
48 </para>
49 </listitem>
50 </varlistentry>
51 </variablelist>
52 </refsection>
53 <refsection>
54 <title>Return value</title>
55 <para>1 if variable is a double type, otherwise 0</para>
56 </refsection>
57</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 @@
1<?xml version="1.0" encoding="utf-8"?>
2<!--
3 * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
4 * Copyright (C) 2009 - DIGITEO - Antoine ELIAS
5 *
6 * This file must be used under the terms of the CeCILL.
7 * This source file is licensed as described in the file COPYING, which
8 * you should have received as part of this distribution. The terms
9 * are also available at
10 * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
11 *
12 -->
13<refentry version="5.0-subset Scilab" xml:id="getScalarDouble"
14 xml:lang="en" xmlns="http://docbook.org/ns/docbook"
15 xmlns:xlink="http://www.w3.org/1999/xlink"
16 xmlns:svg="http://www.w3.org/2000/svg"
17 xmlns:ns5="http://www.w3.org/1999/xhtml"
18 xmlns:mml="http://www.w3.org/1998/Math/MathML"
19 xmlns:db="http://docbook.org/ns/docbook">
20
21 <refnamediv>
22 <refname>getScalarDouble</refname>
23
24 <refpurpose>
25 Get scalar double variable.
26 </refpurpose>
27 </refnamediv>
28 <refsynopsisdiv>
29 <title>Calling Sequence</title>
30 <synopsis>int getScalarDouble(void* _pvCtx, int* _piAddress, double* _pdblReal)</synopsis>
31 </refsynopsisdiv>
32 <refsection>
33 <title>Parameters</title>
34 <variablelist>
35 <varlistentry>
36 <term>_pvCtx</term>
37 <listitem>
38 <para>
39 Scilab environment pointer, pass in "pvApiCtx" provided by api_scilab.h.
40 </para>
41 </listitem>
42 </varlistentry>
43 <varlistentry>
44 <term>_piAddress</term>
45 <listitem>
46 <para>
47 Address of the Scilab variable.
48 </para>
49 </listitem>
50 </varlistentry>
51 <varlistentry>
52 <term>_pdblReal</term>
53 <listitem>
54 <para>
55 Double value.
56 </para>
57 </listitem>
58 </varlistentry>
59 </variablelist>
60 </refsection>
61 <refsection>
62 <title>Return value</title>
63 <para>if successful 0, otherwise print error(s) message(s) in the Scilab console and returns first error number.</para>
64 </refsection>
65</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 @@
1<?xml version="1.0" encoding="utf-8"?>
2<!--
3 * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
4 * Copyright (C) 2009 - DIGITEO - Antoine ELIAS
5 *
6 * This file must be used under the terms of the CeCILL.
7 * This source file is licensed as described in the file COPYING, which
8 * you should have received as part of this distribution. The terms
9 * are also available at
10 * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
11 *
12 -->
13<refentry version="5.0-subset Scilab" xml:id="getScalarComplexDouble"
14 xml:lang="en" xmlns="http://docbook.org/ns/docbook"
15 xmlns:xlink="http://www.w3.org/1999/xlink"
16 xmlns:svg="http://www.w3.org/2000/svg"
17 xmlns:ns5="http://www.w3.org/1999/xhtml"
18 xmlns:mml="http://www.w3.org/1998/Math/MathML"
19 xmlns:db="http://docbook.org/ns/docbook">
20
21 <refnamediv>
22 <refname>getScalarComplexDouble</refname>
23
24 <refpurpose>
25 Get scalar complex double variable.
26 </refpurpose>
27 </refnamediv>
28 <refsynopsisdiv>
29 <title>Calling Sequence</title>
30 <synopsis>int getScalarComplexDouble(void* _pvCtx, int* _piAddress, double* _pdblReal, double* _pdblImg)</synopsis>
31 </refsynopsisdiv>
32 <refsection>
33 <title>Parameters</title>
34 <variablelist>
35 <varlistentry>
36 <term>_pvCtx</term>
37 <listitem>
38 <para>
39 Scilab environment pointer, pass in "pvApiCtx" provided by api_scilab.h.
40 </para>
41 </listitem>
42 </varlistentry>
43 <varlistentry>
44 <term>_piAddress</term>
45 <listitem>
46 <para>
47 Position in the Scilab memory where you want to put the variable.
48 </para>
49 </listitem>
50 </varlistentry>
51 <varlistentry>
52 <term>_pdblReal</term>
53 <listitem>
54 <para>
55 Real part value.
56 </para>
57 </listitem>
58 </varlistentry>
59 <varlistentry>
60 <term>_pdblImg</term>
61 <listitem>
62 <para>
63 Imaginary part value.
64 </para>
65 </listitem>
66 </varlistentry>
67 </variablelist>
68 </refsection>
69 <refsection>
70 <title>Return value</title>
71 <para>if successful 0, otherwise print error(s) message(s) in the Scilab console and returns first error number.</para>
72 </refsection>
73</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 @@
1<?xml version="1.0" encoding="utf-8"?>
2<!--
3 * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
4 * Copyright (C) 2009 - DIGITEO - Antoine ELIAS
5 *
6 * This file must be used under the terms of the CeCILL.
7 * This source file is licensed as described in the file COPYING, which
8 * you should have received as part of this distribution. The terms
9 * are also available at
10 * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
11 *
12 -->
13<refentry version="5.0-subset Scilab" xml:id="createScalarDouble"
14 xml:lang="en" xmlns="http://docbook.org/ns/docbook"
15 xmlns:xlink="http://www.w3.org/1999/xlink"
16 xmlns:svg="http://www.w3.org/2000/svg"
17 xmlns:ns5="http://www.w3.org/1999/xhtml"
18 xmlns:mml="http://www.w3.org/1998/Math/MathML"
19 xmlns:db="http://docbook.org/ns/docbook">
20
21 <refnamediv>
22 <refname>createScalarDouble</refname>
23
24 <refpurpose>
25 Create a scalar double in Scilab memory.
26 </refpurpose>
27 </refnamediv>
28 <refsynopsisdiv>
29 <title>Calling Sequence</title>
30 <synopsis>int createScalarDouble(void* _pvCtx, int _iVar, double _dblReal)</synopsis>
31 </refsynopsisdiv>
32 <refsection>
33 <title>Parameters</title>
34 <variablelist>
35 <varlistentry>
36 <term>_pvCtx</term>
37 <listitem>
38 <para>
39 Scilab environment pointer, pass in "pvApiCtx" provided by api_scilab.h.
40 </para>
41 </listitem>
42 </varlistentry>
43 <varlistentry>
44 <term>_iVar</term>
45 <listitem>
46 <para>
47 Position in the Scilab memory where you want to put the variable.
48 </para>
49 </listitem>
50 </varlistentry>
51 <varlistentry>
52 <term>_dblReal</term>
53 <listitem>
54 <para>
55 Double value.
56 </para>
57 </listitem>
58 </varlistentry>
59 </variablelist>
60 </refsection>
61 <refsection>
62 <title>Return value</title>
63 <para>if successful 0, otherwise print error(s) message(s) in the Scilab console and returns first error number.</para>
64 </refsection>
65</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 @@
1<?xml version="1.0" encoding="utf-8"?>
2<!--
3 * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
4 * Copyright (C) 2009 - DIGITEO - Antoine ELIAS
5 *
6 * This file must be used under the terms of the CeCILL.
7 * This source file is licensed as described in the file COPYING, which
8 * you should have received as part of this distribution. The terms
9 * are also available at
10 * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
11 *
12 -->
13<refentry version="5.0-subset Scilab" xml:id="createScalarComplexDouble"
14 xml:lang="en" xmlns="http://docbook.org/ns/docbook"
15 xmlns:xlink="http://www.w3.org/1999/xlink"
16 xmlns:svg="http://www.w3.org/2000/svg"
17 xmlns:ns5="http://www.w3.org/1999/xhtml"
18 xmlns:mml="http://www.w3.org/1998/Math/MathML"
19 xmlns:db="http://docbook.org/ns/docbook">
20
21 <refnamediv>
22 <refname>createScalarComplexDouble</refname>
23
24 <refpurpose>
25 Create a scalar complex double in Scilab memory.
26 </refpurpose>
27 </refnamediv>
28 <refsynopsisdiv>
29 <title>Calling Sequence</title>
30 <synopsis>int createScalarComplexDouble(void* _pvCtx, int _iVar, double _dblReal, double _dblImg)</synopsis>
31 </refsynopsisdiv>
32 <refsection>
33 <title>Parameters</title>
34 <variablelist>
35 <varlistentry>
36 <term>_pvCtx</term>
37 <listitem>
38 <para>
39 Scilab environment pointer, pass in "pvApiCtx" provided by api_scilab.h.
40 </para>
41 </listitem>
42 </varlistentry>
43 <varlistentry>
44 <term>_iVar</term>
45 <listitem>
46 <para>
47 Position in the Scilab memory where you want to put the variable.
48 </para>
49 </listitem>
50 </varlistentry>
51 <varlistentry>
52 <term>_dblReal</term>
53 <listitem>
54 <para>
55 Real part value.
56 </para>
57 </listitem>
58 </varlistentry>
59 <varlistentry>
60 <term>_dblImg</term>
61 <listitem>
62 <para>
63 imaginary part value.
64 </para>
65 </listitem>
66 </varlistentry>
67 </variablelist>
68 </refsection>
69 <refsection>
70 <title>Return value</title>
71 <para>if successful 0, otherwise print error(s) message(s) in the Scilab console and returns first error number.</para>
72 </refsection>
73</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 @@
1<?xml version="1.0" encoding="utf-8"?>
2<!--
3 * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
4 * Copyright (C) 2009 - DIGITEO - Antoine ELIAS
5 *
6 * This file must be used under the terms of the CeCILL.
7 * This source file is licensed as described in the file COPYING, which
8 * you should have received as part of this distribution. The terms
9 * are also available at
10 * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
11 *
12 -->
13<refentry version="5.0-subset Scilab" xml:id="doubleExample"
14 xml:lang="en" xmlns="http://docbook.org/ns/docbook"
15 xmlns:xlink="http://www.w3.org/1999/xlink"
16 xmlns:svg="http://www.w3.org/2000/svg"
17 xmlns:ns5="http://www.w3.org/1999/xhtml"
18 xmlns:mml="http://www.w3.org/1998/Math/MathML"
19 xmlns:db="http://docbook.org/ns/docbook">
20 <refnamediv>
21 <refname>double example</refname>
22
23 <refpurpose>
24 Double use case.
25 </refpurpose>
26 </refnamediv>
27
28 <refsection>
29 <title>Description</title>
30 <para>This example shows how to get a double variable and return it to Scilab.</para>
31 </refsection>
32 <refsection>
33 <!--File_gateway: SCI/modules/api_scilab/tests/unit_tests/doubleExample.c-->
34 <!--File_scilab: SCI/modules/api_scilab/tests/unit_tests/doubleExample.tst-->
35 <!--Lib_name: doubleExample-->
36 <!--Func_list: doubleExample-->
37 <title>Gateway Source</title>
38 <programlisting role="code_gateway">
39 <![CDATA[
40int doubleExample(char *fname,unsigned long fname_len)
41{
42 SciErr sciErr;
43 int* piAddr = NULL;
44 int iType = 0;
45 int iRet = 0;
46
47 CheckRhs(1,1);
48 CheckLhs(0,1);
49
50 sciErr = getVarAddressFromPosition(pvApiCtx, 1, &piAddr);
51 if(sciErr.iErr)
52 {
53 printError(&sciErr, 0);
54 return 0;
55 }
56
57 if(isEmptyMatrix(pvApiCtx, piAddr))
58 {
59 iRet = createEmptyMatrix(pvApiCtx, Rhs + 1);
60 if(iRet)
61 {
62 return iRet;
63 }
64 }
65 else if(isDoubleType(pvApiCtx, piAddr))
66 {
67 if(isScalar(pvApiCtx, piAddr))
68 {
69 double dblReal = 0;
70 double dblImg = 0;
71
72 if(isVarComplex(pvApiCtx, piAddr))
73 {
74 iRet = getScalarComplexDouble(pvApiCtx, piAddr, &dblReal, &dblImg);
75 if(iRet)
76 {
77 return iRet;
78 }
79
80 iRet = createScalarComplexDouble(pvApiCtx, Rhs + 1, dblReal, dblImg);
81 if(iRet)
82 {
83 return iRet;
84 }
85 }
86 else
87 {
88 iRet = getScalarDouble(pvApiCtx, piAddr, &dblReal);
89 if(iRet)
90 {
91 return iRet;
92 }
93
94 iRet = createScalarDouble(pvApiCtx, Rhs + 1, dblReal);
95 if(iRet)
96 {
97 return iRet;
98 }
99 }
100 }
101 else
102 {
103 int iRows = 0;
104 int iCols = 0;
105 double* pdblReal = NULL;
106 double* pdblImg = NULL;
107
108 if(isVarComplex(pvApiCtx, piAddr))
109 {
110 sciErr = getComplexMatrixOfDouble(pvApiCtx, piAddr, &iRows, &iCols, &pdblReal, &pdblImg);
111 if(sciErr.iErr)
112 {
113 printError(&sciErr, 0);
114 return sciErr.iErr;
115 }
116
117 sciErr = createComplexMatrixOfDouble(pvApiCtx, Rhs + 1, iRows, iCols, pdblReal, pdblImg);
118 if(sciErr.iErr)
119 {
120 printError(&sciErr, 0);
121 return sciErr.iErr;
122 }
123 }
124 else
125 {
126 sciErr = getMatrixOfDouble(pvApiCtx, piAddr, &iRows, &iCols, &pdblReal);
127 if(sciErr.iErr)
128 {
129 printError(&sciErr, 0);
130 return sciErr.iErr;
131 }
132
133 sciErr = createMatrixOfDouble(pvApiCtx, Rhs + 1, iRows, iCols, pdblReal);
134 if(sciErr.iErr)
135 {
136 printError(&sciErr, 0);
137 return sciErr.iErr;
138 }
139 }
140 }
141 }
142 return 0;
143}
144 ]]>
145 </programlisting>
146 </refsection>
147 <refsection>
148 <title>Scilab test script</title>
149 <programlisting role="code_scilab">
150 <![CDATA[
151a = 1;
152b = %i;
153c = [1,2,3;4,5,6];
154d = c(1:$) + c($:-1:1) * %i;
155
156doubleExample(a) == a
157doubleExample(b) == b
158doubleExample(c) == c
159doubleExample(d) == d