summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--scilab/CHANGES_5.2.X15
-rw-r--r--scilab/Makefile.in9
-rw-r--r--scilab/Makefile.incl.am8
-rw-r--r--scilab/RELEASE_NOTES_5.2.X10
-rw-r--r--scilab/build.incl.xml3
-rwxr-xr-xscilab/configure349
-rw-r--r--scilab/configure.ac41
-rw-r--r--scilab/contrib/Makefile.in7
-rw-r--r--scilab/contrib/toolbox_skeleton/sci_gateway/c/sci_csub.c14
-rw-r--r--scilab/contrib/toolbox_skeleton/sci_gateway/c/sci_csum.c14
-rw-r--r--scilab/contrib/toolbox_skeleton/sci_gateway/cpp/sci_cpp_find.cxx18
-rw-r--r--scilab/contrib/toolbox_skeleton/sci_gateway/fortran/sci_fsum.c14
-rw-r--r--scilab/etc/modules.xml.in1
-rw-r--r--scilab/etc/modules.xml.vc1
-rw-r--r--scilab/etc/scilab.start2
-rw-r--r--scilab/libs/MALLOC/Makefile.in15
-rw-r--r--scilab/libs/Makefile.in7
-rw-r--r--scilab/libs/doublylinkedlist/Makefile.in15
-rw-r--r--scilab/libs/dynamiclibrary/Makefile.in15
-rw-r--r--scilab/libs/hashtable/Makefile.in15
-rw-r--r--scilab/libs/libst/Makefile.in15
-rw-r--r--scilab/modules/Makefile.am1
-rw-r--r--scilab/modules/Makefile.in17
-rw-r--r--scilab/modules/action_binding/Makefile.in222
-rw-r--r--scilab/modules/api_scilab/LibScilab_Import.def2
-rw-r--r--scilab/modules/api_scilab/Makefile.in15
-rw-r--r--scilab/modules/api_scilab/api_scilab.vcproj4
-rw-r--r--scilab/modules/api_scilab/api_scilab_export.def4
-rw-r--r--scilab/modules/api_scilab/api_scilab_header.def2
-rw-r--r--scilab/modules/api_scilab/includes/api_boolean.h10
-rw-r--r--scilab/modules/api_scilab/includes/api_boolean_sparse.h10
-rw-r--r--scilab/modules/api_scilab/includes/api_common.h41
-rw-r--r--scilab/modules/api_scilab/includes/api_double.h26
-rw-r--r--scilab/modules/api_scilab/includes/api_error.h12
-rw-r--r--scilab/modules/api_scilab/includes/api_int.h84
-rw-r--r--scilab/modules/api_scilab/includes/api_list.h216
-rw-r--r--scilab/modules/api_scilab/includes/api_pointer.h6
-rw-r--r--scilab/modules/api_scilab/includes/api_poly.h18
-rw-r--r--scilab/modules/api_scilab/includes/api_sparse.h20
-rw-r--r--scilab/modules/api_scilab/includes/api_string.h16
-rw-r--r--scilab/modules/api_scilab/src/cpp/api_boolean.cpp63
-rw-r--r--scilab/modules/api_scilab/src/cpp/api_boolean_sparse.cpp72
-rw-r--r--scilab/modules/api_scilab/src/cpp/api_common.cpp192
-rw-r--r--scilab/modules/api_scilab/src/cpp/api_double.cpp133
-rw-r--r--scilab/modules/api_scilab/src/cpp/api_error.cpp52
-rw-r--r--scilab/modules/api_scilab/src/cpp/api_int.cpp238
-rw-r--r--scilab/modules/api_scilab/src/cpp/api_internal_boolean.h2
-rw-r--r--scilab/modules/api_scilab/src/cpp/api_internal_boolean_sparse.h2
-rw-r--r--scilab/modules/api_scilab/src/cpp/api_internal_common.h2
-rw-r--r--scilab/modules/api_scilab/src/cpp/api_internal_double.h10
-rw-r--r--scilab/modules/api_scilab/src/cpp/api_internal_int.h10
-rw-r--r--scilab/modules/api_scilab/src/cpp/api_internal_pointer.h2
-rw-r--r--scilab/modules/api_scilab/src/cpp/api_internal_poly.h14
-rw-r--r--scilab/modules/api_scilab/src/cpp/api_internal_sparse.h12
-rw-r--r--scilab/modules/api_scilab/src/cpp/api_internal_string.h2
-rw-r--r--scilab/modules/api_scilab/src/cpp/api_list.cpp1087
-rw-r--r--scilab/modules/api_scilab/src/cpp/api_pointer.cpp39
-rw-r--r--scilab/modules/api_scilab/src/cpp/api_poly.cpp97
-rw-r--r--scilab/modules/api_scilab/src/cpp/api_sparse.cpp100
-rw-r--r--scilab/modules/api_scilab/src/cpp/api_string.cpp99
-rw-r--r--scilab/modules/arnoldi/Makefile.in340
-rw-r--r--scilab/modules/atoms/Makefile.in15
-rwxr-xr-x[-rw-r--r--]scilab/modules/atoms/macros/atoms_internals/atomsIsCompatible.sci7
-rw-r--r--scilab/modules/boolean/Makefile.in254
-rw-r--r--scilab/modules/cacsd/Makefile.in654
-rw-r--r--scilab/modules/call_scilab/Makefile.in15
-rw-r--r--scilab/modules/call_scilab/examples/call_scilab/NET/C#/DotNetScilab.sln20
-rw-r--r--scilab/modules/call_scilab/examples/call_scilab/NET/C#/cs_example/cs_example.csproj36
-rw-r--r--scilab/modules/call_scilab/examples/call_scilab/NET/C#/dotnetsci/DotNetScilab.csproj40
-rw-r--r--scilab/modules/call_scilab/examples/call_scilab/NET/C#/dotnetsci/Scilab.cs56
-rw-r--r--scilab/modules/call_scilab/examples/call_scilab/NET/C#/dotnetsci/Scilab_cs_wrapper.cs44
-rw-r--r--scilab/modules/call_scilab/src/c/SendScilabJobs.c6
-rw-r--r--scilab/modules/compatibility_functions/Makefile.in15
-rw-r--r--scilab/modules/compatibility_functions/help/en_US/mtlb_eig.xml39
-rw-r--r--scilab/modules/compatibility_functions/help/fr_FR/mtlb_eig.xml39
-rw-r--r--scilab/modules/compatibility_functions/macros/mtlb_eig.sci26
-rw-r--r--scilab/modules/completion/Makefile.in15
-rw-r--r--scilab/modules/console/Makefile.in284
-rw-r--r--scilab/modules/console/etc/configuration.xml31
-rw-r--r--scilab/modules/console/src/java/org/scilab/modules/console/SciConsole.java17
-rw-r--r--scilab/modules/console/src/jni/CallScilabBridge.cpp2
-rw-r--r--scilab/modules/console/src/jni/CallScilabBridge.hxx2
-rw-r--r--scilab/modules/console/tests/nonreg_tests/bug_4087.tst23
-rw-r--r--scilab/modules/core/Makefile.in15
-rw-r--r--scilab/modules/core/sci_gateway/c/gw_core.c7
-rw-r--r--scilab/modules/core/sci_gateway/c/sci_funcprot.c8
-rw-r--r--scilab/modules/core/sci_gateway/c/sci_newfun.c14
-rw-r--r--scilab/modules/core/sci_gateway/c/sci_typename.c20
-rw-r--r--scilab/modules/data_structures/Makefile.in322
-rw-r--r--scilab/modules/demo_tools/Makefile.in15
-rw-r--r--scilab/modules/development_tools/Makefile.in15
-rw-r--r--scilab/modules/development_tools/src/fake/Makefile.in7
-rw-r--r--scilab/modules/differential_equations/Makefile.in530
-rw-r--r--scilab/modules/double/Makefile.in15
-rw-r--r--scilab/modules/dynamic_link/Makefile.in340
-rw-r--r--scilab/modules/dynamic_link/macros/ilib_gen_gateway.sci2
-rw-r--r--scilab/modules/elementary_functions/Makefile.in1194
-rw-r--r--scilab/modules/fftw/Makefile.in282
-rw-r--r--scilab/modules/fileio/Makefile.in732
-rw-r--r--scilab/modules/fileio/help/en_US/mfprintf.xml4
-rw-r--r--scilab/modules/fileio/help/en_US/mputl.xml2
-rw-r--r--scilab/modules/fileio/macros/mputl.sci27
-rw-r--r--scilab/modules/fileio/sci_gateway/c/gw_fileio.c8
-rw-r--r--scilab/modules/fileio/sci_gateway/c/sci_basename.c30
-rw-r--r--scilab/modules/fileio/sci_gateway/c/sci_chdir.c20
-rw-r--r--scilab/modules/fileio/sci_gateway/c/sci_copyfile.c21
-rw-r--r--scilab/modules/fileio/sci_gateway/c/sci_fileparts.c24
-rw-r--r--scilab/modules/fileio/sci_gateway/c/sci_isdir.c10
-rw-r--r--scilab/modules/fileio/sci_gateway/c/sci_isfile.c10
-rw-r--r--scilab/modules/fileio/sci_gateway/c/sci_movefile.c20
-rw-r--r--scilab/modules/fileio/sci_gateway/c/sci_pathconvert.c40
-rw-r--r--scilab/modules/fileio/src/c/expandPathVariable.c6
-rw-r--r--scilab/modules/fileio/tests/nonreg_tests/bug_3896.dia.ref31
-rw-r--r--scilab/modules/fileio/tests/nonreg_tests/bug_3896.tst43
-rw-r--r--scilab/modules/functions/Makefile.in288
-rw-r--r--scilab/modules/functions/macros/plotprofile.sci135
-rw-r--r--scilab/modules/functions/sci_gateway/c/sci_lib.c8
-rw-r--r--scilab/modules/functions/sci_gateway/c/sci_whereis.c14
-rw-r--r--scilab/modules/genetic_algorithms/Makefile.in15
-rw-r--r--scilab/modules/graphic_export/Makefile.in342
-rw-r--r--scilab/modules/graphic_export/help/en_US/xs2eps.xml2
-rw-r--r--scilab/modules/graphic_export/help/en_US/xs2pdf.xml2
-rw-r--r--scilab/modules/graphic_export/help/en_US/xs2ps.xml2
-rw-r--r--scilab/modules/graphic_export/help/en_US/xs2svg.xml2
-rw-r--r--scilab/modules/graphic_export/help/pt_BR/xs2eps.xml2
-rw-r--r--scilab/modules/graphic_export/help/pt_BR/xs2pdf.xml2
-rw-r--r--scilab/modules/graphic_export/help/pt_BR/xs2ps.xml2
-rw-r--r--scilab/modules/graphic_export/help/pt_BR/xs2svg.xml2
-rw-r--r--scilab/modules/graphic_export/src/jni/FileExporter.cpp2
-rw-r--r--scilab/modules/graphic_export/src/jni/FileExporter.hxx2
-rw-r--r--scilab/modules/graphic_export/src/jni/GL2PSToJOGL.cpp22
-rw-r--r--scilab/modules/graphic_export/src/jni/GL2PSToJOGL.hxx2
-rw-r--r--scilab/modules/graphic_export/src/jni/JOGLConstant.cpp2
-rw-r--r--scilab/modules/graphic_export/src/jni/JOGLConstant.hxx2
-rw-r--r--scilab/modules/graphics/Makefile.in2471
-rw-r--r--scilab/modules/graphics/help/en_US/set_posfig_dim.xml88
-rw-r--r--scilab/modules/graphics/help/en_US/xclip.xml98
-rw-r--r--scilab/modules/graphics/help/fr_FR/xclip.xml91
-rw-r--r--scilab/modules/graphics/help/pt_BR/set_posfig_dim.xml112
-rw-r--r--scilab/modules/graphics/help/pt_BR/xclip.xml123
-rw-r--r--scilab/modules/graphics/macros/addcolor.sci14
-rw-r--r--scilab/modules/graphics/macros/autumncolormap.sci15
-rw-r--r--scilab/modules/graphics/macros/bonecolormap.sci14
-rw-r--r--scilab/modules/graphics/macros/color.sci31
-rw-r--r--scilab/modules/graphics/macros/colorbar.sci17
-rw-r--r--scilab/modules/graphics/macros/colordef.sci54
-rw-r--r--scilab/modules/graphics/macros/contour.sci4
-rw-r--r--scilab/modules/graphics/macros/contour2d.sci6
-rw-r--r--scilab/modules/graphics/macros/contourf.sci76
-rw-r--r--scilab/modules/graphics/macros/coolcolormap.sci12
-rw-r--r--scilab/modules/graphics/macros/coppercolormap.sci12
-rw-r--r--scilab/modules/graphics/macros/dragrect.sci9
-rw-r--r--scilab/modules/graphics/macros/edit_curv.sci2
-rw-r--r--scilab/modules/graphics/macros/errbar.sci6
-rw-r--r--scilab/modules/graphics/macros/eval3d.sci18
-rw-r--r--scilab/modules/graphics/macros/eval3dp.sci5
-rw-r--r--scilab/modules/graphics/macros/fac3d.sci3
-rw-r--r--scilab/modules/graphics/macros/fac3d1.sci3
-rw-r--r--scilab/modules/graphics/macros/xclip.sci26
-rw-r--r--scilab/modules/gui/Makefile.in1067
-rw-r--r--scilab/modules/gui/demos/dialog.dem.sce2
-rw-r--r--scilab/modules/gui/etc/main_menubar.xml22
-rw-r--r--scilab/modules/gui/etc/main_toolbar.xml27
-rw-r--r--scilab/modules/gui/help/en_US/messagebox.xml10
-rw-r--r--scilab/modules/gui/help/en_US/x_mdialog.xml2
-rw-r--r--scilab/modules/gui/help/en_US/x_message.xml68
-rw-r--r--scilab/modules/gui/help/en_US/x_message_modeless.xml2
-rw-r--r--scilab/modules/gui/help/en_US/xgetfile.xml89
-rw-r--r--scilab/modules/gui/help/fr_FR/x_mdialog.xml2
-rw-r--r--scilab/modules/gui/help/fr_FR/x_message.xml74
-rw-r--r--scilab/modules/gui/help/fr_FR/x_message_modeless.xml2
-rw-r--r--scilab/modules/gui/macros/getvalue.sci6
-rw-r--r--scilab/modules/gui/macros/xgetfile.sci104
-rw-r--r--scilab/modules/gui/src/java/org/scilab/modules/gui/utils/ConfigManager.java2
-rw-r--r--scilab/modules/gui/src/jni/CallScilabBridge.cpp1656
-rw-r--r--scilab/modules/gui/src/jni/CallScilabBridge.hxx4
-rw-r--r--scilab/modules/gui/src/jni/Juigetfile.cpp2
-rw-r--r--scilab/modules/gui/src/jni/Juigetfile.hxx2
-rw-r--r--scilab/modules/gui/src/jni/Jxclick.cpp2
-rw-r--r--scilab/modules/gui/src/jni/Jxclick.hxx2
-rw-r--r--scilab/modules/gui/src/jni/Jxgetmouse.cpp2
-rw-r--r--scilab/modules/gui/src/jni/Jxgetmouse.hxx2
-rw-r--r--scilab/modules/gui/src/jni/LookAndFeelManager.cpp2
-rw-r--r--scilab/modules/gui/src/jni/LookAndFeelManager.hxx2
-rw-r--r--scilab/modules/gui/src/jni/ScilabDisplayTree.cpp63
-rw-r--r--scilab/modules/gui/src/jni/ScilabDisplayTree.hxx4
-rw-r--r--scilab/modules/gui/src/jni/SwingScilabMenu.cpp2
-rw-r--r--scilab/modules/gui/src/jni/SwingScilabMenu.hxx2
-rw-r--r--scilab/modules/gui/src/jni/UIElementMapper.cpp2
-rw-r--r--scilab/modules/gui/src/jni/UIElementMapper.hxx2
-rw-r--r--scilab/modules/gui/tests/nonreg_tests/bug_126.tst22
-rw-r--r--scilab/modules/gui/tests/unit_tests/messagebox.tst2
-rw-r--r--scilab/modules/hdf5/Makefile.in246
-rw-r--r--scilab/modules/hdf5/includes/gw_hdf5.h1
-rw-r--r--scilab/modules/hdf5/sci_gateway/c/gw_hdf5.c9
-rw-r--r--scilab/modules/hdf5/sci_gateway/cpp/sci_export_to_hdf5.cpp75
-rw-r--r--scilab/modules/hdf5/sci_gateway/cpp/sci_import_from_hdf5.cpp82
-rw-r--r--scilab/modules/helptools/Makefile.in454
-rw-r--r--scilab/modules/helptools/help/en_US/help_from_sci.xml2
-rw-r--r--scilab/modules/helptools/help/en_US/help_skeleton.xml4
-rw-r--r--scilab/modules/helptools/help/en_US/man.xml4
-rw-r--r--scilab/modules/helptools/help/en_US/manedit.xml4
-rw-r--r--scilab/modules/helptools/help/pt_BR/help_from_sci.xml2
-rw-r--r--scilab/modules/helptools/help/pt_BR/help_skeleton.xml4
-rw-r--r--scilab/modules/helptools/help/pt_BR/man.xml4
-rw-r--r--scilab/modules/helptools/help/pt_BR/manedit.xml4
-rw-r--r--scilab/modules/helptools/macros/check_help.sci6
-rw-r--r--scilab/modules/helptools/macros/extract_help_examples.sci2
-rw-r--r--scilab/modules/helptools/src/jni/BuildDocObject.cpp2
-rw-r--r--scilab/modules/helptools/src/jni/BuildDocObject.hxx2
-rw-r--r--scilab/modules/history_manager/Makefile.in15
-rw-r--r--scilab/modules/integer/Makefile.in588
-rw-r--r--scilab/modules/interpolation/Makefile.in288
-rw-r--r--scilab/modules/intersci/Makefile.in15
-rw-r--r--scilab/modules/io/Makefile.in360
-rw-r--r--scilab/modules/io/sci_gateway/c/gw_io.c9
-rw-r--r--scilab/modules/io/sci_gateway/c/sci_getenv.c20
-rw-r--r--scilab/modules/io/sci_gateway/c/sci_setenv.c18
-rw-r--r--scilab/modules/javasci/Makefile.in280
-rw-r--r--scilab/modules/javasci/src/c/javasci_SciAbstractArray.c28
-rw-r--r--scilab/modules/javasci/src/c/javasci_SciBooleanArray.c4
-rw-r--r--scilab/modules/javasci/src/c/javasci_SciComplexArray.c8
-rw-r--r--scilab/modules/javasci/src/c/javasci_SciDoubleArray.c4
-rw-r--r--scilab/modules/javasci/src/c/javasci_SciIntegerArray.c4
-rw-r--r--scilab/modules/javasci/src/c/javasci_SciStringArray.c6
-rw-r--r--scilab/modules/javasci/src/c/javasci_Scilab.c4
-rw-r--r--scilab/modules/javasci/src/c/javasci_Scilab2.c26
-rw-r--r--scilab/modules/jvm/Makefile.in15
-rw-r--r--scilab/modules/linear_algebra/Makefile.in460
-rw-r--r--scilab/modules/localization/Makefile.in15
-rw-r--r--scilab/modules/m2sci/Makefile.in15
-rw-r--r--scilab/modules/maple2scilab/Makefile.in15
-rw-r--r--scilab/modules/matio/Makefile.in342
-rw-r--r--scilab/modules/metanet/Makefile.in450
-rw-r--r--scilab/modules/mexlib/Makefile.in15
-rw-r--r--scilab/modules/optimization/Makefile.in456
-rw-r--r--scilab/modules/optimization/demos/neldermead/neldermead_boxproblemB.sce11
-rw-r--r--scilab/modules/optimization/demos/neldermead/nmplot_quadratic.fixed2.sce3
-rw-r--r--scilab/modules/optimization/help/en_US/neldermead/fminsearch.xml59
-rw-r--r--scilab/modules/optimization/help/en_US/neldermead/neldermead.xml64
-rw-r--r--scilab/modules/optimization/help/en_US/neldermead/optimget.xml69
-rw-r--r--scilab/modules/optimization/help/en_US/optimbase/optimbase.xml34
-rw-r--r--scilab/modules/optimization/macros/neldermead/fminsearch.sci170
-rw-r--r--scilab/modules/optimization/macros/neldermead/neldermead_cget.sci8
-rw-r--r--scilab/modules/optimization/macros/neldermead/neldermead_configure.sci14
-rw-r--r--scilab/modules/optimization/macros/neldermead/neldermead_new.sci10
-rw-r--r--scilab/modules/optimization/macros/neldermead/neldermead_search.sci216
-rw-r--r--scilab/modules/optimization/macros/neldermead/optimget.sci2
-rw-r--r--scilab/modules/optimization/macros/neldermead/optimplotfval.sci66
-rw-r--r--scilab/modules/optimization/macros/neldermead/optimset.sci19
-rw-r--r--scilab/modules/optimization/macros/optimbase/optimbase_terminate.sci2
-rw-r--r--scilab/modules/optimization/macros/optimsimplex/optimsimplex_new.sci2
-rw-r--r--scilab/modules/optimization/tests/unit_tests/neldermead/fminsearch.tst226
-rw-r--r--scilab/modules/optimization/tests/unit_tests/neldermead/neldermead_mymethod.tst332
-rw-r--r--scilab/modules/optimization/tests/unit_tests/neldermead/neldermead_myterminate.tst178
-rw-r--r--scilab/modules/optimization/tests/unit_tests/neldermead/neldermead_outputcmd.tst2
-rw-r--r--scilab/modules/optimization/tests/unit_tests/neldermead/neldermead_restart.tst92
-rw-r--r--scilab/modules/optimization/tests/unit_tests/neldermead/newFile.txt134
-rw-r--r--scilab/modules/optimization/tests/unit_tests/neldermead/optimget.tst7
-rw-r--r--scilab/modules/optimization/tests/unit_tests/neldermead/optimset.tst65
-rw-r--r--scilab/modules/output_stream/Makefile.in15
-rw-r--r--scilab/modules/output_stream/includes/do_error_number.h5
-rw-r--r--scilab/modules/output_stream/sci_gateway/c/gw_output_stream.c9
-rw-r--r--scilab/modules/output_stream/sci_gateway/cpp/sci_diary.cpp84
-rw-r--r--scilab/modules/output_stream/src/c/api_scilab_Import.def3
-rw-r--r--scilab/modules/output_stream/src/c/error.c6
-rw-r--r--scilab/modules/output_stream/src/c/output_stream_export.def1
-rw-r--r--scilab/modules/overloading/Makefile.in15
-rw-r--r--scilab/modules/parameters/Makefile.in15
-rw-r--r--scilab/modules/polynomials/Makefile.in454
-rw-r--r--scilab/modules/pvm/Makefile.in470
-rw-r--r--scilab/modules/randlib/Makefile.in312
-rw-r--r--scilab/modules/renderer/Makefile.in1724
-rw-r--r--scilab/modules/renderer/src/jni/ArcFillDrawerGL.cpp2
-rw-r--r--scilab/modules/renderer/src/jni/ArcFillDrawerGL.hxx2
-rw-r--r--scilab/modules/renderer/src/jni/ArcLineDrawerGL.cpp2
-rw-r--r--scilab/modules/renderer/src/jni/ArcLineDrawerGL.hxx2
-rw-r--r--scilab/modules/renderer/src/jni/BackTrihedronDrawerGL.cpp2
-rw-r--r--scilab/modules/renderer/src/jni/BackTrihedronDrawerGL.hxx2
-rw-r--r--scilab/modules/renderer/src/jni/CenteredTextDrawerGL.cpp14
-rw-r--r--scilab/modules/renderer/src/jni/CenteredTextDrawerGL.hxx2
-rw-r--r--scilab/modules/renderer/src/jni/DrawableArcGL.cpp2
-rw-r--r--scilab/modules/renderer/src/jni/DrawableArcGL.hxx2
-rw-r--r--scilab/modules/renderer/src/jni/DrawableAxesGL.cpp2
-rw-r--r--scilab/modules/renderer/src/jni/DrawableAxesGL.hxx2
-rw-r--r--scilab/modules/renderer/src/jni/DrawableFecGL.cpp2
-rw-r--r--scilab/modules/renderer/src/jni/DrawableFecGL.hxx2
-rw-r--r--scilab/modules/renderer/src/jni/DrawableFigureGL.cpp14
-rw-r--r--scilab/modules/renderer/src/jni/DrawableFigureGL.hxx2
-rw-r--r--scilab/modules/renderer/src/jni/DrawableGrayplotGL.cpp2
-rw-r--r--scilab/modules/renderer/src/jni/DrawableGrayplotGL.hxx2
-rw-r--r--scilab/modules/renderer/src/jni/DrawablePolylineGL.cpp2
-rw-r--r--scilab/modules/renderer/src/jni/DrawablePolylineGL.hxx2
-rw-r--r--scilab/modules/renderer/src/jni/DrawableRectangleGL.cpp2
-rw-r--r--scilab/modules/renderer/src/jni/DrawableRectangleGL.hxx2
-rw-r--r--scilab/modules/renderer/src/jni/DrawableSegsGL.cpp2
-rw-r--r--scilab/modules/renderer/src/jni/DrawableSegsGL.hxx2
-rw-r--r--scilab/modules/renderer/src/jni/DrawableSubwinGL.cpp2
-rw-r--r--scilab/modules/renderer/src/jni/DrawableSubwinGL.hxx2
-rw-r--r--scilab/modules/renderer/src/jni/DrawableSurfaceGL.cpp2
-rw-r--r--scilab/modules/renderer/src/jni/DrawableSurfaceGL.hxx2
-rw-r--r--scilab/modules/renderer/src/jni/DrawableTextGL.cpp2
-rw-r--r--scilab/modules/renderer/src/jni/DrawableTextGL.hxx2
-rw-r--r--scilab/modules/renderer/src/jni/FecFacetDrawerGL.cpp2
-rw-r--r--scilab/modules/renderer/src/jni/FecFacetDrawerGL.hxx2
-rw-r--r--scilab/modules/renderer/src/jni/FecLineDrawerGL.cpp2
-rw-r--r--scilab/modules/renderer/src/jni/FecLineDrawerGL.hxx2
-rw-r--r--scilab/modules/renderer/src/jni/FilledTextDrawerGL.cpp14
-rw-r--r--scilab/modules/renderer/src/jni/FilledTextDrawerGL.hxx2
-rw-r--r--scilab/modules/renderer/src/jni/FullBoxDrawerGL.cpp2
-rw-r--r--scilab/modules/renderer/src/jni/FullBoxDrawerGL.hxx2
-rw-r--r--scilab/modules/renderer/src/jni/GraphicSynchronizerJava.cpp2
-rw-r--r--scilab/modules/renderer/src/jni/GraphicSynchronizerJava.hxx2
-rw-r--r--scilab/modules/renderer/src/jni/GridDrawerGL.cpp2
-rw-r--r--scilab/modules/renderer/src/jni/GridDrawerGL.hxx2
-rw-r--r--scilab/modules/renderer/src/jni/HalfBoxDrawerGL.cpp2
-rw-r--r--scilab/modules/renderer/src/jni/HalfBoxDrawerGL.hxx2
-rw-r--r--scilab/modules/renderer/src/jni/IsoViewCameraGL.cpp30
-rw-r--r--scilab/modules/renderer/src/jni/IsoViewCameraGL.hxx2
-rw-r--r--scilab/modules/renderer/src/jni/IsometricCameraGL.cpp30
-rw-r--r--scilab/modules/renderer/src/jni/IsometricCameraGL.hxx2
-rw-r--r--scilab/modules/renderer/src/jni/PolylineArrowDrawerGL.cpp2
-rw-r--r--scilab/modules/renderer/src/jni/PolylineArrowDrawerGL.hxx2
-rw-r--r--scilab/modules/renderer/src/jni/PolylineBarDrawerGL.cpp2
-rw-r--r--scilab/modules/renderer/src/jni/PolylineBarDrawerGL.hxx2
-rw-r--r--scilab/modules/renderer/src/jni/PolylineFillDrawerGL.cpp2
-rw-r--r--scilab/modules/renderer/src/jni/PolylineFillDrawerGL.hxx2
-rw-r--r--scilab/modules/renderer/src/jni/PolylineInterpColorDrawerGL.cpp2
-rw-r--r--scilab/modules/renderer/src/jni/PolylineInterpColorDrawerGL.hxx2
-rw-r--r--scilab/modules/renderer/src/jni/PolylineLineDrawerGL.cpp2
-rw-r--r--scilab/modules/renderer/src/jni/PolylineLineDrawerGL.hxx2
-rw-r--r--scilab/modules/renderer/src/jni/PolylineMarkDrawerGL.cpp2
-rw-r--r--scilab/modules/renderer/src/jni/PolylineMarkDrawerGL.hxx2
-rw-r--r--scilab/modules/renderer/src/jni/RectangleFillDrawerGL.cpp2
-rw-r--r--scilab/modules/renderer/src/jni/RectangleFillDrawerGL.hxx2
-rw-r--r--scilab/modules/renderer/src/jni/RectangleLineDrawerGL.cpp2
-rw-r--r--scilab/modules/renderer/src/jni/RectangleLineDrawerGL.hxx2
-rw-r--r--scilab/modules/renderer/src/jni/RectangleMarkDrawerGL.cpp2
-rw-r--r--scilab/modules/renderer/src/jni/RectangleMarkDrawerGL.hxx2
-rw-r--r--scilab/modules/renderer/src/jni/RenderingChecker.cpp2
-rw-r--r--scilab/modules/renderer/src/jni/RenderingChecker.hxx2
-rw-r--r--scilab/modules/renderer/src/jni/SegsArrowDrawerGL.cpp2
-rw-r--r--scilab/modules/renderer/src/jni/SegsArrowDrawerGL.hxx2
-rw-r--r--scilab/modules/renderer/src/jni/SegsLineDrawerGL.cpp2
-rw-r--r--scilab/modules/renderer/src/jni/SegsLineDrawerGL.hxx2
-rw-r--r--scilab/modules/renderer/src/jni/SegsMarkDrawerGL.cpp2
-rw-r--r--scilab/modules/renderer/src/jni/SegsMarkDrawerGL.hxx2
-rw-r--r--scilab/modules/renderer/src/jni/StandardTextDrawerGL.cpp14
-rw-r--r--scilab/modules/renderer/src/jni/StandardTextDrawerGL.hxx2
-rw-r--r--scilab/modules/renderer/src/jni/SubwinBackgroundDrawerGL.cpp2
-rw-r--r--scilab/modules/renderer/src/jni/SubwinBackgroundDrawerGL.hxx2
-rw-r--r--scilab/modules/renderer/src/jni/SurfaceFacetDrawerGL.cpp2
-rw-r--r--scilab/modules/renderer/src/jni/SurfaceFacetDrawerGL.hxx2
-rw-r--r--scilab/modules/renderer/src/jni/SurfaceLineDrawerGL.cpp2
-rw-r--r--scilab/modules/renderer/src/jni/SurfaceLineDrawerGL.hxx2
-rw-r--r--scilab/modules/renderer/src/jni/SurfaceMarkDrawerGL.cpp2
-rw-r--r--scilab/modules/renderer/src/jni/SurfaceMarkDrawerGL.hxx2
-rw-r--r--scilab/modules/renderer/src/jni/TicksDrawerGL.cpp2
-rw-r--r--scilab/modules/renderer/src/jni/TicksDrawerGL.hxx2
-rw-r--r--scilab/modules/renderer/src/jni/XlFontManager.cpp2
-rw-r--r--scilab/modules/renderer/src/jni/XlFontManager.hxx2
-rw-r--r--scilab/modules/scicos/Makefile.in15
-rw-r--r--scilab/modules/scicos/demos/scicos_learn.sci6
-rw-r--r--scilab/modules/scicos/demos/scicos_play.sci8
-rw-r--r--scilab/modules/scicos_blocks/Makefile.in2142
-rw-r--r--scilab/modules/scipad/Makefile.in22
-rw-r--r--scilab/modules/scipad/tests/nonreg_tests/bug_3394.tst6
-rw-r--r--scilab/modules/shell/Makefile.in15
-rw-r--r--scilab/modules/signal_processing/Makefile.in412
-rw-r--r--scilab/modules/simulated_annealing/Makefile.in15
-rw-r--r--scilab/modules/sound/Makefile.in216
-rw-r--r--scilab/modules/sound/sci_gateway/c/gw_sound.c10
-rw-r--r--scilab/modules/sound/sci_gateway/c/sci_PlaySound.c8
-rw-r--r--scilab/modules/sound/sci_gateway/c/sci_beep.c10
-rw-r--r--scilab/modules/sparse/Makefile.in638
-rw-r--r--scilab/modules/special_functions/Makefile.in316
-rw-r--r--scilab/modules/spreadsheet/Makefile.in264
-rw-r--r--scilab/modules/statistics/Makefile.in406
-rw-r--r--scilab/modules/string/Makefile.in538
-rw-r--r--scilab/modules/string/sci_gateway/c/gw_string.c8
-rw-r--r--scilab/modules/string/sci_gateway/c/sci_length.c26
-rw-r--r--scilab/modules/string/sci_gateway/c/sci_strsplit.c36
-rw-r--r--scilab/modules/string/sci_gateway/c/sci_strsubst.c49
-rw-r--r--scilab/modules/symbolic/Makefile.in236
-rw-r--r--scilab/modules/tclsci/Makefile.in413
-rw-r--r--scilab/modules/tclsci/help/en_US/TCL_EvalFile.xml2
-rw-r--r--scilab/modules/tclsci/help/en_US/tk_getfile.xml108
-rw-r--r--scilab/modules/tclsci/macros/tk_getdir.sci1
-rw-r--r--scilab/modules/tclsci/macros/tk_getfile.sci60
-rw-r--r--scilab/modules/tclsci/macros/tk_savefile.sci1
-rw-r--r--scilab/modules/tclsci/tests/nonreg_tests/bug_573.tst36
-rw-r--r--scilab/modules/texmacs/Makefile.in15
-rw-r--r--scilab/modules/time/Makefile.in15
-rw-r--r--scilab/modules/umfpack/Makefile.in300
-rw-r--r--scilab/modules/umfpack/macros/scisptdemo.sci2
-rw-r--r--scilab/modules/windows_tools/Makefile.in204
-rw-r--r--scilab/modules/windows_tools/sci_gateway/c/gw_windows_tools.c8
-rw-r--r--scilab/modules/windows_tools/sci_gateway/c/sci_dos.c26
-rw-r--r--scilab/modules/windows_tools/src/c/scilab_windows/FilesAssociations.c15
-rw-r--r--scilab/modules/xcos/Makefile.in16
-rw-r--r--scilab/modules/xpad/Makefile.am4
-rw-r--r--scilab/modules/xpad/Makefile.in250
-rw-r--r--scilab/modules/xpad/etc/xpad.quit2
-rw-r--r--scilab/modules/xpad/etc/xpad.start4
-rw-r--r--scilab/modules/xpad/etc/xpadConfiguration.xml (renamed from scilab/modules/xpad/etc/configuration_xpad.xml)0
-rw-r--r--scilab/modules/xpad/help/en_US/addchapter.sce (renamed from scilab/modules/graphics/macros/set_posfig_dim.sci)12
-rw-r--r--scilab/modules/xpad/help/en_US/edit_error.xml78
-rw-r--r--scilab/modules/xpad/help/fr_FR/addchapter.sce11
-rw-r--r--scilab/modules/xpad/help/pt_BR/addchapter.sce11
-rw-r--r--scilab/modules/xpad/license.txt10
-rw-r--r--scilab/modules/xpad/macros/buildmacros.sce2
-rw-r--r--scilab/modules/xpad/macros/edit_error.sci36
-rw-r--r--scilab/modules/xpad/macros/editor.sci (renamed from scilab/modules/gui/macros/x_message.sci)30
-rw-r--r--scilab/modules/xpad/sci_gateway/cpp/sci_xpad.cpp10
-rw-r--r--scilab/modules/xpad/src/c/xpad.vcproj8
-rw-r--r--scilab/modules/xpad/src/java/org/scilab/modules/xpad/Xpad.java10
-rw-r--r--scilab/modules/xpad/src/java/org/scilab/modules/xpad/XpadLineNumberPanel.java201
-rw-r--r--scilab/modules/xpad/src/java/org/scilab/modules/xpad/actions/CloseAction.java3
-rw-r--r--scilab/modules/xpad/src/java/org/scilab/modules/xpad/actions/CommentAction.java39
-rw-r--r--scilab/modules/xpad/src/java/org/scilab/modules/xpad/actions/CopyAction.java3
-rw-r--r--scilab/modules/xpad/src/java/org/scilab/modules/xpad/actions/CutAction.java3
-rw-r--r--scilab/modules/xpad/src/java/org/scilab/modules/xpad/actions/ExitAction.java3
-rw-r--r--scilab/modules/xpad/src/java/org/scilab/modules/xpad/actions/FindAction.java101
-rw-r--r--scilab/modules/xpad/src/java/org/scilab/modules/xpad/actions/GotoLineAction.java18
-rw-r--r--scilab/modules/xpad/src/java/org/scilab/modules/xpad/actions/HighlightCurrentLineAction.java3
-rw-r--r--scilab/modules/xpad/src/java/org/scilab/modules/xpad/actions/IndentAction.java3
-rw-r--r--scilab/modules/xpad/src/java/org/scilab/modules/xpad/actions/LineNumbersAction.java5
-rw-r--r--scilab/modules/xpad/src/java/org/scilab/modules/xpad/actions/NewAction.java3
-rw-r--r--scilab/modules/xpad/src/java/org/scilab/modules/xpad/actions/NextTabAction.java3
-rw-r--r--scilab/modules/xpad/src/java/org/scilab/modules/xpad/actions/OpenAction.java3
-rw-r--r--scilab/modules/xpad/src/java/org/scilab/modules/xpad/actions/PasteAction.java3
-rw-r--r--scilab/modules/xpad/src/java/org/scilab/modules/xpad/actions/PreviousTabAction.java3
-rw-r--r--scilab/modules/xpad/src/java/org/scilab/modules/xpad/actions/PrintAction.java3
-rw-r--r--scilab/modules/xpad/src/java/org/scilab/modules/xpad/actions/PrintPreviewAction.java3
-rw-r--r--scilab/modules/xpad/src/java/org/scilab/modules/xpad/actions/RedoAction.java3
-rw-r--r--scilab/modules/xpad/src/java/org/scilab/modules/xpad/actions/SaveAction.java3
-rw-r--r--scilab/modules/xpad/src/java/org/scilab/modules/xpad/actions/SaveAsAction.java3
-rw-r--r--scilab/modules/xpad/src/java/org/scilab/modules/xpad/actions/SelectAllAction.java3
-rw-r--r--scilab/modules/xpad/src/java/org/scilab/modules/xpad/actions/TabifyAction.java64
-rw-r--r--scilab/modules/xpad/src/java/org/scilab/modules/xpad/actions/UnCommentAction.java48
-rw-r--r--scilab/modules/xpad/src/java/org/scilab/modules/xpad/actions/UnTabifyAction.java65
-rw-r--r--scilab/modules/xpad/src/java/org/scilab/modules/xpad/actions/UndoAction.java3
-rw-r--r--scilab/modules/xpad/src/java/org/scilab/modules/xpad/style/ScilabStyleDocument.java644
-rw-r--r--scilab/modules/xpad/src/java/org/scilab/modules/xpad/utils/ConfigXpadManager.java4
-rw-r--r--scilab/modules/xpad/src/java/org/scilab/modules/xpad/utils/XpadMessages.java4
-rw-r--r--scilab/modules/xpad/src/jni/GiwsException.cpp354
-rw-r--r--scilab/modules/xpad/src/jni/GiwsException.hxx243
-rw-r--r--scilab/modules/xpad/src/jni/Xpad.cpp56
-rw-r--r--scilab/modules/xpad/src/jni/Xpad.hxx4
-rw-r--r--scilab/modules/xpad/tests/nonreg_tests/bug_4862.tst (renamed from scilab/modules/scipad/tests/nonreg_tests/bug_3553.tst)20
-rw-r--r--scilab/modules/xpad/tests/nonreg_tests/bug_4863.tst20
-rw-r--r--scilab/modules/xpad/tests/nonreg_tests/bug_4870.tst22
-rw-r--r--scilab/modules/xpad/tests/nonreg_tests/bug_4876.tst23
-rw-r--r--scilab/modules/xpad/tests/nonreg_tests/bug_4877.tst22
-rw-r--r--scilab/modules/xpad/tests/nonreg_tests/bug_4878.tst27
-rw-r--r--scilab/modules/xpad/tests/nonreg_tests/bug_4879.tst22
-rw-r--r--scilab/modules/xpad/tests/nonreg_tests/bug_4880.tst23
-rw-r--r--scilab/modules/xpad/tests/nonreg_tests/bug_4881.tst30
-rw-r--r--scilab/modules/xpad/tests/nonreg_tests/bug_4887.tst24
-rw-r--r--scilab/modules/xpad/tests/nonreg_tests/bug_4892.tst29
-rw-r--r--scilab/modules/xpad/xpad.iss12
-rw-r--r--scilab/scilab-lib.properties.in6
-rw-r--r--scilab_doc/neldermead/acknowledgments.tex5
-rw-r--r--scilab_doc/neldermead/fminsearch-so.pdfbin108029 -> 204275 bytes
-rw-r--r--scilab_doc/neldermead/fminsearch.tex444
-rw-r--r--scilab_doc/neldermead/macros.tex73
-rw-r--r--scilab_doc/neldermead/method-spendley.tex111
-rw-r--r--scilab_doc/neldermead/neldermead-bibliography-so.pdfbin0 -> 147878 bytes
-rw-r--r--scilab_doc/neldermead/neldermead-bibliography-so.tex84
-rw-r--r--scilab_doc/neldermead/neldermead-spendley-so.pdfbin301166 -> 301107 bytes
-rw-r--r--scilab_doc/neldermead/neldermead.bib72
-rw-r--r--scilab_doc/neldermead/nmbibliography.tex134
-rw-r--r--scilab_doc/neldermead/scripts/fminsearch_demo.m78
-rw-r--r--scilab_doc/neldermead/scripts/fminsearch_rosenbrock.m26
-rw-r--r--scilab_doc/neldermead/scripts/fminsearch_rosenbrock.sce32
-rw-r--r--scilab_doc/neldermead/scripts/onehump.m (renamed from scilab_doc/neldermead/scripts/fminsearch_banana.m)9
-rw-r--r--scilab_doc/neldermead/scripts/outfun.m16
-rw-r--r--scilab_doc/neldermead/testFminsearchOptimplotfvalMatlab.pngbin0 -> 6249 bytes
-rw-r--r--scilab_doc/neldermead/testFminsearchOptimplotfvalScilab.pngbin0 -> 4682 bytes
-rw-r--r--scilab_doc/neldermead/testFminsearchPlotMatlab.pngbin0 -> 3391 bytes
-rw-r--r--scilab_doc/neldermead/testFminsearchPlotScilab.pngbin0 -> 3517 bytes
481 files changed, 20814 insertions, 15851 deletions
diff --git a/scilab/CHANGES_5.2.X b/scilab/CHANGES_5.2.X
index 5cbf10e..651bba5 100644
--- a/scilab/CHANGES_5.2.X
+++ b/scilab/CHANGES_5.2.X
@@ -7,6 +7,7 @@ Xcos:
7 7
8TODO: add an explanation about xscos 8TODO: add an explanation about xscos
9 9
10
10ATOMS: 11ATOMS:
11====== 12======
12 13
@@ -21,6 +22,9 @@ TODO: add an explanation about xpad
21Introduction of new binaries: 22Introduction of new binaries:
22============================= 23=============================
23 24
25The goal of these changes is to improve the capabilities to use Scilab
26in different environnements and use cases.
27
24* Scilab 5.2 introduces new binaries in the distribution: 28* Scilab 5.2 introduces new binaries in the distribution:
25 29
26 - classical - The GUI application (equivalent to Scilab Standard Mode). 30 - classical - The GUI application (equivalent to Scilab Standard Mode).
@@ -60,17 +64,20 @@ TODO: write an introduction about all that
60 - manages all Scilab data types 64 - manages all Scilab data types
61 - consistency over all data types 65 - consistency over all data types
62 - will be maintained over future versions of Scilab 66 - will be maintained over future versions of Scilab
67 - error management
63 - fully documented 68 - fully documented
64 - fully tested by unitary tests 69 - fully tested by unitary tests
65 70
66 Note that all other Scilab API (straight access to the Scilab stack, stack1, 71 Note that all other Scilab API (straight access to the Scilab stack, stack1,
67 stack2 and stack3) will be maintained in the Scilab 5.X familly but most of 72 stack2 and stack3) will be maintained in the Scilab 5.X family but most of
68 them will be dropped in the 6 family. 73 them will be dropped in the 6 family.
69 74
70* In the enum sci_types which list all Scilab datatypes, the type 75* In the enum sci_types which list all Scilab datatypes, the type
71 "sci_lufact_pointer" has been renamed to "sci_pointer". 76 "sci_lufact_pointer" has been renamed to "sci_pointer".
72 A define of "sci_lufact_pointer" on "sci_pointer" has been added to backward 77 A define of "sci_lufact_pointer" on "sci_pointer" has been added to backward
73 compatibilities. 78 compatibilities.
79 The rational is to improve the use in special case of the pointer datatype
80 to avoid memory duplication.
74 81
75TODO: talk about call scilab based on api_scilab 82TODO: talk about call scilab based on api_scilab
76 83
@@ -113,6 +120,9 @@ libs/MALLOC/Makefile.am and launch autoreconf.
113toolbox_skeleton: 120toolbox_skeleton:
114================= 121=================
115 122
123The toolbox skeleton is an example of standard toolbox which shows most of the
124use cases.
125
116* examples of gateways functions (c_sum, f_sum, cpp_find) rewritten with new API. 126* examples of gateways functions (c_sum, f_sum, cpp_find) rewritten with new API.
117 127
118* cleaner added 128* cleaner added
@@ -358,6 +368,8 @@ Bug fixes:
358 368
359* bug 4030 fixed - unix_w('dir /s') can display strange matrix on windows. 369* bug 4030 fixed - unix_w('dir /s') can display strange matrix on windows.
360 370
371* bug 4087 fixed - Under Mac OS X, a Apple + C shortcut (Ctrl + C) didn't work from the console.
372
361* bug 4090 fixed - draw does not work any more while inside drawlater/drawnow scope. 373* bug 4090 fixed - draw does not work any more while inside drawlater/drawnow scope.
362 374
363* bug 4110 fixed - Demos order differs between Linux and Windows versions 375* bug 4110 fixed - Demos order differs between Linux and Windows versions
@@ -546,3 +558,4 @@ Bug fixes:
546 558
547* bug 4853 fixed - C,C++ dlls generated by scilab had a dependency on fortran runtime (windows). 559* bug 4853 fixed - C,C++ dlls generated by scilab had a dependency on fortran runtime (windows).
548 560
561* bug 4892 fixed - Xpad : Command+X shortcuts was not managed
diff --git a/scilab/Makefile.in b/scilab/Makefile.in
index 4793468..474a349 100644
--- a/scilab/Makefile.in
+++ b/scilab/Makefile.in
@@ -75,7 +75,7 @@ DIST_COMMON = $(am__configure_deps) $(srcdir)/Makefile.am \
75 $(top_srcdir)/modules/jvm/etc/jvm_options.xml.in COPYING \ 75 $(top_srcdir)/modules/jvm/etc/jvm_options.xml.in COPYING \
76 config/compile config/config.guess config/config.rpath \ 76 config/compile config/config.guess config/config.rpath \
77 config/config.sub config/depcomp config/install-sh \ 77 config/config.sub config/depcomp config/install-sh \
78 config/ltmain.sh config/missing 78 config/ltmain.sh config/missing config/mkinstalldirs
79ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 79ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
80am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \ 80am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \
81 $(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \ 81 $(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \
@@ -94,7 +94,7 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
94 $(ACLOCAL_M4) 94 $(ACLOCAL_M4)
95am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ 95am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
96 configure.lineno config.status.lineno 96 configure.lineno config.status.lineno
97mkinstalldirs = $(install_sh) -d 97mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
98CONFIG_HEADER = $(top_builddir)/modules/core/includes/machine.h 98CONFIG_HEADER = $(top_builddir)/modules/core/includes/machine.h
99CONFIG_CLEAN_FILES = modules/helptools/macros/xmlfiletohtml.sci \ 99CONFIG_CLEAN_FILES = modules/helptools/macros/xmlfiletohtml.sci \
100 scilab.pc etc/modules.xml etc/classpath.xml \ 100 scilab.pc etc/modules.xml etc/classpath.xml \
@@ -314,6 +314,7 @@ ACLOCAL = @ACLOCAL@
314ALL_LINGUAS = @ALL_LINGUAS@ 314ALL_LINGUAS = @ALL_LINGUAS@
315AMTAR = @AMTAR@ 315AMTAR = @AMTAR@
316ANT = @ANT@ 316ANT = @ANT@
317ANTLR = @ANTLR@
317AR = @AR@ 318AR = @AR@
318AUTOCONF = @AUTOCONF@ 319AUTOCONF = @AUTOCONF@
319AUTOHEADER = @AUTOHEADER@ 320AUTOHEADER = @AUTOHEADER@
@@ -325,6 +326,8 @@ BLAS_LIBS = @BLAS_LIBS@
325CC = @CC@ 326CC = @CC@
326CCDEPMODE = @CCDEPMODE@ 327CCDEPMODE = @CCDEPMODE@
327CFLAGS = @CFLAGS@ 328CFLAGS = @CFLAGS@
329CHECKSTYLE = @CHECKSTYLE@
330COMMONS_BEANUTILS = @COMMONS_BEANUTILS@
328COMMONS_IO = @COMMONS_IO@ 331COMMONS_IO = @COMMONS_IO@
329COMMONS_LOGGING = @COMMONS_LOGGING@ 332COMMONS_LOGGING = @COMMONS_LOGGING@
330CPP = @CPP@ 333CPP = @CPP@
@@ -453,12 +456,12 @@ RT_LIB = @RT_LIB@
453SAXON = @SAXON@ 456SAXON = @SAXON@
454SCICOS_ENABLE = @SCICOS_ENABLE@ 457SCICOS_ENABLE = @SCICOS_ENABLE@
455SCILAB_LIBRARY_VERSION = @SCILAB_LIBRARY_VERSION@ 458SCILAB_LIBRARY_VERSION = @SCILAB_LIBRARY_VERSION@
456SCIPAD_ENABLE = @SCIPAD_ENABLE@
457SED = @SED@ 459SED = @SED@
458SET_MAKE = @SET_MAKE@ 460SET_MAKE = @SET_MAKE@
459SET_RELOCATABLE = @SET_RELOCATABLE@ 461SET_RELOCATABLE = @SET_RELOCATABLE@
460SHELL = @SHELL@ 462SHELL = @SHELL@
461SKINLF = @SKINLF@ 463SKINLF = @SKINLF@
464SPLINT = @SPLINT@
462STRIP = @STRIP@ 465STRIP = @STRIP@
463SWIG_BIN = @SWIG_BIN@ 466SWIG_BIN = @SWIG_BIN@
464SWIG_JAVA = @SWIG_JAVA@ 467SWIG_JAVA = @SWIG_JAVA@
diff --git a/scilab/Makefile.incl.am b/scilab/Makefile.incl.am
index f946ffd..6f64624 100644
--- a/scilab/Makefile.incl.am
+++ b/scilab/Makefile.incl.am
@@ -27,10 +27,12 @@ check-local: $(top_builddir)/scilab-bin
27# splint options 27# splint options
28SPLINT_OPTIONS=-weak -booltype BOOL 28SPLINT_OPTIONS=-weak -booltype BOOL
29check-code: 29check-code:
30 @if test -f build.xml; then \ 30 if test -f build.xml; then \
31 $(ANT) checkstyle; \ 31 $(ANT) checkstyle; \
32 fi;\ 32 fi
33 splint $(SPLINT_OPTIONS) -I$(top_srcdir)/modules/core/includes/ -I$(top_srcdir)/libs/MALLOC/includes/ -I$(top_srcdir)/modules/localization/includes/ $(INCLUDE_FLAGS) $(CHECK_SRC) 33 if test -x "$(SPLINT)"; then \
34 $(SPLINT) $(SPLINT_OPTIONS) -I$(top_srcdir)/modules/core/includes/ -I$(top_srcdir)/libs/MALLOC/includes/ -I$(top_srcdir)/modules/localization/includes/ $(INCLUDE_FLAGS) $(CHECK_SRC); \
35 fi
34 36
35 37
36########################### JAVA ###################################### 38########################### JAVA ######################################
diff --git a/scilab/RELEASE_NOTES_5.2.X b/scilab/RELEASE_NOTES_5.2.X
index dcd4b0e..fd45b24 100644
--- a/scilab/RELEASE_NOTES_5.2.X
+++ b/scilab/RELEASE_NOTES_5.2.X
@@ -11,4 +11,12 @@ Known incompatibilities:
11 11
12- 'sort' is obsolete. see 'gsort'. 12- 'sort' is obsolete. see 'gsort'.
13 13
14- 'getf' is obsolete. see 'exec'. \ No newline at end of file 14- 'getf' is obsolete. see 'exec'.
15
16- Removed functions, previously declared obsoletes:
17 'mtlb_eig' to replace by 'spec'.
18 'set_posfig_dim' to replace by 'figure_size' property.
19 'xclip' to replace by 'clip_state' and 'clip_box' properties.
20 'xgetfile' to replace by 'uigetfile'.
21 'tk_getfile' to replace by 'uigetfile'.
22 'x_message' to replace by 'messagebox'. \ No newline at end of file
diff --git a/scilab/build.incl.xml b/scilab/build.incl.xml
index d223ed1..18d255a 100644
--- a/scilab/build.incl.xml
+++ b/scilab/build.incl.xml
@@ -39,6 +39,9 @@
39 39
40 <path id="checkstyle.classpath"> 40 <path id="checkstyle.classpath">
41 <pathelement location="${checkstyle.jar}"/> 41 <pathelement location="${checkstyle.jar}"/>
42 <pathelement location="${commons-logging.jar}"/>
43 <pathelement location="${commons-beanutils.jar}"/>
44 <pathelement location="${antlr.jar}"/>
42 </path> 45 </path>
43 46
44 <path id="compile.classpath"> 47 <path id="compile.classpath">
diff --git a/scilab/configure b/scilab/configure
index 5f17b39..7d178d8 100755
--- a/scilab/configure
+++ b/scilab/configure
@@ -605,6 +605,7 @@ gt_needs=
605ac_subst_vars='am__EXEEXT_FALSE 605ac_subst_vars='am__EXEEXT_FALSE
606am__EXEEXT_TRUE 606am__EXEEXT_TRUE
607LTLIBOBJS 607LTLIBOBJS
608SPLINT
608ENABLE_STATIC_FALSE 609ENABLE_STATIC_FALSE
609ENABLE_STATIC_TRUE 610ENABLE_STATIC_TRUE
610CXXCPP 611CXXCPP
@@ -624,7 +625,6 @@ SED
624LIBTOOL 625LIBTOOL
625GRAPHICS_ENABLE 626GRAPHICS_ENABLE
626DEMOTOOLS_ENABLE 627DEMOTOOLS_ENABLE
627SCIPAD_ENABLE
628JAVASCI_ENABLE 628JAVASCI_ENABLE
629INSTALL_HELP_XML_FALSE 629INSTALL_HELP_XML_FALSE
630INSTALL_HELP_XML_TRUE 630INSTALL_HELP_XML_TRUE
@@ -737,6 +737,9 @@ JAVA_DEBUG_OPTIONS
737JAVA_HOME 737JAVA_HOME
738JAVA_JNI_LIBS 738JAVA_JNI_LIBS
739JAVA_JNI_INCLUDE 739JAVA_JNI_INCLUDE
740ANTLR
741COMMONS_BEANUTILS
742CHECKSTYLE
740COMMONS_LOGGING 743COMMONS_LOGGING
741JHDF5 744JHDF5
742JROSETTA_ENGINE 745JROSETTA_ENGINE
@@ -9808,7 +9811,7 @@ $as_echo "$ac_java_classpath" >&6; }
9808$as_echo_n "checking to see if the java compiler works... " >&6; } 9811$as_echo_n "checking to see if the java compiler works... " >&6; }
9809 9812
9810 cat << \EOF > conftest.java 9813 cat << \EOF > conftest.java
9811// #line 9811 "configure" 9814// #line 9814 "configure"
9812 9815
9813 9816
9814public class conftest { 9817public class conftest {
@@ -9856,7 +9859,7 @@ $as_echo_n "checking type of jvm... " >&6; }
9856 if test "x$ac_java_jvm_name" = "x" ; then 9859 if test "x$ac_java_jvm_name" = "x" ; then
9857 9860
9858 cat << \EOF > conftest.java 9861 cat << \EOF > conftest.java
9859// #line 9859 "configure" 9862// #line 9862 "configure"
9860import gnu.java.io.EncodingManager; 9863import gnu.java.io.EncodingManager;
9861 9864
9862public class conftest { 9865public class conftest {
@@ -9902,7 +9905,7 @@ $as_echo_n "checking java API version... " >&6; }
9902 9905
9903 9906
9904 cat << \EOF > conftest.java 9907 cat << \EOF > conftest.java
9905// #line 9905 "configure" 9908// #line 9908 "configure"
9906import java.nio.charset.Charset; 9909import java.nio.charset.Charset;
9907 9910
9908public class conftest { 9911public class conftest {
@@ -9929,7 +9932,7 @@ EOF
9929 9932
9930 9933
9931 cat << \EOF > conftest.java 9934 cat << \EOF > conftest.java
9932// #line 9932 "configure" 9935// #line 9935 "configure"
9933import java.lang.StringBuilder; 9936import java.lang.StringBuilder;
9934 9937
9935public class conftest { 9938public class conftest {
@@ -11131,7 +11134,7 @@ $as_echo_n "checking jgraphx... " >&6; }
11131 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 11134 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
11132 11135
11133 cat << \EOF > conftest.java 11136 cat << \EOF > conftest.java
11134// #line 11134 "configure" 11137// #line 11137 "configure"
11135import com.mxgraph.model.mxCell; 11138import com.mxgraph.model.mxCell;
11136 11139
11137public class conftest { 11140public class conftest {
@@ -11203,7 +11206,7 @@ $as_echo_n "checking flexdock... " >&6; }
11203 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 11206 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
11204 11207
11205 cat << \EOF > conftest.java 11208 cat << \EOF > conftest.java
11206// #line 11206 "configure" 11209// #line 11209 "configure"
11207import org.flexdock.docking.DockingManager; 11210import org.flexdock.docking.DockingManager;
11208 11211
11209public class conftest { 11212public class conftest {
@@ -11275,7 +11278,7 @@ $as_echo_n "checking looks... " >&6; }
11275 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 11278 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
11276 11279
11277 cat << \EOF > conftest.java 11280 cat << \EOF > conftest.java
11278// #line 11278 "configure" 11281// #line 11281 "configure"
11279import com.jgoodies.looks.common.RenderingUtils; 11282import com.jgoodies.looks.common.RenderingUtils;
11280 11283
11281public class conftest { 11284public class conftest {
@@ -11347,7 +11350,7 @@ $as_echo_n "checking jgoodies-looks... " >&6; }
11347 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 11350 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
11348 11351
11349 cat << \EOF > conftest.java 11352 cat << \EOF > conftest.java
11350// #line 11350 "configure" 11353// #line 11353 "configure"
11351import com.jgoodies.looks.common.RenderingUtils; 11354import com.jgoodies.looks.common.RenderingUtils;
11352 11355
11353public class conftest { 11356public class conftest {
@@ -11420,7 +11423,7 @@ $as_echo_n "checking skinlf... " >&6; }
11420 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 11423 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
11421 11424
11422 cat << \EOF > conftest.java 11425 cat << \EOF > conftest.java
11423// #line 11423 "configure" 11426// #line 11426 "configure"
11424import com.l2fprod.util.AccessUtils; 11427import com.l2fprod.util.AccessUtils;
11425 11428
11426public class conftest { 11429public class conftest {
@@ -11492,7 +11495,7 @@ $as_echo_n "checking jogl... " >&6; }
11492 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 11495 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
11493 11496
11494 cat << \EOF > conftest.java 11497 cat << \EOF > conftest.java
11495// #line 11495 "configure" 11498// #line 11498 "configure"
11496import javax.media.opengl.glu.GLUnurbs; 11499import javax.media.opengl.glu.GLUnurbs;
11497 11500
11498public class conftest { 11501public class conftest {
@@ -11564,7 +11567,7 @@ $as_echo_n "checking jhall... " >&6; }
11564 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 11567 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
11565 11568
11566 cat << \EOF > conftest.java 11569 cat << \EOF > conftest.java
11567// #line 11567 "configure" 11570// #line 11570 "configure"
11568import javax.help.JHelp; 11571import javax.help.JHelp;
11569 11572
11570public class conftest { 11573public class conftest {
@@ -11636,7 +11639,7 @@ $as_echo_n "checking javahelp2... " >&6; }
11636 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 11639 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
11637 11640
11638 cat << \EOF > conftest.java 11641 cat << \EOF > conftest.java
11639// #line 11639 "configure" 11642// #line 11642 "configure"
11640import javax.help.JHelp; 11643import javax.help.JHelp;
11641 11644
11642public class conftest { 11645public class conftest {
@@ -11709,7 +11712,7 @@ $as_echo_n "checking gluegen-rt... " >&6; }
11709 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 11712 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
11710 11713
11711 cat << \EOF > conftest.java 11714 cat << \EOF > conftest.java
11712// #line 11712 "configure" 11715// #line 11715 "configure"
11713import com.sun.gluegen.runtime.CPU; 11716import com.sun.gluegen.runtime.CPU;
11714 11717
11715public class conftest { 11718public class conftest {
@@ -11781,7 +11784,7 @@ $as_echo_n "checking jrosetta-API... " >&6; }
11781 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 11784 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
11782 11785
11783 cat << \EOF > conftest.java 11786 cat << \EOF > conftest.java
11784// #line 11784 "configure" 11787// #line 11787 "configure"
11785import com.artenum.rosetta.interfaces.core.ConsoleConfiguration; 11788import com.artenum.rosetta.interfaces.core.ConsoleConfiguration;
11786 11789
11787public class conftest { 11790public class conftest {
@@ -11853,7 +11856,7 @@ $as_echo_n "checking jrosetta-engine... " >&6; }
11853 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 11856 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
11854 11857
11855 cat << \EOF > conftest.java 11858 cat << \EOF > conftest.java
11856// #line 11856 "configure" 11859// #line 11859 "configure"
11857import com.artenum.rosetta.core.action.AbstractConsoleAction; 11860import com.artenum.rosetta.core.action.AbstractConsoleAction;
11858 11861
11859public class conftest { 11862public class conftest {
@@ -11926,7 +11929,7 @@ $as_echo_n "checking jhdf5... " >&6; }
11926 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 11929 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
11927 11930
11928 cat << \EOF > conftest.java 11931 cat << \EOF > conftest.java
11929// #line 11929 "configure" 11932// #line 11932 "configure"
11930import ncsa.hdf.hdf5lib.HDF5Constants; 11933import ncsa.hdf.hdf5lib.HDF5Constants;
11931 11934
11932public class conftest { 11935public class conftest {
@@ -11999,7 +12002,7 @@ $as_echo_n "checking commons-logging... " >&6; }
11999 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 12002 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
12000 12003
12001 cat << \EOF > conftest.java 12004 cat << \EOF > conftest.java
12002// #line 12002 "configure" 12005// #line 12005 "configure"
12003import org.apache.commons.logging.LogFactory; 12006import org.apache.commons.logging.LogFactory;
12004 12007
12005public class conftest { 12008public class conftest {
@@ -12056,6 +12059,223 @@ $as_echo "#define WITH_GUI /**/" >>confdefs.h
12056 12059
12057 12060
12058 fi 12061 fi
12062
12063 # Checkstyle (code checking)
12064
12065 { $as_echo "$as_me:${as_lineno-$LINENO}: checking checkstyle" >&5
12066$as_echo_n "checking checkstyle... " >&6; }
12067 PACKAGE_JAR_FILE=
12068 found_jar=no
12069 saved_ac_java_classpath=$ac_java_classpath
12070 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)"
12071 for jardir in "`pwd`/thirdparty" "`pwd`/jar" $DEFAULT_JAR_DIR "$_user_libdir"; do
12072 for jar in "$jardir/checkstyle.jar" "$jardir/libcheckstyle.jar" "$jardir/libcheckstyle-java.jar" "$jardir/checkstyle*.jar"; do
12073# jar=`echo $jar|sed -e 's/ /\\ /'`
12074# echo "protected $jar"
12075# jar_resolved=`ls $jar 2>/dev/null`
12076# echo "looking for $jar_resolved"
12077# TODO check the behaviour when spaces
12078 jar_resolved=`ls $jar 2>/dev/null`
12079 if test -e "$jar_resolved"; then
12080 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
12081
12082 cat << \EOF > conftest.java
12083// #line 12083 "configure"
12084import com.puppycrawl.tools.checkstyle.CheckStyleTask;
12085
12086public class conftest {
12087 public static void main(String[] argv) {
12088
12089 }
12090}
12091EOF
12092
12093 CLASSPATH=$ac_java_classpath
12094 export CLASSPATH
12095 cmd="$JAVAC ${JAVAC_FLAGS} conftest.java"
12096 if (echo $cmd >&5 ; eval $cmd >&5 2>&5) ; then
12097 echo "yes" >&5
12098
12099 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $jar_resolved" >&5
12100$as_echo "$jar_resolved" >&6; }
12101 found_jar=yes
12102 PACKAGE_JAR_FILE=$jar_resolved
12103 break
12104
12105 else
12106 echo "configure: failed program was:" >&5
12107 cat conftest.java >&5
12108 echo "configure: CLASSPATH was $CLASSPATH" >&5
12109
12110 ac_java_classpath=$saved_ac_java_classpath
12111
12112
12113 fi
12114
12115 fi
12116 done
12117 if test "$found_jar" = "yes"; then
12118 break
12119 fi
12120 done
12121 if test "$found_jar" = "no"; then
12122 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
12123$as_echo "no" >&6; }
12124 if test ""yes"" = "yes"; then
12125 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Could not find or use the Java package/jar checkstyle used by Checkstyle - code checking (looking for package com.puppycrawl.tools.checkstyle.CheckStyleTask)" >&5
12126$as_echo "$as_me: WARNING: Could not find or use the Java package/jar checkstyle used by Checkstyle - code checking (looking for package com.puppycrawl.tools.checkstyle.CheckStyleTask)" >&2;}
12127 else
12128 as_fn_error "Could not find or use the Java package/jar checkstyle used by Checkstyle - code checking (looking for package com.puppycrawl.tools.checkstyle.CheckStyleTask)" "$LINENO" 5
12129 fi
12130 fi
12131
12132 CHECKSTYLE=$PACKAGE_JAR_FILE
12133
12134
12135 # Commons beanutils (dependency of checkstyle)
12136
12137 { $as_echo "$as_me:${as_lineno-$LINENO}: checking commons-beanutils" >&5
12138$as_echo_n "checking commons-beanutils... " >&6; }
12139 PACKAGE_JAR_FILE=
12140 found_jar=no
12141 saved_ac_java_classpath=$ac_java_classpath
12142 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)"
12143 for jardir in "`pwd`/thirdparty" "`pwd`/jar" $DEFAULT_JAR_DIR "$_user_libdir"; do
12144 for jar in "$jardir/commons-beanutils.jar" "$jardir/libcommons-beanutils.jar" "$jardir/libcommons-beanutils-java.jar" "$jardir/commons-beanutils*.jar"; do
12145# jar=`echo $jar|sed -e 's/ /\\ /'`
12146# echo "protected $jar"
12147# jar_resolved=`ls $jar 2>/dev/null`
12148# echo "looking for $jar_resolved"
12149# TODO check the behaviour when spaces
12150 jar_resolved=`ls $jar 2>/dev/null`
12151 if test -e "$jar_resolved"; then
12152 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
12153
12154 cat << \EOF > conftest.java
12155// #line 12155 "configure"
12156import org.apache.commons.beanutils.Converter;
12157
12158public class conftest {
12159 public static void main(String[] argv) {
12160
12161 }
12162}
12163EOF
12164
12165 CLASSPATH=$ac_java_classpath
12166 export CLASSPATH
12167 cmd="$JAVAC ${JAVAC_FLAGS} conftest.java"
12168 if (echo $cmd >&5 ; eval $cmd >&5 2>&5) ; then
12169 echo "yes" >&5
12170
12171 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $jar_resolved" >&5
12172$as_echo "$jar_resolved" >&6; }
12173 found_jar=yes
12174 PACKAGE_JAR_FILE=$jar_resolved
12175 break
12176
12177 else
12178 echo "configure: failed program was:" >&5
12179 cat conftest.java >&5
12180 echo "configure: CLASSPATH was $CLASSPATH" >&5
12181
12182 ac_java_classpath=$saved_ac_java_classpath
12183
12184
12185 fi
12186
12187 fi
12188 done
12189 if test "$found_jar" = "yes"; then
12190 break
12191 fi
12192 done
12193 if test "$found_jar" = "no"; then
12194 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
12195$as_echo "no" >&6; }
12196 if test ""yes"" = "yes"; then
12197 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Could not find or use the Java package/jar commons-beanutils used by Bean utility (looking for package org.apache.commons.beanutils.Converter)" >&5
12198$as_echo "$as_me: WARNING: Could not find or use the Java package/jar commons-beanutils used by Bean utility (looking for package org.apache.commons.beanutils.Converter)" >&2;}
12199 else
12200 as_fn_error "Could not find or use the Java package/jar commons-beanutils used by Bean utility (looking for package org.apache.commons.beanutils.Converter)" "$LINENO" 5
12201 fi
12202 fi
12203
12204 COMMONS_BEANUTILS=$PACKAGE_JAR_FILE
12205
12206
12207 # antlr (dependency of checkstyle)
12208
12209 { $as_echo "$as_me:${as_lineno-$LINENO}: checking antlr" >&5
12210$as_echo_n "checking antlr... " >&6; }
12211 PACKAGE_JAR_FILE=
12212 found_jar=no
12213 saved_ac_java_classpath=$ac_java_classpath
12214 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)"
12215 for jardir in "`pwd`/thirdparty" "`pwd`/jar" $DEFAULT_JAR_DIR "$_user_libdir"; do
12216 for jar in "$jardir/antlr.jar" "$jardir/libantlr.jar" "$jardir/libantlr-java.jar" "$jardir/antlr*.jar"; do
12217# jar=`echo $jar|sed -e 's/ /\\ /'`
12218# echo "protected $jar"
12219# jar_resolved=`ls $jar 2>/dev/null`
12220# echo "looking for $jar_resolved"
12221# TODO check the behaviour when spaces
12222 jar_resolved=`ls $jar 2>/dev/null`
12223 if test -e "$jar_resolved"; then
12224 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
12225
12226 cat << \EOF > conftest.java
12227// #line 12227 "configure"
12228import antlr.TokenStreamException;
12229
12230public class conftest {
12231 public static void main(String[] argv) {
12232
12233 }
12234}
12235EOF
12236
12237 CLASSPATH=$ac_java_classpath
12238 export CLASSPATH
12239 cmd="$JAVAC ${JAVAC_FLAGS} conftest.java"
12240 if (echo $cmd >&5 ; eval $cmd >&5 2>&5) ; then
12241 echo "yes" >&5
12242
12243 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $jar_resolved" >&5
12244$as_echo "$jar_resolved" >&6; }
12245 found_jar=yes
12246 PACKAGE_JAR_FILE=$jar_resolved
12247 break
12248
12249 else
12250 echo "configure: failed program was:" >&5
12251 cat conftest.java >&5
12252 echo "configure: CLASSPATH was $CLASSPATH" >&5
12253
12254 ac_java_classpath=$saved_ac_java_classpath
12255
12256
12257 fi
12258
12259 fi
12260 done
12261 if test "$found_jar" = "yes"; then
12262 break
12263 fi
12264 done
12265 if test "$found_jar" = "no"; then
12266 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
12267$as_echo "no" >&6; }
12268 if test ""yes"" = "yes"; then
12269 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Could not find or use the Java package/jar antlr used by language tool for constructing recognizers (looking for package antlr.TokenStreamException)" >&5
12270$as_echo "$as_me: WARNING: Could not find or use the Java package/jar antlr used by language tool for constructing recognizers (looking for package antlr.TokenStreamException)" >&2;}
12271 else
12272 as_fn_error "Could not find or use the Java package/jar antlr used by language tool for constructing recognizers (looking for package antlr.TokenStreamException)" "$LINENO" 5
12273 fi
12274 fi
12275
12276 ANTLR=$PACKAGE_JAR_FILE
12277
12278
12059 else 12279 else
12060 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Sun javac not found: I will not build the java interface" >&5 12280 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Sun javac not found: I will not build the java interface" >&5
12061$as_echo "$as_me: WARNING: Sun javac not found: I will not build the java interface" >&2;} 12281$as_echo "$as_me: WARNING: Sun javac not found: I will not build the java interface" >&2;}
@@ -20055,7 +20275,7 @@ CPPFLAGS="$CPPFLAGS -I$CHK_TCL_INCLUDE_PATH"
20055{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if tcl is version $CHK_TCL_MAJOR.$CHK_TCL_MINOR or later" >&5 20275{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if tcl is version $CHK_TCL_MAJOR.$CHK_TCL_MINOR or later" >&5
20056$as_echo_n "checking if tcl is version $CHK_TCL_MAJOR.$CHK_TCL_MINOR or later... " >&6; } 20276$as_echo_n "checking if tcl is version $CHK_TCL_MAJOR.$CHK_TCL_MINOR or later... " >&6; }
20057cat > conftest.$ac_ext <<EOF 20277cat > conftest.$ac_ext <<EOF
20058#line 20058 "configure" 20278#line 20278 "configure"
20059#include "confdefs.h" 20279#include "confdefs.h"
20060 20280
20061#include "$CHK_TCL_INCLUDE_PATH/$CHK_TCL_INC_NAME" 20281#include "$CHK_TCL_INCLUDE_PATH/$CHK_TCL_INC_NAME"
@@ -20367,7 +20587,7 @@ CPPFLAGS="$CPPFLAGS $TCL_INC_PATH -I$CHK_TK_INCLUDE_PATH $X_CFLAGS"
20367$as_echo_n "checking if tk is version $CHK_TK_MAJOR.$CHK_TK_MINOR or later... " >&6; } 20587$as_echo_n "checking if tk is version $CHK_TK_MAJOR.$CHK_TK_MINOR or later... " >&6; }
20368 20588
20369cat > conftest.$ac_ext <<EOF 20589cat > conftest.$ac_ext <<EOF
20370#line 20370 "configure" 20590#line 20590 "configure"
20371#include "confdefs.h" 20591#include "confdefs.h"
20372 20592
20373#include "$CHK_TK_INCLUDE_PATH/$CHK_TK_INC_NAME" 20593#include "$CHK_TK_INCLUDE_PATH/$CHK_TK_INC_NAME"
@@ -20948,7 +21168,7 @@ $as_echo_n "checking batik-all... " >&6; }
20948 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 21168 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
20949 21169
20950 cat << \EOF > conftest.java 21170 cat << \EOF > conftest.java
20951// #line 20951 "configure" 21171// #line 21171 "configure"
20952import org.apache.batik.parser.Parser; 21172import org.apache.batik.parser.Parser;
20953 21173
20954public class conftest { 21174public class conftest {
@@ -21020,7 +21240,7 @@ $as_echo_n "checking batik... " >&6; }
21020 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 21240 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
21021 21241
21022 cat << \EOF > conftest.java 21242 cat << \EOF > conftest.java
21023// #line 21023 "configure" 21243// #line 21243 "configure"
21024import org.apache.batik.parser.Parser; 21244import org.apache.batik.parser.Parser;
21025 21245
21026public class conftest { 21246public class conftest {
@@ -21094,7 +21314,7 @@ $as_echo_n "checking saxon... " >&6; }
21094 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 21314 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
21095 21315
21096 cat << \EOF > conftest.java 21316 cat << \EOF > conftest.java
21097// #line 21097 "configure" 21317// #line 21317 "configure"
21098import com.icl.saxon.Loader; 21318import com.icl.saxon.Loader;
21099 21319
21100public class conftest { 21320public class conftest {
@@ -21166,7 +21386,7 @@ $as_echo_n "checking fop... " >&6; }
21166 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 21386 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
21167 21387
21168 cat << \EOF > conftest.java 21388 cat << \EOF > conftest.java
21169// #line 21169 "configure" 21389// #line 21389 "configure"
21170import org.apache.fop.pdf.PDFInfo; 21390import org.apache.fop.pdf.PDFInfo;
21171 21391
21172public class conftest { 21392public class conftest {
@@ -21238,7 +21458,7 @@ $as_echo_n "checking jeuclid-core... " >&6; }
21238 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 21458 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
21239 21459
21240 cat << \EOF > conftest.java 21460 cat << \EOF > conftest.java
21241// #line 21241 "configure" 21461// #line 21461 "configure"
21242import net.sourceforge.jeuclid.LayoutContext; 21462import net.sourceforge.jeuclid.LayoutContext;
21243 21463
21244public class conftest { 21464public class conftest {
@@ -21310,7 +21530,7 @@ $as_echo_n "checking commons-io... " >&6; }
21310 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 21530 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
21311 21531
21312 cat << \EOF > conftest.java 21532 cat << \EOF > conftest.java
21313// #line 21313 "configure" 21533// #line 21533 "configure"
21314import org.apache.commons.io.output.CountingOutputStream; 21534import org.apache.commons.io.output.CountingOutputStream;
21315 21535
21316public class conftest { 21536public class conftest {
@@ -21382,7 +21602,7 @@ $as_echo_n "checking xmlgraphics-commons... " >&6; }
21382 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 21602 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
21383 21603
21384 cat << \EOF > conftest.java 21604 cat << \EOF > conftest.java
21385// #line 21385 "configure" 21605// #line 21605 "configure"
21386import org.apache.xmlgraphics.util.Service; 21606import org.apache.xmlgraphics.util.Service;
21387 21607
21388public class conftest { 21608public class conftest {
@@ -21454,7 +21674,7 @@ $as_echo_n "checking xml-apis-ext... " >&6; }
21454 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 21674 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
21455 21675
21456 cat << \EOF > conftest.java 21676 cat << \EOF > conftest.java
21457// #line 21457 "configure" 21677// #line 21677 "configure"
21458import org.w3c.dom.svg.SVGDocument; 21678import org.w3c.dom.svg.SVGDocument;
21459 21679
21460public class conftest { 21680public class conftest {
@@ -21527,7 +21747,7 @@ $as_echo_n "checking avalon-framework... " >&6; }
21527 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 21747 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
21528 21748
21529 cat << \EOF > conftest.java 21749 cat << \EOF > conftest.java
21530// #line 21530 "configure" 21750// #line 21750 "configure"
21531import org.apache.avalon.framework.configuration.ConfigurationException; 21751import org.apache.avalon.framework.configuration.ConfigurationException;
21532 21752
21533public class conftest { 21753public class conftest {
@@ -21636,18 +21856,6 @@ fi
21636 21856
21637 21857
21638############################################################## 21858##############################################################
21639## Scipad module
21640##############################################################
21641
21642SCIPAD_ENABLE=yes
21643
21644if test "$WITH_TKSCI" = no -o "$GUI_ENABLE" = no; then
21645 SCIPAD_ENABLE=no
21646fi
21647
21648
21649
21650##############################################################
21651## demo_tools module 21859## demo_tools module
21652############################################################## 21860##############################################################
21653 21861
@@ -27782,7 +27990,7 @@ else
27782 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 27990 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
27783 lt_status=$lt_dlunknown 27991 lt_status=$lt_dlunknown
27784 cat > conftest.$ac_ext <<_LT_EOF 27992 cat > conftest.$ac_ext <<_LT_EOF
27785#line 27785 "configure" 27993#line 27993 "configure"
27786#include "confdefs.h" 27994#include "confdefs.h"
27787 27995
27788#if HAVE_DLFCN_H 27996#if HAVE_DLFCN_H
@@ -27888,7 +28096,7 @@ else
27888 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 28096 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
27889 lt_status=$lt_dlunknown 28097 lt_status=$lt_dlunknown
27890 cat > conftest.$ac_ext <<_LT_EOF 28098 cat > conftest.$ac_ext <<_LT_EOF
27891#line 27891 "configure" 28099#line 28099 "configure"
27892#include "confdefs.h" 28100#include "confdefs.h"
27893 28101
27894#if HAVE_DLFCN_H 28102#if HAVE_DLFCN_H
@@ -33831,6 +34039,51 @@ esac
33831 34039
33832 34040
33833 34041
34042##########
34043##### Code quality
34044##########
34045# Extract the first word of "splint", so it can be a program name with args.
34046set dummy splint; ac_word=$2
34047{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
34048$as_echo_n "checking for $ac_word... " >&6; }
34049if test "${ac_cv_path_SPLINT+set}" = set; then :
34050 $as_echo_n "(cached) " >&6
34051else
34052 case $SPLINT in
34053 [\\/]* | ?:[\\/]*)
34054 ac_cv_path_SPLINT="$SPLINT" # Let the user override the test with a path.
34055 ;;
34056 *)
34057 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
34058for as_dir in $PATH
34059do
34060 IFS=$as_save_IFS
34061 test -z "$as_dir" && as_dir=.
34062 for ac_exec_ext in '' $ac_executable_extensions; do
34063 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
34064 ac_cv_path_SPLINT="$as_dir/$ac_word$ac_exec_ext"
34065 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
34066 break 2
34067 fi
34068done
34069 done
34070IFS=$as_save_IFS
34071
34072 test -z "$ac_cv_path_SPLINT" && ac_cv_path_SPLINT="no"
34073 ;;
34074esac
34075fi
34076SPLINT=$ac_cv_path_SPLINT
34077if test -n "$SPLINT"; then
34078 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $SPLINT" >&5
34079$as_echo "$SPLINT" >&6; }
34080else
34081 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
34082$as_echo "no" >&6; }
34083fi
34084
34085
34086
33834####################### 34087#######################
33835###### Creation of the header file (machine.h) 34088###### Creation of the header file (machine.h)
33836####################### 34089#######################
@@ -33865,7 +34118,7 @@ if test "$enable_stop_on_warning" = yes; then
33865 CXXFLAGS="$CXXFLAGS -Werror -O0" 34118 CXXFLAGS="$CXXFLAGS -Werror -O0"
33866fi 34119fi
33867 34120
33868ac_config_files="$ac_config_files libs/MALLOC/Makefile libs/dynamiclibrary/Makefile libs/doublylinkedlist/Makefile libs/hashtable/Makefile libs/libst/Makefile contrib/Makefile modules/helptools/Makefile modules/helptools/macros/xmlfiletohtml.sci modules/data_structures/Makefile modules/differential_equations/Makefile modules/optimization/Makefile modules/elementary_functions/Makefile modules/special_functions/Makefile modules/io/Makefile modules/shell/Makefile modules/completion/Makefile modules/history_manager/Makefile modules/jvm/Makefile modules/sound/Makefile modules/statistics/Makefile modules/mexlib/Makefile modules/sparse/Makefile modules/linear_algebra/Makefile modules/polynomials/Makefile modules/symbolic/Makefile modules/signal_processing/Makefile modules/arnoldi/Makefile modules/interpolation/Makefile modules/intersci/Makefile modules/localization/Makefile modules/metanet/Makefile modules/cacsd/Makefile modules/boolean/Makefile modules/integer/Makefile modules/double/Makefile modules/fileio/Makefile modules/spreadsheet/Makefile modules/string/Makefile modules/time/Makefile modules/graphics/Makefile modules/graphic_export/Makefile modules/renderer/Makefile modules/action_binding/Makefile modules/gui/Makefile modules/pvm/Makefile modules/randlib/Makefile modules/tclsci/Makefile modules/windows_tools/Makefile modules/core/Makefile modules/api_scilab/Makefile modules/call_scilab/Makefile modules/hdf5/Makefile modules/fftw/Makefile modules/umfpack/Makefile modules/scicos/Makefile modules/scicos_blocks/Makefile modules/functions/Makefile modules/dynamic_link/Makefile modules/overloading/Makefile modules/javasci/Makefile modules/maple2scilab/Makefile modules/m2sci/Makefile modules/compatibility_functions/Makefile modules/texmacs/Makefile modules/scipad/Makefile modules/development_tools/Makefile modules/output_stream/Makefile modules/console/Makefile modules/demo_tools/Makefile modules/genetic_algorithms/Makefile modules/simulated_annealing/Makefile modules/parameters/Makefile modules/matio/Makefile modules/atoms/Makefile modules/xcos/Makefile modules/xpad/Makefile modules/Makefile libs/Makefile Makefile scilab.pc etc/modules.xml etc/classpath.xml modules/jvm/etc/jvm_options.xml scilab-lib.properties scilab-lib-doc.properties" 34121ac_config_files="$ac_config_files libs/MALLOC/Makefile libs/dynamiclibrary/Makefile libs/doublylinkedlist/Makefile libs/hashtable/Makefile libs/libst/Makefile contrib/Makefile modules/helptools/Makefile modules/helptools/macros/xmlfiletohtml.sci modules/data_structures/Makefile modules/differential_equations/Makefile modules/optimization/Makefile modules/elementary_functions/Makefile modules/special_functions/Makefile modules/io/Makefile modules/shell/Makefile modules/completion/Makefile modules/history_manager/Makefile modules/jvm/Makefile modules/sound/Makefile modules/statistics/Makefile modules/mexlib/Makefile modules/sparse/Makefile modules/linear_algebra/Makefile modules/polynomials/Makefile modules/symbolic/Makefile modules/signal_processing/Makefile modules/arnoldi/Makefile modules/interpolation/Makefile modules/intersci/Makefile modules/localization/Makefile modules/metanet/Makefile modules/cacsd/Makefile modules/boolean/Makefile modules/integer/Makefile modules/double/Makefile modules/fileio/Makefile modules/spreadsheet/Makefile modules/string/Makefile modules/time/Makefile modules/graphics/Makefile modules/graphic_export/Makefile modules/renderer/Makefile modules/action_binding/Makefile modules/gui/Makefile modules/pvm/Makefile modules/randlib/Makefile modules/tclsci/Makefile modules/windows_tools/Makefile modules/core/Makefile modules/api_scilab/Makefile modules/call_scilab/Makefile modules/hdf5/Makefile modules/fftw/Makefile modules/umfpack/Makefile modules/scicos/Makefile modules/scicos_blocks/Makefile modules/functions/Makefile modules/dynamic_link/Makefile modules/overloading/Makefile modules/javasci/Makefile modules/maple2scilab/Makefile modules/m2sci/Makefile modules/compatibility_functions/Makefile modules/texmacs/Makefile modules/development_tools/Makefile modules/output_stream/Makefile modules/console/Makefile modules/demo_tools/Makefile modules/genetic_algorithms/Makefile modules/simulated_annealing/Makefile modules/parameters/Makefile modules/matio/Makefile modules/atoms/Makefile modules/xcos/Makefile modules/xpad/Makefile modules/Makefile libs/Makefile Makefile scilab.pc etc/modules.xml etc/classpath.xml modules/jvm/etc/jvm_options.xml scilab-lib.properties scilab-lib-doc.properties"
33869 34122
33870 34123
33871# Detection of the module for the future version of Scilab 6 34124# Detection of the module for the future version of Scilab 6
@@ -35242,7 +35495,6 @@ do
35242 "modules/m2sci/Makefile") CONFIG_FILES="$CONFIG_FILES modules/m2sci/Makefile" ;; 35495 "modules/m2sci/Makefile") CONFIG_FILES="$CONFIG_FILES modules/m2sci/Makefile" ;;
35243 "modules/compatibility_functions/Makefile") CONFIG_FILES="$CONFIG_FILES modules/compatibility_functions/Makefile" ;; 35496 "modules/compatibility_functions/Makefile") CONFIG_FILES="$CONFIG_FILES modules/compatibility_functions/Makefile" ;;
35244 "modules/texmacs/Makefile") CONFIG_FILES="$CONFIG_FILES modules/texmacs/Makefile" ;; 35497 "modules/texmacs/Makefile") CONFIG_FILES="$CONFIG_FILES modules/texmacs/Makefile" ;;
35245 "modules/scipad/Makefile") CONFIG_FILES="$CONFIG_FILES modules/scipad/Makefile" ;;
35246 "modules/development_tools/Makefile") CONFIG_FILES="$CONFIG_FILES modules/development_tools/Makefile" ;; 35498 "modules/development_tools/Makefile") CONFIG_FILES="$CONFIG_FILES modules/development_tools/Makefile" ;;
35247 "modules/output_stream/Makefile") CONFIG_FILES="$CONFIG_FILES modules/output_stream/Makefile" ;; 35499 "modules/output_stream/Makefile") CONFIG_FILES="$CONFIG_FILES modules/output_stream/Makefile" ;;
35248 "modules/console/Makefile") CONFIG_FILES="$CONFIG_FILES modules/console/Makefile" ;; 35500 "modules/console/Makefile") CONFIG_FILES="$CONFIG_FILES modules/console/Makefile" ;;
@@ -37279,6 +37531,13 @@ echo " JGraph X ............ = $JGRAPHX"
37279fi 37531fi
37280 37532
37281echo "" 37533echo ""
37534echo "Code quality (optional):"
37535echo " Checkstyle .......... = $CHECKSTYLE"
37536echo " Commons-beanutils ... = $COMMONS_BEANUTILS"
37537echo " Antlr ............... = $ANTLR"
37538echo " splint .............. = $SPLINT"
37539
37540echo ""
37282echo "TCL/TK configuration:" 37541echo "TCL/TK configuration:"
37283echo " TK_INC_PATH ........ = $TK_INC_PATH" 37542echo " TK_INC_PATH ........ = $TK_INC_PATH"
37284echo " TCL_INC_PATH ....... = $TCL_INC_PATH" 37543echo " TCL_INC_PATH ....... = $TCL_INC_PATH"
diff --git a/scilab/configure.ac b/scilab/configure.ac
index 4c158f6..e486780 100644
--- a/scilab/configure.ac
+++ b/scilab/configure.ac
@@ -731,6 +731,22 @@ if test "$with_javasci" != no -o "$with_gui" != no -o "$enable_build_help" != no
731 AC_DEFINE([WITH_GUI],[],[With the JAVA stuff (GUI, Console, JOGL...)]) 731 AC_DEFINE([WITH_GUI],[],[With the JAVA stuff (GUI, Console, JOGL...)])
732 732
733 fi 733 fi
734
735 # Checkstyle (code checking)
736 AC_JAVA_CHECK_PACKAGE([checkstyle],[com.puppycrawl.tools.checkstyle.CheckStyleTask],[Checkstyle - code checking],"yes")
737 CHECKSTYLE=$PACKAGE_JAR_FILE
738 AC_SUBST(CHECKSTYLE)
739
740 # Commons beanutils (dependency of checkstyle)
741 AC_JAVA_CHECK_PACKAGE([commons-beanutils],[org.apache.commons.beanutils.Converter],[Bean utility],"yes")
742 COMMONS_BEANUTILS=$PACKAGE_JAR_FILE
743 AC_SUBST(COMMONS_BEANUTILS)
744
745 # antlr (dependency of checkstyle)
746 AC_JAVA_CHECK_PACKAGE([antlr],[antlr.TokenStreamException],[language tool for constructing recognizers],"yes")
747 ANTLR=$PACKAGE_JAR_FILE
748 AC_SUBST(ANTLR)
749
734 else 750 else
735 AC_MSG_WARN([Sun javac not found: I will not build the java interface]) 751 AC_MSG_WARN([Sun javac not found: I will not build the java interface])
736 if test "$ac_java_jvm_name" != ""; then 752 if test "$ac_java_jvm_name" != ""; then
@@ -1302,18 +1318,6 @@ fi
1302AC_SUBST(JAVASCI_ENABLE) 1318AC_SUBST(JAVASCI_ENABLE)
1303 1319
1304############################################################## 1320##############################################################
1305## Scipad module
1306##############################################################
1307
1308SCIPAD_ENABLE=yes
1309
1310if test "$WITH_TKSCI" = no -o "$GUI_ENABLE" = no; then
1311 SCIPAD_ENABLE=no
1312fi
1313
1314AC_SUBST(SCIPAD_ENABLE)
1315
1316##############################################################
1317## demo_tools module 1321## demo_tools module
1318############################################################## 1322##############################################################
1319 1323
@@ -1369,6 +1373,11 @@ AC_C_CONST()
1369AC_C_INLINE() 1373AC_C_INLINE()
1370 1374
1371 1375
1376##########
1377##### Code quality
1378##########
1379AC_PATH_PROG(SPLINT, splint, no)
1380
1372####################### 1381#######################
1373###### Creation of the header file (machine.h) 1382###### Creation of the header file (machine.h)
1374####################### 1383#######################
@@ -1473,7 +1482,6 @@ modules/maple2scilab/Makefile
1473modules/m2sci/Makefile 1482modules/m2sci/Makefile
1474modules/compatibility_functions/Makefile 1483modules/compatibility_functions/Makefile
1475modules/texmacs/Makefile 1484modules/texmacs/Makefile
1476modules/scipad/Makefile
1477modules/development_tools/Makefile 1485modules/development_tools/Makefile
1478modules/output_stream/Makefile 1486modules/output_stream/Makefile
1479modules/console/Makefile 1487modules/console/Makefile
@@ -1749,6 +1757,13 @@ echo " Commons Logging ..... = $COMMONS_LOGGING"
1749echo " JGraph X ............ = $JGRAPHX" 1757echo " JGraph X ............ = $JGRAPHX"
1750fi 1758fi
1751 1759
1760echo ""
1761echo "Code quality (optional):"
1762echo " Checkstyle .......... = $CHECKSTYLE"
1763echo " Commons-beanutils ... = $COMMONS_BEANUTILS"
1764echo " Antlr ............... = $ANTLR"
1765echo " splint .............. = $SPLINT"
1766
1752echo "" 1767echo ""
1753echo "TCL/TK configuration:" 1768echo "TCL/TK configuration:"
1754echo " TK_INC_PATH ........ = $TK_INC_PATH" 1769echo " TK_INC_PATH ........ = $TK_INC_PATH"
diff --git a/scilab/contrib/Makefile.in b/scilab/contrib/Makefile.in
index 67e8b25..c568a51 100644
--- a/scilab/contrib/Makefile.in
+++ b/scilab/contrib/Makefile.in
@@ -58,7 +58,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \
58 $(top_srcdir)/m4/umfpack.m4 $(top_srcdir)/configure.ac 58 $(top_srcdir)/m4/umfpack.m4 $(top_srcdir)/configure.ac
59am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ 59am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
60 $(ACLOCAL_M4) 60 $(ACLOCAL_M4)
61mkinstalldirs = $(install_sh) -d 61mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
62CONFIG_HEADER = $(top_builddir)/modules/core/includes/machine.h 62CONFIG_HEADER = $(top_builddir)/modules/core/includes/machine.h
63CONFIG_CLEAN_FILES = 63CONFIG_CLEAN_FILES =
64CONFIG_CLEAN_VPATH_FILES = 64CONFIG_CLEAN_VPATH_FILES =
@@ -69,6 +69,7 @@ ACLOCAL = @ACLOCAL@
69ALL_LINGUAS = @ALL_LINGUAS@ 69ALL_LINGUAS = @ALL_LINGUAS@
70AMTAR = @AMTAR@ 70AMTAR = @AMTAR@
71ANT = @ANT@ 71ANT = @ANT@
72ANTLR = @ANTLR@
72AR = @AR@ 73AR = @AR@
73AUTOCONF = @AUTOCONF@ 74AUTOCONF = @AUTOCONF@
74AUTOHEADER = @AUTOHEADER@ 75AUTOHEADER = @AUTOHEADER@
@@ -80,6 +81,8 @@ BLAS_LIBS = @BLAS_LIBS@
80CC = @CC@ 81CC = @CC@
81CCDEPMODE = @CCDEPMODE@ 82CCDEPMODE = @CCDEPMODE@
82CFLAGS = @CFLAGS@ 83CFLAGS = @CFLAGS@
84CHECKSTYLE = @CHECKSTYLE@
85COMMONS_BEANUTILS = @COMMONS_BEANUTILS@
83COMMONS_IO = @COMMONS_IO@ 86COMMONS_IO = @COMMONS_IO@
84COMMONS_LOGGING = @COMMONS_LOGGING@ 87COMMONS_LOGGING = @COMMONS_LOGGING@
85CPP = @CPP@ 88CPP = @CPP@
@@ -208,12 +211,12 @@ RT_LIB = @RT_LIB@
208SAXON = @SAXON@ 211SAXON = @SAXON@
209SCICOS_ENABLE = @SCICOS_ENABLE@ 212SCICOS_ENABLE = @SCICOS_ENABLE@
210SCILAB_LIBRARY_VERSION = @SCILAB_LIBRARY_VERSION@ 213SCILAB_LIBRARY_VERSION = @SCILAB_LIBRARY_VERSION@
211SCIPAD_ENABLE = @SCIPAD_ENABLE@
212SED = @SED@ 214SED = @SED@
213SET_MAKE = @SET_MAKE@ 215SET_MAKE = @SET_MAKE@
214SET_RELOCATABLE = @SET_RELOCATABLE@ 216SET_RELOCATABLE = @SET_RELOCATABLE@
215SHELL = @SHELL@ 217SHELL = @SHELL@
216SKINLF = @SKINLF@ 218SKINLF = @SKINLF@
219SPLINT = @SPLINT@
217STRIP = @STRIP@ 220STRIP = @STRIP@
218SWIG_BIN = @SWIG_BIN@ 221SWIG_BIN = @SWIG_BIN@
219SWIG_JAVA = @SWIG_JAVA@ 222SWIG_JAVA = @SWIG_JAVA@
diff --git a/scilab/contrib/toolbox_skeleton/sci_gateway/c/sci_csub.c b/scilab/contrib/toolbox_skeleton/sci_gateway/c/sci_csub.c
index 81d318b..5b186f7 100644
--- a/scilab/contrib/toolbox_skeleton/sci_gateway/c/sci_csub.c
+++ b/scilab/contrib/toolbox_skeleton/sci_gateway/c/sci_csub.c
@@ -34,14 +34,14 @@ int sci_csub(char *fname)
34 CheckLhs(1,1) ; 34 CheckLhs(1,1) ;
35 35
36 /* get Address of inputs */ 36 /* get Address of inputs */
37 strErr = getVarAddressFromPosition(1, &piAddressVarOne); 37 strErr = getVarAddressFromPosition(pvApiCtx, 1, &piAddressVarOne);
38 if(strErr.iErr) 38 if(strErr.iErr)
39 { 39 {
40 printError(&strErr, 0); 40 printError(&strErr, 0);
41 return 0; 41 return 0;
42 } 42 }
43 43
44 strErr = getVarAddressFromPosition(2, &piAddressVarTwo); 44 strErr = getVarAddressFromPosition(pvApiCtx, 2, &piAddressVarTwo);
45 if(strErr.iErr) 45 if(strErr.iErr)
46 { 46 {
47 printError(&strErr, 0); 47 printError(&strErr, 0);
@@ -49,7 +49,7 @@ int sci_csub(char *fname)
49 } 49 }
50 50
51 /* check input type */ 51 /* check input type */
52 strErr = getVarType(piAddressVarOne, &iType1); 52 strErr = getVarType(pvApiCtx, piAddressVarOne, &iType1);
53 if(strErr.iErr) 53 if(strErr.iErr)
54 { 54 {
55 printError(&strErr, 0); 55 printError(&strErr, 0);
@@ -62,7 +62,7 @@ int sci_csub(char *fname)
62 return 0; 62 return 0;
63 } 63 }
64 64
65 strErr = getVarType(piAddressVarTwo, &iType2); 65 strErr = getVarType(pvApiCtx, piAddressVarTwo, &iType2);
66 if(strErr.iErr) 66 if(strErr.iErr)
67 { 67 {
68 printError(&strErr, 0); 68 printError(&strErr, 0);
@@ -76,14 +76,14 @@ int sci_csub(char *fname)
76 } 76 }
77 77
78 /* get matrix */ 78 /* get matrix */
79 strErr = getMatrixOfDouble(piAddressVarOne,&m1,&n1,&pdVarOne); 79 strErr = getMatrixOfDouble(pvApiCtx, piAddressVarOne,&m1,&n1,&pdVarOne);
80 if(strErr.iErr) 80 if(strErr.iErr)
81 { 81 {
82 printError(&strErr, 0); 82 printError(&strErr, 0);
83 return 0; 83 return 0;
84 } 84 }
85 85
86 strErr = getMatrixOfDouble(piAddressVarTwo,&m2,&n2,&pdVarTwo); 86 strErr = getMatrixOfDouble(pvApiCtx, piAddressVarTwo,&m2,&n2,&pdVarTwo);
87 if(strErr.iErr) 87 if(strErr.iErr)
88 { 88 {
89 printError(&strErr, 0); 89 printError(&strErr, 0);
@@ -107,7 +107,7 @@ int sci_csub(char *fname)
107 107
108 /* create result on stack */ 108 /* create result on stack */
109 m_out = 1; n_out = 1; 109 m_out = 1; n_out = 1;
110 createMatrixOfDouble(Rhs + 1, m_out, n_out, &dOut); 110 createMatrixOfDouble(pvApiCtx, Rhs + 1, m_out, n_out, &dOut);
111 111
112 LhsVar(1) = Rhs + 1; 112 LhsVar(1) = Rhs + 1;
113 113
diff --git a/scilab/contrib/toolbox_skeleton/sci_gateway/c/sci_csum.c b/scilab/contrib/toolbox_skeleton/sci_gateway/c/sci_csum.c
index 838d08b..96a8754 100644
--- a/scilab/contrib/toolbox_skeleton/sci_gateway/c/sci_csum.c
+++ b/scilab/contrib/toolbox_skeleton/sci_gateway/c/sci_csum.c
@@ -34,14 +34,14 @@ int sci_csum(char *fname)
34 CheckLhs(1,1) ; 34 CheckLhs(1,1) ;
35 35
36 /* get Address of inputs */ 36 /* get Address of inputs */
37 strErr = getVarAddressFromPosition(1, &piAddressVarOne); 37 strErr = getVarAddressFromPosition(pvApiCtx, 1, &piAddressVarOne);
38 if(strErr.iErr) 38 if(strErr.iErr)
39 { 39 {
40 printError(&strErr, 0); 40 printError(&strErr, 0);
41 return 0; 41 return 0;
42 } 42 }
43 43
44 strErr = getVarAddressFromPosition(2, &piAddressVarTwo); 44 strErr = getVarAddressFromPosition(pvApiCtx, 2, &piAddressVarTwo);
45 if(strErr.iErr) 45 if(strErr.iErr)
46 { 46 {
47 printError(&strErr, 0); 47 printError(&strErr, 0);
@@ -50,7 +50,7 @@ int sci_csum(char *fname)
50 50
51 51
52 /* check input type */ 52 /* check input type */
53 strErr = getVarType(piAddressVarOne, &iType1); 53 strErr = getVarType(pvApiCtx, piAddressVarOne, &iType1);
54 if(strErr.iErr) 54 if(strErr.iErr)
55 { 55 {
56 printError(&strErr, 0); 56 printError(&strErr, 0);
@@ -63,7 +63,7 @@ int sci_csum(char *fname)
63 return 0; 63 return 0;
64 } 64 }
65 65
66 strErr = getVarType(piAddressVarTwo, &iType2); 66 strErr = getVarType(pvApiCtx, piAddressVarTwo, &iType2);
67 if(strErr.iErr) 67 if(strErr.iErr)
68 { 68 {
69 printError(&strErr, 0); 69 printError(&strErr, 0);
@@ -77,14 +77,14 @@ int sci_csum(char *fname)
77 } 77 }
78 78
79 /* get matrix */ 79 /* get matrix */
80 strErr = getMatrixOfDouble(piAddressVarOne,&m1,&n1,&pdVarOne); 80 strErr = getMatrixOfDouble(pvApiCtx, piAddressVarOne,&m1,&n1,&pdVarOne);
81 if(strErr.iErr) 81 if(strErr.iErr)
82 { 82 {
83 printError(&strErr, 0); 83 printError(&strErr, 0);
84 return 0; 84 return 0;
85 } 85 }
86 86
87 strErr = getMatrixOfDouble(piAddressVarTwo,&m2,&n2,&pdVarTwo); 87 strErr = getMatrixOfDouble(pvApiCtx, piAddressVarTwo,&m2,&n2,&pdVarTwo);
88 if(strErr.iErr) 88 if(strErr.iErr)
89 { 89 {
90 printError(&strErr, 0); 90 printError(&strErr, 0);
@@ -108,7 +108,7 @@ int sci_csum(char *fname)
108 108
109 /* create result on stack */ 109 /* create result on stack */
110 m_out = 1; n_out = 1; 110 m_out = 1; n_out = 1;
111 createMatrixOfDouble(Rhs + 1, m_out, n_out, &dOut); 111 createMatrixOfDouble(pvApiCtx, Rhs + 1, m_out, n_out, &dOut);
112 112
113 LhsVar(1) = Rhs + 1; 113 LhsVar(1) = Rhs + 1;
114 114
diff --git a/scilab/contrib/toolbox_skeleton/sci_gateway/cpp/sci_cpp_find.cxx b/scilab/contrib/toolbox_skeleton/sci_gateway/cpp/sci_cpp_find.cxx
index b26bb14..0ee4034 100644
--- a/scilab/contrib/toolbox_skeleton/sci_gateway/cpp/sci_cpp_find.cxx
+++ b/scilab/contrib/toolbox_skeleton/sci_gateway/cpp/sci_cpp_find.cxx
@@ -37,13 +37,13 @@ extern "C"
37 CheckLhs(1,1); 37 CheckLhs(1,1);
38 38
39 /* get Address of inputs */ 39 /* get Address of inputs */
40 strErr = getVarAddressFromPosition(1, &piAddressVarOne); 40 strErr = getVarAddressFromPosition(pvApiCtx, 1, &piAddressVarOne);
41 if(strErr.iErr) 41 if(strErr.iErr)
42 { 42 {
43 printError(&strErr, 0); 43 printError(&strErr, 0);
44 return 0; 44 return 0;
45 } 45 }
46 strErr = getVarAddressFromPosition(2, &piAddressVarTwo); 46 strErr = getVarAddressFromPosition(pvApiCtx, 2, &piAddressVarTwo);
47 if(strErr.iErr) 47 if(strErr.iErr)
48 { 48 {
49 printError(&strErr, 0); 49 printError(&strErr, 0);
@@ -51,7 +51,7 @@ extern "C"
51 } 51 }
52 52
53 /* checks types */ 53 /* checks types */
54 strErr = getVarType(piAddressVarOne, &iType1); 54 strErr = getVarType(pvApiCtx, piAddressVarOne, &iType1);
55 if(strErr.iErr) 55 if(strErr.iErr)
56 { 56 {
57 printError(&strErr, 0); 57 printError(&strErr, 0);
@@ -64,7 +64,7 @@ extern "C"
64 return 0; 64 return 0;
65 } 65 }
66 66
67 strErr = getVarType(piAddressVarTwo, &iType2); 67 strErr = getVarType(pvApiCtx, piAddressVarTwo, &iType2);
68 if(strErr.iErr) 68 if(strErr.iErr)
69 { 69 {
70 printError(&strErr, 0); 70 printError(&strErr, 0);
@@ -79,7 +79,7 @@ extern "C"
79 79
80 /* get strings */ 80 /* get strings */
81 81
82 strErr = getMatrixOfString(piAddressVarOne,&m1,&n1,&lenStVarOne,&pStVarOne); 82 strErr = getMatrixOfString(pvApiCtx, piAddressVarOne,&m1,&n1,&lenStVarOne,&pStVarOne);
83 if(strErr.iErr) 83 if(strErr.iErr)
84 { 84 {
85 printError(&strErr, 0); 85 printError(&strErr, 0);
@@ -95,14 +95,14 @@ extern "C"
95 /* alloc string */ 95 /* alloc string */
96 pStVarOne = (char*)MALLOC(sizeof(char)*(lenStVarOne + 1)); 96 pStVarOne = (char*)MALLOC(sizeof(char)*(lenStVarOne + 1));
97 /* get string One */ 97 /* get string One */
98 strErr = getMatrixOfString(piAddressVarOne,&m1,&n1,&lenStVarOne,&pStVarOne); 98 strErr = getMatrixOfString(pvApiCtx, piAddressVarOne,&m1,&n1,&lenStVarOne,&pStVarOne);
99 if(strErr.iErr) 99 if(strErr.iErr)
100 { 100 {
101 printError(&strErr, 0); 101 printError(&strErr, 0);
102 return 0; 102 return 0;
103 } 103 }
104 104
105 strErr = getMatrixOfString(piAddressVarTwo,&m2,&n2,&lenStVarTwo,&pStVarTwo); 105 strErr = getMatrixOfString(pvApiCtx, piAddressVarTwo,&m2,&n2,&lenStVarTwo,&pStVarTwo);
106 if(strErr.iErr) 106 if(strErr.iErr)
107 { 107 {
108 printError(&strErr, 0); 108 printError(&strErr, 0);
@@ -117,7 +117,7 @@ extern "C"
117 /* alloc string */ 117 /* alloc string */
118 pStVarTwo = (char*)MALLOC(sizeof(char)*(lenStVarTwo + 1)); 118 pStVarTwo = (char*)MALLOC(sizeof(char)*(lenStVarTwo + 1));
119 /* get string Two */ 119 /* get string Two */
120 strErr = getMatrixOfString(piAddressVarTwo,&m2,&n2,&lenStVarTwo,&pStVarTwo); 120 strErr = getMatrixOfString(pvApiCtx, piAddressVarTwo,&m2,&n2,&lenStVarTwo,&pStVarTwo);
121 if(strErr.iErr) 121 if(strErr.iErr)
122 { 122 {
123 printError(&strErr, 0); 123 printError(&strErr, 0);
@@ -146,7 +146,7 @@ extern "C"
146 /* create result on stack */ 146 /* create result on stack */
147 int m_out = 1, n_out = 1; 147 int m_out = 1, n_out = 1;
148 148
149 createMatrixOfDouble(Rhs + 1, m_out, n_out, &dOut); 149 createMatrixOfDouble(pvApiCtx, Rhs + 1, m_out, n_out, &dOut);
150 150
151 LhsVar(1) = Rhs + 1; 151 LhsVar(1) = Rhs + 1;
152 152
diff --git a/scilab/contrib/toolbox_skeleton/sci_gateway/fortran/sci_fsum.c b/scilab/contrib/toolbox_skeleton/sci_gateway/fortran/sci_fsum.c
index 05ef5e9..bf6164d 100644
--- a/scilab/contrib/toolbox_skeleton/sci_gateway/fortran/sci_fsum.c
+++ b/scilab/contrib/toolbox_skeleton/sci_gateway/fortran/sci_fsum.c
@@ -35,14 +35,14 @@ int sci_fsum(char *fname)
35 CheckLhs(1,1) ; 35 CheckLhs(1,1) ;
36 36
37 /* get Address of inputs */ 37 /* get Address of inputs */
38 strErr = getVarAddressFromPosition(1, &piAddressVarOne); 38 strErr = getVarAddressFromPosition(pvApiCtx, 1, &piAddressVarOne);
39 if(strErr.iErr) 39 if(strErr.iErr)
40 { 40 {
41 printError(&strErr, 0); 41 printError(&strErr, 0);
42 return 0; 42 return 0;
43 } 43 }
44 44
45 strErr = getVarAddressFromPosition(2, &piAddressVarTwo); 45 strErr = getVarAddressFromPosition(pvApiCtx, 2, &piAddressVarTwo);
46 if(strErr.iErr) 46 if(strErr.iErr)
47 { 47 {
48 printError(&strErr, 0); 48 printError(&strErr, 0);
@@ -50,7 +50,7 @@ int sci_fsum(char *fname)
50 } 50 }
51 51
52 /* check input type */ 52 /* check input type */
53 strErr = getVarType(piAddressVarOne, &iType1); 53 strErr = getVarType(pvApiCtx, piAddressVarOne, &iType1);
54 if(strErr.iErr) 54 if(strErr.iErr)
55 { 55 {
56 printError(&strErr, 0); 56 printError(&strErr, 0);
@@ -63,7 +63,7 @@ int sci_fsum(char *fname)
63 return 0; 63 return 0;
64 } 64 }
65 65
66 strErr = getVarType(piAddressVarTwo, &iType2); 66 strErr = getVarType(pvApiCtx, piAddressVarTwo, &iType2);
67 if(strErr.iErr) 67 if(strErr.iErr)
68 { 68 {
69 printError(&strErr, 0); 69 printError(&strErr, 0);
@@ -77,14 +77,14 @@ int sci_fsum(char *fname)
77 } 77 }
78 78
79 /* get matrix */ 79 /* get matrix */
80 strErr = getMatrixOfDouble(piAddressVarOne,&m1,&n1,&pdVarOne); 80 strErr = getMatrixOfDouble(pvApiCtx, piAddressVarOne,&m1,&n1,&pdVarOne);
81 if(strErr.iErr) 81 if(strErr.iErr)
82 { 82 {
83 printError(&strErr, 0); 83 printError(&strErr, 0);
84 return 0; 84 return 0;
85 } 85 }
86 86
87 strErr = getMatrixOfDouble(piAddressVarTwo,&m2,&n2,&pdVarTwo); 87 strErr = getMatrixOfDouble(pvApiCtx, piAddressVarTwo,&m2,&n2,&pdVarTwo);
88 if(strErr.iErr) 88 if(strErr.iErr)
89 { 89 {
90 printError(&strErr, 0); 90 printError(&strErr, 0);
@@ -108,7 +108,7 @@ int sci_fsum(char *fname)
108 108
109 /* create result on stack */ 109 /* create result on stack */
110 m_out = 1; n_out = 1; 110 m_out = 1; n_out = 1;
111 strErr = createMatrixOfDouble(Rhs + 1, m_out, n_out, &dOut); 111 strErr = createMatrixOfDouble(pvApiCtx, Rhs + 1, m_out, n_out, &dOut);
112 if(strErr.iErr) 112 if(strErr.iErr)
113 { 113 {
114 printError(&strErr, 0); 114 printError(&strErr, 0);
diff --git a/scilab/etc/modules.xml.in b/scilab/etc/modules.xml.in
index 1d0514a..ac6ff3c 100644
--- a/scilab/etc/modules.xml.in
+++ b/scilab/etc/modules.xml.in
@@ -61,7 +61,6 @@
61<module name="tclsci" activate="@WITH_TKSCI@"/> 61<module name="tclsci" activate="@WITH_TKSCI@"/>
62<module name="texmacs" activate="yes"/> 62<module name="texmacs" activate="yes"/>
63<module name="sound" activate="yes"/> 63<module name="sound" activate="yes"/>
64<module name="scipad" activate="@SCIPAD_ENABLE@"/>
65<module name="randlib" activate="yes"/> 64<module name="randlib" activate="yes"/>
66<module name="development_tools" activate="yes"/> 65<module name="development_tools" activate="yes"/>
67<module name="demo_tools" activate="@DEMOTOOLS_ENABLE@"/> 66<module name="demo_tools" activate="@DEMOTOOLS_ENABLE@"/>
diff --git a/scilab/etc/modules.xml.vc b/scilab/etc/modules.xml.vc
index 714c5e2..5624ec4 100644
--- a/scilab/etc/modules.xml.vc
+++ b/scilab/etc/modules.xml.vc
@@ -86,6 +86,5 @@
86<module name="hdf5" activate="yes"/> 86<module name="hdf5" activate="yes"/>
87<module name="xcos" activate="yes"/> 87<module name="xcos" activate="yes"/>
88<module name="xpad" activate="yes"/> 88<module name="xpad" activate="yes"/>
89<module name="scipad" activate="no"/>
90<!-- comments --> 89<!-- comments -->
91</modules> 90</modules>
diff --git a/scilab/etc/scilab.start b/scilab/etc/scilab.start
index f77941d..dc17ee6 100644
--- a/scilab/etc/scilab.start
+++ b/scilab/etc/scilab.start
@@ -147,7 +147,7 @@ if sciargs()<>'-nouserstartup' then
147 end 147 end
148 end 148 end
149 149
150 clear startupfiles; 150 clear startupfiles isempty i;
151 151
152end 152end
153 153
diff --git a/scilab/libs/MALLOC/Makefile.in b/scilab/libs/MALLOC/Makefile.in
index e82e4b5..85e2d84 100644
--- a/scilab/libs/MALLOC/Makefile.in
+++ b/scilab/libs/MALLOC/Makefile.in
@@ -76,7 +76,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \
76 $(top_srcdir)/m4/umfpack.m4 $(top_srcdir)/configure.ac 76 $(top_srcdir)/m4/umfpack.m4 $(top_srcdir)/configure.ac
77am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ 77am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
78 $(ACLOCAL_M4) 78 $(ACLOCAL_M4)
79mkinstalldirs = $(install_sh) -d 79mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
80CONFIG_HEADER = $(top_builddir)/modules/core/includes/machine.h 80CONFIG_HEADER = $(top_builddir)/modules/core/includes/machine.h
81CONFIG_CLEAN_FILES = 81CONFIG_CLEAN_FILES =
82CONFIG_CLEAN_VPATH_FILES = 82CONFIG_CLEAN_VPATH_FILES =
@@ -135,6 +135,7 @@ ACLOCAL = @ACLOCAL@
135ALL_LINGUAS = @ALL_LINGUAS@ 135ALL_LINGUAS = @ALL_LINGUAS@
136AMTAR = @AMTAR@ 136AMTAR = @AMTAR@
137ANT = @ANT@ 137ANT = @ANT@
138ANTLR = @ANTLR@
138AR = @AR@ 139AR = @AR@
139AUTOCONF = @AUTOCONF@ 140AUTOCONF = @AUTOCONF@
140AUTOHEADER = @AUTOHEADER@ 141AUTOHEADER = @AUTOHEADER@
@@ -146,6 +147,8 @@ BLAS_LIBS = @BLAS_LIBS@
146CC = @CC@ 147CC = @CC@
147CCDEPMODE = @CCDEPMODE@ 148CCDEPMODE = @CCDEPMODE@
148CFLAGS = @CFLAGS@ 149CFLAGS = @CFLAGS@
150CHECKSTYLE = @CHECKSTYLE@
151COMMONS_BEANUTILS = @COMMONS_BEANUTILS@
149COMMONS_IO = @COMMONS_IO@ 152COMMONS_IO = @COMMONS_IO@
150COMMONS_LOGGING = @COMMONS_LOGGING@ 153COMMONS_LOGGING = @COMMONS_LOGGING@
151CPP = @CPP@ 154CPP = @CPP@
@@ -274,12 +277,12 @@ RT_LIB = @RT_LIB@
274SAXON = @SAXON@ 277SAXON = @SAXON@
275SCICOS_ENABLE = @SCICOS_ENABLE@ 278SCICOS_ENABLE = @SCICOS_ENABLE@
276SCILAB_LIBRARY_VERSION = @SCILAB_LIBRARY_VERSION@ 279SCILAB_LIBRARY_VERSION = @SCILAB_LIBRARY_VERSION@
277SCIPAD_ENABLE = @SCIPAD_ENABLE@
278SED = @SED@ 280SED = @SED@
279SET_MAKE = @SET_MAKE@ 281SET_MAKE = @SET_MAKE@
280SET_RELOCATABLE = @SET_RELOCATABLE@ 282SET_RELOCATABLE = @SET_RELOCATABLE@
281SHELL = @SHELL@ 283SHELL = @SHELL@
282SKINLF = @SKINLF@ 284SKINLF = @SKINLF@
285SPLINT = @SPLINT@
283STRIP = @STRIP@ 286STRIP = @STRIP@
284SWIG_BIN = @SWIG_BIN@ 287SWIG_BIN = @SWIG_BIN@
285SWIG_JAVA = @SWIG_JAVA@ 288SWIG_JAVA = @SWIG_JAVA@
@@ -804,10 +807,12 @@ check-local: $(top_builddir)/scilab-bin
804 export LANG=C;\ 807 export LANG=C;\
805 $(top_builddir)/bin/scilab -nwni -nb -e "$$COMMAND" 808 $(top_builddir)/bin/scilab -nwni -nb -e "$$COMMAND"
806check-code: 809check-code:
807 @if test -f build.xml; then \ 810 if test -f build.xml; then \
808 $(ANT) checkstyle; \ 811 $(ANT) checkstyle; \
809 fi;\ 812 fi
810 splint $(SPLINT_OPTIONS) -I$(top_srcdir)/modules/core/includes/ -I$(top_srcdir)/libs/MALLOC/includes/ -I$(top_srcdir)/modules/localization/includes/ $(INCLUDE_FLAGS) $(CHECK_SRC) 813 if test -x "$(SPLINT)"; then \
814 $(SPLINT) $(SPLINT_OPTIONS) -I$(top_srcdir)/modules/core/includes/ -I$(top_srcdir)/libs/MALLOC/includes/ -I$(top_srcdir)/modules/localization/includes/ $(INCLUDE_FLAGS) $(CHECK_SRC); \
815 fi
811@NEED_JAVA_TRUE@java: 816@NEED_JAVA_TRUE@java:
812# Some configurations needs to export JAVA_HOME in the current env 817# Some configurations needs to export JAVA_HOME in the current env
813@NEED_JAVA_TRUE@ @if test "$(JAVA_HOME)"; then export JAVA_HOME=$(JAVA_HOME); fi; \ 818@NEED_JAVA_TRUE@ @if test "$(JAVA_HOME)"; then export JAVA_HOME=$(JAVA_HOME); fi; \
diff --git a/scilab/libs/Makefile.in b/scilab/libs/Makefile.in
index f538db6..0f97bc9 100644
--- a/scilab/libs/Makefile.in
+++ b/scilab/libs/Makefile.in
@@ -56,7 +56,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \
56 $(top_srcdir)/m4/umfpack.m4 $(top_srcdir)/configure.ac 56 $(top_srcdir)/m4/umfpack.m4 $(top_srcdir)/configure.ac
57am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ 57am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
58 $(ACLOCAL_M4) 58 $(ACLOCAL_M4)
59mkinstalldirs = $(install_sh) -d 59mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
60CONFIG_HEADER = $(top_builddir)/modules/core/includes/machine.h 60CONFIG_HEADER = $(top_builddir)/modules/core/includes/machine.h
61CONFIG_CLEAN_FILES = 61CONFIG_CLEAN_FILES =
62CONFIG_CLEAN_VPATH_FILES = 62CONFIG_CLEAN_VPATH_FILES =
@@ -107,6 +107,7 @@ ACLOCAL = @ACLOCAL@
107ALL_LINGUAS = @ALL_LINGUAS@ 107ALL_LINGUAS = @ALL_LINGUAS@
108AMTAR = @AMTAR@ 108AMTAR = @AMTAR@
109ANT = @ANT@ 109ANT = @ANT@
110ANTLR = @ANTLR@
110AR = @AR@ 111AR = @AR@
111AUTOCONF = @AUTOCONF@ 112AUTOCONF = @AUTOCONF@
112AUTOHEADER = @AUTOHEADER@ 113AUTOHEADER = @AUTOHEADER@
@@ -118,6 +119,8 @@ BLAS_LIBS = @BLAS_LIBS@
118CC = @CC@ 119CC = @CC@
119CCDEPMODE = @CCDEPMODE@ 120CCDEPMODE = @CCDEPMODE@
120CFLAGS = @CFLAGS@ 121CFLAGS = @CFLAGS@
122CHECKSTYLE = @CHECKSTYLE@
123COMMONS_BEANUTILS = @COMMONS_BEANUTILS@
121COMMONS_IO = @COMMONS_IO@ 124COMMONS_IO = @COMMONS_IO@
122COMMONS_LOGGING = @COMMONS_LOGGING@ 125COMMONS_LOGGING = @COMMONS_LOGGING@
123CPP = @CPP@ 126CPP = @CPP@
@@ -246,12 +249,12 @@ RT_LIB = @RT_LIB@
246SAXON = @SAXON@ 249SAXON = @SAXON@
247SCICOS_ENABLE = @SCICOS_ENABLE@ 250SCICOS_ENABLE = @SCICOS_ENABLE@
248SCILAB_LIBRARY_VERSION = @SCILAB_LIBRARY_VERSION@ 251SCILAB_LIBRARY_VERSION = @SCILAB_LIBRARY_VERSION@
249SCIPAD_ENABLE = @SCIPAD_ENABLE@
250SED = @SED@ 252SED = @SED@
251SET_MAKE = @SET_MAKE@ 253SET_MAKE = @SET_MAKE@
252SET_RELOCATABLE = @SET_RELOCATABLE@ 254SET_RELOCATABLE = @SET_RELOCATABLE@
253SHELL = @SHELL@ 255SHELL = @SHELL@
254SKINLF = @SKINLF@ 256SKINLF = @SKINLF@
257SPLINT = @SPLINT@
255STRIP = @STRIP@ 258STRIP = @STRIP@
256SWIG_BIN = @SWIG_BIN@ 259SWIG_BIN = @SWIG_BIN@
257SWIG_JAVA = @SWIG_JAVA@ 260SWIG_JAVA = @SWIG_JAVA@
diff --git a/scilab/libs/doublylinkedlist/Makefile.in b/scilab/libs/doublylinkedlist/Makefile.in
index c8f39b9..298d0bb 100644
--- a/scilab/libs/doublylinkedlist/Makefile.in
+++ b/scilab/libs/doublylinkedlist/Makefile.in
@@ -77,7 +77,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \
77 $(top_srcdir)/m4/umfpack.m4 $(top_srcdir)/configure.ac 77 $(top_srcdir)/m4/umfpack.m4 $(top_srcdir)/configure.ac
78am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ 78am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
79 $(ACLOCAL_M4) 79 $(ACLOCAL_M4)
80mkinstalldirs = $(install_sh) -d 80mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
81CONFIG_HEADER = $(top_builddir)/modules/core/includes/machine.h 81CONFIG_HEADER = $(top_builddir)/modules/core/includes/machine.h
82CONFIG_CLEAN_FILES = 82CONFIG_CLEAN_FILES =
83CONFIG_CLEAN_VPATH_FILES = 83CONFIG_CLEAN_VPATH_FILES =
@@ -137,6 +137,7 @@ ACLOCAL = @ACLOCAL@
137ALL_LINGUAS = @ALL_LINGUAS@ 137ALL_LINGUAS = @ALL_LINGUAS@
138AMTAR = @AMTAR@ 138AMTAR = @AMTAR@
139ANT = @ANT@ 139ANT = @ANT@
140ANTLR = @ANTLR@
140AR = @AR@ 141AR = @AR@
141AUTOCONF = @AUTOCONF@ 142AUTOCONF = @AUTOCONF@
142AUTOHEADER = @AUTOHEADER@ 143AUTOHEADER = @AUTOHEADER@
@@ -148,6 +149,8 @@ BLAS_LIBS = @BLAS_LIBS@
148CC = @CC@ 149CC = @CC@
149CCDEPMODE = @CCDEPMODE@ 150CCDEPMODE = @CCDEPMODE@
150CFLAGS = @CFLAGS@ 151CFLAGS = @CFLAGS@
152CHECKSTYLE = @CHECKSTYLE@
153COMMONS_BEANUTILS = @COMMONS_BEANUTILS@
151COMMONS_IO = @COMMONS_IO@ 154COMMONS_IO = @COMMONS_IO@
152COMMONS_LOGGING = @COMMONS_LOGGING@ 155COMMONS_LOGGING = @COMMONS_LOGGING@
153CPP = @CPP@ 156CPP = @CPP@
@@ -276,12 +279,12 @@ RT_LIB = @RT_LIB@
276SAXON = @SAXON@ 279SAXON = @SAXON@
277SCICOS_ENABLE = @SCICOS_ENABLE@ 280SCICOS_ENABLE = @SCICOS_ENABLE@
278SCILAB_LIBRARY_VERSION = @SCILAB_LIBRARY_VERSION@ 281SCILAB_LIBRARY_VERSION = @SCILAB_LIBRARY_VERSION@
279SCIPAD_ENABLE = @SCIPAD_ENABLE@
280SED = @SED@ 282SED = @SED@
281SET_MAKE = @SET_MAKE@ 283SET_MAKE = @SET_MAKE@
282SET_RELOCATABLE = @SET_RELOCATABLE@ 284SET_RELOCATABLE = @SET_RELOCATABLE@
283SHELL = @SHELL@ 285SHELL = @SHELL@
284SKINLF = @SKINLF@ 286SKINLF = @SKINLF@
287SPLINT = @SPLINT@
285STRIP = @STRIP@ 288STRIP = @STRIP@
286SWIG_BIN = @SWIG_BIN@ 289SWIG_BIN = @SWIG_BIN@
287SWIG_JAVA = @SWIG_JAVA@ 290SWIG_JAVA = @SWIG_JAVA@
@@ -787,10 +790,12 @@ check-local: $(top_builddir)/scilab-bin
787 export LANG=C;\ 790 export LANG=C;\
788 $(top_builddir)/bin/scilab -nwni -nb -e "$$COMMAND" 791 $(top_builddir)/bin/scilab -nwni -nb -e "$$COMMAND"
789check-code: 792check-code:
790 @if test -f build.xml; then \ 793 if test -f build.xml; then \
791 $(ANT) checkstyle; \ 794 $(ANT) checkstyle; \
792 fi;\ 795 fi
793 splint $(SPLINT_OPTIONS) -I$(top_srcdir)/modules/core/includes/ -I$(top_srcdir)/libs/MALLOC/includes/ -I$(top_srcdir)/modules/localization/includes/ $(INCLUDE_FLAGS) $(CHECK_SRC) 796 if test -x "$(SPLINT)"; then \
797 $(SPLINT) $(SPLINT_OPTIONS) -I$(top_srcdir)/modules/core/includes/ -I$(top_srcdir)/libs/MALLOC/includes/ -I$(top_srcdir)/modules/localization/includes/ $(INCLUDE_FLAGS) $(CHECK_SRC); \
798 fi
794@NEED_JAVA_TRUE@java: 799@NEED_JAVA_TRUE@java:
795# Some configurations needs to export JAVA_HOME in the current env 800# Some configurations needs to export JAVA_HOME in the current env
796@NEED_JAVA_TRUE@ @if test "$(JAVA_HOME)"; then export JAVA_HOME=$(JAVA_HOME); fi; \ 801@NEED_JAVA_TRUE@ @if test "$(JAVA_HOME)"; then export JAVA_HOME=$(JAVA_HOME); fi; \
diff --git a/scilab/libs/dynamiclibrary/Makefile.in b/scilab/libs/dynamiclibrary/Makefile.in
index c66e7c3..b82c4f0 100644
--- a/scilab/libs/dynamiclibrary/Makefile.in
+++ b/scilab/libs/dynamiclibrary/Makefile.in
@@ -77,7 +77,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \
77 $(top_srcdir)/m4/umfpack.m4 $(top_srcdir)/configure.ac 77 $(top_srcdir)/m4/umfpack.m4 $(top_srcdir)/configure.ac
78am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ 78am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
79 $(ACLOCAL_M4) 79 $(ACLOCAL_M4)
80mkinstalldirs = $(install_sh) -d 80mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
81CONFIG_HEADER = $(top_builddir)/modules/core/includes/machine.h 81CONFIG_HEADER = $(top_builddir)/modules/core/includes/machine.h
82CONFIG_CLEAN_FILES = 82CONFIG_CLEAN_FILES =
83CONFIG_CLEAN_VPATH_FILES = 83CONFIG_CLEAN_VPATH_FILES =
@@ -137,6 +137,7 @@ ACLOCAL = @ACLOCAL@
137ALL_LINGUAS = @ALL_LINGUAS@ 137ALL_LINGUAS = @ALL_LINGUAS@
138AMTAR = @AMTAR@ 138AMTAR = @AMTAR@
139ANT = @ANT@ 139ANT = @ANT@
140ANTLR = @ANTLR@
140AR = @AR@ 141AR = @AR@
141AUTOCONF = @AUTOCONF@ 142AUTOCONF = @AUTOCONF@
142AUTOHEADER = @AUTOHEADER@ 143AUTOHEADER = @AUTOHEADER@
@@ -148,6 +149,8 @@ BLAS_LIBS = @BLAS_LIBS@
148CC = @CC@ 149CC = @CC@
149CCDEPMODE = @CCDEPMODE@ 150CCDEPMODE = @CCDEPMODE@
150CFLAGS = @CFLAGS@ 151CFLAGS = @CFLAGS@
152CHECKSTYLE = @CHECKSTYLE@
153COMMONS_BEANUTILS = @COMMONS_BEANUTILS@
151COMMONS_IO = @COMMONS_IO@ 154COMMONS_IO = @COMMONS_IO@
152COMMONS_LOGGING = @COMMONS_LOGGING@ 155COMMONS_LOGGING = @COMMONS_LOGGING@
153CPP = @CPP@ 156CPP = @CPP@
@@ -276,12 +279,12 @@ RT_LIB = @RT_LIB@
276SAXON = @SAXON@ 279SAXON = @SAXON@
277SCICOS_ENABLE = @SCICOS_ENABLE@ 280SCICOS_ENABLE = @SCICOS_ENABLE@
278SCILAB_LIBRARY_VERSION = @SCILAB_LIBRARY_VERSION@ 281SCILAB_LIBRARY_VERSION = @SCILAB_LIBRARY_VERSION@
279SCIPAD_ENABLE = @SCIPAD_ENABLE@
280SED = @SED@ 282SED = @SED@
281SET_MAKE = @SET_MAKE@ 283SET_MAKE = @SET_MAKE@
282SET_RELOCATABLE = @SET_RELOCATABLE@ 284SET_RELOCATABLE = @SET_RELOCATABLE@
283SHELL = @SHELL@ 285SHELL = @SHELL@
284SKINLF = @SKINLF@ 286SKINLF = @SKINLF@
287SPLINT = @SPLINT@
285STRIP = @STRIP@ 288STRIP = @STRIP@
286SWIG_BIN = @SWIG_BIN@ 289SWIG_BIN = @SWIG_BIN@
287SWIG_JAVA = @SWIG_JAVA@ 290SWIG_JAVA = @SWIG_JAVA@
@@ -789,10 +792,12 @@ check-local: $(top_builddir)/scilab-bin
789 export LANG=C;\ 792 export LANG=C;\
790 $(top_builddir)/bin/scilab -nwni -nb -e "$$COMMAND" 793 $(top_builddir)/bin/scilab -nwni -nb -e "$$COMMAND"
791check-code: 794check-code:
792 @if test -f build.xml; then \ 795 if test -f build.xml; then \
793 $(ANT) checkstyle; \ 796 $(ANT) checkstyle; \
794 fi;\ 797 fi
795 splint $(SPLINT_OPTIONS) -I$(top_srcdir)/modules/core/includes/ -I$(top_srcdir)/libs/MALLOC/includes/ -I$(top_srcdir)/modules/localization/includes/ $(INCLUDE_FLAGS) $(CHECK_SRC) 798 if test -x "$(SPLINT)"; then \
799 $(SPLINT) $(SPLINT_OPTIONS) -I$(top_srcdir)/modules/core/includes/ -I$(top_srcdir)/libs/MALLOC/includes/ -I$(top_srcdir)/modules/localization/includes/ $(INCLUDE_FLAGS) $(CHECK_SRC); \
800 fi
796@NEED_JAVA_TRUE@java: 801@NEED_JAVA_TRUE@java:
797# Some configurations needs to export JAVA_HOME in the current env 802# Some configurations needs to export JAVA_HOME in the current env
798@NEED_JAVA_TRUE@ @if test "$(JAVA_HOME)"; then export JAVA_HOME=$(JAVA_HOME); fi; \ 803@NEED_JAVA_TRUE@ @if test "$(JAVA_HOME)"; then export JAVA_HOME=$(JAVA_HOME); fi; \
diff --git a/scilab/libs/hashtable/Makefile.in b/scilab/libs/hashtable/Makefile.in
index d4b5dec..e8a6d6d 100644
--- a/scilab/libs/hashtable/Makefile.in
+++ b/scilab/libs/hashtable/Makefile.in
@@ -77,7 +77,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \
77 $(top_srcdir)/m4/umfpack.m4 $(top_srcdir)/configure.ac 77 $(top_srcdir)/m4/umfpack.m4 $(top_srcdir)/configure.ac
78am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ 78am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
79 $(ACLOCAL_M4) 79 $(ACLOCAL_M4)
80mkinstalldirs = $(install_sh) -d 80mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
81CONFIG_HEADER = $(top_builddir)/modules/core/includes/machine.h 81CONFIG_HEADER = $(top_builddir)/modules/core/includes/machine.h
82CONFIG_CLEAN_FILES = 82CONFIG_CLEAN_FILES =
83CONFIG_CLEAN_VPATH_FILES = 83CONFIG_CLEAN_VPATH_FILES =
@@ -135,6 +135,7 @@ ACLOCAL = @ACLOCAL@
135ALL_LINGUAS = @ALL_LINGUAS@ 135ALL_LINGUAS = @ALL_LINGUAS@
136AMTAR = @AMTAR@ 136AMTAR = @AMTAR@
137ANT = @ANT@ 137ANT = @ANT@
138ANTLR = @ANTLR@
138AR = @AR@ 139AR = @AR@
139AUTOCONF = @AUTOCONF@ 140AUTOCONF = @AUTOCONF@
140AUTOHEADER = @AUTOHEADER@ 141AUTOHEADER = @AUTOHEADER@
@@ -146,6 +147,8 @@ BLAS_LIBS = @BLAS_LIBS@
146CC = @CC@ 147CC = @CC@
147CCDEPMODE = @CCDEPMODE@ 148CCDEPMODE = @CCDEPMODE@
148CFLAGS = @CFLAGS@ 149CFLAGS = @CFLAGS@
150CHECKSTYLE = @CHECKSTYLE@
151COMMONS_BEANUTILS = @COMMONS_BEANUTILS@
149COMMONS_IO = @COMMONS_IO@ 152COMMONS_IO = @COMMONS_IO@
150COMMONS_LOGGING = @COMMONS_LOGGING@ 153COMMONS_LOGGING = @COMMONS_LOGGING@
151CPP = @CPP@ 154CPP = @CPP@
@@ -274,12 +277,12 @@ RT_LIB = @RT_LIB@
274SAXON = @SAXON@ 277SAXON = @SAXON@
275SCICOS_ENABLE = @SCICOS_ENABLE@ 278SCICOS_ENABLE = @SCICOS_ENABLE@
276SCILAB_LIBRARY_VERSION = @SCILAB_LIBRARY_VERSION@ 279SCILAB_LIBRARY_VERSION = @SCILAB_LIBRARY_VERSION@
277SCIPAD_ENABLE = @SCIPAD_ENABLE@
278SED = @SED@ 280SED = @SED@
279SET_MAKE = @SET_MAKE@ 281SET_MAKE = @SET_MAKE@
280SET_RELOCATABLE = @SET_RELOCATABLE@ 282SET_RELOCATABLE = @SET_RELOCATABLE@
281SHELL = @SHELL@ 283SHELL = @SHELL@
282SKINLF = @SKINLF@ 284SKINLF = @SKINLF@
285SPLINT = @SPLINT@
283STRIP = @STRIP@ 286STRIP = @STRIP@
284SWIG_BIN = @SWIG_BIN@ 287SWIG_BIN = @SWIG_BIN@
285SWIG_JAVA = @SWIG_JAVA@ 288SWIG_JAVA = @SWIG_JAVA@
@@ -784,10 +787,12 @@ check-local: $(top_builddir)/scilab-bin
784 export LANG=C;\ 787 export LANG=C;\
785 $(top_builddir)/bin/scilab -nwni -nb -e "$$COMMAND" 788 $(top_builddir)/bin/scilab -nwni -nb -e "$$COMMAND"
786check-code: 789check-code:
787 @if test -f build.xml; then \ 790 if test -f build.xml; then \
788 $(ANT) checkstyle; \ 791 $(ANT) checkstyle; \
789 fi;\ 792 fi
790 splint $(SPLINT_OPTIONS) -I$(top_srcdir)/modules/core/includes/ -I$(top_srcdir)/libs/MALLOC/includes/ -I$(top_srcdir)/modules/localization/includes/ $(INCLUDE_FLAGS) $(CHECK_SRC) 793 if test -x "$(SPLINT)"; then \
794 $(SPLINT) $(SPLINT_OPTIONS) -I$(top_srcdir)/modules/core/includes/ -I$(top_srcdir)/libs/MALLOC/includes/ -I$(top_srcdir)/modules/localization/includes/ $(INCLUDE_FLAGS) $(CHECK_SRC); \
795 fi
791@NEED_JAVA_TRUE@java: 796@NEED_JAVA_TRUE@java:
792# Some configurations needs to export JAVA_HOME in the current env 797# Some configurations needs to export JAVA_HOME in the current env
793@NEED_JAVA_TRUE@ @if test "$(JAVA_HOME)"; then export JAVA_HOME=$(JAVA_HOME); fi; \ 798@NEED_JAVA_TRUE@ @if test "$(JAVA_HOME)"; then export JAVA_HOME=$(JAVA_HOME); fi; \
diff --git a/scilab/libs/libst/Makefile.in b/scilab/libs/libst/Makefile.in
index ea577f5..1e54843 100644
--- a/scilab/libs/libst/Makefile.in
+++ b/scilab/libs/libst/Makefile.in
@@ -75,7 +75,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \
75 $(top_srcdir)/m4/umfpack.m4 $(top_srcdir)/configure.ac 75 $(top_srcdir)/m4/umfpack.m4 $(top_srcdir)/configure.ac
76am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ 76am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
77 $(ACLOCAL_M4) 77 $(ACLOCAL_M4)
78mkinstalldirs = $(install_sh) -d 78mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
79CONFIG_HEADER = $(top_builddir)/modules/core/includes/machine.h 79CONFIG_HEADER = $(top_builddir)/modules/core/includes/machine.h
80CONFIG_CLEAN_FILES = 80CONFIG_CLEAN_FILES =
81CONFIG_CLEAN_VPATH_FILES = 81CONFIG_CLEAN_VPATH_FILES =
@@ -131,6 +131,7 @@ ACLOCAL = @ACLOCAL@
131ALL_LINGUAS = @ALL_LINGUAS@ 131ALL_LINGUAS = @ALL_LINGUAS@
132AMTAR = @AMTAR@ 132AMTAR = @AMTAR@
133ANT = @ANT@ 133ANT = @ANT@
134ANTLR = @ANTLR@
134AR = @AR@ 135AR = @AR@
135AUTOCONF = @AUTOCONF@ 136AUTOCONF = @AUTOCONF@
136AUTOHEADER = @AUTOHEADER@ 137AUTOHEADER = @AUTOHEADER@
@@ -142,6 +143,8 @@ BLAS_LIBS = @BLAS_LIBS@
142CC = @CC@ 143CC = @CC@
143CCDEPMODE = @CCDEPMODE@ 144CCDEPMODE = @CCDEPMODE@
144CFLAGS = @CFLAGS@ 145CFLAGS = @CFLAGS@
146CHECKSTYLE = @CHECKSTYLE@
147COMMONS_BEANUTILS = @COMMONS_BEANUTILS@
145COMMONS_IO = @COMMONS_IO@ 148COMMONS_IO = @COMMONS_IO@
146COMMONS_LOGGING = @COMMONS_LOGGING@ 149COMMONS_LOGGING = @COMMONS_LOGGING@
147CPP = @CPP@ 150CPP = @CPP@
@@ -270,12 +273,12 @@ RT_LIB = @RT_LIB@
270SAXON = @SAXON@ 273SAXON = @SAXON@
271SCICOS_ENABLE = @SCICOS_ENABLE@ 274SCICOS_ENABLE = @SCICOS_ENABLE@
272SCILAB_LIBRARY_VERSION = @SCILAB_LIBRARY_VERSION@ 275SCILAB_LIBRARY_VERSION = @SCILAB_LIBRARY_VERSION@
273SCIPAD_ENABLE = @SCIPAD_ENABLE@
274SED = @SED@ 276SED = @SED@
275SET_MAKE = @SET_MAKE@ 277SET_MAKE = @SET_MAKE@
276SET_RELOCATABLE = @SET_RELOCATABLE@ 278SET_RELOCATABLE = @SET_RELOCATABLE@
277SHELL = @SHELL@ 279SHELL = @SHELL@
278SKINLF = @SKINLF@ 280SKINLF = @SKINLF@
281SPLINT = @SPLINT@
279STRIP = @STRIP@ 282STRIP = @STRIP@
280SWIG_BIN = @SWIG_BIN@ 283SWIG_BIN = @SWIG_BIN@
281SWIG_JAVA = @SWIG_JAVA@ 284SWIG_JAVA = @SWIG_JAVA@
@@ -746,10 +749,12 @@ check-local: $(top_builddir)/scilab-bin
746 export LANG=C;\ 749 export LANG=C;\
747 $(top_builddir)/bin/scilab -nwni -nb -e "$$COMMAND" 750 $(top_builddir)/bin/scilab -nwni -nb -e "$$COMMAND"
748check-code: 751check-code:
749 @if test -f build.xml; then \ 752 if test -f build.xml; then \
750 $(ANT) checkstyle; \ 753 $(ANT) checkstyle; \
751 fi;\ 754 fi
752 splint $(SPLINT_OPTIONS) -I$(top_srcdir)/modules/core/includes/ -I$(top_srcdir)/libs/MALLOC/includes/ -I$(top_srcdir)/modules/localization/includes/ $(INCLUDE_FLAGS) $(CHECK_SRC) 755 if test -x "$(SPLINT)"; then \
756 $(SPLINT) $(SPLINT_OPTIONS) -I$(top_srcdir)/modules/core/includes/ -I$(top_srcdir)/libs/MALLOC/includes/ -I$(top_srcdir)/modules/localization/includes/ $(INCLUDE_FLAGS) $(CHECK_SRC); \
757 fi
753@NEED_JAVA_TRUE@java: 758@NEED_JAVA_TRUE@java:
754# Some configurations needs to export JAVA_HOME in the current env 759# Some configurations needs to export JAVA_HOME in the current env
755@NEED_JAVA_TRUE@ @if test "$(JAVA_HOME)"; then export JAVA_HOME=$(JAVA_HOME); fi; \ 760@NEED_JAVA_TRUE@ @if test "$(JAVA_HOME)"; then export JAVA_HOME=$(JAVA_HOME); fi; \
diff --git a/scilab/modules/Makefile.am b/scilab/modules/Makefile.am
index 86be6b0..94c5514 100644
--- a/scilab/modules/Makefile.am
+++ b/scilab/modules/Makefile.am
@@ -70,7 +70,6 @@ overloading \
70maple2scilab \ 70maple2scilab \
71m2sci \ 71m2sci \
72texmacs \ 72texmacs \
73scipad \
74development_tools \ 73development_tools \
75compatibility_functions \ 74compatibility_functions \
76helptools \ 75helptools \
diff --git a/scilab/modules/Makefile.in b/scilab/modules/Makefile.in
index c447e34..54f75d6 100644
--- a/scilab/modules/Makefile.in
+++ b/scilab/modules/Makefile.in
@@ -81,7 +81,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \
81 $(top_srcdir)/m4/umfpack.m4 $(top_srcdir)/configure.ac 81 $(top_srcdir)/m4/umfpack.m4 $(top_srcdir)/configure.ac
82am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ 82am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
83 $(ACLOCAL_M4) 83 $(ACLOCAL_M4)
84mkinstalldirs = $(install_sh) -d 84mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
85CONFIG_HEADER = $(top_builddir)/modules/core/includes/machine.h 85CONFIG_HEADER = $(top_builddir)/modules/core/includes/machine.h
86CONFIG_CLEAN_FILES = 86CONFIG_CLEAN_FILES =
87CONFIG_CLEAN_VPATH_FILES = 87CONFIG_CLEAN_VPATH_FILES =
@@ -159,10 +159,10 @@ DIST_SUBDIRS = core output_stream action_binding arnoldi \
159 differential_equations cacsd polynomials boolean double pvm io \ 159 differential_equations cacsd polynomials boolean double pvm io \
160 intersci metanet signal_processing call_scilab sound time \ 160 intersci metanet signal_processing call_scilab sound time \
161 sparse windows_tools functions overloading maple2scilab m2sci \ 161 sparse windows_tools functions overloading maple2scilab m2sci \
162 texmacs scipad development_tools compatibility_functions \ 162 texmacs development_tools compatibility_functions helptools \
163 helptools fftw umfpack demo_tools genetic_algorithms \ 163 fftw umfpack demo_tools genetic_algorithms simulated_annealing \
164 simulated_annealing parameters matio atoms hdf5 xcos xpad \ 164 parameters matio atoms hdf5 xcos xpad scicos_blocks scicos . \
165 scicos_blocks scicos . javasci 165 javasci
166DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) 166DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
167am__relativize = \ 167am__relativize = \
168 dir0=`pwd`; \ 168 dir0=`pwd`; \
@@ -193,6 +193,7 @@ ACLOCAL = @ACLOCAL@
193ALL_LINGUAS = @ALL_LINGUAS@ 193ALL_LINGUAS = @ALL_LINGUAS@
194AMTAR = @AMTAR@ 194AMTAR = @AMTAR@
195ANT = @ANT@ 195ANT = @ANT@
196ANTLR = @ANTLR@
196AR = @AR@ 197AR = @AR@
197AUTOCONF = @AUTOCONF@ 198AUTOCONF = @AUTOCONF@
198AUTOHEADER = @AUTOHEADER@ 199AUTOHEADER = @AUTOHEADER@
@@ -204,6 +205,8 @@ BLAS_LIBS = @BLAS_LIBS@
204CC = @CC@ 205CC = @CC@
205CCDEPMODE = @CCDEPMODE@ 206CCDEPMODE = @CCDEPMODE@
206CFLAGS = @CFLAGS@ 207CFLAGS = @CFLAGS@
208CHECKSTYLE = @CHECKSTYLE@
209COMMONS_BEANUTILS = @COMMONS_BEANUTILS@
207COMMONS_IO = @COMMONS_IO@ 210COMMONS_IO = @COMMONS_IO@
208COMMONS_LOGGING = @COMMONS_LOGGING@ 211COMMONS_LOGGING = @COMMONS_LOGGING@
209CPP = @CPP@ 212CPP = @CPP@
@@ -332,12 +335,12 @@ RT_LIB = @RT_LIB@
332SAXON = @SAXON@ 335SAXON = @SAXON@
333SCICOS_ENABLE = @SCICOS_ENABLE@ 336SCICOS_ENABLE = @SCICOS_ENABLE@
334SCILAB_LIBRARY_VERSION = @SCILAB_LIBRARY_VERSION@ 337SCILAB_LIBRARY_VERSION = @SCILAB_LIBRARY_VERSION@
335SCIPAD_ENABLE = @SCIPAD_ENABLE@
336SED = @SED@ 338SED = @SED@
337SET_MAKE = @SET_MAKE@ 339SET_MAKE = @SET_MAKE@
338SET_RELOCATABLE = @SET_RELOCATABLE@ 340SET_RELOCATABLE = @SET_RELOCATABLE@
339SHELL = @SHELL@ 341SHELL = @SHELL@
340SKINLF = @SKINLF@ 342SKINLF = @SKINLF@
343SPLINT = @SPLINT@
341STRIP = @STRIP@ 344STRIP = @STRIP@
342SWIG_BIN = @SWIG_BIN@ 345SWIG_BIN = @SWIG_BIN@
343SWIG_JAVA = @SWIG_JAVA@ 346SWIG_JAVA = @SWIG_JAVA@
@@ -431,7 +434,7 @@ SUBDIRS = core output_stream action_binding arnoldi \
431 differential_equations cacsd polynomials boolean double pvm io \ 434 differential_equations cacsd polynomials boolean double pvm io \
432 intersci metanet signal_processing core call_scilab \ 435 intersci metanet signal_processing core call_scilab \
433 interpolation sound time randlib sparse windows_tools \ 436 interpolation sound time randlib sparse windows_tools \
434 functions overloading maple2scilab m2sci texmacs scipad \ 437 functions overloading maple2scilab m2sci texmacs \
435 development_tools compatibility_functions helptools fftw \ 438 development_tools compatibility_functions helptools fftw \
436 umfpack demo_tools genetic_algorithms simulated_annealing \ 439 umfpack demo_tools genetic_algorithms simulated_annealing \
437 parameters matio atoms hdf5 xcos xpad $(am__append_1) scicos . \ 440 parameters matio atoms hdf5 xcos xpad $(am__append_1) scicos . \
diff --git a/scilab/modules/action_binding/Makefile.in b/scilab/modules/action_binding/Makefile.in
index 0fb1747..5438964 100644
--- a/scilab/modules/action_binding/Makefile.in
+++ b/scilab/modules/action_binding/Makefile.in
@@ -1,8 +1,9 @@
1# Makefile.in generated by automake 1.10.2 from Makefile.am. 1# Makefile.in generated by automake 1.11 from Makefile.am.
2# @configure_input@ 2# @configure_input@
3 3
4# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 4# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
5# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. 5# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
6# Inc.
6# This Makefile.in is free software; the Free Software Foundation 7# This Makefile.in is free software; the Free Software Foundation
7# gives unlimited permission to copy and/or distribute it, 8# gives unlimited permission to copy and/or distribute it,
8# with or without modifications, as long as this notice is preserved. 9# with or without modifications, as long as this notice is preserved.
@@ -43,8 +44,9 @@
43 44
44VPATH = @srcdir@ 45VPATH = @srcdir@
45pkgdatadir = $(datadir)/@PACKAGE@ 46pkgdatadir = $(datadir)/@PACKAGE@
46pkglibdir = $(libdir)/@PACKAGE@
47pkgincludedir = $(includedir)/@PACKAGE@ 47pkgincludedir = $(includedir)/@PACKAGE@
48pkglibdir = $(libdir)/@PACKAGE@
49pkglibexecdir = $(libexecdir)/@PACKAGE@
48am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd 50am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
49install_sh_DATA = $(install_sh) -c -m 644 51install_sh_DATA = $(install_sh) -c -m 644
50install_sh_PROGRAM = $(install_sh) -c 52install_sh_PROGRAM = $(install_sh) -c
@@ -82,17 +84,32 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
82mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs 84mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
83CONFIG_HEADER = $(top_builddir)/modules/core/includes/machine.h 85CONFIG_HEADER = $(top_builddir)/modules/core/includes/machine.h
84CONFIG_CLEAN_FILES = 86CONFIG_CLEAN_FILES =
87CONFIG_CLEAN_VPATH_FILES =
85am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; 88am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
86am__vpath_adj = case $$p in \ 89am__vpath_adj = case $$p in \
87 $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ 90 $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
88 *) f=$$p;; \ 91 *) f=$$p;; \
89 esac; 92 esac;
90am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; 93am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
94am__install_max = 40
95am__nobase_strip_setup = \
96 srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
97am__nobase_strip = \
98 for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
99am__nobase_list = $(am__nobase_strip_setup); \
100 for p in $$list; do echo "$$p $$p"; done | \
101 sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
102 $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
103 if (++n[$$2] == $(am__install_max)) \
104 { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
105 END { for (dir in files) print dir, files[dir] }'
106am__base_list = \
107 sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
108 sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
91am__installdirs = "$(DESTDIR)$(pkglibdir)" \ 109am__installdirs = "$(DESTDIR)$(pkglibdir)" \
92 "$(DESTDIR)$(libsciaction_binding_la_etcdir)" \ 110 "$(DESTDIR)$(libsciaction_binding_la_etcdir)" \
93 "$(DESTDIR)$(libsciaction_binding_la_rootdir)" \ 111 "$(DESTDIR)$(libsciaction_binding_la_rootdir)" \
94 "$(DESTDIR)$(libsciaction_binding_la_sci_gatewaydir)" 112 "$(DESTDIR)$(libsciaction_binding_la_sci_gatewaydir)"
95pkglibLTLIBRARIES_INSTALL = $(INSTALL)
96LTLIBRARIES = $(pkglib_LTLIBRARIES) 113LTLIBRARIES = $(pkglib_LTLIBRARIES)
97libsciaction_binding_la_DEPENDENCIES = \ 114libsciaction_binding_la_DEPENDENCIES = \
98 $(top_builddir)/modules/core/libscicore.la \ 115 $(top_builddir)/modules/core/libscicore.la \
@@ -119,6 +136,7 @@ libsciaction_binding_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
119DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/modules/core/includes 136DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/modules/core/includes
120depcomp = $(SHELL) $(top_srcdir)/config/depcomp 137depcomp = $(SHELL) $(top_srcdir)/config/depcomp
121am__depfiles_maybe = depfiles 138am__depfiles_maybe = depfiles
139am__mv = mv -f
122COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ 140COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
123 $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) 141 $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
124LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ 142LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
@@ -130,9 +148,6 @@ LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
130 $(LDFLAGS) -o $@ 148 $(LDFLAGS) -o $@
131SOURCES = $(libsciaction_binding_la_SOURCES) 149SOURCES = $(libsciaction_binding_la_SOURCES)
132DIST_SOURCES = $(am__libsciaction_binding_la_SOURCES_DIST) 150DIST_SOURCES = $(am__libsciaction_binding_la_SOURCES_DIST)
133libsciaction_binding_la_etcDATA_INSTALL = $(INSTALL_DATA)
134libsciaction_binding_la_rootDATA_INSTALL = $(INSTALL_DATA)
135libsciaction_binding_la_sci_gatewayDATA_INSTALL = $(INSTALL_DATA)
136DATA = $(libsciaction_binding_la_etc_DATA) \ 151DATA = $(libsciaction_binding_la_etc_DATA) \
137 $(libsciaction_binding_la_root_DATA) \ 152 $(libsciaction_binding_la_root_DATA) \
138 $(libsciaction_binding_la_sci_gateway_DATA) 153 $(libsciaction_binding_la_sci_gateway_DATA)
@@ -143,6 +158,7 @@ ACLOCAL = @ACLOCAL@
143ALL_LINGUAS = @ALL_LINGUAS@ 158ALL_LINGUAS = @ALL_LINGUAS@
144AMTAR = @AMTAR@ 159AMTAR = @AMTAR@
145ANT = @ANT@ 160ANT = @ANT@
161ANTLR = @ANTLR@
146AR = @AR@ 162AR = @AR@
147AUTOCONF = @AUTOCONF@ 163AUTOCONF = @AUTOCONF@
148AUTOHEADER = @AUTOHEADER@ 164AUTOHEADER = @AUTOHEADER@
@@ -154,6 +170,8 @@ BLAS_LIBS = @BLAS_LIBS@
154CC = @CC@ 170CC = @CC@
155CCDEPMODE = @CCDEPMODE@ 171CCDEPMODE = @CCDEPMODE@
156CFLAGS = @CFLAGS@ 172CFLAGS = @CFLAGS@
173CHECKSTYLE = @CHECKSTYLE@
174COMMONS_BEANUTILS = @COMMONS_BEANUTILS@
157COMMONS_IO = @COMMONS_IO@ 175COMMONS_IO = @COMMONS_IO@
158COMMONS_LOGGING = @COMMONS_LOGGING@ 176COMMONS_LOGGING = @COMMONS_LOGGING@
159CPP = @CPP@ 177CPP = @CPP@
@@ -182,9 +200,11 @@ FGREP = @FGREP@
182FLEXDOCK = @FLEXDOCK@ 200FLEXDOCK = @FLEXDOCK@
183FLIBS = @FLIBS@ 201FLIBS = @FLIBS@
184FOP = @FOP@ 202FOP = @FOP@
203GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
185GIWS_BIN = @GIWS_BIN@ 204GIWS_BIN = @GIWS_BIN@
186GLUEGEN_RT = @GLUEGEN_RT@ 205GLUEGEN_RT = @GLUEGEN_RT@
187GMSGFMT = @GMSGFMT@ 206GMSGFMT = @GMSGFMT@
207GMSGFMT_015 = @GMSGFMT_015@
188GRAPHICS_ENABLE = @GRAPHICS_ENABLE@ 208GRAPHICS_ENABLE = @GRAPHICS_ENABLE@
189GREP = @GREP@ 209GREP = @GREP@
190GUI_ENABLE = @GUI_ENABLE@ 210GUI_ENABLE = @GUI_ENABLE@
@@ -238,9 +258,9 @@ MATIO_CFLAGS = @MATIO_CFLAGS@
238MATIO_ENABLE = @MATIO_ENABLE@ 258MATIO_ENABLE = @MATIO_ENABLE@
239MATIO_LIBS = @MATIO_LIBS@ 259MATIO_LIBS = @MATIO_LIBS@
240MKDIR_P = @MKDIR_P@ 260MKDIR_P = @MKDIR_P@
241MKINSTALLDIRS = @MKINSTALLDIRS@
242MSGCAT = @MSGCAT@ 261MSGCAT = @MSGCAT@
243MSGFMT = @MSGFMT@ 262MSGFMT = @MSGFMT@
263MSGFMT_015 = @MSGFMT_015@
244MSGMERGE = @MSGMERGE@ 264MSGMERGE = @MSGMERGE@
245NM = @NM@ 265NM = @NM@
246NMEDIT = @NMEDIT@ 266NMEDIT = @NMEDIT@
@@ -258,6 +278,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
258PACKAGE_NAME = @PACKAGE_NAME@ 278PACKAGE_NAME = @PACKAGE_NAME@
259PACKAGE_STRING = @PACKAGE_STRING@ 279PACKAGE_STRING = @PACKAGE_STRING@
260PACKAGE_TARNAME = @PACKAGE_TARNAME@ 280PACKAGE_TARNAME = @PACKAGE_TARNAME@
281PACKAGE_URL = @PACKAGE_URL@
261PACKAGE_VERSION = @PACKAGE_VERSION@ 282PACKAGE_VERSION = @PACKAGE_VERSION@
262PATH_SEPARATOR = @PATH_SEPARATOR@ 283PATH_SEPARATOR = @PATH_SEPARATOR@
263PCRE_CFLAGS = @PCRE_CFLAGS@ 284PCRE_CFLAGS = @PCRE_CFLAGS@
@@ -279,12 +300,12 @@ RT_LIB = @RT_LIB@
279SAXON = @SAXON@ 300SAXON = @SAXON@
280SCICOS_ENABLE = @SCICOS_ENABLE@ 301SCICOS_ENABLE = @SCICOS_ENABLE@
281SCILAB_LIBRARY_VERSION = @SCILAB_LIBRARY_VERSION@ 302SCILAB_LIBRARY_VERSION = @SCILAB_LIBRARY_VERSION@
282SCIPAD_ENABLE = @SCIPAD_ENABLE@
283SED = @SED@ 303SED = @SED@
284SET_MAKE = @SET_MAKE@ 304SET_MAKE = @SET_MAKE@
285SET_RELOCATABLE = @SET_RELOCATABLE@ 305SET_RELOCATABLE = @SET_RELOCATABLE@
286SHELL = @SHELL@ 306SHELL = @SHELL@
287SKINLF = @SKINLF@ 307SKINLF = @SKINLF@
308SPLINT = @SPLINT@
288STRIP = @STRIP@ 309STRIP = @STRIP@
289SWIG_BIN = @SWIG_BIN@ 310SWIG_BIN = @SWIG_BIN@
290SWIG_JAVA = @SWIG_JAVA@ 311SWIG_JAVA = @SWIG_JAVA@
@@ -299,6 +320,8 @@ VERSION = @VERSION@
299WITH_OCAML = @WITH_OCAML@ 320WITH_OCAML = @WITH_OCAML@
300WITH_TKSCI = @WITH_TKSCI@ 321WITH_TKSCI = @WITH_TKSCI@
301XGETTEXT = @XGETTEXT@ 322XGETTEXT = @XGETTEXT@
323XGETTEXT_015 = @XGETTEXT_015@
324XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
302XMKMF = @XMKMF@ 325XMKMF = @XMKMF@
303XMLGRAPHICS_COMMONS = @XMLGRAPHICS_COMMONS@ 326XMLGRAPHICS_COMMONS = @XMLGRAPHICS_COMMONS@
304XML_APIS_EXT = @XML_APIS_EXT@ 327XML_APIS_EXT = @XML_APIS_EXT@
@@ -495,9 +518,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir
495 exit 1;; \ 518 exit 1;; \
496 esac; \ 519 esac; \
497 done; \ 520 done; \
498 echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign modules/action_binding/Makefile'; \ 521 echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign modules/action_binding/Makefile'; \
499 cd $(top_srcdir) && \ 522 $(am__cd) $(top_srcdir) && \
500 $(AUTOMAKE) --foreign modules/action_binding/Makefile 523 $(AUTOMAKE) --foreign modules/action_binding/Makefile
501.PRECIOUS: Makefile 524.PRECIOUS: Makefile
502Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status 525Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
503 @case '$?' in \ 526 @case '$?' in \
@@ -515,23 +538,28 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
515 cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh 538 cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
516$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) 539$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
517 cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh 540 cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
541$(am__aclocal_m4_deps):
518install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES) 542install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES)
519 @$(NORMAL_INSTALL) 543 @$(NORMAL_INSTALL)
520 test -z "$(pkglibdir)" || $(MKDIR_P) "$(DESTDIR)$(pkglibdir)" 544 test -z "$(pkglibdir)" || $(MKDIR_P) "$(DESTDIR)$(pkglibdir)"
521 @list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \ 545 @list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \
546 list2=; for p in $$list; do \
522 if test -f $$p; then \ 547 if test -f $$p; then \
523 f=$(am__strip_dir) \ 548 list2="$$list2 $$p"; \
524 echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pkglibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(pkglibdir)/$$f'"; \
525 $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pkglibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(pkglibdir)/$$f"; \
526 else :; fi; \ 549 else :; fi; \
527 done 550 done; \
551 test -z "$$list2" || { \
552 echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(pkglibdir)'"; \
553 $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(pkglibdir)"; \
554 }
528 555
529uninstall-pkglibLTLIBRARIES: 556uninstall-pkglibLTLIBRARIES:
530 @$(NORMAL_UNINSTALL) 557 @$(NORMAL_UNINSTALL)
531 @list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \ 558 @list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \
532 p=$(am__strip_dir) \ 559 for p in $$list; do \
533 echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(pkglibdir)/$$p'"; \ 560 $(am__strip_dir) \
534 $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(pkglibdir)/$$p"; \ 561 echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(pkglibdir)/$$f'"; \
562 $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(pkglibdir)/$$f"; \
535 done 563 done
536 564
537clean-pkglibLTLIBRARIES: 565clean-pkglibLTLIBRARIES:
@@ -558,52 +586,52 @@ distclean-compile:
558 586
559.c.o: 587.c.o:
560@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< 588@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
561@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po 589@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
562@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ 590@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
563@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ 591@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
564@am__fastdepCC_FALSE@ $(COMPILE) -c $< 592@am__fastdepCC_FALSE@ $(COMPILE) -c $<
565 593
566.c.obj: 594.c.obj:
567@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` 595@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
568@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po 596@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
569@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ 597@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
570@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ 598@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
571@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` 599@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
572 600
573.c.lo: 601.c.lo:
574@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< 602@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
575@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo 603@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
576@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ 604@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
577@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ 605@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
578@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< 606@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
579 607
580libsciaction_binding_la-noaction_binding.lo: src/noaction_binding/noaction_binding.c 608libsciaction_binding_la-noaction_binding.lo: src/noaction_binding/noaction_binding.c
581@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsciaction_binding_la_CFLAGS) $(CFLAGS) -MT libsciaction_binding_la-noaction_binding.lo -MD -MP -MF $(DEPDIR)/libsciaction_binding_la-noaction_binding.Tpo -c -o libsciaction_binding_la-noaction_binding.lo `test -f 'src/noaction_binding/noaction_binding.c' || echo '$(srcdir)/'`src/noaction_binding/noaction_binding.c 609@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsciaction_binding_la_CFLAGS) $(CFLAGS) -MT libsciaction_binding_la-noaction_binding.lo -MD -MP -MF $(DEPDIR)/libsciaction_binding_la-noaction_binding.Tpo -c -o libsciaction_binding_la-noaction_binding.lo `test -f 'src/noaction_binding/noaction_binding.c' || echo '$(srcdir)/'`src/noaction_binding/noaction_binding.c
582@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libsciaction_binding_la-noaction_binding.Tpo $(DEPDIR)/libsciaction_binding_la-noaction_binding.Plo 610@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libsciaction_binding_la-noaction_binding.Tpo $(DEPDIR)/libsciaction_binding_la-noaction_binding.Plo
583@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='src/noaction_binding/noaction_binding.c' object='libsciaction_binding_la-noaction_binding.lo' libtool=yes @AMDEPBACKSLASH@ 611@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='src/noaction_binding/noaction_binding.c' object='libsciaction_binding_la-noaction_binding.lo' libtool=yes @AMDEPBACKSLASH@
584@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ 612@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
585@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsciaction_binding_la_CFLAGS) $(CFLAGS) -c -o libsciaction_binding_la-noaction_binding.lo `test -f 'src/noaction_binding/noaction_binding.c' || echo '$(srcdir)/'`src/noaction_binding/noaction_binding.c 613@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsciaction_binding_la_CFLAGS) $(CFLAGS) -c -o libsciaction_binding_la-noaction_binding.lo `test -f 'src/noaction_binding/noaction_binding.c' || echo '$(srcdir)/'`src/noaction_binding/noaction_binding.c
586 614
587libsciaction_binding_la-dynamic_menus.lo: src/c/dynamic_menus.c 615libsciaction_binding_la-dynamic_menus.lo: src/c/dynamic_menus.c
588@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsciaction_binding_la_CFLAGS) $(CFLAGS) -MT libsciaction_binding_la-dynamic_menus.lo -MD -MP -MF $(DEPDIR)/libsciaction_binding_la-dynamic_menus.Tpo -c -o libsciaction_binding_la-dynamic_menus.lo `test -f 'src/c/dynamic_menus.c' || echo '$(srcdir)/'`src/c/dynamic_menus.c 616@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsciaction_binding_la_CFLAGS) $(CFLAGS) -MT libsciaction_binding_la-dynamic_menus.lo -MD -MP -MF $(DEPDIR)/libsciaction_binding_la-dynamic_menus.Tpo -c -o libsciaction_binding_la-dynamic_menus.lo `test -f 'src/c/dynamic_menus.c' || echo '$(srcdir)/'`src/c/dynamic_menus.c
589@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libsciaction_binding_la-dynamic_menus.Tpo $(DEPDIR)/libsciaction_binding_la-dynamic_menus.Plo 617@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libsciaction_binding_la-dynamic_menus.Tpo $(DEPDIR)/libsciaction_binding_la-dynamic_menus.Plo
590@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='src/c/dynamic_menus.c' object='libsciaction_binding_la-dynamic_menus.lo' libtool=yes @AMDEPBACKSLASH@ 618@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='src/c/dynamic_menus.c' object='libsciaction_binding_la-dynamic_menus.lo' libtool=yes @AMDEPBACKSLASH@
591@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ 619@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
592@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsciaction_binding_la_CFLAGS) $(CFLAGS) -c -o libsciaction_binding_la-dynamic_menus.lo `test -f 'src/c/dynamic_menus.c' || echo '$(srcdir)/'`src/c/dynamic_menus.c 620@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsciaction_binding_la_CFLAGS) $(CFLAGS) -c -o libsciaction_binding_la-dynamic_menus.lo `test -f 'src/c/dynamic_menus.c' || echo '$(srcdir)/'`src/c/dynamic_menus.c
593 621
594libsciaction_binding_la-InterpreterManagement.lo: src/c/InterpreterManagement.c 622libsciaction_binding_la-InterpreterManagement.lo: src/c/InterpreterManagement.c
595@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsciaction_binding_la_CFLAGS) $(CFLAGS) -MT libsciaction_binding_la-InterpreterManagement.lo -MD -MP -MF $(DEPDIR)/libsciaction_binding_la-InterpreterManagement.Tpo -c -o libsciaction_binding_la-InterpreterManagement.lo `test -f 'src/c/InterpreterManagement.c' || echo '$(srcdir)/'`src/c/InterpreterManagement.c 623@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsciaction_binding_la_CFLAGS) $(CFLAGS) -MT libsciaction_binding_la-InterpreterManagement.lo -MD -MP -MF $(DEPDIR)/libsciaction_binding_la-InterpreterManagement.Tpo -c -o libsciaction_binding_la-InterpreterManagement.lo `test -f 'src/c/InterpreterManagement.c' || echo '$(srcdir)/'`src/c/InterpreterManagement.c
596@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libsciaction_binding_la-InterpreterManagement.Tpo $(DEPDIR)/libsciaction_binding_la-InterpreterManagement.Plo 624@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libsciaction_binding_la-InterpreterManagement.Tpo $(DEPDIR)/libsciaction_binding_la-InterpreterManagement.Plo
597@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='src/c/InterpreterManagement.c' object='libsciaction_binding_la-InterpreterManagement.lo' libtool=yes @AMDEPBACKSLASH@ 625@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='src/c/InterpreterManagement.c' object='libsciaction_binding_la-InterpreterManagement.lo' libtool=yes @AMDEPBACKSLASH@
598@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ 626@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
599@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsciaction_binding_la_CFLAGS) $(CFLAGS) -c -o libsciaction_binding_la-InterpreterManagement.lo `test -f 'src/c/InterpreterManagement.c' || echo '$(srcdir)/'`src/c/InterpreterManagement.c 627@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsciaction_binding_la_CFLAGS) $(CFLAGS) -c -o libsciaction_binding_la-InterpreterManagement.lo `test -f 'src/c/InterpreterManagement.c' || echo '$(srcdir)/'`src/c/InterpreterManagement.c
600 628
601libsciaction_binding_la-InterpreterManagement_wrap.lo: src/jni/InterpreterManagement_wrap.c 629libsciaction_binding_la-InterpreterManagement_wrap.lo: src/jni/InterpreterManagement_wrap.c
602@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsciaction_binding_la_CFLAGS) $(CFLAGS) -MT libsciaction_binding_la-InterpreterManagement_wrap.lo -MD -MP -MF $(DEPDIR)/libsciaction_binding_la-InterpreterManagement_wrap.Tpo -c -o libsciaction_binding_la-InterpreterManagement_wrap.lo `test -f 'src/jni/InterpreterManagement_wrap.c' || echo '$(srcdir)/'`src/jni/InterpreterManagement_wrap.c 630@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsciaction_binding_la_CFLAGS) $(CFLAGS) -MT libsciaction_binding_la-InterpreterManagement_wrap.lo -MD -MP -MF $(DEPDIR)/libsciaction_binding_la-InterpreterManagement_wrap.Tpo -c -o libsciaction_binding_la-InterpreterManagement_wrap.lo `test -f 'src/jni/InterpreterManagement_wrap.c' || echo '$(srcdir)/'`src/jni/InterpreterManagement_wrap.c
603@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libsciaction_binding_la-InterpreterManagement_wrap.Tpo $(DEPDIR)/libsciaction_binding_la-InterpreterManagement_wrap.Plo 631@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libsciaction_binding_la-InterpreterManagement_wrap.Tpo $(DEPDIR)/libsciaction_binding_la-InterpreterManagement_wrap.Plo
604@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='src/jni/InterpreterManagement_wrap.c' object='libsciaction_binding_la-InterpreterManagement_wrap.lo' libtool=yes @AMDEPBACKSLASH@ 632@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='src/jni/InterpreterManagement_wrap.c' object='libsciaction_binding_la-InterpreterManagement_wrap.lo' libtool=yes @AMDEPBACKSLASH@
605@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ 633@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
606@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsciaction_binding_la_CFLAGS) $(CFLAGS) -c -o libsciaction_binding_la-InterpreterManagement_wrap.lo `test -f 'src/jni/InterpreterManagement_wrap.c' || echo '$(srcdir)/'`src/jni/InterpreterManagement_wrap.c 634@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsciaction_binding_la_CFLAGS) $(CFLAGS) -c -o libsciaction_binding_la-InterpreterManagement_wrap.lo `test -f 'src/jni/InterpreterManagement_wrap.c' || echo '$(srcdir)/'`src/jni/InterpreterManagement_wrap.c
607 635
608mostlyclean-libtool: 636mostlyclean-libtool:
609 -rm -f *.lo 637 -rm -f *.lo
@@ -613,54 +641,63 @@ clean-libtool:
613install-libsciaction_binding_la_etcDATA: $(libsciaction_binding_la_etc_DATA) 641install-libsciaction_binding_la_etcDATA: $(libsciaction_binding_la_etc_DATA)
614 @$(NORMAL_INSTALL) 642 @$(NORMAL_INSTALL)
615 test -z "$(libsciaction_binding_la_etcdir)" || $(MKDIR_P) "$(DESTDIR)$(libsciaction_binding_la_etcdir)" 643 test -z "$(libsciaction_binding_la_etcdir)" || $(MKDIR_P) "$(DESTDIR)$(libsciaction_binding_la_etcdir)"
616 @list='$(libsciaction_binding_la_etc_DATA)'; for p in $$list; do \ 644 @list='$(libsciaction_binding_la_etc_DATA)'; test -n "$(libsciaction_binding_la_etcdir)" || list=; \
645 for p in $$list; do \
617 if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ 646 if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
618 f=$(am__strip_dir) \ 647 echo "$$d$$p"; \
619 echo " $(libsciaction_binding_la_etcDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(libsciaction_binding_la_etcdir)/$$f'"; \ 648 done | $(am__base_list) | \
620 $(libsciaction_binding_la_etcDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(libsciaction_binding_la_etcdir)/$$f"; \ 649 while read files; do \
650 echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(libsciaction_binding_la_etcdir)'"; \
651 $(INSTALL_DATA) $$files "$(DESTDIR)$(libsciaction_binding_la_etcdir)" || exit $$?; \
621 done 652 done
622 653
623uninstall-libsciaction_binding_la_etcDATA: 654uninstall-libsciaction_binding_la_etcDATA:
624 @$(NORMAL_UNINSTALL) 655 @$(NORMAL_UNINSTALL)
625 @list='$(libsciaction_binding_la_etc_DATA)'; for p in $$list; do \ 656 @list='$(libsciaction_binding_la_etc_DATA)'; test -n "$(libsciaction_binding_la_etcdir)" || list=; \
626 f=$(am__strip_dir) \ 657 files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
627 echo " rm -f '$(DESTDIR)$(libsciaction_binding_la_etcdir)/$$f'"; \ 658 test -n "$$files" || exit 0; \
628 rm -f "$(DESTDIR)$(libsciaction_binding_la_etcdir)/$$f"; \ 659 echo " ( cd '$(DESTDIR)$(libsciaction_binding_la_etcdir)' && rm -f" $$files ")"; \
629 done 660 cd "$(DESTDIR)$(libsciaction_binding_la_etcdir)" && rm -f $$files
630install-libsciaction_binding_la_rootDATA: $(libsciaction_binding_la_root_DATA) 661install-libsciaction_binding_la_rootDATA: $(libsciaction_binding_la_root_DATA)
631 @$(NORMAL_INSTALL) 662 @$(NORMAL_INSTALL)
632 test -z "$(libsciaction_binding_la_rootdir)" || $(MKDIR_P) "$(DESTDIR)$(libsciaction_binding_la_rootdir)" 663 test -z "$(libsciaction_binding_la_rootdir)" || $(MKDIR_P) "$(DESTDIR)$(libsciaction_binding_la_rootdir)"
633 @list='$(libsciaction_binding_la_root_DATA)'; for p in $$list; do \ 664 @list='$(libsciaction_binding_la_root_DATA)'; test -n "$(libsciaction_binding_la_rootdir)" || list=; \
665 for p in $$list; do \
634 if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ 666 if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
635 f=$(am__strip_dir) \ 667 echo "$$d$$p"; \
636 echo " $(libsciaction_binding_la_rootDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(libsciaction_binding_la_rootdir)/$$f'"; \ 668 done | $(am__base_list) | \
637 $(libsciaction_binding_la_rootDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(libsciaction_binding_la_rootdir)/$$f"; \ 669 while read files; do \
670 echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(libsciaction_binding_la_rootdir)'"; \
671 $(INSTALL_DATA) $$files "$(DESTDIR)$(libsciaction_binding_la_rootdir)" || exit $$?; \
638 done 672 done
639 673
640uninstall-libsciaction_binding_la_rootDATA: 674uninstall-libsciaction_binding_la_rootDATA:
641 @$(NORMAL_UNINSTALL) 675 @$(NORMAL_UNINSTALL)
642 @list='$(libsciaction_binding_la_root_DATA)'; for p in $$list; do \ 676 @list='$(libsciaction_binding_la_root_DATA)'; test -n "$(libsciaction_binding_la_rootdir)" || list=; \
643 f=$(am__strip_dir) \ 677 files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
644 echo " rm -f '$(DESTDIR)$(libsciaction_binding_la_rootdir)/$$f'"; \ 678 test -n "$$files" || exit 0; \
645 rm -f "$(DESTDIR)$(libsciaction_binding_la_rootdir)/$$f"; \ 679 echo " ( cd '$(DESTDIR)$(libsciaction_binding_la_rootdir)' && rm -f" $$files ")"; \
646 done 680 cd "$(DESTDIR)$(libsciaction_binding_la_rootdir)" && rm -f $$files
647install-libsciaction_binding_la_sci_gatewayDATA: $(libsciaction_binding_la_sci_gateway_DATA) 681install-libsciaction_binding_la_sci_gatewayDATA: $(libsciaction_binding_la_sci_gateway_DATA)
648 @$(NORMAL_INSTALL) 682 @$(NORMAL_INSTALL)
649 test -z "$(libsciaction_binding_la_sci_gatewaydir)" || $(MKDIR_P) "$(DESTDIR)$(libsciaction_binding_la_sci_gatewaydir)" 683 test -z "$(libsciaction_binding_la_sci_gatewaydir)" || $(MKDIR_P) "$(DESTDIR)$(libsciaction_binding_la_sci_gatewaydir)"
650 @list='$(libsciaction_binding_la_sci_gateway_DATA)'; for p in $$list; do \ 684 @list='$(libsciaction_binding_la_sci_gateway_DATA)'; test -n "$(libsciaction_binding_la_sci_gatewaydir)" || list=; \
685 for p in $$list; do \
651 if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ 686 if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
652 f=$(am__strip_dir) \ 687 echo "$$d$$p"; \
653 echo " $(libsciaction_binding_la_sci_gatewayDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(libsciaction_binding_la_sci_gatewaydir)/$$f'"; \ 688 done | $(am__base_list) | \
654 $(libsciaction_binding_la_sci_gatewayDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(libsciaction_binding_la_sci_gatewaydir)/$$f"; \ 689 while read files; do \
690 echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(libsciaction_binding_la_sci_gatewaydir)'"; \
691 $(INSTALL_DATA) $$files "$(DESTDIR)$(libsciaction_binding_la_sci_gatewaydir)" || exit $$?; \
655 done 692 done
656 693
657uninstall-libsciaction_binding_la_sci_gatewayDATA: 694uninstall-libsciaction_binding_la_sci_gatewayDATA:
658 @$(NORMAL_UNINSTALL) 695 @$(NORMAL_UNINSTALL)
659 @list='$(libsciaction_binding_la_sci_gateway_DATA)'; for p in $$list; do \ 696 @list='$(libsciaction_binding_la_sci_gateway_DATA)'; test -n "$(libsciaction_binding_la_sci_gatewaydir)" || list=; \
660 f=$(am__strip_dir) \ 697 files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
661 echo " rm -f '$(DESTDIR)$(libsciaction_binding_la_sci_gatewaydir)/$$f'"; \ 698 test -n "$$files" || exit 0; \
662 rm -f "$(DESTDIR)$(libsciaction_binding_la_sci_gatewaydir)/$$f"; \ 699 echo " ( cd '$(DESTDIR)$(libsciaction_binding_la_sci_gatewaydir)' && rm -f" $$files ")"; \
663 done 700 cd "$(DESTDIR)$(libsciaction_binding_la_sci_gatewaydir)" && rm -f $$files
664 701
665ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) 702ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
666 list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ 703 list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
@@ -674,7 +711,7 @@ tags: TAGS
674 711
675TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ 712TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
676 $(TAGS_FILES) $(LISP) 713 $(TAGS_FILES) $(LISP)
677 tags=; \ 714 set x; \
678 here=`pwd`; \ 715 here=`pwd`; \
679 list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ 716 list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
680 unique=`for i in $$list; do \ 717 unique=`for i in $$list; do \
@@ -682,29 +719,34 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
682 done | \ 719 done | \
683 $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ 720 $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
684 END { if (nonempty) { for (i in files) print i; }; }'`; \ 721 END { if (nonempty) { for (i in files) print i; }; }'`; \
685 if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ 722 shift; \
723 if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
686 test -n "$$unique" || unique=$$empty_fix; \ 724 test -n "$$unique" || unique=$$empty_fix; \
687 $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ 725 if test $$# -gt 0; then \
688 $$tags $$unique; \ 726 $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
727 "$$@" $$unique; \
728 else \
729 $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
730 $$unique; \
731 fi; \
689 fi 732 fi
690ctags: CTAGS 733ctags: CTAGS
691CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ 734CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
692 $(TAGS_FILES) $(LISP) 735 $(TAGS_FILES) $(LISP)
693 tags=; \
694 list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ 736 list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
695 unique=`for i in $$list; do \ 737 unique=`for i in $$list; do \
696 if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ 738 if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
697 done | \ 739 done | \
698 $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ 740 $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
699 END { if (nonempty) { for (i in files) print i; }; }'`; \ 741 END { if (nonempty) { for (i in files) print i; }; }'`; \
700 test -z "$(CTAGS_ARGS)$$tags$$unique" \ 742 test -z "$(CTAGS_ARGS)$$unique" \
701 || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ 743 || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
702 $$tags $$unique 744 $$unique
703 745
704GTAGS: 746GTAGS:
705 here=`$(am__cd) $(top_builddir) && pwd` \ 747 here=`$(am__cd) $(top_builddir) && pwd` \
706 && cd $(top_srcdir) \ 748 && $(am__cd) $(top_srcdir) \
707 && gtags -i $(GTAGS_ARGS) $$here 749 && gtags -i $(GTAGS_ARGS) "$$here"
708 750
709distclean-tags: 751distclean-tags:
710 -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags 752 -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -725,13 +767,17 @@ distdir: $(DISTFILES)
725 if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ 767 if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
726 if test -d $$d/$$file; then \ 768 if test -d $$d/$$file; then \
727 dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ 769 dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
770 if test -d "$(distdir)/$$file"; then \
771 find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
772 fi; \
728 if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ 773 if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
729 cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ 774 cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
775 find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
730 fi; \ 776 fi; \
731 cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ 777 cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
732 else \ 778 else \
733 test -f $(distdir)/$$file \ 779 test -f "$(distdir)/$$file" \
734 || cp -p $$d/$$file $(distdir)/$$file \ 780 || cp -p $$d/$$file "$(distdir)/$$file" \
735 || exit 1; \ 781 || exit 1; \
736 fi; \ 782 fi; \
737 done 783 done
@@ -765,6 +811,7 @@ clean-generic:
765 811
766distclean-generic: 812distclean-generic:
767 -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) 813 -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
814 -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
768 815
769maintainer-clean-generic: 816maintainer-clean-generic:
770 @echo "This command is intended for maintainers to use" 817 @echo "This command is intended for maintainers to use"
@@ -787,6 +834,8 @@ dvi-am:
787 834
788html: html-am 835html: html-am
789 836
837html-am:
838
790info: info-am 839info: info-am
791 840
792info-am: 841info-am:
@@ -798,6 +847,8 @@ install-data-am: install-data-local \
798 847
799install-dvi: install-dvi-am 848install-dvi: install-dvi-am
800 849
850install-dvi-am:
851
801install-exec-am: install-pkglibLTLIBRARIES 852install-exec-am: install-pkglibLTLIBRARIES
802 853
803install-html: install-html-am 854install-html: install-html-am
@@ -806,12 +857,18 @@ install-html-am: install-html-local
806 857
807install-info: install-info-am 858install-info: install-info-am
808 859
860install-info-am:
861
809install-man: 862install-man:
810 863
811install-pdf: install-pdf-am 864install-pdf: install-pdf-am
812 865
866install-pdf-am:
867
813install-ps: install-ps-am 868install-ps: install-ps-am
814 869
870install-ps-am:
871
815installcheck-am: 872installcheck-am:
816 873
817maintainer-clean: maintainer-clean-am 874maintainer-clean: maintainer-clean-am
@@ -837,7 +894,7 @@ uninstall-am: uninstall-libsciaction_binding_la_etcDATA \
837 uninstall-libsciaction_binding_la_sci_gatewayDATA \ 894 uninstall-libsciaction_binding_la_sci_gatewayDATA \
838 uninstall-pkglibLTLIBRARIES 895 uninstall-pkglibLTLIBRARIES
839 896
840.MAKE: install-am install-strip 897.MAKE: all check check-am install install-am install-strip
841 898
842.PHONY: CTAGS GTAGS all all-am all-local check check-am check-local \ 899.PHONY: CTAGS GTAGS all all-am all-local check check-am check-local \
843 clean clean-generic clean-libtool clean-local \ 900 clean clean-generic clean-libtool clean-local \
@@ -869,10 +926,12 @@ check-local: $(top_builddir)/scilab-bin
869 export LANG=C;\ 926 export LANG=C;\
870 $(top_builddir)/bin/scilab -nwni -nb -e "$$COMMAND" 927 $(top_builddir)/bin/scilab -nwni -nb -e "$$COMMAND"
871check-code: 928check-code:
872 @if test -f build.xml; then \ 929 if test -f build.xml; then \
873 $(ANT) checkstyle; \ 930 $(ANT) checkstyle; \
874 fi;\ 931 fi
875 splint $(SPLINT_OPTIONS) -I$(top_srcdir)/modules/core/includes/ -I$(top_srcdir)/libs/MALLOC/includes/ -I$(top_srcdir)/modules/localization/includes/ $(INCLUDE_FLAGS) $(CHECK_SRC) 932 if test -x "$(SPLINT)"; then \
933 $(SPLINT) $(SPLINT_OPTIONS) -I$(top_srcdir)/modules/core/includes/ -I$(top_srcdir)/libs/MALLOC/includes/ -I$(top_srcdir)/modules/localization/includes/ $(INCLUDE_FLAGS) $(CHECK_SRC); \
934 fi
876@NEED_JAVA_TRUE@java: 935@NEED_JAVA_TRUE@java:
877# Some configurations needs to export JAVA_HOME in the current env 936# Some configurations needs to export JAVA_HOME in the current env
878@NEED_JAVA_TRUE@ @if test "$(JAVA_HOME)"; then export JAVA_HOME=$(JAVA_HOME); fi; \ 937@NEED_JAVA_TRUE@ @if test "$(JAVA_HOME)"; then export JAVA_HOME=$(JAVA_HOME); fi; \
@@ -1047,6 +1106,7 @@ distclean-local:
1047 1106
1048# Provides macros compilation, Java compilation, cleaning 1107# Provides macros compilation, Java compilation, cleaning
1049# If you want Makefile to call ant, added USEANT=1 1108# If you want Makefile to call ant, added USEANT=1
1109
1050# Tell versions [3.59,3.63) of GNU make to not export all variables. 1110# Tell versions [3.59,3.63) of GNU make to not export all variables.
1051# Otherwise a system limit (for SysV at least) may be exceeded. 1111# Otherwise a system limit (for SysV at least) may be exceeded.
1052.NOEXPORT: 1112.NOEXPORT:
diff --git a/scilab/modules/api_scilab/LibScilab_Import.def b/scilab/modules/api_scilab/LibScilab_Import.def
index 047bf6a..3440a5e 100644
--- a/scilab/modules/api_scilab/LibScilab_Import.def
+++ b/scilab/modules/api_scilab/LibScilab_Import.def
@@ -16,3 +16,5 @@ str2name_
16cvnamel_ 16cvnamel_
17freeArrayOfString 17freeArrayOfString
18getExecMode 18getExecMode
19getIntermediateMemoryNeeded
20getstackinfo_ \ No newline at end of file
diff --git a/scilab/modules/api_scilab/Makefile.in b/scilab/modules/api_scilab/Makefile.in
index 600fa73..7777762 100644
--- a/scilab/modules/api_scilab/Makefile.in
+++ b/scilab/modules/api_scilab/Makefile.in
@@ -80,7 +80,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \
80 $(top_srcdir)/m4/umfpack.m4 $(top_srcdir)/configure.ac 80 $(top_srcdir)/m4/umfpack.m4 $(top_srcdir)/configure.ac
81am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ 81am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
82 $(ACLOCAL_M4) 82 $(ACLOCAL_M4)
83mkinstalldirs = $(install_sh) -d 83mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
84CONFIG_HEADER = $(top_builddir)/modules/core/includes/machine.h 84CONFIG_HEADER = $(top_builddir)/modules/core/includes/machine.h
85CONFIG_CLEAN_FILES = 85CONFIG_CLEAN_FILES =
86CONFIG_CLEAN_VPATH_FILES = 86CONFIG_CLEAN_VPATH_FILES =
@@ -152,6 +152,7 @@ ACLOCAL = @ACLOCAL@
152ALL_LINGUAS = @ALL_LINGUAS@ 152ALL_LINGUAS = @ALL_LINGUAS@
153AMTAR = @AMTAR@ 153AMTAR = @AMTAR@
154ANT = @ANT@ 154ANT = @ANT@
155ANTLR = @ANTLR@
155AR = @AR@ 156AR = @AR@
156AUTOCONF = @AUTOCONF@ 157AUTOCONF = @AUTOCONF@
157AUTOHEADER = @AUTOHEADER@ 158AUTOHEADER = @AUTOHEADER@
@@ -163,6 +164,8 @@ BLAS_LIBS = @BLAS_LIBS@
163CC = @CC@ 164CC = @CC@
164CCDEPMODE = @CCDEPMODE@ 165CCDEPMODE = @CCDEPMODE@
165CFLAGS = @CFLAGS@ 166CFLAGS = @CFLAGS@
167CHECKSTYLE = @CHECKSTYLE@
168COMMONS_BEANUTILS = @COMMONS_BEANUTILS@
166COMMONS_IO = @COMMONS_IO@ 169COMMONS_IO = @COMMONS_IO@
167COMMONS_LOGGING = @COMMONS_LOGGING@ 170COMMONS_LOGGING = @COMMONS_LOGGING@
168CPP = @CPP@ 171CPP = @CPP@
@@ -291,12 +294,12 @@ RT_LIB = @RT_LIB@
291SAXON = @SAXON@ 294SAXON = @SAXON@
292SCICOS_ENABLE = @SCICOS_ENABLE@ 295SCICOS_ENABLE = @SCICOS_ENABLE@
293SCILAB_LIBRARY_VERSION = @SCILAB_LIBRARY_VERSION@ 296SCILAB_LIBRARY_VERSION = @SCILAB_LIBRARY_VERSION@
294SCIPAD_ENABLE = @SCIPAD_ENABLE@
295SED = @SED@ 297SED = @SED@
296SET_MAKE = @SET_MAKE@ 298SET_MAKE = @SET_MAKE@
297SET_RELOCATABLE = @SET_RELOCATABLE@ 299SET_RELOCATABLE = @SET_RELOCATABLE@
298SHELL = @SHELL@ 300SHELL = @SHELL@
299SKINLF = @SKINLF@ 301SKINLF = @SKINLF@
302SPLINT = @SPLINT@
300STRIP = @STRIP@ 303STRIP = @STRIP@
301SWIG_BIN = @SWIG_BIN@ 304SWIG_BIN = @SWIG_BIN@
302SWIG_JAVA = @SWIG_JAVA@ 305SWIG_JAVA = @SWIG_JAVA@
@@ -978,10 +981,12 @@ check-local: $(top_builddir)/scilab-bin
978 export LANG=C;\ 981 export LANG=C;\
979 $(top_builddir)/bin/scilab -nwni -nb -e "$$COMMAND" 982 $(top_builddir)/bin/scilab -nwni -nb -e "$$COMMAND"
980check-code: 983check-code:
981 @if test -f build.xml; then \ 984 if test -f build.xml; then \
982 $(ANT) checkstyle; \ 985 $(ANT) checkstyle; \
983 fi;\ 986 fi
984 splint $(SPLINT_OPTIONS) -I$(top_srcdir)/modules/core/includes/ -I$(top_srcdir)/libs/MALLOC/includes/ -I$(top_srcdir)/modules/localization/includes/ $(INCLUDE_FLAGS) $(CHECK_SRC) 987 if test -x "$(SPLINT)"; then \
988 $(SPLINT) $(SPLINT_OPTIONS) -I$(top_srcdir)/modules/core/includes/ -I$(top_srcdir)/libs/MALLOC/includes/ -I$(top_srcdir)/modules/localization/includes/ $(INCLUDE_FLAGS) $(CHECK_SRC); \
989 fi
985@NEED_JAVA_TRUE@java: 990@NEED_JAVA_TRUE@java:
986# Some configurations needs to export JAVA_HOME in the current env 991# Some configurations needs to export JAVA_HOME in the current env
987@NEED_JAVA_TRUE@ @if test "$(JAVA_HOME)"; then export JAVA_HOME=$(JAVA_HOME); fi; \ 992@NEED_JAVA_TRUE@ @if test "$(JAVA_HOME)"; then export JAVA_HOME=$(JAVA_HOME); fi; \
diff --git a/scilab/modules/api_scilab/api_scilab.vcproj b/scilab/modules/api_scilab/api_scilab.vcproj
index aa6f503..ad248c4 100644
--- a/scilab/modules/api_scilab/api_scilab.vcproj
+++ b/scilab/modules/api_scilab/api_scilab.vcproj
@@ -563,6 +563,10 @@
563 RelativePath=".\api_scilab_export.def" 563 RelativePath=".\api_scilab_export.def"
564 > 564 >
565 </File> 565 </File>
566 <File
567 RelativePath=".\api_scilab_header.def"
568 >
569 </File>
566 </Filter> 570 </Filter>
567 </Filter> 571 </Filter>
568 <File 572 <File
diff --git a/scilab/modules/api_scilab/api_scilab_export.def b/scilab/modules/api_scilab/api_scilab_export.def
index 1aa9f5c..410821d 100644
--- a/scilab/modules/api_scilab/api_scilab_export.def
+++ b/scilab/modules/api_scilab/api_scilab_export.def
@@ -1,10 +1,12 @@
1LIBRARY api_scilab.dll 1LIBRARY api_scilab.dll
2 2
3 3
4
4EXPORTS 5EXPORTS
5; --------------------------------------- 6; ---------------------------------------
6; api_scilab explicit export (SEP 35) 7; api_scilab explicit export (SEP 35)
7; --------------------------------------- 8; ---------------------------------------
9pvApiCtx DATA
8 getMatrixOfBoolean 10 getMatrixOfBoolean
9 allocMatrixOfBoolean 11 allocMatrixOfBoolean
10 createMatrixOfBoolean 12 createMatrixOfBoolean
@@ -25,7 +27,6 @@ EXPORTS
25 isVarComplex 27 isVarComplex
26 isNamedVarComplex 28 isNamedVarComplex
27 isVarMatrixType 29 isVarMatrixType
28 isNamedVarMatrixType
29 getProcessMode 30 getProcessMode
30 getDimFromVar 31 getDimFromVar
31 getDimFromNamedVar 32 getDimFromNamedVar
@@ -43,6 +44,7 @@ EXPORTS
43 createNamedComplexZMatrixOfDouble 44 createNamedComplexZMatrixOfDouble
44 readNamedMatrixOfDouble 45 readNamedMatrixOfDouble
45 readNamedComplexMatrixOfDouble 46 readNamedComplexMatrixOfDouble
47 addStackSizeError
46 addErrorMessage 48 addErrorMessage
47 printError 49 printError
48 getErrorMessage 50 getErrorMessage
diff --git a/scilab/modules/api_scilab/api_scilab_header.def b/scilab/modules/api_scilab/api_scilab_header.def
index 6275f71..d19faaa 100644
--- a/scilab/modules/api_scilab/api_scilab_header.def
+++ b/scilab/modules/api_scilab/api_scilab_header.def
@@ -1,7 +1,9 @@
1LIBRARY api_scilab.dll 1LIBRARY api_scilab.dll
2 2
3 3
4
4EXPORTS 5EXPORTS
5; --------------------------------------- 6; ---------------------------------------
6; api_scilab explicit export (SEP 35) 7; api_scilab explicit export (SEP 35)
7; --------------------------------------- 8; ---------------------------------------
9pvApiCtx DATA
diff --git a/scilab/modules/api_scilab/includes/api_boolean.h b/scilab/modules/api_scilab/includes/api_boolean.h
index 2db1651..ac90034 100644
--- a/scilab/modules/api_scilab/includes/api_boolean.h
+++ b/scilab/modules/api_scilab/includes/api_boolean.h
@@ -24,7 +24,7 @@ extern "C" {
24 * @param[out] _piBool return pointer on data 24 * @param[out] _piBool return pointer on data
25 * @return if the operation successed (0) or not ( !0 ) 25 * @return if the operation successed (0) or not ( !0 )
26 */ 26 */
27StrErr getMatrixOfBoolean(int* _piAddress, int* _piRows, int* _piCols, int** _piBool); 27StrErr getMatrixOfBoolean(void* _pvCtx, int* _piAddress, int* _piRows, int* _piCols, int** _piBool);
28 28
29/** 29/**
30 * alloc boolean variable 30 * alloc boolean variable
@@ -35,7 +35,7 @@ StrErr getMatrixOfBoolean(int* _piAddress, int* _piRows, int* _piCols, int** _pi
35 * @param[out] _piAddress return pointer on new variable 35 * @param[out] _piAddress return pointer on new variable
36 * @return if the operation successed (0) or not ( !0 ) 36 * @return if the operation successed (0) or not ( !0 )
37 */ 37 */
38StrErr allocMatrixOfBoolean(int _iVar, int _iRows, int _iCols, int** _piBool); 38StrErr allocMatrixOfBoolean(void* _pvCtx, int _iVar, int _iRows, int _iCols, int** _piBool);
39 39
40/** 40/**
41 * alloc boolean variable 41 * alloc boolean variable
@@ -46,7 +46,7 @@ StrErr allocMatrixOfBoolean(int _iVar, int _iRows, int _iCols, int** _piBool);
46 * @param[out] _piAddress return pointer on new variable 46 * @param[out] _piAddress return pointer on new variable
47 * @return if the operation successed (0) or not ( !0 ) 47 * @return if the operation successed (0) or not ( !0 )
48 */ 48 */
49StrErr createMatrixOfBoolean(int _iVar, int _iRows, int _iCols, int* _piBool); 49StrErr createMatrixOfBoolean(void* _pvCtx, int _iVar, int _iRows, int _iCols, int* _piBool);
50 50
51/** 51/**
52 * Create boolean named variable 52 * Create boolean named variable
@@ -56,7 +56,7 @@ StrErr createMatrixOfBoolean(int _iVar, int _iRows, int _iCols, int* _piBool);
56 * @param[in] _piBool pointer on data 56 * @param[in] _piBool pointer on data
57 * @return if the operation successed (0) or not ( !0 ) 57 * @return if the operation successed (0) or not ( !0 )
58 */ 58 */
59StrErr createNamedMatrixOfBoolean(char* _pstName, int _iRows, int _iCols, int* _piBool); 59StrErr createNamedMatrixOfBoolean(void* _pvCtx, char* _pstName, int _iRows, int _iCols, int* _piBool);
60 60
61/** 61/**
62 * Read boolean named variable 62 * Read boolean named variable
@@ -66,7 +66,7 @@ StrErr createNamedMatrixOfBoolean(char* _pstName, int _iRows, int _iCols, int* _
66 * @param[out] _piBool return data 66 * @param[out] _piBool return data
67 * @return if the operation successed (0) or not ( !0 ) 67 * @return if the operation successed (0) or not ( !0 )
68 */ 68 */
69StrErr readNamedMatrixOfBoolean(char* _pstName, int* _piRows, int* _piCols, int* _piBool); 69StrErr readNamedMatrixOfBoolean(void* _pvCtx, char* _pstName, int* _piRows, int* _piCols, int* _piBool);
70 70
71#ifdef __cplusplus 71#ifdef __cplusplus
72} 72}
diff --git a/scilab/modules/api_scilab/includes/api_boolean_sparse.h b/scilab/modules/api_scilab/includes/api_boolean_sparse.h
index 2e1f298..dd036d5 100644
--- a/scilab/modules/api_scilab/includes/api_boolean_sparse.h
+++ b/scilab/modules/api_scilab/includes/api_boolean_sparse.h
@@ -29,7 +29,7 @@ extern "C" {
29 * @param[out] _piColPos return array of item column position ( 1 indexed ) 29 * @param[out] _piColPos return array of item column position ( 1 indexed )
30 * @return if the operation successed (0) or not ( !0 ) 30 * @return if the operation successed (0) or not ( !0 )
31 */ 31 */
32StrErr getBooleanSparseMatrix(int* _piAddress, int* _piRows, int* _piCols, int* _piNbItem, int** _piNbItemRow, int** _piColPos); 32StrErr getBooleanSparseMatrix(void* _pvCtx, int* _piAddress, int* _piRows, int* _piCols, int* _piNbItem, int** _piNbItemRow, int** _piColPos);
33 33
34/** 34/**
35 * Alloc boolean sparse variable data 35 * Alloc boolean sparse variable data
@@ -41,7 +41,7 @@ StrErr getBooleanSparseMatrix(int* _piAddress, int* _piRows, int* _piCols, int*
41 * @param[out] _piColPos return array of item column position ( 1 indexed ) 41 * @param[out] _piColPos return array of item column position ( 1 indexed )
42 * @return if the operation successed (0) or not ( !0 ) 42 * @return if the operation successed (0) or not ( !0 )
43 */ 43 */
44StrErr allocBooleanSparseMatrix(int _iVar, int _iRows, int _iCols, int _iNbItem, int** _piNbItemRow, int** _piColPos); 44StrErr allocBooleanSparseMatrix(void* _pvCtx, int _iVar, int _iRows, int _iCols, int _iNbItem, int** _piNbItemRow, int** _piColPos);
45 45
46/** 46/**
47 * Create boolean sparse variable 47 * Create boolean sparse variable
@@ -53,7 +53,7 @@ StrErr allocBooleanSparseMatrix(int _iVar, int _iRows, int _iCols, int _iNbItem,
53 * @param[in] _piColPos array of item column position ( 1 indexed ) 53 * @param[in] _piColPos array of item column position ( 1 indexed )
54 * @return if the operation successed (0) or not ( !0 ) 54 * @return if the operation successed (0) or not ( !0 )
55 */ 55 */
56StrErr createBooleanSparseMatrix(int _iVar, int _iRows, int _iCols, int _iNbItem, int* _piNbItemRow, int* _piColPos); 56StrErr createBooleanSparseMatrix(void* _pvCtx, int _iVar, int _iRows, int _iCols, int _iNbItem, int* _piNbItemRow, int* _piColPos);
57 57
58/** 58/**
59 * Create named boolean sparse variable 59 * Create named boolean sparse variable
@@ -66,7 +66,7 @@ StrErr createBooleanSparseMatrix(int _iVar, int _iRows, int _iCols, int _iNbItem
66 * @param[out] _piAddress return pointer on new variable 66 * @param[out] _piAddress return pointer on new variable
67 * @return if the operation successed (0) or not ( !0 ) 67 * @return if the operation successed (0) or not ( !0 )
68 */ 68 */
69StrErr createNamedBooleanSparseMatrix(char* _pstName, int _iRows, int _iCols, int _iNbItem, int* _piNbItemRow, int* _piColPos); 69StrErr createNamedBooleanSparseMatrix(void* _pvCtx, char* _pstName, int _iRows, int _iCols, int _iNbItem, int* _piNbItemRow, int* _piColPos);
70 70
71/** 71/**
72 * Read named boolean sparse variable 72 * Read named boolean sparse variable
@@ -79,7 +79,7 @@ StrErr createNamedBooleanSparseMatrix(char* _pstName, int _iRows, int _iCols, in
79 * @param[out] _piAddress return pointer on new variable 79 * @param[out] _piAddress return pointer on new variable
80 * @return if the operation successed (0) or not ( !0 ) 80 * @return if the operation successed (0) or not ( !0 )
81 */ 81 */
82StrErr readNamedBooleanSparseMatrix(char* _pstName, int* _piRows, int* _piCols, int* _piNbItem, int* _piNbItemRow, int* _piColPos); 82StrErr readNamedBooleanSparseMatrix(void* _pvCtx, char* _pstName, int* _piRows, int* _piCols, int* _piNbItem, int* _piNbItemRow, int* _piColPos);
83 83
84#ifdef __cplusplus 84#ifdef __cplusplus
85} 85}
diff --git a/scilab/modules/api_scilab/includes/api_common.h b/scilab/modules/api_scilab/includes/api_common.h
index c3f3806..8b9458b 100644
--- a/scilab/modules/api_scilab/includes/api_common.h
+++ b/scilab/modules/api_scilab/includes/api_common.h
@@ -31,6 +31,19 @@ typedef struct api_Err
31 char* pstMsg[MESSAGE_STACK_SIZE]; /**< The error message */ 31 char* pstMsg[MESSAGE_STACK_SIZE]; /**< The error message */
32} StrErr; 32} StrErr;
33 33
34typedef struct api_Ctx
35{
36 char* pstName; /**< Function name */
37} StrCtx, *pStrCtx;
38
39#ifdef _MSC_VER
40 #ifndef API_SCILAB_EXPORTS
41 __declspec( dllimport ) StrCtx* pvApiCtx;
42 #endif
43#else
44 extern StrCtx* pvApiCtx;
45#endif
46
34#include "api_error.h" 47#include "api_error.h"
35/* generics functions */ 48/* generics functions */
36 49
@@ -40,7 +53,7 @@ typedef struct api_Err
40 * @param[out] _piAddress return variable address 53 * @param[out] _piAddress return variable address
41 * @return if the operation successed (0) or not ( !0 ) 54 * @return if the operation successed (0) or not ( !0 )
42 */ 55 */
43StrErr getVarAddressFromPosition(int _iVar, int** _piAddress); 56StrErr getVarAddressFromPosition(void* _pvCtx, int _iVar, int** _piAddress);
44 57
45/** 58/**
46 * Get memory address of a variable from the variable position 59 * Get memory address of a variable from the variable position
@@ -48,7 +61,7 @@ StrErr getVarAddressFromPosition(int _iVar, int** _piAddress);
48 * @param[out] _pstName variable name 61 * @param[out] _pstName variable name
49 * @return if the operation successed (0) or not ( !0 ) 62 * @return if the operation successed (0) or not ( !0 )
50 */ 63 */
51StrErr getVarNameFromPosition(int _iVar, char* _pstName); 64StrErr getVarNameFromPosition(void* _pvCtx, int _iVar, char* _pstName);
52 65
53/** 66/**
54 * Get memory address of a variable from the variable name 67 * Get memory address of a variable from the variable name
@@ -56,7 +69,7 @@ StrErr getVarNameFromPosition(int _iVar, char* _pstName);
56 * @param[out] _piAddress return variable address 69 * @param[out] _piAddress return variable address
57 * @return if the operation successed (0) or not ( !0 ) 70 * @return if the operation successed (0) or not ( !0 )
58 */ 71 */
59StrErr getVarAddressFromName(char* _pstName, int** _piAddress); 72StrErr getVarAddressFromName(void* _pvCtx, char* _pstName, int** _piAddress);
60 73
61/** 74/**
62 * Get variable type 75 * Get variable type
@@ -64,28 +77,28 @@ StrErr getVarAddressFromName(char* _pstName, int** _piAddress);
64 * @param[out] returns _piType variable type 77 * @param[out] returns _piType variable type
65 * @return scilab variable type ( sci_matrix, sci_strings, ... ) 78 * @return scilab variable type ( sci_matrix, sci_strings, ... )
66 */ 79 */
67StrErr getVarType(int* _piAddress, int* _piType); 80StrErr getVarType(void* _pvCtx, int* _piAddress, int* _piType);
68 81
69/** 82/**
70* Get variable type from the variable name 83* Get variable type from the variable name
71* @param[in] _piAddress variable address 84* @param[in] _piAddress variable address
72* @return scilab variable type ( sci_matrix, sci_strings, ... ) 85* @return scilab variable type ( sci_matrix, sci_strings, ... )
73*/ 86*/
74StrErr getNamedVarType(char* _pstName, int* _piType); 87StrErr getNamedVarType(void* _pvCtx, char* _pstName, int* _piType);
75 88
76/** 89/**
77 * Get complex information 90 * Get complex information
78 * @param[in] _piAddress variable address 91 * @param[in] _piAddress variable address
79 * @return if complex 1 otherwise 0 92 * @return if complex 1 otherwise 0
80 */ 93 */
81 int isVarComplex(int* _piAddress); 94 int isVarComplex(void* _pvCtx, int* _piAddress);
82 95
83/** 96/**
84* Get named complex information 97* Get named complex information
85* @param[in] _pstName variable name 98* @param[in] _pstName variable name
86* @return if complex 1 otherwise 0 99* @return if complex 1 otherwise 0
87*/ 100*/
88 int isNamedVarComplex(char *_pstName); 101 int isNamedVarComplex(void* _pvCtx, char *_pstName);
89 102
90/** 103/**
91 * Get variable dimension 104 * Get variable dimension
@@ -94,7 +107,7 @@ StrErr getNamedVarType(char* _pstName, int* _piType);
94 * @param[out] _piCols Number of cols 107 * @param[out] _piCols Number of cols
95 * @return if the operation successed (0) or not ( !0 ) 108 * @return if the operation successed (0) or not ( !0 )
96 */ 109 */
97StrErr getVarDimension(int* _piAddress, int* _piRows, int* _piCols); 110StrErr getVarDimension(void* _pvCtx, int* _piAddress, int* _piRows, int* _piCols);
98 111
99/** 112/**
100* Get named variable dimension 113* Get named variable dimension
@@ -103,14 +116,14 @@ StrErr getVarDimension(int* _piAddress, int* _piRows, int* _piCols);
103* @param[out] _piCols Number of cols 116* @param[out] _piCols Number of cols
104* @return if the operation successed (0) or not ( !0 ) 117* @return if the operatio