summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorClément DAVID <clement.david@scilab.org>2011-03-07 09:52:16 +0100
committerClément DAVID <clement.david@scilab.org>2011-03-07 09:52:16 +0100
commit2835e08091d79405f8a4ef74787b5aace3e935ab (patch)
tree76ee3a864662a8fba9f395735a60ae4a0f9e8e4b
parent6c742c35f0a9a138f765e434e294273a262f8fd5 (diff)
parent0118710f9d4ca4c1843a40d7355add417b510001 (diff)
downloadscilab-2835e08091d79405f8a4ef74787b5aace3e935ab.zip
scilab-2835e08091d79405f8a4ef74787b5aace3e935ab.tar.gz
Merge remote-tracking branch 'origin/5.3' into simulinkimport
Conflicts: scilab/aclocal.m4 scilab/configure Change-Id: I6a0f0a544872cd5e77e74384e76c65674f701898
-rw-r--r--scilab/CHANGES_5.3.X174
-rw-r--r--scilab/Makefile.am33
-rw-r--r--scilab/Makefile.in29
-rw-r--r--scilab/RELEASE_NOTES_5.3.X12
-rwxr-xr-xscilab/bin/scilab1130
-rw-r--r--scilab/build.incl.xml2
-rwxr-xr-xscilab/configure249
-rw-r--r--scilab/configure.ac45
-rw-r--r--scilab/contrib/Makefile.in2
-rw-r--r--scilab/libs/GetWindowsVersion/GetWindowsVersion.rc10
-rw-r--r--scilab/libs/LibScilab/libscilab.rc10
-rw-r--r--scilab/libs/LibScilab/libscilab_f2c.rc10
-rw-r--r--scilab/libs/MALLOC/MALLOC.rc10
-rw-r--r--scilab/libs/MALLOC/Makefile.in2
-rw-r--r--scilab/libs/Makefile.in2
-rw-r--r--scilab/libs/doublylinkedlist/Makefile.in2
-rw-r--r--scilab/libs/doublylinkedlist/doublylinkedlist.rc10
-rw-r--r--scilab/libs/dynamiclibrary/Makefile.in2
-rw-r--r--scilab/libs/dynamiclibrary/dynamiclibrary.rc10
-rw-r--r--scilab/libs/hashtable/Makefile.in2
-rw-r--r--scilab/libs/hashtable/hashtable.rc10
-rw-r--r--scilab/libs/libst/Makefile.in2
-rw-r--r--scilab/libs/libst/libst.rc10
-rw-r--r--scilab/modules/Makefile.in2
-rw-r--r--scilab/modules/action_binding/Makefile.in2
-rw-r--r--scilab/modules/action_binding/locales/it_IT/action_binding.po2
-rw-r--r--scilab/modules/action_binding/locales/pt_BR/action_binding.po2
-rw-r--r--scilab/modules/action_binding/src/c/action_binding.rc10
-rw-r--r--scilab/modules/action_binding/src/noaction_binding/noaction_binding.rc10
-rw-r--r--scilab/modules/action_binding/version.xml2
-rw-r--r--scilab/modules/api_scilab/Makefile.in2
-rw-r--r--scilab/modules/api_scilab/src/c/api_scilab.rc10
-rw-r--r--scilab/modules/api_scilab/src/cpp/api_double.cpp651
-rw-r--r--scilab/modules/api_scilab/tests/nonreg_tests/bug_8587.c50
-rw-r--r--scilab/modules/api_scilab/tests/nonreg_tests/bug_8587.dia.ref35
-rw-r--r--scilab/modules/api_scilab/tests/nonreg_tests/bug_8587.tst36
-rw-r--r--scilab/modules/arnoldi/Makefile.in2
-rw-r--r--scilab/modules/arnoldi/src/c/arnoldi.rc10
-rw-r--r--scilab/modules/arnoldi/version.xml2
-rw-r--r--scilab/modules/atoms/Makefile.in2
-rw-r--r--scilab/modules/atoms/locales/de_DE/atoms.po6
-rw-r--r--scilab/modules/atoms/locales/en_GB/atoms.po768
-rw-r--r--scilab/modules/atoms/locales/fr_FR/atoms.po4
-rw-r--r--scilab/modules/atoms/locales/it_IT/atoms.po60
-rw-r--r--scilab/modules/atoms/locales/ja_JP/atoms.po36
-rw-r--r--scilab/modules/atoms/locales/pl_PL/atoms.po6
-rw-r--r--scilab/modules/atoms/locales/pt_BR/atoms.po68
-rw-r--r--scilab/modules/atoms/locales/zh_TW/atoms.po10
-rw-r--r--scilab/modules/boolean/Makefile.in2
-rw-r--r--scilab/modules/boolean/src/c/boolean.rc10
-rw-r--r--scilab/modules/boolean/src/fortran/boolean_f.rc10
-rw-r--r--scilab/modules/boolean/version.xml2
-rw-r--r--scilab/modules/cacsd/Makefile.in2
-rw-r--r--scilab/modules/cacsd/locales/ca_ES/cacsd.po2
-rw-r--r--scilab/modules/cacsd/locales/es_ES/cacsd.po4
-rw-r--r--scilab/modules/cacsd/locales/it_IT/cacsd.po4
-rw-r--r--scilab/modules/cacsd/locales/pt_BR/cacsd.po2
-rw-r--r--scilab/modules/cacsd/locales/zh_CN/cacsd.po4
-rw-r--r--scilab/modules/cacsd/src/c/cacsd.rc10
-rw-r--r--scilab/modules/cacsd/src/fortran/cacsd_f.rc10
-rw-r--r--scilab/modules/cacsd/src/slicot/slicot_f/slicot_f.rc10
-rw-r--r--scilab/modules/cacsd/version.xml2
-rw-r--r--scilab/modules/call_scilab/Makefile.in2
-rw-r--r--scilab/modules/call_scilab/src/c/call_scilab.rc10
-rw-r--r--scilab/modules/call_scilab/version.xml2
-rw-r--r--scilab/modules/commons/Makefile.in2
-rw-r--r--scilab/modules/commons/src/c/commons.rc10
-rw-r--r--scilab/modules/commons/src/fortran/commons_f.rc10
-rw-r--r--scilab/modules/compatibility_functions/Makefile.in2
-rw-r--r--scilab/modules/compatibility_functions/locales/it_IT/compatibility_functions.po38
-rw-r--r--scilab/modules/compatibility_functions/locales/ja_JP/compatibility_functions.po28
-rw-r--r--scilab/modules/compatibility_functions/locales/pl_PL/compatibility_functions.po22
-rw-r--r--scilab/modules/compatibility_functions/locales/pt_BR/compatibility_functions.po12
-rw-r--r--scilab/modules/compatibility_functions/locales/zh_TW/compatibility_functions.po18
-rw-r--r--scilab/modules/compatibility_functions/version.xml2
-rw-r--r--scilab/modules/completion/Makefile.in2
-rw-r--r--scilab/modules/completion/locales/it_IT/completion.po2
-rw-r--r--scilab/modules/completion/locales/pt_BR/completion.po4
-rw-r--r--scilab/modules/completion/src/c/completion.rc10
-rw-r--r--scilab/modules/completion/src/nocompletion/nocompletion.rc10
-rw-r--r--scilab/modules/completion/version.xml2
-rw-r--r--scilab/modules/console/Makefile.in2
-rw-r--r--scilab/modules/console/src/c/console.rc10
-rw-r--r--scilab/modules/console/src/noconsole/noconsole.rc10
-rw-r--r--scilab/modules/console/version.xml2
-rw-r--r--scilab/modules/core/Makefile.in2
-rw-r--r--scilab/modules/core/help/en_US/keywords/else.xml13
-rw-r--r--scilab/modules/core/help/en_US/keywords/elseif.xml13
-rw-r--r--scilab/modules/core/help/fr_FR/keywords/else.xml13
-rw-r--r--scilab/modules/core/help/fr_FR/keywords/elseif.xml13
-rw-r--r--scilab/modules/core/help/fr_FR/keywords/return.xml3
-rw-r--r--scilab/modules/core/help/pt_BR/keywords/else.xml11
-rw-r--r--scilab/modules/core/help/pt_BR/keywords/elseif.xml13
-rw-r--r--scilab/modules/core/includes/version.h2
-rw-r--r--scilab/modules/core/locales/ca_ES/core.po12
-rw-r--r--scilab/modules/core/locales/de_DE/core.po14
-rw-r--r--scilab/modules/core/locales/en_US/core.pot6
-rw-r--r--scilab/modules/core/locales/es_ES/core.po12
-rw-r--r--scilab/modules/core/locales/fr_FR/core.po14
-rw-r--r--scilab/modules/core/locales/it_IT/core.po64
-rw-r--r--scilab/modules/core/locales/ja_JP/core.po14
-rw-r--r--scilab/modules/core/locales/pl_PL/core.po18
-rw-r--r--scilab/modules/core/locales/pt_BR/core.po64
-rw-r--r--scilab/modules/core/locales/ru_RU/core.po12
-rw-r--r--scilab/modules/core/locales/uk_UA/core.po12
-rw-r--r--scilab/modules/core/locales/zh_CN/core.po10
-rw-r--r--scilab/modules/core/locales/zh_TW/core.po12
-rw-r--r--scilab/modules/core/macros/edit.sci4
-rw-r--r--scilab/modules/core/src/c/banier.c85
-rw-r--r--scilab/modules/core/tests/nonreg_tests/bug_8531.dia.ref36
-rw-r--r--scilab/modules/core/tests/nonreg_tests/bug_8531.sci24
-rw-r--r--scilab/modules/core/tests/nonreg_tests/bug_8531.tst41
-rw-r--r--scilab/modules/core/tests/unit_tests/eq_neq_priority.dia.ref65
-rw-r--r--scilab/modules/core/tests/unit_tests/eq_neq_priority.tst47
-rw-r--r--scilab/modules/core/version.xml2
-rw-r--r--scilab/modules/data_structures/Makefile.in2
-rw-r--r--scilab/modules/data_structures/locales/es_ES/data_structures.po4
-rw-r--r--scilab/modules/data_structures/locales/it_IT/data_structures.po4
-rw-r--r--scilab/modules/data_structures/locales/ja_JP/data_structures.po2
-rw-r--r--scilab/modules/data_structures/locales/pt_BR/data_structures.po4
-rw-r--r--scilab/modules/data_structures/src/c/data_structures.rc10
-rw-r--r--scilab/modules/data_structures/src/fortran/data_structures_f.rc10
-rw-r--r--scilab/modules/data_structures/version.xml2
-rw-r--r--scilab/modules/demo_tools/Makefile.in2
-rw-r--r--scilab/modules/demo_tools/macros/demo_viewCode.sci18
-rw-r--r--scilab/modules/demo_tools/version.xml2
-rw-r--r--scilab/modules/development_tools/Makefile.in2
-rw-r--r--scilab/modules/development_tools/locales/it_IT/development_tools.po2
-rw-r--r--scilab/modules/development_tools/locales/ja_JP/development_tools.po2
-rw-r--r--scilab/modules/development_tools/locales/pt_BR/development_tools.po2
-rw-r--r--scilab/modules/development_tools/src/fake/Makefile.in2
-rw-r--r--scilab/modules/development_tools/version.xml2
-rw-r--r--scilab/modules/differential_equations/Makefile.in2
-rw-r--r--scilab/modules/differential_equations/locales/it_IT/differential_equations.po4
-rw-r--r--scilab/modules/differential_equations/locales/pl_PL/differential_equations.po2
-rw-r--r--scilab/modules/differential_equations/locales/pt_BR/differential_equations.po2
-rw-r--r--scilab/modules/differential_equations/locales/zh_TW/differential_equations.po4
-rw-r--r--scilab/modules/differential_equations/src/c/differential_equations.rc10
-rw-r--r--scilab/modules/differential_equations/src/fortran/differential_equations_f.rc10
-rw-r--r--scilab/modules/differential_equations/src/fortran/differential_equations_f.vfproj12
-rw-r--r--scilab/modules/differential_equations/tests/nonreg_tests/bug_8462.dia.ref61
-rw-r--r--scilab/modules/differential_equations/tests/nonreg_tests/bug_8462.tst73
-rw-r--r--scilab/modules/differential_equations/version.xml2
-rw-r--r--scilab/modules/double/Makefile.in2
-rw-r--r--scilab/modules/double/src/c/double.rc10
-rw-r--r--scilab/modules/double/src/fortran/double_f.rc10
-rw-r--r--scilab/modules/double/version.xml2
-rw-r--r--scilab/modules/dynamic_link/Makefile.in2
-rw-r--r--scilab/modules/dynamic_link/help/en_US/VCtoLCCLib.xml21
-rw-r--r--scilab/modules/dynamic_link/help/en_US/addinter.xml41
-rw-r--r--scilab/modules/dynamic_link/help/en_US/configure_lcc.xml21
-rw-r--r--scilab/modules/dynamic_link/help/en_US/findlcccompiler.xml21
-rw-r--r--scilab/modules/dynamic_link/help/en_US/haveacompiler.xml3
-rw-r--r--scilab/modules/dynamic_link/help/en_US/with_lcc.xml22
-rw-r--r--scilab/modules/dynamic_link/locales/it_IT/dynamic_link.po10
-rw-r--r--scilab/modules/dynamic_link/locales/ja_JP/dynamic_link.po2
-rw-r--r--scilab/modules/dynamic_link/locales/pl_PL/dynamic_link.po4
-rw-r--r--scilab/modules/dynamic_link/locales/pt_BR/dynamic_link.po4
-rw-r--r--scilab/modules/dynamic_link/locales/ru_RU/dynamic_link.po2
-rw-r--r--scilab/modules/dynamic_link/locales/uk_UA/dynamic_link.po2
-rw-r--r--scilab/modules/dynamic_link/macros/VCtoLCCLib.sci16
-rw-r--r--scilab/modules/dynamic_link/macros/chooselcccompiler.sci16
-rw-r--r--scilab/modules/dynamic_link/macros/configure_lcc.sci15
-rw-r--r--scilab/modules/dynamic_link/macros/findlcccompiler.sci17
-rw-r--r--scilab/modules/dynamic_link/macros/with_lcc.sci15
-rw-r--r--scilab/modules/dynamic_link/src/c/dynamic_link.rc10
-rw-r--r--scilab/modules/dynamic_link/src/fortran/dynamic_link_f.rc10
-rw-r--r--scilab/modules/dynamic_link/version.xml2
-rw-r--r--scilab/modules/elementary_functions/Makefile.in2
-rw-r--r--scilab/modules/elementary_functions/help/en_US/max.xml8
-rw-r--r--scilab/modules/elementary_functions/help/en_US/min.xml8
-rw-r--r--scilab/modules/elementary_functions/help/fr_FR/max.xml9
-rw-r--r--scilab/modules/elementary_functions/help/fr_FR/min.xml9
-rw-r--r--scilab/modules/elementary_functions/help/fr_FR/trigonometry/conj.xml (renamed from scilab/modules/elementary_functions/help/fr_FR/conj.xml)0
-rw-r--r--scilab/modules/elementary_functions/help/pt_BR/min.xml (renamed from scilab/modules/core/help/pt_BR/keywords/min.xml)0
-rw-r--r--scilab/modules/elementary_functions/help/pt_BR/trigonometry/conj.xml (renamed from scilab/modules/elementary_functions/help/pt_BR/conj.xml)0
-rw-r--r--scilab/modules/elementary_functions/locales/es_ES/elementary_functions.po12
-rw-r--r--scilab/modules/elementary_functions/locales/it_IT/elementary_functions.po12
-rw-r--r--scilab/modules/elementary_functions/locales/ja_JP/elementary_functions.po2
-rw-r--r--scilab/modules/elementary_functions/locales/pl_PL/elementary_functions.po8
-rw-r--r--scilab/modules/elementary_functions/locales/pt_BR/elementary_functions.po18
-rw-r--r--scilab/modules/elementary_functions/locales/zh_CN/elementary_functions.po6
-rw-r--r--scilab/modules/elementary_functions/macros/acosd.sci7
-rw-r--r--scilab/modules/elementary_functions/macros/acotd.sci4
-rw-r--r--scilab/modules/elementary_functions/macros/acscd.sci3
-rw-r--r--scilab/modules/elementary_functions/macros/asecd.sci3
-rw-r--r--scilab/modules/elementary_functions/macros/asind.sci5
-rw-r--r--scilab/modules/elementary_functions/macros/atand.sci5
-rw-r--r--scilab/modules/elementary_functions/macros/cosd.sci3
-rw-r--r--scilab/modules/elementary_functions/macros/cotd.sci3
-rw-r--r--scilab/modules/elementary_functions/macros/cscd.sci3
-rw-r--r--scilab/modules/elementary_functions/macros/secd.sci3
-rw-r--r--scilab/modules/elementary_functions/macros/sind.sci3
-rw-r--r--scilab/modules/elementary_functions/macros/tand.sci2
-rw-r--r--scilab/modules/elementary_functions/sci_gateway/c/gw_elementary_functions.c4
-rw-r--r--scilab/modules/elementary_functions/sci_gateway/c/sci_maxi.c24
-rw-r--r--scilab/modules/elementary_functions/sci_gateway/elementary_functions_gateway.xml2
-rw-r--r--scilab/modules/elementary_functions/src/c/elementary_functions.rc10
-rw-r--r--scilab/modules/elementary_functions/src/c/f2c_workaround.c (renamed from scilab/modules/special_functions/sci_gateway/c/gw_special_functions1.c)37
-rw-r--r--scilab/modules/elementary_functions/src/fortran/eispack/eispack_f.rc10
-rw-r--r--scilab/modules/elementary_functions/src/fortran/elementary_functions_f.rc10
-rw-r--r--scilab/modules/elementary_functions/src/fortran/elementary_functions_f2c.vcproj8
-rw-r--r--scilab/modules/elementary_functions/src/fortran/linpack/linpack_f.rc10
-rw-r--r--scilab/modules/elementary_functions/src/fortran/simple.f5
-rw-r--r--scilab/modules/elementary_functions/src/fortran/slatec/slatec_f.rc10
-rw-r--r--scilab/modules/elementary_functions/tests/nonreg_tests/bug_7691.dia.ref36
-rw-r--r--scilab/modules/elementary_functions/tests/nonreg_tests/bug_7691.tst39
-rw-r--r--scilab/modules/elementary_functions/tests/unit_tests/acosd.dia.ref10
-rw-r--r--scilab/modules/elementary_functions/tests/unit_tests/acosd.tst6
-rw-r--r--scilab/modules/elementary_functions/tests/unit_tests/cotd.dia.ref28
-rw-r--r--scilab/modules/elementary_functions/tests/unit_tests/cotd.tst27
-rw-r--r--scilab/modules/elementary_functions/tests/unit_tests/max.dia.ref (renamed from scilab/modules/elementary_functions/tests/unit_tests/maxi.dia.ref)0
-rw-r--r--scilab/modules/elementary_functions/tests/unit_tests/max.tst (renamed from scilab/modules/elementary_functions/tests/unit_tests/maxi.tst)0
-rw-r--r--scilab/modules/elementary_functions/version.xml2
-rw-r--r--scilab/modules/fftw/Makefile.in2
-rw-r--r--scilab/modules/fftw/etc/fftw.start109
-rw-r--r--scilab/modules/fftw/locales/it_IT/fftw.po2
-rw-r--r--scilab/modules/fftw/src/c/fftw.rc10
-rw-r--r--scilab/modules/fftw/src/nofftw/nofftw.rc10
-rw-r--r--scilab/modules/fftw/tests/nonreg_tests/bug_8390.tst22
-rw-r--r--scilab/modules/fftw/version.xml2
-rw-r--r--scilab/modules/fileio/Makefile.in2
-rw-r--r--scilab/modules/fileio/help/en_US/basename.xml7
-rw-r--r--scilab/modules/fileio/locales/ca_ES/fileio.po2
-rw-r--r--scilab/modules/fileio/locales/it_IT/fileio.po28
-rw-r--r--scilab/modules/fileio/locales/pt_BR/fileio.po32
-rw-r--r--scilab/modules/fileio/sci_gateway/c/sci_mscanf.c178
-rw-r--r--scilab/modules/fileio/src/c/fileio.rc10
-rw-r--r--scilab/modules/fileio/tests/nonreg_tests/bug_6768.tst22
-rw-r--r--scilab/modules/fileio/tests/unit_tests/chdir.dia.ref2
-rw-r--r--scilab/modules/fileio/tests/unit_tests/chdir.tst4
-rw-r--r--scilab/modules/fileio/version.xml2
-rw-r--r--scilab/modules/functions/Makefile.in2
-rw-r--r--scilab/modules/functions/locales/it_IT/functions.po4
-rw-r--r--scilab/modules/functions/locales/pt_BR/functions.po6
-rw-r--r--scilab/modules/functions/src/c/functions.rc10
-rw-r--r--scilab/modules/functions/src/c/libraryinfo.c136
-rw-r--r--scilab/modules/functions/src/fortran/functions_f.rc10
-rw-r--r--scilab/modules/functions/tests/nonreg_tests/bug_8448.tst27
-rw-r--r--scilab/modules/functions/version.xml2
-rw-r--r--scilab/modules/genetic_algorithms/Makefile.in2
-rw-r--r--scilab/modules/genetic_algorithms/version.xml2
-rw-r--r--scilab/modules/graph/Makefile.in2
-rw-r--r--scilab/modules/graph/src/java/org/scilab/modules/graph/ScilabCanvas.java18
-rw-r--r--scilab/modules/graph/src/java/org/scilab/modules/graph/ScilabGraph.java3
-rw-r--r--scilab/modules/graph/src/java/org/scilab/modules/graph/utils/StyleMap.java24
-rw-r--r--scilab/modules/graphic_export/Makefile.in2
-rw-r--r--scilab/modules/graphic_export/graphic_export.rc10
-rw-r--r--scilab/modules/graphic_export/locales/it_IT/graphic_export.po14
-rw-r--r--scilab/modules/graphic_export/locales/ja_JP/graphic_export.po2
-rw-r--r--scilab/modules/graphic_export/locales/pl_PL/graphic_export.po6
-rw-r--r--scilab/modules/graphic_export/locales/pt_BR/graphic_export.po12
-rw-r--r--scilab/modules/graphic_export/src/c/xs2file.c4
-rw-r--r--scilab/modules/graphic_export/src/java/org/scilab/modules/graphic_export/FileExporter.java2
-rw-r--r--scilab/modules/graphic_export/src/java/org/scilab/modules/graphic_export/GL2PSCircleMarkDrawer.java60
-rw-r--r--scilab/modules/graphic_export/src/java/org/scilab/modules/graphic_export/GL2PSDotMarkDrawer.java47
-rw-r--r--scilab/modules/graphic_export/src/java/org/scilab/modules/graphic_export/GL2PSMarkDrawingStrategy.java92
-rw-r--r--scilab/modules/graphic_export/src/java/org/scilab/modules/graphic_export/GL2PSRenderer.java3
-rw-r--r--scilab/modules/graphic_export/src/java/org/scilab/modules/graphic_export/GL2PSStarMarkDrawer.java52
-rw-r--r--scilab/modules/graphic_export/src/java/org/scilab/modules/graphic_export/GL2PSTextRenderer.java2
-rw-r--r--scilab/modules/graphic_export/src/nographic_export/nographic_export.rc10
-rw-r--r--scilab/modules/graphic_export/tests/nonreg_tests/bug_4818.dia.ref20
-rw-r--r--scilab/modules/graphic_export/tests/nonreg_tests/bug_4818.tst21
-rw-r--r--scilab/modules/graphic_export/version.xml2
-rw-r--r--scilab/modules/graphics/Makefile.in2
-rw-r--r--scilab/modules/graphics/demos/anim/anim8/anim8.sci2
-rw-r--r--scilab/modules/graphics/graphic.rc10
-rw-r--r--scilab/modules/graphics/help/en_US/3d_plot/param3d_properties.xml2
-rw-r--r--scilab/modules/graphics/help/en_US/3d_plot/surf.xml2
-rw-r--r--scilab/modules/graphics/help/en_US/3d_plot/surface_properties.xml2
-rw-r--r--scilab/modules/graphics/help/en_US/annotation/legend.xml116
-rw-r--r--scilab/modules/graphics/help/en_US/polygon/polyline_properties.xml4
-rw-r--r--scilab/modules/graphics/help/fr_FR/axes_operations/replot.xml (renamed from scilab/modules/graphics/help/fr_FR/replot.xml)0
-rw-r--r--scilab/modules/graphics/help/fr_FR/axes_operations/subplot.xml (renamed from scilab/modules/graphics/help/fr_FR/subplot.xml)0
-rw-r--r--scilab/modules/graphics/help/fr_FR/geometric_shapes/xfrect.xml (renamed from scilab/modules/graphics/help/fr_FR/xfrect.xml)0
-rw-r--r--scilab/modules/graphics/help/fr_FR/handle/sd2sci.xml (renamed from scilab/modules/graphics/help/fr_FR/sd2sci.xml)0
-rw-r--r--scilab/modules/graphics/help/fr_FR/interaction/locate.xml (renamed from scilab/modules/graphics/help/fr_FR/locate.xml)0
-rw-r--r--scilab/modules/graphics/help/fr_FR/interaction/xclick.xml (renamed from scilab/modules/graphics/help/fr_FR/xclick.xml)0
-rw-r--r--scilab/modules/graphics/help/fr_FR/text/titlepage.xml (renamed from scilab/modules/graphics/help/fr_FR/titlepage.xml)0
-rw-r--r--scilab/modules/graphics/help/fr_FR/text/xinfo.xml (renamed from scilab/modules/graphics/help/fr_FR/xinfo.xml)0
-rw-r--r--scilab/modules/graphics/help/fr_FR/transform/rotate.xml (renamed from scilab/modules/graphics/help/fr_FR/rotate.xml)0
-rw-r--r--scilab/modules/graphics/help/fr_FR/transform/scaling.xml (renamed from scilab/modules/graphics/help/fr_FR/scaling.xml)0
-rw-r--r--scilab/modules/graphics/help/fr_FR/window_control/show_window.xml (renamed from scilab/modules/graphics/help/fr_FR/show_window.xml)0
-rw-r--r--scilab/modules/graphics/help/pt_BR/3d_plot/surf.xml2
-rw-r--r--scilab/modules/graphics/includes/GetProperty.h3
-rw-r--r--scilab/modules/graphics/includes/SetProperty.h10
-rw-r--r--scilab/modules/graphics/locales/de_DE/graphics.po2
-rw-r--r--scilab/modules/graphics/locales/es_ES/graphics.po8
-rw-r--r--scilab/modules/graphics/locales/fr_FR/graphics.po2
-rw-r--r--scilab/modules/graphics/locales/it_IT/graphics.po156
-rw-r--r--scilab/modules/graphics/locales/ja_JP/graphics.po16
-rw-r--r--scilab/modules/graphics/locales/pl_PL/graphics.po46
-rw-r--r--scilab/modules/graphics/locales/pt_BR/graphics.po160
-rw-r--r--scilab/modules/graphics/macros/legend.sci116
-rw-r--r--scilab/modules/graphics/src/c/GetProperty.c31
-rw-r--r--scilab/modules/graphics/src/c/SetProperty.c101
-rw-r--r--scilab/modules/graphics/src/c/getHandleProperty/get_sub_tics_property.c11
-rw-r--r--scilab/modules/graphics/src/nographics/nographics.rc10
-rw-r--r--scilab/modules/graphics/tests/nonreg_tests/bug_7509.dia.ref86
-rw-r--r--scilab/modules/graphics/tests/nonreg_tests/bug_7509.tst112
-rw-r--r--scilab/modules/graphics/tests/nonreg_tests/bug_7836.dia.ref25
-rw-r--r--scilab/modules/graphics/tests/nonreg_tests/bug_7836.tst32
-rw-r--r--scilab/modules/graphics/tests/nonreg_tests/bug_8475.tst29
-rw-r--r--scilab/modules/graphics/version.xml2
-rw-r--r--scilab/modules/gui/Makefile.in2
-rw-r--r--scilab/modules/gui/locales/es_ES/gui.po8
-rw-r--r--scilab/modules/gui/locales/fr_FR/gui.po4
-rw-r--r--scilab/modules/gui/locales/it_IT/gui.po166
-rw-r--r--scilab/modules/gui/locales/ja_JP/gui.po14
-rw-r--r--scilab/modules/gui/locales/pl_PL/gui.po20
-rw-r--r--scilab/modules/gui/locales/pt_BR/gui.po174
-rw-r--r--scilab/modules/gui/locales/ru_RU/gui.po2
-rw-r--r--scilab/modules/gui/locales/uk_UA/gui.po2
-rw-r--r--scilab/modules/gui/locales/zh_CN/gui.po6
-rw-r--r--scilab/modules/gui/locales/zh_TW/gui.po22
-rw-r--r--scilab/modules/gui/src/c/gui.rc10
-rw-r--r--scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/colorchooser/SwingScilabColorChooser.java220
-rw-r--r--scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/fontchooser/SwingScilabFontChooser.java683
-rw-r--r--scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/messagebox/SwingScilabMessageBox.java1587
-rw-r--r--scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/waitbar/SwingScilabWaitBar.java2
-rw-r--r--scilab/modules/gui/src/java/org/scilab/modules/gui/utils/ScilabAboutBox.java270
-rw-r--r--scilab/modules/gui/src/java/org/scilab/modules/gui/utils/ScilabSwingUtilities.java345
-rw-r--r--scilab/modules/gui/src/nogui/nogui.rc10
-rw-r--r--scilab/modules/gui/tests/nonreg_tests/bug_8203.tst18
-rw-r--r--scilab/modules/gui/tests/nonreg_tests/bug_8582.tst28
-rw-r--r--scilab/modules/gui/version.xml2
-rw-r--r--scilab/modules/hdf5/Makefile.in2
-rw-r--r--scilab/modules/hdf5/src/c/hdf5.rc10
-rw-r--r--scilab/modules/hdf5/src/java/org/scilab/modules/hdf5/write/H5WriteScilabString.java44
-rw-r--r--scilab/modules/hdf5/tests/java/org/scilab/tests/modules/hdf5/testScilabBoolean.java17
-rw-r--r--scilab/modules/hdf5/tests/java/org/scilab/tests/modules/hdf5/testScilabDouble.java17
-rw-r--r--scilab/modules/hdf5/tests/java/org/scilab/tests/modules/hdf5/testScilabList.java90
-rw-r--r--scilab/modules/hdf5/tests/java/org/scilab/tests/modules/hdf5/testScilabString.java77
-rw-r--r--scilab/modules/helptools/Makefile.am63
-rw-r--r--scilab/modules/helptools/Makefile.in224
-rw-r--r--scilab/modules/helptools/css/html.css39
-rw-r--r--scilab/modules/helptools/css/htmlhelp.css39
-rw-r--r--scilab/modules/helptools/css/javahelp.css153
-rw-r--r--scilab/modules/helptools/data/configuration/scilab_macros.txt5
-rw-r--r--scilab/modules/helptools/data/configuration/scilab_primitives.txt6
-rw-r--r--scilab/modules/helptools/data/template/template_web.html94
-rw-r--r--scilab/modules/helptools/doc/addonprefs.pngbin36653 -> 0 bytes
-rw-r--r--scilab/modules/helptools/doc/doc.pdfbin80178 -> 0 bytes
-rw-r--r--scilab/modules/helptools/doc/doc.xml762
-rw-r--r--scilab/modules/helptools/doc/html/ch01.html3
-rw-r--r--scilab/modules/helptools/doc/html/ch02.html21
-rw-r--r--scilab/modules/helptools/doc/html/ch03.html3
-rw-r--r--scilab/modules/helptools/doc/html/ch04.html6
-rw-r--r--scilab/modules/helptools/doc/html/ch05.html7
-rw-r--r--scilab/modules/helptools/doc/html/ch06.html13
-rw-r--r--scilab/modules/helptools/doc/html/ch07.html3
-rw-r--r--scilab/modules/helptools/doc/html/html.css27
-rw-r--r--scilab/modules/helptools/doc/html/images/callouts/1.pngbin329 -> 0 bytes
-rw-r--r--scilab/modules/helptools/doc/html/images/callouts/10.pngbin361 -> 0 bytes
-rw-r--r--scilab/modules/helptools/doc/html/images/callouts/11.pngbin565 -> 0 bytes
-rw-r--r--scilab/modules/helptools/doc/html/images/callouts/12.pngbin617 -> 0 bytes
-rw-r--r--scilab/modules/helptools/doc/html/images/callouts/13.pngbin623 -> 0 bytes
-rw-r--r--scilab/modules/helptools/doc/html/images/callouts/14.pngbin411 -> 0 bytes
-rw-r--r--scilab/modules/helptools/doc/html/images/callouts/15.pngbin640 -> 0 bytes
-rw-r--r--scilab/modules/helptools/doc/html/images/callouts/2.pngbin353 -> 0 bytes
-rw-r--r--scilab/modules/helptools/doc/html/images/callouts/3.pngbin350 -> 0 bytes
-rw-r--r--scilab/modules/helptools/doc/html/images/callouts/4.pngbin345 -> 0 bytes
-rw-r--r--scilab/modules/helptools/doc/html/images/callouts/5.pngbin348 -> 0 bytes
-rw-r--r--scilab/modules/helptools/doc/html/images/callouts/6.pngbin355 -> 0 bytes
-rw-r--r--scilab/modules/helptools/doc/html/images/callouts/7.pngbin344 -> 0 bytes
-rw-r--r--scilab/modules/helptools/doc/html/images/callouts/8.pngbin357 -> 0 bytes
-rw-r--r--scilab/modules/helptools/doc/html/images/callouts/9.pngbin357 -> 0 bytes
-rw-r--r--scilab/modules/helptools/doc/html/images/draft.pngbin17454 -> 0 bytes
-rw-r--r--scilab/modules/helptools/doc/html/index.html3
-rw-r--r--scilab/modules/helptools/doc/html/resources/addonprefs.pngbin36653 -> 0 bytes
-rw-r--r--scilab/modules/helptools/etc/fopconf.xml (renamed from scilab/modules/helptools/fopconf.xml)0
-rw-r--r--scilab/modules/helptools/help/en_US/man.xml400
-rw-r--r--scilab/modules/helptools/help/pt_BR/man.xml293
-rw-r--r--scilab/modules/helptools/helptools.iss4
-rw-r--r--scilab/modules/helptools/locales/fr_FR/helptools.po2
-rw-r--r--scilab/modules/helptools/locales/it_IT/helptools.po4
-rw-r--r--scilab/modules/helptools/locales/pt_BR/helptools.po4
-rw-r--r--scilab/modules/helptools/macros/xmltoformat.sci20
-rw-r--r--scilab/modules/helptools/macros/xmltoweb.sci32
-rw-r--r--scilab/modules/helptools/src/c/helptools.rc10
-rw-r--r--scilab/modules/helptools/src/java/org/scilab/forge/scidoc/CHMDocbookTagConverter.java10
-rw-r--r--scilab/modules/helptools/src/java/org/scilab/forge/scidoc/HTMLDocbookLinkResolver.java22
-rw-r--r--scilab/modules/helptools/src/java/org/scilab/forge/scidoc/HTMLDocbookTagConverter.java14
-rw-r--r--scilab/modules/helptools/src/java/org/scilab/forge/scidoc/SciDocMain.java23
-rw-r--r--scilab/modules/helptools/src/java/org/scilab/forge/scidoc/scilab/HTMLScilabCodeHandler.java232
-rw-r--r--scilab/modules/helptools/src/java/org/scilab/modules/helptools/BuildPDF.java2
-rw-r--r--scilab/modules/helptools/version.xml2
-rw-r--r--scilab/modules/history_browser/Makefile.in2
-rw-r--r--scilab/modules/history_browser/src/c/history_browser.rc10
-rw-r--r--scilab/modules/history_browser/src/nohistory_browser/nohistory_browser.rc10
-rw-r--r--scilab/modules/history_manager/Makefile.in2
-rw-r--r--scilab/modules/history_manager/locales/it_IT/history_manager.po4
-rw-r--r--scilab/modules/history_manager/locales/pt_BR/history_manager.po4
-rw-r--r--scilab/modules/history_manager/src/c/history_manager.rc10
-rw-r--r--scilab/modules/history_manager/version.xml2
-rw-r--r--scilab/modules/integer/Makefile.in2
-rw-r--r--scilab/modules/integer/src/c/integer.rc10
-rw-r--r--scilab/modules/integer/src/fortran/integer_f.rc10
-rw-r--r--scilab/modules/integer/version.xml2
-rw-r--r--scilab/modules/interpolation/Makefile.in2
-rw-r--r--scilab/modules/interpolation/locales/es_ES/interpolation.po6
-rw-r--r--scilab/modules/interpolation/locales/it_IT/interpolation.po10
-rw-r--r--scilab/modules/interpolation/locales/ja_JP/interpolation.po4
-rw-r--r--scilab/modules/interpolation/locales/zh_CN/interpolation.po4
-rw-r--r--scilab/modules/interpolation/src/c/interpolation.rc10
-rw-r--r--scilab/modules/interpolation/src/fortran/interpolation_f.rc10
-rw-r--r--scilab/modules/interpolation/version.xml2
-rw-r--r--scilab/modules/intersci/Makefile.in2
-rw-r--r--scilab/modules/intersci/src/lib/intersci.rc10
-rw-r--r--scilab/modules/intersci/version.xml2
-rw-r--r--scilab/modules/io/Makefile.in2
-rw-r--r--scilab/modules/io/locales/it_IT/io.po2
-rw-r--r--scilab/modules/io/locales/pl_PL/io.po2
-rw-r--r--scilab/modules/io/locales/pt_BR/io.po2
-rw-r--r--scilab/modules/io/locales/zh_TW/io.po2
-rw-r--r--scilab/modules/io/src/c/io.rc10
-rw-r--r--scilab/modules/io/src/fortran/io_f.rc10
-rw-r--r--scilab/modules/io/version.xml2
-rw-r--r--scilab/modules/javasci/Makefile.in2
-rw-r--r--scilab/modules/javasci/examples/v2/Example1.java61
-rw-r--r--scilab/modules/javasci/examples/v2/Makefile12
-rw-r--r--scilab/modules/javasci/examples/v2/build.bat9
-rw-r--r--scilab/modules/javasci/help/en_US/javasci_step_by_step.xml162
-rw-r--r--scilab/modules/javasci/javasci.rc10
-rw-r--r--scilab/modules/javasci/version.xml2
-rw-r--r--scilab/modules/jvm/Makefile.in2
-rw-r--r--scilab/modules/jvm/locales/it_IT/jvm.po12
-rw-r--r--scilab/modules/jvm/locales/pt_BR/jvm.po6
-rw-r--r--scilab/modules/jvm/src/c/libjvm.rc10
-rw-r--r--scilab/modules/jvm/src/nojvm/nojvm.rc10
-rw-r--r--scilab/modules/jvm/version.xml2
-rw-r--r--scilab/modules/linear_algebra/Makefile.in2
-rw-r--r--scilab/modules/linear_algebra/src/c/linear_algebra.rc10
-rw-r--r--scilab/modules/linear_algebra/src/fortran/linear_algebra_f.rc10
-rw-r--r--scilab/modules/linear_algebra/version.xml2
-rw-r--r--scilab/modules/localization/Makefile.am7
-rw-r--r--scilab/modules/localization/Makefile.in37
-rw-r--r--scilab/modules/localization/locales/it_IT/localization.po6
-rw-r--r--scilab/modules/localization/src/c/LocaleNameToLCID_Windows.c35
-rw-r--r--scilab/modules/localization/src/c/LocaleNameToLCID_Windows.h30
-rw-r--r--scilab/modules/localization/src/c/getLcidString.c90
-rw-r--r--scilab/modules/localization/src/c/getLcidString.h26
-rw-r--r--scilab/modules/localization/src/java/org/scilab/modules/localization/LocaleToLCID.java28
-rw-r--r--scilab/modules/localization/src/java/org/scilab/modules/localization/LocaleToLCIDJNI.java42
-rw-r--r--scilab/modules/localization/src/jni/LocaleToLCID.i87
-rw-r--r--scilab/modules/localization/src/jni/LocaleToLCID_wrap.c219
-rw-r--r--scilab/modules/localization/src/localization.rc10
-rw-r--r--scilab/modules/localization/src/localization.vcproj36
-rw-r--r--scilab/modules/localization/src/localization_export.def2
-rw-r--r--scilab/modules/localization/version.xml2
-rw-r--r--scilab/modules/m2sci/Makefile.in2
-rw-r--r--scilab/modules/m2sci/locales/es_ES/m2sci.po6
-rw-r--r--scilab/modules/m2sci/locales/fr_FR/m2sci.po4
-rw-r--r--scilab/modules/m2sci/locales/it_IT/m2sci.po16
-rw-r--r--scilab/modules/m2sci/locales/ja_JP/m2sci.po12
-rw-r--r--scilab/modules/m2sci/locales/pl_PL/m2sci.po10
-rw-r--r--scilab/modules/m2sci/version.xml2
-rw-r--r--scilab/modules/maple2scilab/Makefile.in2
-rw-r--r--scilab/modules/maple2scilab/version.xml2
-rw-r--r--scilab/modules/matio/Makefile.in2
-rw-r--r--scilab/modules/matio/src/c/matio.rc10
-rw-r--r--scilab/modules/matio/src/nomatio/nomatio.rc10
-rw-r--r--scilab/modules/matio/version.xml2
-rw-r--r--scilab/modules/mexlib/Makefile.in2
-rw-r--r--scilab/modules/mexlib/src/libmat/libmat.rc10
-rw-r--r--scilab/modules/mexlib/src/libmex/libmex.rc10
-rw-r--r--scilab/modules/mexlib/src/libmx/libmx.rc10
-rw-r--r--scilab/modules/mexlib/version.xml2
-rw-r--r--scilab/modules/modules_manager/Makefile.in2
-rw-r--r--scilab/modules/optimization/Makefile.in2
-rw-r--r--scilab/modules/optimization/locales/de_DE/optimization.po2
-rw-r--r--scilab/modules/optimization/locales/it_IT/optimization.po10
-rw-r--r--scilab/modules/optimization/locales/ja_JP/optimization.po6
-rw-r--r--scilab/modules/optimization/locales/pl_PL/optimization.po2
-rw-r--r--scilab/modules/optimization/src/c/optimization.rc10
-rw-r--r--scilab/modules/optimization/src/fortran/optimization_f.rc10
-rw-r--r--scilab/modules/optimization/version.xml2
-rw-r--r--scilab/modules/output_stream/Makefile.in2
-rw-r--r--scilab/modules/output_stream/locales/it_IT/output_stream.po20
-rw-r--r--scilab/modules/output_stream/locales/pl_PL/output_stream.po4
-rw-r--r--scilab/modules/output_stream/locales/pt_BR/output_stream.po8
-rw-r--r--scilab/modules/output_stream/src/c/errmsg.c10
-rw-r--r--scilab/modules/output_stream/src/c/output_stream.rc10
-rw-r--r--scilab/modules/output_stream/src/fortran/output_stream_f.rc10
-rw-r--r--scilab/modules/output_stream/tests/nonreg_tests/bug_8279.dia.ref20
-rw-r--r--scilab/modules/output_stream/tests/nonreg_tests/bug_8279.tst22
-rw-r--r--scilab/modules/output_stream/version.xml2
-rw-r--r--scilab/modules/overloading/Makefile.in2
-rw-r--r--scilab/modules/overloading/macros/%r_diag.sci34
-rw-r--r--scilab/modules/overloading/macros/%r_tril.sci17
-rw-r--r--scilab/modules/overloading/macros/%r_triu.sci19
-rw-r--r--scilab/modules/overloading/macros/generic_i_hm.sci2
-rw-r--r--scilab/modules/overloading/tests/nonreg_tests/bug_7714.dia.ref21
-rw-r--r--scilab/modules/overloading/tests/nonreg_tests/bug_7714.tst24
-rw-r--r--scilab/modules/overloading/tests/nonreg_tests/bug_7900.dia.ref16
-rw-r--r--scilab/modules/overloading/tests/nonreg_tests/bug_7900.tst18
-rw-r--r--scilab/modules/overloading/version.xml2
-rw-r--r--scilab/modules/parallel/Makefile.in2
-rw-r--r--scilab/modules/parallel/src/c/parallel.rc6
-rw-r--r--scilab/modules/parameters/Makefile.in2
-rw-r--r--scilab/modules/parameters/src/c/parameters.rc10
-rw-r--r--scilab/modules/parameters/version.xml2
-rw-r--r--scilab/modules/polynomials/Makefile.in2
-rw-r--r--scilab/modules/polynomials/src/fortran/polynomials_f.rc10
-rw-r--r--scilab/modules/polynomials/src/fortran/polynomials_f2c.vcproj16
-rw-r--r--scilab/modules/polynomials/src/fortran/rpoly.f19
-rw-r--r--scilab/modules/polynomials/tests/nonreg_tests/bug_5686.dia.ref25
-rw-r--r--scilab/modules/polynomials/tests/nonreg_tests/bug_5686.tst26
-rw-r--r--scilab/modules/polynomials/version.xml2
-rw-r--r--scilab/modules/pvm/Makefile.in2
-rw-r--r--scilab/modules/pvm/locales/it_IT/pvm.po4
-rw-r--r--scilab/modules/pvm/src/c/pvm.rc10
-rw-r--r--scilab/modules/pvm/version.xml2
-rw-r--r--scilab/modules/randlib/Makefile.in2
-rw-r--r--scilab/modules/randlib/src/c/randlib.rc10
-rw-r--r--scilab/modules/randlib/src/fortran/randlib_f.rc10
-rw-r--r--scilab/modules/randlib/src/norandlib/norandlib.rc10
-rw-r--r--scilab/modules/randlib/version.xml2
-rw-r--r--scilab/modules/renderer/Makefile.in2
-rw-r--r--scilab/modules/renderer/graphics_Import.def3
-rw-r--r--scilab/modules/renderer/includes/GetJavaProperty.h8
-rw-r--r--scilab/modules/renderer/renderer.rc10
-rw-r--r--scilab/modules/renderer/src/cpp/GetJavaProperty.cpp6
-rw-r--r--scilab/modules/renderer/src/cpp/axesDrawing/AxesTicksComputer.cpp48
-rw-r--r--scilab/modules/renderer/src/cpp/axesDrawing/AxesTicksComputer.hxx2
-rw-r--r--scilab/modules/renderer/src/cpp/subwinDrawing/AutoLogTicksComputer.cpp62
-rw-r--r--scilab/modules/renderer/src/cpp/subwinDrawing/AutoLogTicksComputer.hxx4
-rw-r--r--scilab/modules/renderer/src/cpp/subwinDrawing/AutomaticTicksComputer.cpp34
-rw-r--r--scilab/modules/renderer/src/cpp/subwinDrawing/AutomaticTicksComputer.hxx2
-rw-r--r--scilab/modules/renderer/src/cpp/subwinDrawing/ComputeTicksStrategy.hxx2
-rw-r--r--scilab/modules/renderer/src/cpp/subwinDrawing/ConcreteDrawableSubwin.cpp21
-rw-r--r--scilab/modules/renderer/src/cpp/subwinDrawing/ConcreteDrawableSubwin.hxx7
-rw-r--r--scilab/modules/renderer/src/cpp/subwinDrawing/DrawableSubwin.h9
-rw-r--r--scilab/modules/renderer/src/cpp/subwinDrawing/TicksDrawer.cpp32
-rw-r--r--scilab/modules/renderer/src/cpp/subwinDrawing/TicksDrawer.hxx7
-rw-r--r--scilab/modules/renderer/src/cpp/subwinDrawing/TicksDrawerFactory.cpp10
-rw-r--r--scilab/modules/renderer/src/cpp/subwinDrawing/UserDefLogTicksComputer.cpp7
-rw-r--r--scilab/modules/renderer/src/cpp/subwinDrawing/UserDefinedTicksComputer.cpp13
-rw-r--r--scilab/modules/renderer/src/cpp/subwinDrawing/UserDefinedTicksComputer.hxx6
-rw-r--r--scilab/modules/renderer/src/java/org/scilab/modules/renderer/drawers/MarkDrawerGL.java3
-rw-r--r--scilab/modules/renderer/src/java/org/scilab/modules/renderer/figureDrawing/DrawableFigureGL.java20
-rw-r--r--scilab/modules/renderer/src/java/org/scilab/modules/renderer/utils/MarkDrawing/AsteriskMarkDrawer.java2
-rw-r--r--scilab/modules/renderer/src/java/org/scilab/modules/renderer/utils/MarkDrawing/CircleMarkDrawer.java4
-rw-r--r--scilab/modules/renderer/src/java/org/scilab/modules/renderer/utils/MarkDrawing/CrossMarkDrawer.java2
-rw-r--r--scilab/modules/renderer/src/java/org/scilab/modules/renderer/utils/MarkDrawing/DiamondMarkDrawer.java2
-rw-r--r--scilab/modules/renderer/src/java/org/scilab/modules/renderer/utils/MarkDrawing/DotMarkDrawer.java2
-rw-r--r--scilab/modules/renderer/src/java/org/scilab/modules/renderer/utils/MarkDrawing/FilledDiamondMarkDrawer.java2
-rw-r--r--scilab/modules/renderer/src/java/org/scilab/modules/renderer/utils/MarkDrawing/JOGLMarkDrawingStrategy.java89
-rw-r--r--scilab/modules/renderer/src/java/org/scilab/modules/renderer/utils/MarkDrawing/MarkDrawer.java20
-rw-r--r--scilab/modules/renderer/src/java/org/scilab/modules/renderer/utils/MarkDrawing/MarkDrawingStrategy.java171
-rw-r--r--scilab/modules/renderer/src/java/org/scilab/modules/renderer/utils/MarkDrawing/PentagramMarkDrawer.java2
-rw-r--r--scilab/modules/renderer/src/java/org/scilab/modules/renderer/utils/MarkDrawing/PlusMarkDrawer.java2
-rw-r--r--scilab/modules/renderer/src/java/org/scilab/modules/renderer/utils/MarkDrawing/SquareMarkDrawer.java2
-rw-r--r--scilab/modules/renderer/src/java/org/scilab/modules/renderer/utils/MarkDrawing/TriangleMarkDrawer.java2
-rw-r--r--scilab/modules/renderer/src/norenderer/norenderer.rc10
-rw-r--r--scilab/modules/renderer/version.xml2
-rw-r--r--scilab/modules/scicos/Makefile.in2
-rw-r--r--scilab/modules/scicos/locales/it_IT/scicos.po2
-rw-r--r--scilab/modules/scicos/locales/ja_JP/scicos.po2
-rw-r--r--scilab/modules/scicos/locales/pl_PL/scicos.po2
-rw-r--r--scilab/modules/scicos/locales/pt_BR/scicos.po2
-rw-r--r--scilab/modules/scicos/macros/scicos_scicos/scicos_flat.sci2
-rw-r--r--scilab/modules/scicos/src/c/noscicos/noscicos.rc10
-rw-r--r--scilab/modules/scicos/src/c/scicos.rc10
-rw-r--r--scilab/modules/scicos/src/fortran/scicos_f.rc10
-rw-r--r--scilab/modules/scicos/src/scicos_sundials/scicos_sundials.rc10
-rw-r--r--scilab/modules/scicos/version.xml2
-rw-r--r--scilab/modules/scicos_blocks/Makefile.am41
-rw-r--r--scilab/modules/scicos_blocks/Makefile.in506
-rw-r--r--scilab/modules/scicos_blocks/src/c/scicos_blocks.rc10
-rw-r--r--scilab/modules/scicos_blocks/src/c/sum.c83
-rw-r--r--scilab/modules/scicos_blocks/src/fortran/scicos_blocks_f.rc10
-rw-r--r--scilab/modules/scicos_blocks/version.xml2
-rw-r--r--scilab/modules/scinotes/Makefile.in2
-rw-r--r--scilab/modules/scinotes/locales/fr_FR/scinotes.po94
-rw-r--r--scilab/modules/scinotes/src/c/scinotes.rc10
-rw-r--r--scilab/modules/scinotes/src/java/org/scilab/modules/scinotes/ScilabDocument.java32
-rw-r--r--scilab/modules/scinotes/src/java/org/scilab/modules/scinotes/ScilabEditorPane.java9
-rw-r--r--scilab/modules/scinotes/src/java/org/scilab/modules/scinotes/ScilabLexer.java2950
-rw-r--r--scilab/modules/scinotes/src/java/org/scilab/modules/scinotes/ScilabLexerConstants.java9
-rw-r--r--scilab/modules/scinotes/src/java/org/scilab/modules/scinotes/ScilabView.java10
-rw-r--r--scilab/modules/scinotes/src/java/org/scilab/modules/scinotes/utils/SciNotesMessages.java26
-rw-r--r--scilab/modules/scinotes/src/jflex/scilab.jflex13
-rw-r--r--scilab/modules/scinotes/tests/nonreg_tests/bug_8627.tst23
-rw-r--r--scilab/modules/shell/Makefile.in2
-rw-r--r--scilab/modules/shell/locales/it_IT/shell.po2
-rw-r--r--scilab/modules/shell/locales/pt_BR/shell.po2
-rw-r--r--scilab/modules/shell/src/c/shell.rc8
-rw-r--r--scilab/modules/shell/version.xml2
-rw-r--r--scilab/modules/signal_processing/Makefile.in2
-rw-r--r--scilab/modules/signal_processing/src/c/signal_processing.rc10
-rw-r--r--scilab/modules/signal_processing/src/fortran/signal_processing_f.rc10
-rw-r--r--scilab/modules/signal_processing/version.xml2
-rw-r--r--scilab/modules/simulated_annealing/Makefile.in2
-rw-r--r--scilab/modules/simulated_annealing/version.xml2
-rw-r--r--scilab/modules/sound/Makefile.in2
-rw-r--r--scilab/modules/sound/locales/it_IT/sound.po4
-rw-r--r--scilab/modules/sound/locales/pt_BR/sound.po2
-rw-r--r--scilab/modules/sound/src/c/sound.rc10
-rw-r--r--scilab/modules/sound/src/nosound/nosound.rc10
-rw-r--r--scilab/modules/sound/version.xml2
-rw-r--r--scilab/modules/sparse/Makefile.in2
-rw-r--r--scilab/modules/sparse/help/en_US/adj2sp.xml199
-rw-r--r--scilab/modules/sparse/help/en_US/sp2adj.xml203
-rw-r--r--scilab/modules/sparse/locales/es_ES/sparse.po4
-rw-r--r--scilab/modules/sparse/locales/it_IT/sparse.po6
-rw-r--r--scilab/modules/sparse/locales/ja_JP/sparse.po2
-rw-r--r--scilab/modules/sparse/locales/pt_BR/sparse.po2
-rw-r--r--scilab/modules/sparse/macros/adj2sp.sci99
-rw-r--r--scilab/modules/sparse/macros/sp2adj.sci58
-rw-r--r--scilab/modules/sparse/src/c/sparse.rc10
-rw-r--r--scilab/modules/sparse/src/fortran/sparse_f.rc10
-rw-r--r--scilab/modules/sparse/src/fortran/ta2lpd.f1
-rw-r--r--scilab/modules/sparse/tests/unit_tests/adj2sp.dia.ref93
-rw-r--r--scilab/modules/sparse/tests/unit_tests/adj2sp.tst96
-rw-r--r--scilab/modules/sparse/tests/unit_tests/sp2adj.dia.ref101
-rw-r--r--scilab/modules/sparse/tests/unit_tests/sp2adj.tst104
-rw-r--r--scilab/modules/sparse/version.xml2
-rw-r--r--scilab/modules/special_functions/Makefile.am8
-rw-r--r--scilab/modules/special_functions/Makefile.in63
-rw-r--r--scilab/modules/special_functions/help/en_US/bessel.xml9
-rw-r--r--scilab/modules/special_functions/help/en_US/oldbessel.xml223
-rw-r--r--scilab/modules/special_functions/help/pt_BR/bessel.xml7
-rw-r--r--scilab/modules/special_functions/help/pt_BR/oldbessel.xml213
-rw-r--r--scilab/modules/special_functions/includes/gw_special_functions.h4
-rw-r--r--scilab/modules/special_functions/sci_gateway/c/gw_special_functions.c4
-rw-r--r--scilab/modules/special_functions/sci_gateway/c/sci_oldbesseli.c40
-rw-r--r--scilab/modules/special_functions/sci_gateway/c/sci_oldbesselj.c38
-rw-r--r--scilab/modules/special_functions/sci_gateway/c/sci_oldbesselk.c39
-rw-r--r--scilab/modules/special_functions/sci_gateway/c/sci_oldbessely.c39
-rw-r--r--scilab/modules/special_functions/sci_gateway/fortran/sci_f_oldbesseli.f116
-rw-r--r--scilab/modules/special_functions/sci_gateway/fortran/sci_f_oldbesselj.f99
-rw-r--r--scilab/modules/special_functions/sci_gateway/fortran/sci_f_oldbesselk.f116
-rw-r--r--scilab/modules/special_functions/sci_gateway/fortran/sci_f_oldbessely.f106
-rw-r--r--scilab/modules/special_functions/sci_gateway/special_functions_gateway.xml12
-rw-r--r--scilab/modules/special_functions/src/c/special_functions.rc10
-rw-r--r--scilab/modules/special_functions/src/c/special_functions.vcproj16
-rw-r--r--scilab/modules/special_functions/src/fortran/special_functions_f.def4
-rw-r--r--scilab/modules/special_functions/src/fortran/special_functions_f.rc10
-rw-r--r--scilab/modules/special_functions/src/fortran/special_functions_f.vfproj6
-rw-r--r--scilab/modules/special_functions/src/fortran/special_functions_f2c.vcproj32
-rw-r--r--scilab/modules/special_functions/version.xml2
-rw-r--r--scilab/modules/spreadsheet/Makefile.in2
-rw-r--r--scilab/modules/spreadsheet/locales/es_ES/spreadsheet.po4
-rw-r--r--scilab/modules/spreadsheet/locales/it_IT/spreadsheet.po28
-rw-r--r--scilab/modules/spreadsheet/locales/ja_JP/spreadsheet.po4
-rw-r--r--scilab/modules/spreadsheet/locales/pl_PL/spreadsheet.po6
-rw-r--r--scilab/modules/spreadsheet/locales/pt_BR/spreadsheet.po28
-rw-r--r--scilab/modules/spreadsheet/locales/zh_TW/spreadsheet.po2
-rw-r--r--scilab/modules/spreadsheet/macros/read_csv.sci23
-rw-r--r--scilab/modules/spreadsheet/src/c/spreadsheet.rc10
-rw-r--r--scilab/modules/spreadsheet/src/nospreadsheet/nospreadsheet.rc10
-rw-r--r--scilab/modules/spreadsheet/tests/nonreg_tests/bug_8532.dia.ref26
-rw-r--r--scilab/modules/spreadsheet/tests/nonreg_tests/bug_8532.tst29
-rw-r--r--scilab/modules/spreadsheet/version.xml2
-rw-r--r--scilab/modules/statistics/Makefile.in2
-rw-r--r--scilab/modules/statistics/locales/es_ES/statistics.po4
-rw-r--r--scilab/modules/statistics/locales/it_IT/statistics.po34
-rw-r--r--scilab/modules/statistics/locales/ja_JP/statistics.po6
-rw-r--r--scilab/modules/statistics/locales/pl_PL/statistics.po4
-rw-r--r--scilab/modules/statistics/locales/pt_BR/statistics.po38
-rw-r--r--scilab/modules/statistics/locales/zh_CN/statistics.po2
-rw-r--r--scilab/modules/statistics/locales/zh_TW/statistics.po8
-rw-r--r--scilab/modules/statistics/src/c/statistics.rc10
-rw-r--r--scilab/modules/statistics/src/dcdflib/dcd_f/dcd_f.rc10
-rw-r--r--scilab/modules/statistics/version.xml2
-rw-r--r--scilab/modules/string/Makefile.in2
-rw-r--r--scilab/modules/string/locales/es_ES/string.po2
-rw-r--r--scilab/modules/string/locales/it_IT/string.po26
-rw-r--r--scilab/modules/string/locales/ja_JP/string.po4
-rw-r--r--scilab/modules/string/locales/pl_PL/string.po4
-rw-r--r--scilab/modules/string/locales/pt_BR/string.po26
-rw-r--r--scilab/modules/string/locales/zh_CN/string.po2
-rw-r--r--scilab/modules/string/sci_gateway/c/sci_length.c634
-rw-r--r--scilab/modules/string/src/c/setScilabCharactersCodes.c16
-rw-r--r--scilab/modules/string/src/c/string.rc10
-rw-r--r--scilab/modules/string/src/fortran/string_f.rc10
-rw-r--r--scilab/modules/string/tests/nonreg_tests/bug_8528.dia.ref25
-rw-r--r--scilab/modules/string/tests/nonreg_tests/bug_8528.tst26
-rw-r--r--scilab/modules/string/version.xml2
-rw-r--r--scilab/modules/symbolic/Makefile.in2
-rw-r--r--scilab/modules/symbolic/src/c/symbolic.rc10
-rw-r--r--scilab/modules/symbolic/src/fortran/symbolic_f.rc10
-rw-r--r--scilab/modules/symbolic/version.xml2
-rw-r--r--scilab/modules/tclsci/Makefile.am2
-rw-r--r--scilab/modules/tclsci/Makefile.in4
-rw-r--r--scilab/modules/tclsci/locales/it_IT/tclsci.po2
-rw-r--r--scilab/modules/tclsci/src/c/tclsci.rc10
-rw-r--r--scilab/modules/tclsci/tcl/sciGUI/sciBrowseVar.tcl374
-rw-r--r--scilab/modules/tclsci/tcl/sciGUI/sciEditVar.tcl699
-rw-r--r--scilab/modules/tclsci/version.xml2
-rw-r--r--scilab/modules/texmacs/Makefile.in2
-rw-r--r--scilab/modules/texmacs/version.xml2
-rw-r--r--scilab/modules/time/Makefile.in2
-rw-r--r--scilab/modules/time/locales/es_ES/time.po4
-rw-r--r--scilab/modules/time/locales/it_IT/time.po6
-rw-r--r--scilab/modules/time/locales/ja_JP/time.po2
-rw-r--r--scilab/modules/time/locales/pl_PL/time.po4
-rw-r--r--scilab/modules/time/locales/pt_BR/time.po6
-rw-r--r--scilab/modules/time/src/c/time.rc10
-rw-r--r--scilab/modules/time/version.xml2
-rw-r--r--scilab/modules/types/Makefile.in2
-rw-r--r--scilab/modules/types/src/java/org/scilab/modules/types/ScilabBoolean.java5
-rw-r--r--scilab/modules/types/src/java/org/scilab/modules/types/ScilabDouble.java4
-rw-r--r--scilab/modules/types/src/java/org/scilab/modules/types/ScilabInteger.java4
-rw-r--r--scilab/modules/types/src/java/org/scilab/modules/types/ScilabList.java4
-rw-r--r--scilab/modules/types/src/java/org/scilab/modules/types/ScilabMList.java4
-rw-r--r--scilab/modules/types/src/java/org/scilab/modules/types/ScilabString.java4
-rw-r--r--scilab/modules/types/src/java/org/scilab/modules/types/ScilabTList.java4
-rw-r--r--scilab/modules/types/src/java/org/scilab/modules/types/ScilabType.java5
-rw-r--r--scilab/modules/ui_data/Makefile.in2
-rw-r--r--scilab/modules/umfpack/Makefile.in2
-rw-r--r--scilab/modules/umfpack/locales/it_IT/umfpack.po2
-rw-r--r--scilab/modules/umfpack/locales/pt_BR/umfpack.po2
-rw-r--r--scilab/modules/umfpack/src/c/umfpack.rc10
-rw-r--r--scilab/modules/umfpack/src/noumfpack/noumfpack.rc10
-rw-r--r--scilab/modules/umfpack/version.xml2
-rw-r--r--scilab/modules/windows_tools/Makefile.in2
-rw-r--r--scilab/modules/windows_tools/locales/it_IT/windows_tools.po2
-rw-r--r--scilab/modules/windows_tools/locales/pt_BR/windows_tools.po2
-rw-r--r--scilab/modules/windows_tools/src/c/CScilex/CScilex.rc12
-rw-r--r--scilab/modules/windows_tools/src/c/WScilex/WScilex.rc12
-rw-r--r--scilab/modules/windows_tools/src/c/scilab_windows/scilab_windows.rc10
-rw-r--r--scilab/modules/windows_tools/src/c/scilab_windows/spawncommand.c19
-rw-r--r--scilab/modules/windows_tools/src/c/windows_tools.rc10
-rw-r--r--scilab/modules/windows_tools/src/nowindows_tools/nowindows_tools.rc10
-rw-r--r--scilab/modules/windows_tools/tests/nonreg_tests/bug_8424.tst31
-rw-r--r--scilab/modules/windows_tools/version.xml2
-rw-r--r--scilab/modules/xcos/Makefile.am2
-rw-r--r--scilab/modules/xcos/Makefile.in4
-rw-r--r--scilab/modules/xcos/examples/Variable_delay.xcos1648
-rw-r--r--scilab/modules/xcos/examples/dead_zone.xcos1577
-rw-r--r--scilab/modules/xcos/examples/derivative.xcos1555
-rw-r--r--scilab/modules/xcos/examples/pid_d.xcos7137
-rw-r--r--scilab/modules/xcos/help/en_US/palettes/Continuous_pal/DERIV.xml180
-rw-r--r--scilab/modules/xcos/help/en_US/palettes/Continuous_pal/INTEGRAL_m.xml62
-rw-r--r--scilab/modules/xcos/help/en_US/palettes/Continuous_pal/PID.xml293
-rw-r--r--scilab/modules/xcos/help/en_US/palettes/Continuous_pal/VARIABLE_DELAY.xml261
-rw-r--r--scilab/modules/xcos/help/en_US/palettes/Discontinuities_pal/DEADBAND.xml272
-rw-r--r--scilab/modules/xcos/help/examples/INTEGRAL_diagram.png (renamed from scilab/modules/xcos/help/examples/INTEGRAL_m.png)bin109720 -> 109720 bytes
-rw-r--r--scilab/modules/xcos/help/examples/deadband_c.pngbin0 -> 9536 bytes
-rw-r--r--scilab/modules/xcos/help/examples/deadband_d.pngbin0 -> 35237 bytes
-rw-r--r--scilab/modules/xcos/help/examples/deadband_desc.pngbin0 -> 1630 bytes
-rw-r--r--scilab/modules/xcos/help/examples/deadband_eq.gifbin0 -> 3316 bytes
-rw-r--r--scilab/modules/xcos/help/examples/deadband_eq1.gifbin0 -> 793 bytes
-rw-r--r--scilab/modules/xcos/help/examples/deadband_eq2.gifbin0 -> 1116 bytes
-rw-r--r--scilab/modules/xcos/help/examples/deadband_screen.pngbin0 -> 25537 bytes
-rw-r--r--scilab/modules/xcos/help/examples/derivative_diag.pngbin0 -> 65599 bytes
-rw-r--r--scilab/modules/xcos/help/examples/pid_error.gifbin0 -> 983 bytes
-rw-r--r--scilab/modules/xcos/help/examples/pid_example.pngbin0 -> 61833 bytes
-rw-r--r--scilab/modules/xcos/help/examples/pid_filter.gifbin0 -> 1510 bytes
-rw-r--r--scilab/modules/xcos/help/examples/pid_filter_param.pngbin0 -> 12121 bytes
-rw-r--r--scilab/modules/xcos/help/examples/pid_filter_parameters.pngbin0 -> 54705 bytes
-rw-r--r--scilab/modules/xcos/help/examples/pid_law.gifbin0 -> 3547 bytes
-rw-r--r--scilab/modules/xcos/help/examples/pid_parameters.pngbin0 -> 11213 bytes
-rw-r--r--scilab/modules/xcos/help/examples/pid_structure.pngbin0 -> 1755 bytes
-rw-r--r--scilab/modules/xcos/help/examples/variable_delay1.pngbin0 -> 11526 bytes
-rw-r--r--scilab/modules/xcos/help/examples/variable_delay2.pngbin0 -> 51736 bytes
-rw-r--r--scilab/modules/xcos/help/examples/variable_delay_eq.gifbin0 -> 1304 bytes
-rw-r--r--scilab/modules/xcos/help/examples/variable_delay_with_equations.pngbin0 -> 7028 bytes
-rw-r--r--scilab/modules/xcos/images/gui/INTEGRAL_m_gui.gifbin2408 -> 23889 bytes
-rw-r--r--scilab/modules/xcos/images/gui/PID_gui.gifbin1600 -> 17892 bytes
-rw-r--r--scilab/modules/xcos/images/palettes/DEADBAND_modif.png (renamed from scilab/modules/xcos/images/palettes/DEADBAND.png)bin1325 -> 1325 bytes
-rw-r--r--scilab/modules/xcos/locales/it_IT/xcos.po18
-rw-r--r--scilab/modules/xcos/locales/ja_JP/xcos.po8
-rw-r--r--scilab/modules/xcos/locales/pl_PL/xcos.po2
-rw-r--r--scilab/modules/xcos/locales/pt_BR/xcos.po10
-rw-r--r--scilab/modules/xcos/macros/%diagram_xcos.sci1
-rw-r--r--scilab/modules/xcos/macros/generateBlockImage.sci32
-rw-r--r--scilab/modules/xcos/macros/generateBlockImages.sci13
-rw-r--r--scilab/modules/xcos/macros/xcosPalAddBlock.sci2
-rw-r--r--scilab/modules/xcos/macros/xcosPalExport.sci1
-rw-r--r--scilab/modules/xcos/macros/xcos_simulate.sci2
-rw-r--r--scilab/modules/xcos/src/c/xcos.rc10
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/actions/AboutXcosAction.java2
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/actions/EditFormatAction.java142
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/BasicBlock.java14
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/ConstBlock.java11
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/SplitBlock.java131
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/listener/SumPortLabelingListener.java4
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/graph/XcosDiagram.java212
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/graph/swing/handler/ConnectPreview.java27
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/graph/swing/handler/ConnectionHandler.java19
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/io/scicos/BlockElement.java13
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/link/BasicLink.java38
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/utils/XcosMessages.java1
-rw-r--r--scilab/modules/xcos/tests/nonreg_tests/bug_8348.tst29
-rw-r--r--scilab/modules/xcos/tests/nonreg_tests/bug_8348.xcos1
-rw-r--r--scilab/modules/xcos/tests/nonreg_tests/bug_8441.dia.ref20
-rw-r--r--scilab/modules/xcos/tests/nonreg_tests/bug_8441.tst24
-rw-r--r--scilab/modules/xcos/tests/nonreg_tests/bug_8441.xcos724
-rw-r--r--scilab/modules/xcos/tests/nonreg_tests/bug_8483.dia.ref18
-rw-r--r--scilab/modules/xcos/tests/nonreg_tests/bug_8483.tst21
-rw-r--r--scilab/modules/xcos/tests/nonreg_tests/bug_8483.xcos2370
-rw-r--r--scilab/modules/xcos/tests/nonreg_tests/bug_8556.tst22
-rw-r--r--scilab/modules/xcos/tests/nonreg_tests/bug_8569.tst22
-rw-r--r--scilab/modules/xcos/tests/nonreg_tests/bug_8569.xcos1379
-rw-r--r--scilab/modules/xcos/tests/unit_tests/computational_functions.dia.ref415
-rw-r--r--scilab/modules/xcos/tests/unit_tests/computational_functions.tst427
799 files changed, 32557 insertions, 11570 deletions
diff --git a/scilab/CHANGES_5.3.X b/scilab/CHANGES_5.3.X
index f69ab63..ed134da 100644
--- a/scilab/CHANGES_5.3.X
+++ b/scilab/CHANGES_5.3.X
@@ -1,37 +1,210 @@
1 Changes between version 5.3.0 and 5.3.1 of Scilab
2 =================================================
3
4Removed functions (previously declared as obsolete):
5====================================================
6
7* 'maxi' removed. Please use 'max' instead.
8
9* 'mini' removed. Please use 'min' instead.
10
11* 'VCtoLCCLib', 'configure_lcc', 'with_lcc', 'chooselcccompiler', 'findlcccompiler'
12 are now available as ATOMS modules.
13 See http://atoms.scilab.org/toolboxes/LCC-windows
14 or type atomsInstall('lcc-windows') in Scilab.
15
16* 'oldbesseli', 'oldbesselj', 'oldbesselk' and 'oldbessely' removed.
17 Please use 'besseli', 'besselj', 'besselk' and 'bessely' instead.
18
19
20Documentation:
21==============
22
23* In an example in the documentation, when an undocumented function is used,
24trigger a warning and do not add a link on the function name.
25
26* bug 7069 fixed - Old documentation about the documentation build process
27 removed.
28
29Scinotes:
30=========
31
32* Name of the current function and position (line, column) are now displayedno
33in the status bar of Scinotes.
34
35* A bad identifier is now shown in the text editor.
36
37Localization:
38=============
39
40* bug 8096 fixed - With Russian localization, the banner was not centered.
41
42Graphics:
43=========
44
45* bug 4818 fixed - It was not possible to export a figure with a lot of circle
46 marks.
47
48* bug 7509 fixed - Update of the legend help page regarding some previous
49 changes.
50
51* bug 7836 fixed - The sub_tics property was not correctly tracking the number
52 of displayed sub-ticks. Thanks to Paul Griffiths.
53
54* bug 8518 fixed - When graphic export failed, some error messages were not
55 clear.
56
57GUI:
58====
59
60* bug 8203 fixed - It was not possible to close the fontchooser or the
61 colorchooser with the escape key.
62
63Quality assurance:
64==================
65
66* C/C++/Fortran test coverage available on the Scilab source code.
67 Add "--enable-code-coverage" to the configure under GNU/Linux and Mac OS X
68 Start the unitary tests or launch Scilab
69 "make code-coverage" creates the report into "/coverage/results/"
70
71
72Compilation:
73============
74
75* -Wimplicit removed for gfortran in the enable debug mode
76
77
78Scilab:
79=======
80
81* Scilab startup script of the binary is now automatically synchronized with
82 the one from the source tree.
83
84
85Bug fixes:
86==========
87
88* bug 7691 fixed - Giving complex arguments to inverse degree trigonometric
89 functions produced inconsistent results.
90
91
1 Changes between version 5.3.0-beta-5 and 5.3.0 of Scilab 92 Changes between version 5.3.0-beta-5 and 5.3.0 of Scilab
2 ======================================================== 93 ========================================================
3 94
95
4SciNotes: 96SciNotes:
5========= 97=========
6 98
7* bug 8465 fixed - Under GNU/Linux, it was not possible to paste with the 99* bug 8465 fixed - Under GNU/Linux, it was not possible to paste with the
8 middle click. 100 middle click.
9 101
102Xcos:
103=====
104
105* bug 8348 fixed - Sometimes when openning the parameters of a block, its ports
106 changed their index (and position).
107
108* bug 8407 fixed - The blocks was always resized after a parameters edition.
109
110* bug 8441 fixed - "xcos_block" abstract block were not removed on the
111 compilation.
112
113* bug 8483 fixed - Multiplying a scalar and vector using the MATMUL block did not
114 work.
115
116* bug 8540 fixed - Fix a typo on the "highligthed" term.
117
118* bug 8556 fixed - Creating a split block from a link did not work.
119
120* bug 8569 fixed - Deleting a link with a split-block did not reconstruct any
121 valid link.
122
10 123
11Bug Fixes: 124Bug Fixes:
12========== 125==========
13 126
127* bug 4673 fixed - An example of "addinter" function call was added.
128
129* bug 4821 fixed - help file 'man' was obsolete.
130
131* bug 5686 fixed - Complex number manipulation could crash Scilab.
132
133* bug 6768 fixed - input did not return good value when RETURN was pressed
134 on Windows XP.
135
14* bug 7694 fixed - There were no key shortcuts in the command history browser. 136* bug 7694 fixed - There were no key shortcuts in the command history browser.
15 137
16* bug 7695 fixed - Only the first selected line was deleted in command history 138* bug 7695 fixed - Only the first selected line was deleted in command history
17 browser. 139 browser.
18 140
141* bug 7714 fixed - diag, triu, tril applyed to rational matrices changed
142 the formal variable name
143
144* bug 7727 fixed - The help page of sp2adj was not correct.
145 Improved the help page of adj2sp.
146 Added unit tests for sp2adj and adj2sp.
147 Improved implementation by checking the input arguments.
148
149* bug 7806 fixed - [a, b] = dos("git 1>&2") returned a wrong error.
150
151* bug 7849 fixed - eqfir / remez functions crashed under MacOSX due to
152 a lapack bug on slamch function.
153
154* bug 7900 fixed - inserting a rational in a rational hymermatrix generated
155 invalid rationals entries (with zero denominators)
156
157* bug 8091 fixed - Scilab was unable to find fortran compiler under MacOSX.
158
159* bug 8175 fixed - roots function did not converge under MacOSX due to
160 a lapack bug on slamch function.
161
19* bug 8254 fixed - The nearfloat function did not work properly for near 162* bug 8254 fixed - The nearfloat function did not work properly for near
20 denormalized numbers. 163 denormalized numbers.
21 164
165* bug 8279 fixed - error(144) returned a unexpected message.
166
167* bug 8390 fixed - a "Warning : redefining function: mputl" displayed if you
168 did not install fftw on Windows.
169
22* bug 8412 fixed - find returned incorrect values with big vector. 170* bug 8412 fixed - find returned incorrect values with big vector.
23 171
172* bug 8448 fixed - 'whereis' function with a string as input argument did not work
173 with ATOMS functions.
174
24* bug 8459 fixed - strsplit failed when second input argument was a "/" 175* bug 8459 fixed - strsplit failed when second input argument was a "/"
25 176
177* bug 8462 fixed - bvodeS crashed on Windows and did not return a error.
178
26* bug 8468 fixed - size with 2 input arguments did not work for hypermatrices. 179* bug 8468 fixed - size with 2 input arguments did not work for hypermatrices.
27 180
181* bug 8475 fixed - It was impossible to get the data of an entity through
182 the graphic editor.
183
28* bug 8481 fixed - Scilab crashed when display a rational containing a complex. 184* bug 8481 fixed - Scilab crashed when display a rational containing a complex.
29 185
30* bug 8505 fixed - help was not generated on Windows, if there was a path name 186* bug 8505 fixed - help was not generated on Windows, if there was a path name
31 with some spaces. 187 with some spaces.
32 188
189* bug 8528 fixed - length returned a wrong size for malformed characters.
190
191* bug 8531 fixed - "edit" function failed to open a defined macro loaded on stack.
192
193* bug 8532 fixed - size of input arguments of read_csv was not verified.
194
33* bug 8540 fixed - Fix a typo in Xcos. 195* bug 8540 fixed - Fix a typo in Xcos.
34 196
197* bug 8582 fixed - Under Linux & Mac OS the waitbar window was too small and we
198 could not see the bar inside it.
199
200* bug 8587 fixed - readNamedMatrixOfDouble (readCommonNamedMatrixOfDouble)
201 returned wrong values.
202
203* bug 8598 fixed - Fix a typo in the french help page of "return".
204
205* bug 8611 fixed - Path of few images in documentation was bad.
206
207
35 Changes between version 5.3.0-beta-4 and 5.3.0-beta-5 of Scilab 208 Changes between version 5.3.0-beta-4 and 5.3.0-beta-5 of Scilab
36 =============================================================== 209 ===============================================================
37 210
@@ -1152,7 +1325,6 @@ Compilation:
1152 1325
1153Bug Fixes: 1326Bug Fixes:
1154========== 1327==========
1155
1156* bug 3842 fixed - "native" and "double" evaluation modes added to the sum, 1328* bug 3842 fixed - "native" and "double" evaluation modes added to the sum,
1157 cumsum, prod and cumprod functions 1329 cumsum, prod and cumprod functions
1158 For more information, see the SEP #46. 1330 For more information, see the SEP #46.
diff --git a/scilab/Makefile.am b/scilab/Makefile.am
index fd44654..9608408 100644
--- a/scilab/Makefile.am
+++ b/scilab/Makefile.am
@@ -171,6 +171,26 @@ else
171 @echo "Cannot buid help. Add --enable-build-help to the ./configure if you want to build it." 171 @echo "Cannot buid help. Add --enable-build-help to the ./configure if you want to build it."
172endif 172endif
173 173
174doc-web:$(top_builddir)/scilab-bin $(top_builddir)/bin/scilab-adv-cli
175if BUILD_HELP
176 -@if test -x $(top_builddir)/scilab-bin; then \
177 cd $(top_builddir);\
178 echo "-- Building documentation (English) --"; \
179 echo "LANG=C SCI_DISABLE_TK=1 SCI_JAVA_ENABLE_HEADLESS=1 $(top_builddir)/bin/scilab-adv-cli -nb -nouserstartup -e \"xmltoweb([],[],'en_US');exit;\"";\
180 LANG=C SCI_DISABLE_TK=1 SCI_JAVA_ENABLE_HEADLESS=1 $(top_builddir)/bin/scilab-adv-cli -nb -l en_US -nouserstartup -e "xmltoweb([],[],'en_US');exit;";\
181 echo "-- Building documentation (French) --"; \
182 echo "SCI_DISABLE_TK=1 SCI_JAVA_ENABLE_HEADLESS=1 $(top_builddir)/bin/scilab-adv-cli -nb -nouserstartup -e \"xmltoweb([],[],'fr_FR');exit;\""; \
183 SCI_DISABLE_TK=1 SCI_JAVA_ENABLE_HEADLESS=1 $(top_builddir)/bin/scilab-adv-cli -nb -nouserstartup -e "xmltoweb([],[],'fr_FR');exit;"; \
184 echo "-- Building documentation (portugues do Brasil) --"; \
185 echo "SCI_DISABLE_TK=1 SCI_JAVA_ENABLE_HEADLESS=1 $(top_builddir)/bin/scilab-adv-cli -nb -nouserstartup -e \"xmltoweb([],[],'pt_BR');exit;\""; \
186 SCI_DISABLE_TK=1 SCI_JAVA_ENABLE_HEADLESS=1 $(top_builddir)/bin/scilab-adv-cli -nb -nouserstartup -e "xmltoweb([],[],'pt_BR');exit;"; \
187 else \
188 echo "Cannot find Scilab-adv-cli binary"; \
189 fi
190else
191 @echo "Cannot buid help. Add --enable-build-help to the ./configure if you want to build it."
192endif
193
174check-help:$(top_builddir)/scilab-cli-bin $(top_builddir)/bin/scilab-cli 194check-help:$(top_builddir)/scilab-cli-bin $(top_builddir)/bin/scilab-cli
175 @if test -x $(top_builddir)/scilab-cli-bin; then \ 195 @if test -x $(top_builddir)/scilab-cli-bin; then \
176 echo "-- Checking documentation (English) --"; \ 196 echo "-- Checking documentation (English) --"; \
@@ -191,6 +211,19 @@ check-local:
191 echo "Cannot find Scilab binary"; \ 211 echo "Cannot find Scilab binary"; \
192 fi 212 fi
193 213
214code-coverage:
215if CODE_COVERAGE
216 @if test ! -d $(top_builddir)/coverage/; then \
217 mkdir $(top_builddir)/coverage/; \
218 fi; \
219 $(LCOV) --directory $(top_builddir) --capture --ignore-errors source --output-file $(top_builddir)/coverage/scilab-code-coverage.info; \
220 $(GENHTML) -o $(top_builddir)/coverage/results/ --show-details --highlight --legend $(top_builddir)/coverage/scilab-code-coverage.info; \
221 echo "To open the result: firefox $(top_builddir)/coverage/results/index.html"
222#--frames is disable because of : http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=607206
223else
224 @echo "Cannot start the code coverage. Add --enable-code-coverage to the ./configure and 'make clean all'."
225endif
226
194distclean-recursive: distclean-generated clean-recursive 227distclean-recursive: distclean-generated clean-recursive
195 228
196clean-recursive: clean-doc clean-localization clean-macros clean-generated 229clean-recursive: clean-doc clean-localization clean-macros clean-generated
diff --git a/scilab/Makefile.in b/scilab/Makefile.in
index 5ecb931..a995cd6 100644
--- a/scilab/Makefile.in
+++ b/scilab/Makefile.in
@@ -372,6 +372,7 @@ FGREP = @FGREP@
372FLEXDOCK = @FLEXDOCK@ 372FLEXDOCK = @FLEXDOCK@
373FLIBS = @FLIBS@ 373FLIBS = @FLIBS@
374FOP = @FOP@ 374FOP = @FOP@
375GENHTML = @GENHTML@
375GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ 376GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
376GIWS_BIN = @GIWS_BIN@ 377GIWS_BIN = @GIWS_BIN@
377GLUEGEN_RT = @GLUEGEN_RT@ 378GLUEGEN_RT = @GLUEGEN_RT@
@@ -416,6 +417,7 @@ JROSETTA_API = @JROSETTA_API@
416JROSETTA_ENGINE = @JROSETTA_ENGINE@ 417JROSETTA_ENGINE = @JROSETTA_ENGINE@
417JUNIT = @JUNIT@ 418JUNIT = @JUNIT@
418LAPACK_LIBS = @LAPACK_LIBS@ 419LAPACK_LIBS = @LAPACK_LIBS@
420LCOV = @LCOV@
419LD = @LD@ 421LD = @LD@
420LDFLAGS = @LDFLAGS@ 422LDFLAGS = @LDFLAGS@
421LIBICONV = @LIBICONV@ 423LIBICONV = @LIBICONV@
@@ -1685,6 +1687,23 @@ doc: javadoc $(top_builddir)/scilab-bin $(top_builddir)/bin/scilab-adv-cli
1685@BUILD_HELP_TRUE@ fi 1687@BUILD_HELP_TRUE@ fi
1686@BUILD_HELP_FALSE@ @echo "Cannot buid help. Add --enable-build-help to the ./configure if you want to build it." 1688@BUILD_HELP_FALSE@ @echo "Cannot buid help. Add --enable-build-help to the ./configure if you want to build it."
1687 1689
1690doc-web:$(top_builddir)/scilab-bin $(top_builddir)/bin/scilab-adv-cli
1691@BUILD_HELP_TRUE@ -@if test -x $(top_builddir)/scilab-bin; then \
1692@BUILD_HELP_TRUE@ cd $(top_builddir);\
1693@BUILD_HELP_TRUE@ echo "-- Building documentation (English) --"; \
1694@BUILD_HELP_TRUE@ echo "LANG=C SCI_DISABLE_TK=1 SCI_JAVA_ENABLE_HEADLESS=1 $(top_builddir)/bin/scilab-adv-cli -nb -nouserstartup -e \"xmltoweb([],[],'en_US');exit;\"";\
1695@BUILD_HELP_TRUE@ LANG=C SCI_DISABLE_TK=1 SCI_JAVA_ENABLE_HEADLESS=1 $(top_builddir)/bin/scilab-adv-cli -nb -l en_US -nouserstartup -e "xmltoweb([],[],'en_US');exit;";\
1696@BUILD_HELP_TRUE@ echo "-- Building documentation (French) --"; \
1697@BUILD_HELP_TRUE@ echo "SCI_DISABLE_TK=1 SCI_JAVA_ENABLE_HEADLESS=1 $(top_builddir)/bin/scilab-adv-cli -nb -nouserstartup -e \"xmltoweb([],[],'fr_FR');exit;\""; \
1698@BUILD_HELP_TRUE@ SCI_DISABLE_TK=1 SCI_JAVA_ENABLE_HEADLESS=1 $(top_builddir)/bin/scilab-adv-cli -nb -nouserstartup -e "xmltoweb([],[],'fr_FR');exit;"; \
1699@BUILD_HELP_TRUE@ echo "-- Building documentation (portugues do Brasil) --"; \
1700@BUILD_HELP_TRUE@ echo "SCI_DISABLE_TK=1 SCI_JAVA_ENABLE_HEADLESS=1 $(top_builddir)/bin/scilab-adv-cli -nb -nouserstartup -e \"xmltoweb([],[],'pt_BR');exit;\""; \
1701@BUILD_HELP_TRUE@ SCI_DISABLE_TK=1 SCI_JAVA_ENABLE_HEADLESS=1 $(top_builddir)/bin/scilab-adv-cli -nb -nouserstartup -e "xmltoweb([],[],'pt_BR');exit;"; \
1702@BUILD_HELP_TRUE@ else \
1703@BUILD_HELP_TRUE@ echo "Cannot find Scilab-adv-cli binary"; \
1704@BUILD_HELP_TRUE@ fi
1705@BUILD_HELP_FALSE@ @echo "Cannot buid help. Add --enable-build-help to the ./configure if you want to build it."
1706
1688check-help:$(top_builddir)/scilab-cli-bin $(top_builddir)/bin/scilab-cli 1707check-help:$(top_builddir)/scilab-cli-bin $(top_builddir)/bin/scilab-cli
1689 @if test -x $(top_builddir)/scilab-cli-bin; then \ 1708 @if test -x $(top_builddir)/scilab-cli-bin; then \
1690 echo "-- Checking documentation (English) --"; \ 1709 echo "-- Checking documentation (English) --"; \
@@ -1705,6 +1724,16 @@ check-local:
1705 echo "Cannot find Scilab binary"; \ 1724 echo "Cannot find Scilab binary"; \
1706 fi 1725 fi
1707 1726
1727code-coverage:
1728@CODE_COVERAGE_TRUE@ @if test ! -d $(top_builddir)/coverage/; then \
1729@CODE_COVERAGE_TRUE@ mkdir $(top_builddir)/coverage/; \
1730@CODE_COVERAGE_TRUE@ fi; \
1731@CODE_COVERAGE_TRUE@ $(LCOV) --directory $(top_builddir) --capture --ignore-errors source --output-file $(top_builddir)/coverage/scilab-code-coverage.info; \
1732@CODE_COVERAGE_TRUE@ $(GENHTML) -o $(top_builddir)/coverage/results/ --show-details --highlight --legend $(top_builddir)/coverage/scilab-code-coverage.info; \
1733@CODE_COVERAGE_TRUE@ echo "To open the result: firefox $(top_builddir)/coverage/results/index.html"
1734#--frames is disable because of : http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=607206
1735@CODE_COVERAGE_FALSE@ @echo "Cannot start the code coverage. Add --enable-code-coverage to the ./configure and 'make clean all'."
1736
1708distclean-recursive: distclean-generated clean-recursive 1737distclean-recursive: distclean-generated clean-recursive
1709 1738
1710clean-recursive: clean-doc clean-localization clean-macros clean-generated 1739clean-recursive: clean-doc clean-localization clean-macros clean-generated
diff --git a/scilab/RELEASE_NOTES_5.3.X b/scilab/RELEASE_NOTES_5.3.X
index 29eb123..40b23a8 100644
--- a/scilab/RELEASE_NOTES_5.3.X
+++ b/scilab/RELEASE_NOTES_5.3.X
@@ -16,11 +16,13 @@
16 * Do not hesitate to report your problem as comment of the bug: 16 * Do not hesitate to report your problem as comment of the bug:
17 http://bugzilla.scilab.org/show_bug.cgi?id=7012 17 http://bugzilla.scilab.org/show_bug.cgi?id=7012
18 18
19- Some issues on startup under Mac OS X have been reported and should be fixed 19- Some issues on startup under Mac OS X 10.6 have been reported.
20 in Scilab 5.3.0: 20 If you have "Audio Hijack" installed on your Mac OS X, it prevents some
21 Bug #7012: Error in the detection of the version of Java available. 21 applications to work including Scilab. See bug #7012.
22 Bug #7433: A segmentation fault on Scilab startup on some Mac OS X 22 Uninstall / disable Audio Hijack should fix this problem.
23 installations. 23
24- Support of Mac OS X 10.5 can be partial. This should be fixed with version
25 5.3.1.
24 26
25- The dependencies on the GLIBC 2.7 have been removed. However, on old system, 27- The dependencies on the GLIBC 2.7 have been removed. However, on old system,
26 the function parallel_run will not work since it needs a recent version 28 the function parallel_run will not work since it needs a recent version
diff --git a/scilab/bin/scilab b/scilab/bin/scilab
index d8416fe..bb9e01c 100755
--- a/scilab/bin/scilab
+++ b/scilab/bin/scilab
@@ -4,16 +4,12 @@
4# Copyright (C) INRIA - 2006-2008 - Sylvestre Ledru 4# Copyright (C) INRIA - 2006-2008 - Sylvestre Ledru
5# Copyright (C) INRIA - 2008 - Simon Lipp 5# Copyright (C) INRIA - 2008 - Simon Lipp
6# Copyright (C) DIGITEO - 2009 - Sylvestre Ledru 6# Copyright (C) DIGITEO - 2009 - Sylvestre Ledru
7# Copyright (C) DIGITEO - 2010 - Bruno JOFRET
7# This file must be used under the terms of the CeCILL. 8# This file must be used under the terms of the CeCILL.
8# This source file is licensed as described in the file COPYING, which 9# This source file is licensed as described in the file COPYING, which
9# you should have received as part of this distribution. The terms 10# you should have received as part of this distribution. The terms
10# are also available at 11# are also available at
11# http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt 12# http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
12#
13# Simon Lipp 2008:
14# - clean up (get rid of unnecessary sci_args)
15# - accept arguments with spaces, e.g.
16# -e "disp(1); disp(2)" (fix bug #2606)
17 13
18#### 14####
19# 15#
@@ -28,8 +24,8 @@
28# /my/dir/include/scilab/ 24# /my/dir/include/scilab/
29# Scilab official binary uses this arch 25# Scilab official binary uses this arch
30# * ./configure; make install prefix=$(DESTDIR)/usr \ 26# * ./configure; make install prefix=$(DESTDIR)/usr \
31# bindir=$(DESTDIR)/usr/bin \ 27# bindir=$(DESTDIR)/usr/bin \
32# datadir=$(DESTDIR)/usr/share/scilab ... 28# datadir=$(DESTDIR)/usr/share/scilab ...
33# Solution used mainly by Linux packagers 29# Solution used mainly by Linux packagers
34# 30#
35## First, this script will look for scilab-bin in : 31## First, this script will look for scilab-bin in :
@@ -45,198 +41,272 @@
45### 41###
46 42
47if test ! -z "$SCIVERBOSE"; then 43if test ! -z "$SCIVERBOSE"; then
48 SCIVERBOSE=1 44 SCIVERBOSE=1
49else 45else
50 SCIVERBOSE=0 46 SCIVERBOSE=0
51fi 47fi
52 48
53if test -n "$SCI"; then 49if test -n "$SCI"; then
54 if test ! -d "$SCI/modules"; then 50 if test ! -d "$SCI/modules"; then
55 echo "Cannot find directory $SCI/modules/ !" 51 echo "Cannot find directory $SCI/modules/ !"
56 echo "SCI should point to the root data directory of Scilab" 52 echo "SCI should point to the root data directory of Scilab"
57 exit -1 53 exit -1
58 fi 54 fi
59fi 55fi
60 56
61DISABLE_JAVA_DETECTION=0 57DISABLE_JAVA_DETECTION=0
58IS_SCILAB_BINARY=0
62 59
63# Electric fence is a tool to check problem of memory 60# Electric fence is a tool to check problem of memory
64start_electric_fence() { 61start_electric_fence() {
65 echo "Running Scilab with Electric Fence : " LD_PRELOAD=libefence.so.0.0 "$SCILABBIN" "$@" 62 echo "Running Scilab with Electric Fence : " LD_PRELOAD=libefence.so.0.0 "$SCILABBIN" "$@"
66 LD_PRELOAD=libefence.so.0.0 "$SCILABBIN" "$@" 63 LD_PRELOAD=libefence.so.0.0 "$SCILABBIN" "$@"
67} 64}
68 65
69start_debug() { 66start_debug() {
70 if test -n "$DEVENV"; then 67 if test -n "$DEVENV"; then
71 echo "Running debug of Scilab [gdb] : " "$SCI"/libtool --mode=execute gdb $SCILAB_GDB_OPT --args "$SCILABBIN" "$@" 68 echo "Running debug of Scilab [gdb] : " "$SCI"/libtool --mode=execute gdb $SCILAB_GDB_OPT --args "$SCILABBIN" "$@"
72 "$SCI"/libtool --mode=execute gdb $SCILAB_GDB_OPT --args "$SCILABBIN" "$@" 69 "$SCI"/libtool --mode=execute gdb $SCILAB_GDB_OPT --args "$SCILABBIN" "$@"
73 else 70 else
74 echo "Running debug of Scilab [gdb] : " gdb $SCILAB_GDB_OPT --args "$SCILABBIN" "$@" 71 echo "Running debug of Scilab [gdb] : " gdb $SCILAB_GDB_OPT --args "$SCILABBIN" "$@"
75 gdb $SCILAB_GDB_OPT --args "$SCILABBIN" "$@" 72 gdb $SCILAB_GDB_OPT --args "$SCILABBIN" "$@"
76 fi 73 fi
77} 74}
78 75
79start_debug_kdbg() { 76start_debug_kdbg() {
80 if test -n "$DEVENV"; then 77 if test -n "$DEVENV"; then
81 echo "Running debug of Scilab [kdbg] : " "$SCI"/libtool --mode=execute kdbg "$SCILABBIN" 78 echo "Running debug of Scilab [kdbg] : " "$SCI"/libtool --mode=execute kdbg "$SCILABBIN"
82 "$SCI"/libtool --mode=execute kdbg "$SCILABBIN" 79 "$SCI"/libtool --mode=execute kdbg "$SCILABBIN"
83 else 80 else
84 echo "Running debug of Scilab [kdbg] : " kdbg "$SCILABBIN" 81 echo "Running debug of Scilab [kdbg] : " kdbg "$SCILABBIN"
85 kdbg "$SCILABBIN" 82 kdbg "$SCILABBIN"
86 fi 83 fi
87} 84}
88 85
89start_profiling() { 86start_profiling() {
90 VALGRIND_OPTIONS=" --show-below-main=yes --num-callers=12 --demangle=yes --leak-check=full --show-reachable=yes --smc-check=all --db-attach=yes --gen-suppressions=all -v --trace-redir=yes --show-below-main=yes --track-origins=yes --suppressions=$SCI/tools/profiling/valgrind.supp $SCILAB_VALGRIND_OPT" 87 VALGRIND_OPTIONS=" --show-below-main=yes --num-callers=12 --demangle=yes --leak-check=full --show-reachable=yes --smc-check=all --db-attach=yes --gen-suppressions=all -v --trace-redir=yes --show-below-main=yes --track-origins=yes --suppressions=$SCI/tools/profiling/valgrind.supp $SCILAB_VALGRIND_OPT"
91 if test -n "$DEVENV"; then 88 if test -n "$DEVENV"; then
92 echo "Running profiling of Scilab : " "$SCI"/libtool --mode=execute valgrind $VALGRIND_OPTIONS "$SCILABBIN" "$@" 89 echo "Running profiling of Scilab : " "$SCI"/libtool --mode=execute valgrind $VALGRIND_OPTIONS "$SCILABBIN" "$@"
93 "$SCI"/libtool --mode=execute valgrind $VALGRIND_OPTIONS "$SCILABBIN" "$@" 90 "$SCI"/libtool --mode=execute valgrind $VALGRIND_OPTIONS "$SCILABBIN" "$@"
94 else 91 else
95 echo "Running profiling of Scilab : " valgrind $VALGRIND_OPTIONS "$SCILABBIN" "$@" 92 echo "Running profiling of Scilab : " valgrind $VALGRIND_OPTIONS "$SCILABBIN" "$@"
96 valgrind $VALGRIND_OPTIONS "$SCILABBIN" "$@" 93 valgrind $VALGRIND_OPTIONS "$SCILABBIN" "$@"
97 fi 94 fi
98 95
99} 96}
100 97
101start_profiling_visu() { 98start_profiling_visu() {
102 VALGRIND_VISU_OPTIONS=" --tool=callgrind --trace-children=yes --smc-check=all --trace-jump=yes --dump-line=yes --separate-threads=yes $SCILAB_VALGRIND_OPT" 99 VALGRIND_VISU_OPTIONS=" --tool=callgrind --trace-children=yes --smc-check=all --trace-jump=yes --dump-line=yes --separate-threads=yes $SCILAB_VALGRIND_OPT"
103#--dump-instr=yes 100#--dump-instr=yes
104 if test -n "$DEVENV"; then 101 if test -n "$DEVENV"; then
105 echo "Running profiling visualization of Scilab : " "$SCI"/libtool --mode=execute valgrind $VALGRIND_VISU_OPTIONS "$SCILABBIN" "$@" 102 echo "Running profiling visualization of Scilab : " "$SCI"/libtool --mode=execute valgrind $VALGRIND_VISU_OPTIONS "$SCILABBIN" "$@"
106 "$SCI"/libtool --mode=execute valgrind $VALGRIND_VISU_OPTIONS "$SCILABBIN" "$@" 103 "$SCI"/libtool --mode=execute valgrind $VALGRIND_VISU_OPTIONS "$SCILABBIN" "$@"
107 else 104 else
108 echo "Running profiling visualization of Scilab : " valgrind $VALGRIND_VISU_OPTIONS "$SCILABBIN" "$@" 105 echo "Running profiling visualization of Scilab : " valgrind $VALGRIND_VISU_OPTIONS "$SCILABBIN" "$@"
109 valgrind $VALGRIND_VISU_OPTIONS "$SCILABBIN" "$@" 106 valgrind $VALGRIND_VISU_OPTIONS "$SCILABBIN" "$@"
110 fi 107 fi
111} 108}
112 109
113find_docbook_path() { 110find_docbook_path() {
114 if test -z "$DOCBOOK_ROOT"; then 111 if test -z "$DOCBOOK_ROOT"; then
115 for dir in $SCI/thirdparty/docbook /usr/share/sgml/docbook/stylesheet/xsl/nwalsh /usr/share/docbook2X/xslt/man/ /usr/share/xml/docbook/stylesheet/nwalsh/ /usr/share/xml/docbook/stylesheet/nwalsh/current/ /sw/share/xml/xsl/docbook-xsl /usr/share/xml/docbook/xsl-stylesheets-*/ /usr/share/sgml/docbook/xsl-stylesheets-*/; do 112 for dir in $SCI/thirdparty/docbook /usr/share/sgml/docbook/stylesheet/xsl/nwalsh /usr/share/docbook2X/xslt/man/ /usr/share/xml/docbook/stylesheet/nwalsh/ /usr/share/xml/docbook/stylesheet/nwalsh/current/ /sw/share/xml/xsl/docbook-xsl /usr/share/xml/docbook/xsl-stylesheets-*/ /usr/share/sgml/docbook/xsl-stylesheets-*/; do
116 if test -r "$dir/javahelp/javahelp.xsl"; then 113 if test -r "$dir/javahelp/javahelp.xsl"; then
117 if test -z "$DOCBOOK_ROOT"; then 114 if test -z "$DOCBOOK_ROOT"; then
118 DOCBOOK_ROOT=$dir 115 DOCBOOK_ROOT=$dir
119 export DOCBOOK_ROOT 116 export DOCBOOK_ROOT
120 fi 117 fi
121 fi 118 fi
122 done 119 done
123 fi 120 fi
124 if test $SCIVERBOSE -ne 0; then 121 if test $SCIVERBOSE -ne 0; then
125 echo "DOCBOOK : $DOCBOOK_ROOT" 122 echo "DOCBOOK : $DOCBOOK_ROOT"
126 fi 123 fi
127} 124}
128 125
129detect_type_of_scilab(){ 126detect_type_of_scilab(){
130 127
131 progname="$0" 128 progname="$0"
132 SCILAB_MODE="gui" 129 SCILAB_MODE="gui"
133 SCILABBIN="scilab-bin" 130 SCILABBIN="scilab-bin"
134 131
135 if (echo "$progname"|grep "scilab-adv-cli$" 2>&1 > /dev/null;) || (echo "$@"|grep "\-nw" 2>&1 > /dev/null;) then 132 if (echo "$progname"|grep "scilab-adv-cli$" 2>&1 > /dev/null;) || (echo "$@"|grep "\-nw" 2>&1 > /dev/null;) then
136 SCILAB_MODE="nw" 133 SCILAB_MODE="nw"
137 # We are using scilab-bin here because we are going to force the arg -nw 134 # We are using scilab-bin here because we are going to force the arg -nw
138 SCILABBIN="scilab-bin" 135 SCILABBIN="scilab-bin"
139 fi 136 fi
140 137
141 if (echo "$progname"|grep "scilab-cli$" 2>&1 > /dev/null;) || (echo "$@"|grep "\-nwni" 2>&1 > /dev/null;) then 138 if (echo "$progname"|grep "scilab-cli$" 2>&1 > /dev/null;) || (echo "$@"|grep "\-nwni" 2>&1 > /dev/null;) then
142 SCILAB_MODE="nwni" 139 SCILAB_MODE="nwni"
143 SCILABBIN="scilab-cli-bin" 140 SCILABBIN="scilab-cli-bin"
144 DISABLE_JAVA_DETECTION=1 141 DISABLE_JAVA_DETECTION=1
145 fi 142 fi
146 143
147 if test $SCIVERBOSE -ne 0; then 144 if test $SCIVERBOSE -ne 0; then
148 echo "SCILABBIN : $SCILABBIN" 145 echo "SCILABBIN : $SCILABBIN"
149 echo "DISABLE_JAVA_DETECTION : $DISABLE_JAVA_DETECTION" 146 echo "DISABLE_JAVA_DETECTION : $DISABLE_JAVA_DETECTION"
150 echo "SCILAB_MODE : $SCILAB_MODE" 147 echo "SCILAB_MODE : $SCILAB_MODE"
151 fi 148 fi
149}
150
151detect_os() {
152
153 if test "${OS}" = ""; then
154 OS=`uname -s` # Retrieve the Operating System
155 fi
156 if test "${MODEL}" = ""; then
157 MODEL=`uname -m` # Retrieve the model
158 fi
159
160 if test $SCIVERBOSE -ne 0; then
161 echo "OS : $OS"
162 echo "MODEL : $MODEL"
163 fi
152} 164}
153 165
154detect_type_of_scilab $@ 166detect_type_of_scilab $@
155 167
168detect_os
169
156detect_scilab_path() { 170detect_scilab_path() {
157 171
158LOCALOLDPWD=`pwd` 172 LOCALOLDPWD=`pwd`
159 173
160# Use scilab-bin in the current dir if it exists 174 # If we are running Scilab binary, it is trivial to set paths.
161# If not, then start resolving symlinks until we find scilab-bin 175 curdir=`dirname "$progname"`
162 found=0 176 if test -d $curdir/../thirdparty/ -a -d $curdir/../share/scilab; then
163 progname="$0" 177 # We are in the Scilab binary
164 curdir=`dirname "$progname"` 178 IS_SCILAB_BINARY=1
165 PATH="$curdir:$PATH" 179 # export the bin directory to the PATH first (avoid to take the packaged version)
166 180 PATH="$curdir:$PATH"
167 progbase=`basename "$progname"` 181 cd "$curdir/../"
168 run_sci="$curdir/$SCILABBIN" 182 SCIBINARYBASE=$(pwd)
169 if test -x "$run_sci"; then # scilab-bin is in the /bin/ directory 183 SCI=$SCIBINARYBASE/share/scilab/
170 cd "$curdir/../" 184 export SCI
171 SCI=`pwd` 185 return
172 SCIBIN=$run_sci 186 fi
173 found=1 187
174 else 188 # Use scilab-bin in the current dir if it exists
175 run_sci="$curdir/../$SCILABBIN" 189 # If not, then start resolving symlinks until we find scilab-bin
176 if test -x "$run_sci"; then # scilab-bin is in the / directory 190 found=0
177 # which is the case in a dev env 191 progname="$0"
178 cd "$curdir/../" 192 curdir=`dirname "$progname"`
179 SCI=`pwd` 193 PATH="$curdir:$PATH"
180 SCIBIN=$run_sci 194
181 found=1 195 progbase=`basename "$progname"`
182 else 196 run_sci="$curdir/$SCILABBIN"
183 here=`/bin/pwd` 197 if test -x "$run_sci"; then # scilab-bin is in the /bin/ directory
184 while test -h "$progname"; do 198 cd "$curdir/../"
185 bn=`basename "$progname"` 199 SCI=`pwd`
186 cd `dirname "$progname"` 200 SCIBIN=$run_sci
187 # Browse the symlink to the real one 201 found=1
188 progname=`/bin/ls -l "$bn" | sed -e 's/^.* -> //' ` 202 else
189 if test ! -x "$progname"; then 203 run_sci="$curdir/../$SCILABBIN"
190 break 204 if test -x "$run_sci"; then # scilab-bin is in the / directory
191 fi 205 # which is the case in a dev env
192 curdir=`dirname "$progname"` 206 cd "$curdir/../"
193 if test -x "$curdir"; then 207 SCI=`pwd`
194 cd "$curdir/../" 208 SCIBIN=$run_sci
195 SCI=`pwd` 209 found=1
196 SCIBIN="$curdir/$SCILABBIN" 210 else
197 found=1 211 here=`/bin/pwd`
198 break 212 while test -h "$progname"; do
199 fi 213 bn=`basename "$progname"`
200 # The current file ($0), probably scilab is a symlink to the 214 cd `dirname "$progname"`
201 # real one and here, it is the dev env 215 # Browse the symlink to the real one
202 run_sci="$curdir/../$SCILABBIN" 216 progname=`/bin/ls -l "$bn" | sed -e 's/^.* -> //' `
203 if test -x "$run_sci"; then 217 if test ! -x "$progname"; then
204 cd "$curdir/../" 218 break
205 SCI=`pwd` 219 fi
206 SCIBIN=$run_sci 220 curdir=`dirname "$progname"`
207 found=1 221 if test -x "$curdir"; then
208 break 222 cd "$curdir/../"
209 fi 223 SCI=`pwd`
210 done 224 SCIBIN="$curdir/$SCILABBIN"
211 cd "$here" 225 found=1
212 fi 226 break
213 if test $SCIVERBOSE -ne 0; then 227 fi
214 echo "I think I found Scilab here : $SCI" 228 # The current file ($0), probably scilab is a symlink to the
215 fi 229 # real one and here, it is the dev env
216 fi 230 run_sci="$curdir/../$SCILABBIN"
217 231 if test -x "$run_sci"; then
218 232 cd "$curdir/../"
219 if test -x "$SCI/bin/$SCILABBIN"; then 233 SCI=`pwd`
234 SCIBIN=$run_sci
235 found=1
236 break
237 fi
238 done
239 cd "$here"
240 fi
241 if test $SCIVERBOSE -ne 0; then
242 echo "I think I found Scilab here : $SCI"
243 fi
244 fi
245
246
247 if test -x "$SCI/bin/$SCILABBIN"; then
220# real env 248# real env
221 SCILABBIN=$SCI/bin/$SCILABBIN 249 SCILABBIN=$SCI/bin/$SCILABBIN
222 SCI=$SCI/share/scilab/ 250 SCI=$SCI/share/scilab/
223 else 251 else
224 if test -x "$SCI/$SCILABBIN"; then 252 if test -x "$SCI/$SCILABBIN"; then
225 # dev env 253 # dev env
226 SCILABBIN=$SCI/$SCILABBIN 254 SCILABBIN=$SCI/$SCILABBIN
227 DEVENV=1 255 DEVENV=1
228 # add modelica in the path 256 # add modelica in the path
229 PATH="$PATH:$SCI/modules/scicos/" 257 PATH="$PATH:$SCI/modules/scicos/"
230 else 258 else
231 echo "Cannot find $SCILABBIN ..." 259 echo "Cannot find $SCILABBIN ..."
232 exit 1 260 exit 1
233 fi 261 fi
234 fi 262 fi
235 263
236 export SCI 264 export SCI
237} 265}
238 266
239detect_java_vm() { 267detect_java_vm() {
268
269 JAVA_SHLIB="libjava.so"
270
271 if test $IS_SCILAB_BINARY -eq 1; then
272 # Scilab binary => no Java detection since we are using the embeded JRE
273 # Here, we are handling 3 cases: GNU/Linux 32bit, GNU/Linux 64bit,
274 # Mac OS X
275 case $OS in
276 "Linux")
277 case $MODEL in
278 "x86_64")
279 proc="amd64"
280 ;;
281 i?86)
282 if test -d ${JRE_HOME}/lib/`uname -m` ; then
283 proc=`uname -m`
284 else
285 proc="i386"
286 fi
287 ;;
288 *)
289 echo "Could not find the Java configuration for the model <${MODEL}>. Please contact us on http://bugzilla.scilab.org"
290 ;;
291 esac
292 ;;
293 *darwin* | *Darwin*) # MacOS X
294 # For Mac OS X, Since path are different from the JVM normal tree,
295 # don't need to detect the CPU
296 JAVA_SHLIB="libjava.jnilib"
297 JAVA_HOME=$(/usr/libexec/java_home --arch x86_64 --failfast --version 1.6+)
298 DYLD_LIBRARY_PATH="$JAVA_HOME/../Libraries${DYLD_LIBRARY_PATH:+:$DYLD_LIBRARY_PATH}"
299 ;;
300
301 *)
302 echo "Could not find the Java configuration for the OS <${OS}>. Please contact us or submit a bug report with your detailed configuration http://bugzilla.scilab.org/"
303 echo "Fallback on the model <${MODEL}> found by uname -m"
304 proc=$MODEL
305 ;;
306 esac
307 JRE_HOME="$SCIBINARYBASE/thirdparty/java/"
308 else # NOT IS_SCILAB_BINARY
309
240############# JAVA DETECTION ############## 310############# JAVA DETECTION ##############
241# Basic inspiration from Eclipse 311# Basic inspiration from Eclipse
242# 312#
@@ -251,13 +321,6 @@ detect_java_vm() {
251# 2 others) are available 321# 2 others) are available
252### 322###
253 323
254 if test "${OS}" = ""; then
255 OS=`uname -s` # Retrieve the Operating System
256 fi
257 if test "${MODEL}" = ""; then
258 MODEL=`uname -m` # Retrieve the model
259 fi
260
261# Get the proc name matching to the one of the JVM 324# Get the proc name matching to the one of the JVM
262# Inspiration and data are from http://www.google.com/codesearch?hl=en&q=+java+ppc+libjava.so+show:a78sz0SP41k:zxNozD-vc0A:FWiIy7Hinmg&sa=N&cd=2&ct=rc&cs_p=http://fresh.t-systems-sfr.com/unix/src/misc/tclBlendSrc1.2.5.tar.gz&cs_f=tclBlend1.2.5/configure.in#a0 325# Inspiration and data are from http://www.google.com/codesearch?hl=en&q=+java+ppc+libjava.so+show:a78sz0SP41k:zxNozD-vc0A:FWiIy7Hinmg&sa=N&cd=2&ct=rc&cs_p=http://fresh.t-systems-sfr.com/unix/src/misc/tclBlendSrc1.2.5.tar.gz&cs_f=tclBlend1.2.5/configure.in#a0
263# For Mac OS X, we will get stuff like that: 326# For Mac OS X, we will get stuff like that:
@@ -265,218 +328,247 @@ detect_java_vm() {
265# uname -m Darwin 328# uname -m Darwin
266 329
267# If the user has the variable JAVA_HOME in the ENV 330# If the user has the variable JAVA_HOME in the ENV
268 if test -n "$JAVA_HOME" ; then 331 if test -n "$JAVA_HOME" ; then
269 if test $SCIVERBOSE -ne 0; then 332 if test $SCIVERBOSE -ne 0; then
270 echo "Using specified vm: $JAVA_HOME" 333 echo "Using specified vm: $JAVA_HOME"
271 fi 334 fi
272 if test ! -x "$JAVA_HOME/bin/java" ; then 335 if test ! -x "$JAVA_HOME/bin/java" ; then
273 echo "Cannot find $JAVA_HOME/bin/java" 336 echo "Cannot find $JAVA_HOME/bin/java"
274 exit 1 337 exit 1
275 fi 338 fi
276 fi 339 fi
277 340
278 if test -z "$JAVA_HOME"; then
279 case $OS in 341 case $OS in
280 *darwin* | *Darwin*) 342 *darwin* | *Darwin*)
343 if test -z "$JAVA_HOME"; then
281 # Apple thinks and does things different (it would be too easy otherwise) 344 # Apple thinks and does things different (it would be too easy otherwise)
282 # They provide a script which returns the JAVA_HOME path 345 # They provide a script which returns the JAVA_HOME path
283 JAVA_HOME=$(/usr/libexec/java_home --arch x86_64 --failfast --version 1.6+) 346 JAVA_HOME=$(/usr/libexec/java_home --arch x86_64 --failfast --version 1.6+)
284 LD_LIBRARY_PATH="$JAVA_HOME/../Libraries${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}" 347 fi
285 if test $SCIVERBOSE -ne 0; then 348 LD_LIBRARY_PATH="$JAVA_HOME/../Libraries${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}"
286 echo "Using default Mac OS X vm: $JAVA_HOME" 349 DYLD_LIBRARY_PATH="$JAVA_HOME/../Libraries${DYLD_LIBRARY_PATH:+:$DYLD_LIBRARY_PATH}"
287 echo "And LD_LIBRARY_PATH: $LD_LIBRARY_PATH" 350 if test $SCIVERBOSE -ne 0; then
288 fi 351 echo "Using default Mac OS X vm: $JAVA_HOME"
289 ;; 352 echo "And LD_LIBRARY_PATH: $LD_LIBRARY_PATH"
290 *) 353 echo "And DYLD_LIBRARY_PATH: $DYLD_LIBRARY_PATH"
291 ;; 354 fi
292 esac 355 ;;
293fi 356 *)
357 ;;
358 esac
294 359
295# Browse "default directory" (if it means anything under Unix/Linux) of Java 360# Browse "default directory" (if it means anything under Unix/Linux) of Java
296# to find where it could be ! 361# to find where it could be !
297 if test -z "$JAVA_HOME"; then 362 if test -z "$JAVA_HOME"; then
298 JAVA_DEFAULT_DIR="/usr/lib/jvm/java-6-openjdk/ /usr/lib/jvm/java/ /usr/lib/jvm/java-6-sun/ /usr/lib/j2se/1.6 /usr/java/jdk1.6.0*/ /usr/java/jdk1.5.0*/ /usr/lib/j2sdk1.6-ibm /usr/lib/jvm/java-1.5.0-sun /usr/java/ /usr/lib/j2se/1.5 /usr/lib/j2se/1.4 /usr/java/jre1.6.0*/ /usr/java/jre1.5.0*/ /usr/lib/j2sdk1.5-ibm /usr/lib/j2sdk1.4-ibm /usr/lib/j2sdk1.5-sun /usr/lib/j2sdk1.4-sun /usr/lib/jvm/java-gcj /usr/lib/jvm/java-1.5.0-gcj/ /usr/lib/kaffe/pthreads /usr/lib/jvm/java-1.7.0-icedtea-*/ /usr/lib/jvm/jre/ /usr/local/diablo-jdk1.6.0/" 363 JAVA_DEFAULT_DIR="/usr/lib/jvm/java-6-openjdk/ /usr/lib/jvm/java/ /usr/lib/jvm/java-6-sun/ /usr/lib/j2se/1.6 /usr/java/jdk1.6.0*/ /usr/java/jdk1.5.0*/ /usr/lib/j2sdk1.6-ibm /usr/lib/jvm/java-1.5.0-sun /usr/java/ /usr/lib/j2se/1.5 /usr/lib/j2se/1.4 /usr/java/jre1.6.0*/ /usr/java/jre1.5.0*/ /usr/lib/j2sdk1.5-ibm /usr/lib/j2sdk1.4-ibm /usr/lib/j2sdk1.5-sun /usr/lib/j2sdk1.4-sun /usr/lib/jvm/java-gcj /usr/lib/jvm/java-1.5.0-gcj/ /usr/lib/kaffe/pthreads /usr/lib/jvm/java-1.7.0-icedtea-*/ /usr/lib/jvm/jre/ /usr/local/diablo-jdk1.6.0/"
299 for JAVA_HOME in $JAVA_DEFAULT_DIR ; do 364 for JAVA_HOME in $JAVA_DEFAULT_DIR ; do
300 if test $SCIVERBOSE -ne 0; then 365 if test $SCIVERBOSE -ne 0; then
301 echo "Trying to find Java in $JAVA_HOME " 366 echo "Trying to find Java in $JAVA_HOME "
302 fi 367 fi
303 if test -x "${JAVA_HOME}/bin/java" ; then 368 if test -x "${JAVA_HOME}/bin/java" ; then
304 export JAVA_HOME 369 export JAVA_HOME
305 if test $SCIVERBOSE -ne 0; then 370 if test $SCIVERBOSE -ne 0; then
306 echo "found" 371 echo "found"
307 fi 372 fi
308 break 373 break
309 fi 374 fi
310 done 375 done
311 fi 376 fi
312 377
313# JAVA_HOME still haven't been found. Well, we can now try to find it in the path 378# JAVA_HOME still haven't been found. Well, we can now try to find it in the path
314 379
315 if test -z "$JAVA_HOME"; then 380 if test ! -z "$JAVA_HOME"; then
316 PATH_SEPARATOR=: 381 if test $SCIVERBOSE -ne 0; then
317 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR 382 echo "Have not been able to find any Java VM on this computer. Some features may be broken."
318 if test $SCIVERBOSE -ne 0; then 383 fi
319 echo "Look the binary java in the PATH. If it is a symlink, try to resolve it" 384 else
320 fi 385
321 for DIR in $PATH; do 386 PATH_SEPARATOR=:
322 if test -f $DIR/java; then 387 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
323 388 if test $SCIVERBOSE -ne 0; then
324 _cur=$DIR/java 389 echo "Look the binary java in the PATH. If it is a symlink, try to resolve it"
325 # resolve symlink 390 fi
326 # Will probably bug if a file contains -> in the name 391 for DIR in $PATH; do
327 while ls -ld "$_cur" 2>/dev/null | grep " -> " >/dev/null; do 392 if test -f $DIR/java; then
328 _cur=`ls -ld "$_cur" | sed 's/.* -> //'` 393
329 done 394 _cur=$DIR/java
330 # symlink resolved to the real file 395 # resolve symlink
331 396 # Will probably bug if a file contains -> in the name
332 # Now, create JAVA_HOME 397 while ls -ld "$_cur" 2>/dev/null | grep " -> " >/dev/null; do
333 TMP=`dirname $_cur` 398 _cur=`ls -ld "$_cur" | sed 's/.* -> //'`
334 JAVA_HOME=`dirname $TMP` 399 done
335 if test ! -z "$JAVA_HOME"; then 400 # symlink resolved to the real file
336 break; 401
337 fi 402 # Now, create JAVA_HOME
338 fi 403 TMP=`dirname $_cur`
339 done 404 JAVA_HOME=`dirname $TMP`
340 IFS=$as_save_IFS 405 if test ! -z "$JAVA_HOME"; then
341 fi 406 break;
342 if test ! -z "$JAVA_HOME"; then 407 fi
343 if test $SCIVERBOSE -ne 0; then 408 fi
344 echo "JAVA_HOME : $JAVA_HOME" 409 done
345 fi 410 IFS=$as_save_IFS
411 fi
412 if test ! -z "$JAVA_HOME"; then
413 if test $SCIVERBOSE -ne 0; then
414 echo "JAVA_HOME : $JAVA_HOME"
415 fi
346 416
347# Manage JRE & JDK because libjava.so and others are stored in the JRE 417# Manage JRE & JDK because libjava.so and others are stored in the JRE
348 if test -d $JAVA_HOME/jre; then 418 if test -d $JAVA_HOME/jre; then
349 JRE_HOME=$JAVA_HOME/jre 419 JRE_HOME=$JAVA_HOME/jre
350 else 420 else
351 JRE_HOME=$JAVA_HOME 421 JRE_HOME=$JAVA_HOME
352 fi 422 fi
353 423
354# Configuring LD_LIBRARY_PATH for libjava.so libhpi.so and libxxxx.so 424# Configuring LD_LIBRARY_PATH for libjava.so libhpi.so and libxxxx.so
355 425
356 JAVA_SHLIB="libjava.so" 426 case $OS in
357 427 "Linux")
358 case $OS in 428 case $MODEL in
359 "Linux") 429 "x86_64")
360 case $MODEL in 430 proc="amd64"
361 "x86_64") 431 ;;
362 proc="amd64" 432 i?86)
363 ;; 433
364 i?86) 434 if test -d ${JRE_HOME}/lib/`uname -m` ; then
365 435 proc=`uname -m`
366 if test -d ${JRE_HOME}/lib/`uname -m` ; then 436 else
367 proc=`uname -m` 437 proc="i386"
368 else 438 fi
369 proc="i386" 439 ;;
370 fi 440 "alpha")
371 ;; 441 proc="alpha"
372 "alpha") 442 ;;
373 proc="alpha" 443 "sparc"|"sparc64")
374 ;; 444 proc="sparc"
375 "sparc"|"sparc64") 445 ;;
376 proc="sparc" 446 sh*)
377 ;; 447 proc="sh"
378 sh*) 448 ;;
379 proc="sh" 449 "ia64")
380 ;; 450 proc="ia64"
381 "ia64") 451 ;;
382 proc="ia64" 452 "mips"|"mipsel") # under mipsel, uname -m is
383 ;; 453 # usually returning mips ...
384 "mips"|"mipsel") # under mipsel, uname -m is 454 # but binary are in mipsel
385 # usually returning mips ... 455 if test -d ${JRE_HOME}/lib/mipsel ; then
386 # but binary are in mipsel 456 proc="mipsel"
387 if test -d ${JRE_HOME}/lib/mipsel ; then 457 else
388 proc="mipsel" 458 proc="mips"
389 else 459 fi
390 proc="mips" 460 ;;
391 fi 461 "ppc"|"powerpc"|"ppc64")
392 ;; 462 proc="ppc"
393 "ppc"|"powerpc"|"ppc64") 463 ;;
394 proc="ppc" 464 "s390"|"s390x")
395 ;; 465 proc="s390"
396 "s390"|"s390x") 466 ;;
397 proc="s390" 467 armv*)
398 ;; 468 proc="arm"
399 armv*) 469 ;;
400 proc="arm" 470 *)
401 ;; 471 echo "Could not find the Java configuration for the model <${MODEL}>. Please contact us on http://bugzilla.scilab.org"
402 *) 472 ;;
403 echo "Could not find the Java configuration for the model <${MODEL}>. Please contact us." 473 esac
404 ;; 474 ;;
405 esac 475 "HP-UX")
406 ;; 476 JAVA_SHLIB="libjava.sl"
407 "HP-UX") 477 proc="lib" # TODO : check if it is right or not ... seems not !
408 JAVA_SHLIB="libjava.sl" 478 ;;
409 proc="lib" # TODO : check if it is right or not ... seems not ! 479 "IRIX")
410 ;; 480 proc="lib32"
411 "IRIX") 481 ;;
412 proc="lib32" 482 "SunOS")
413 ;; 483 case $MODEL in
414 "SunOS") 484 "i86pc") # solaris x86
415 case $MODEL in 485 proc="i386"
416 "i86pc") # solaris x86 486 ;;
417 proc="i386" 487 # check for the 64 bits syntax
418 ;; 488 "sparc"|"sparc64")
419 # check for the 64 bits syntax 489 proc="sparc"
420 "sparc"|"sparc64") 490 ;;
421 proc="sparc" 491 *)
422 ;; 492 echo "Could not find the Java configuration for the model <${MODEL}>. Please contact us."
423 *) 493 ;;
424 echo "Could not find the Java configuration for the model <${MODEL}>. Please contact us." 494 esac
425 ;; 495 ;;
426 esac 496
427 ;; 497 *win32* | *WIN32* | *CYGWIN_NT*)
428 498 proc="win32"
429 *win32* | *WIN32* | *CYGWIN_NT*) 499 JAVA_SHLIB="jvm.dll"
430 proc="win32" 500 ;;
431 JAVA_SHLIB="jvm.dll" 501 *darwin* | *Darwin*) # MacOS X
432 ;;
433 *darwin* | *Darwin*) # MacOS X
434 # For Mac OS X, Since path are different from the JVM normal tree, 502 # For Mac OS X, Since path are different from the JVM normal tree,
435 # don't need to detect the CPU 503 # don't need to detect the CPU
436 JAVA_SHLIB="libjava.jnilib" 504 JAVA_SHLIB="libjava.jnilib"
437 ;; 505 # Need to set DYLD_LIBRARY_PATH for Mac.
438 *FreeBSD*) 506 DYLD_LIBRARY_PATH="$JAVA_HOME/../Libraries${DYLD_LIBRARY_PATH:+:$DYLD_LIBRARY_PATH}"
439 proc=$MODEL 507 ;;
440 ;; 508 *FreeBSD*)
441 *) 509 proc=$MODEL
442 echo "Could not find the Java configuration for the OS <${OS}>. Please contact us or submit a bug report with your detailed configuration http://bugzilla.scilab.org/" 510 ;;
443 echo "Fallback on the model <${MODEL}> found by uname -m" 511 *)
444 proc=$MODEL 512 echo "Could not find the Java configuration for the OS <${OS}>. Please contact us or submit a bug report with your detailed configuration http://bugzilla.scilab.org/"
445 ;; 513 echo "Fallback on the model <${MODEL}> found by uname -m"
446 esac 514 proc=$MODEL
447 515 ;;
516 esac
517 fi # JAVA_HOME provided but wrong
518 fi # IS_SCILAB_BINARY
448 519
449# Check if the lib exists or not (we should manage system where .so is not the 520# Check if the lib exists or not (we should manage system where .so is not the
450# ext for library 521# ext for library
451 LIBJAVA="$JRE_HOME/lib/$proc/$JAVA_SHLIB" 522 LIBJAVA="$JRE_HOME/lib/$proc/$JAVA_SHLIB"
452 if test ! -f $LIBJAVA; then 523 if test ! -f $LIBJAVA; then
453 if test $SCIVERBOSE -ne 0; then 524 if test $SCIVERBOSE -ne 0; then
454 echo "Cannot find $LIBJAVA" 525 echo "Cannot find $LIBJAVA"
455 fi 526 fi
456 else 527 else
457 CLASSPATH="$CLASSPATH:$SCI/modules/jvm/jar/org.scilab.modules.jvm.jar" 528 CLASSPATH="${CLASSPATH:+:$CLASSPATH}$SCI/modules/core/jar/org.scilab.modules.core.jar"
458 # @TODO This is the default path of the official sun JVM. 529 # @TODO This is the default path of the official sun JVM.
459 # It is different for other implementation of the JVM.... 530 # It is different for other implementation of the JVM....
460 LD_LIBRARY_PATH="$JRE_HOME/lib/$proc/:$JRE_HOME/lib/$proc/server/:$JRE_HOME/lib/$proc/native_threads/${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}" 531 LD_LIBRARY_PATH="$JRE_HOME/lib/$proc/:$JRE_HOME/lib/$proc/server/:$JRE_HOME/lib/$proc/native_threads/${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}"
461 fi 532 fi
462 else
463 if test $SCIVERBOSE -ne 0; then
464 echo "Have not been able to find any Java VM on this computer. Some features may be broken."
465 fi
466 fi
467 533
468####### END OF JAVA ENV DETECTION/SETTING ###### 534####### END OF JAVA ENV DETECTION/SETTING ######
469} 535}
470 536
471detect_scilab_path 537detect_scilab_path
472 538
473PATH="$SCI:$SCI/bin:$PATH"
474
475# If we are calling scilab-cli, no need to detect java. 539# If we are calling scilab-cli, no need to detect java.
476if test $DISABLE_JAVA_DETECTION -ne 1; then 540if test $DISABLE_JAVA_DETECTION -ne 1; then
477 detect_java_vm 541 detect_java_vm
478fi 542fi
479 543
544if test $IS_SCILAB_BINARY -eq 1; then
545
546 TCL_LIBRARY="$SCIBINARYBASE/thirdparty/tcl8.5"
547 Tk_LIBRARY="$SCIBINARYBASE/thirdparty/tk8.5"
548 LD_LIBRARY_PATH=$SCIBINARYBASE/lib/scilab:$SCIBINARYBASE/lib/thirdparty${LD_LIBRARY_PATH+:$LD_LIBRARY_PATH}
549 DOCBOOK_ROOT="$SCI/thirdparty/docbook"
550 PATH="$PATH:$SCI/modules/scicos/"
551
552 export DOCBOOK_ROOT
553 export PATH
554 export LD_LIBRARY_PATH
555 export TCL_LIBRARY
556 export Tk_LIBRARY
557
558 case $OS in
559 *darwin* | *Darwin*)
560 DYLD_LIBRARY_PATH=$SCIBINARYBASE/lib/scilab:$SCIBINARYBASE/lib/thirdparty${DYLD_LIBRARY_PATH+:$DYLD_LIBRARY_PATH}
561 export DYLD_LIBRARY_PATH
562 PATH="/sw/bin:/sw64/bin:$PATH"
563 export PATH
564 ;;
565 esac
566
567else
568 PATH="$SCI:$SCI/bin:$PATH"
569fi
570
571
480# See http://bugzilla.scilab.org/show_bug.cgi?id=3486 572# See http://bugzilla.scilab.org/show_bug.cgi?id=3486
481# Some Java stuff raises spurious SIGSEGV. The problem is that when bug-buddy 573# Some Java stuff raises spurious SIGSEGV. The problem is that when bug-buddy
482# is enabled, it catches the signal and terminate Scilab. We have to 574# is enabled, it catches the signal and terminate Scilab. We have to
@@ -487,9 +579,10 @@ GTK_MODULES=`echo $GTK_MODULES | sed s/gnomebreakpad//g`
487export GTK_MODULES 579export GTK_MODULES
488 580
489if test $SCIVERBOSE -ne 0; then 581if test $SCIVERBOSE -ne 0; then
490 echo "SCI : $SCI" 582 echo "SCI : $SCI"
491 echo "SCIBIN : $SCIBIN" 583 echo "SCIBIN : $SCIBIN"
492 echo "PATH : $PATH" 584 echo "PATH : $PATH"
585 echo "CLASSPATH : $CLASSPATH"
493fi 586fi
494 587
495# Returns to the original path 588# Returns to the original path
@@ -517,35 +610,38 @@ case $OS in
517 *darwin* | *Darwin*) # MacOS X 610 *darwin* | *Darwin*) # MacOS X
518 # When using some packaging tools like fink which are storing the info in /sw/lib 611 # When using some packaging tools like fink which are storing the info in /sw/lib
519 LD_LIBRARY_PATH="/sw/lib/${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}" 612 LD_LIBRARY_PATH="/sw/lib/${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}"
520 # Export the path to the Scilab lib when Scilab has been install ... 613 # Export the path to the Scilab lib when Scilab has been install ...
521 # to a Mac os x specific variable used by the linker before LD_LIBRARY_PATH 614 # to a Mac os x specific variable used by the linker before LD_LIBRARY_PATH
522 DYLD_LIBRARY_PATH=$SCI/../../lib/scilab/${DYLD_LIBRARY_PATH:+:$DYLD_LIBRARY_PATH}: 615 DYLD_LIBRARY_PATH=$SCI/../../lib/scilab/${DYLD_LIBRARY_PATH:+:$DYLD_LIBRARY_PATH}:
523 # Crappy workaround for the dynamic load of sundials under Mac OS X 616 # Crappy workaround for the dynamic load of sundials under Mac OS X
524 # in the source tree version. This does not occur in the binary 617 # in the source tree version. This does not occur in the binary
525 # thanks to the previous declaration on ../../lib/scilab 618 # thanks to the previous declaration on ../../lib/scilab
526 # See bug #4949 619 # See bug #4949
527 if test -d "$SCI/modules/scicos_blocks/.libs/"; then 620 if test -d "$SCI/modules/scicos_blocks/.libs/"; then
528 DYLD_LIBRARY_PATH=$SCI/modules/scicos_blocks/.libs/${DYLD_LIBRARY_PATH:+:$DYLD_LIBRARY_PATH} 621 DYLD_LIBRARY_PATH=$SCI/modules/scicos_blocks/.libs/${DYLD_LIBRARY_PATH:+:$DYLD_LIBRARY_PATH}
529 fi 622 fi
530 if test -d "$SCI/modules/scicos/.libs/"; then 623 if test -d "$SCI/modules/scicos/.libs/"; then
531 DYLD_LIBRARY_PATH=$SCI/modules/scicos/.libs/${DYLD_LIBRARY_PATH:+:$DYLD_LIBRARY_PATH} 624 DYLD_LIBRARY_PATH=$SCI/modules/scicos/.libs/${DYLD_LIBRARY_PATH:+:$DYLD_LIBRARY_PATH}
532 fi 625 fi
533 export DYLD_LIBRARY_PATH 626 export DYLD_LIBRARY_PATH
534 ;; 627 ;;
535 *) 628 *)
536esac 629esac
537 630
538 631
539if test $SCIVERBOSE -ne 0; then 632if test $SCIVERBOSE -ne 0; then
540 echo "LD_LIBRARY_PATH : $LD_LIBRARY_PATH" 633 echo "LD_LIBRARY_PATH : $LD_LIBRARY_PATH"
541 if test ! -z "$DYLD_LIBRARY_PATH"; then 634 if test ! -z "$DYLD_LIBRARY_PATH"; then
542 echo "DYLD_LIBRARY_PATH: $DYLD_LIBRARY_PATH" 635 echo "DYLD_LIBRARY_PATH: $DYLD_LIBRARY_PATH"
543 fi 636 fi
544fi 637fi
545export LD_LIBRARY_PATH 638export LD_LIBRARY_PATH
546export PATH 639export PATH
547 640
548find_docbook_path 641if test $IS_SCILAB_BINARY -ne 1; then
642# We are not using the Scilab binary, find out where docbook is.
643 find_docbook_path
644fi
549 645
550do_scilex() 646do_scilex()
551{ 647{
@@ -555,115 +651,117 @@ do_scilex()
555 651
556do_help() 652do_help()
557{ 653{
558 echo "Usage:" 654 echo "Usage:"
559 echo "scilab <arguments>" 655 echo "scilab <arguments>"
560 echo " " 656 echo " "
561 echo " Possible arguments are:" 657 echo " Possible arguments are:"
562 echo " -display Display: for use under Xwindow systems to set a specific X server display." 658 echo " -display Display: for use under Xwindow systems to set a specific X server display."
563 echo " -d Display : equivalent to -display Display." 659 echo " -d Display : equivalent to -display Display."
564 echo " -e Instruction : execute the scilab instruction given in Instruction argument." 660 echo " -e Instruction : execute the scilab instruction given in Instruction argument."
565 echo " -e and -f arguments are mutually exclusive." 661 echo " -e and -f arguments are mutually exclusive."
566 echo " -f File : execute the scilab script given in File argument." 662 echo " -f File : execute the scilab script given in File argument."
567 echo " -e and -f arguments are mutually exclusive." 663 echo " -e and -f arguments are mutually exclusive."
568 echo " -l Lang : set the current language. Lang can be equal to fr or en." 664 echo " -l Lang : set the current language. Lang can be equal to fr or en."
569 echo " -mem N : set the initial stacksize, for use with -ns argument." 665 echo " -mem N : set the initial stacksize, for use with -ns argument."
570 echo " -nb : do not display the Scilab banner at starting time." 666 echo " -nb : do not display the Scilab banner at starting time."
571 echo " -ns : do not execute scilab.start startup file. This argument will disable many features in Scilab (Only use if you know what you are doing)." 667 echo " -ns : do not execute scilab.start startup file. This argument will disable many features in Scilab (Only use if you know what you are doing)."
572 echo " -nouserstartup : do not execute the user startup files SCIHOME/.scilab or SCIHOME/scilab.ini." 668 echo " -nouserstartup : do not execute the user startup files SCIHOME/.scilab or SCIHOME/scilab.ini."
573 echo " -nw : start Scilab without dedicated Scilab Window." 669 echo " -nw : start Scilab without dedicated Scilab Window."
574 echo " -nwni : start Scilab without the GUI, graphic and help features (batch mode). This argument disables the need of Java." 670 echo " -nwni : start Scilab without the GUI, graphic and help features (batch mode). This argument disables the need of Java."
575 echo " -nogui : See -nwni" 671 echo " -nogui : See -nwni"
576 echo " -args : accept all extra arguments and make them available through sciargs" 672 echo " -args : accept all extra arguments and make them available through sciargs"
577 echo " -version : print product version and exit." 673 echo " -version : print product version and exit."
578 echo " -h/--help : display help about this command." 674 echo " -h/--help : display help about this command."
579 echo " --texmacs : reserved for TeXMacs." 675 echo " --texmacs : reserved for TeXMacs."
580 echo " " 676 echo " "
581 echo "Developer arguments:" 677if test $IS_SCILAB_BINARY -eq 0; then
582 echo " -debug : Start Scilab under gdb (Unix/linux only)." 678 echo "Developer arguments:"
583 echo " define the variable SCILAB_GDB_OPT to add custom arguments to gdb." 679 echo " -debug : Start Scilab under gdb (Unix/linux only)."
584 echo " -debug-kdbg : Start Scilab under kdbg (Unix/linux only)." 680 echo " define the variable SCILAB_GDB_OPT to add custom arguments to gdb."
585 echo " -profiling : Start Scilab under valgrind (Unix/linux only)." 681 echo " -debug-kdbg : Start Scilab under kdbg (Unix/linux only)."
586 echo " define the variable SCILAB_VALGRIND_OPT to add custom arguments to" 682 echo " -profiling : Start Scilab under valgrind (Unix/linux only)."
587 echo " valgrind (and override the existing valgrind arguments)." 683 echo " define the variable SCILAB_VALGRIND_OPT to add custom arguments to"
588 echo " -profiling-visu : Start Scilab under callgrind (Unix/linux only)." 684 echo " valgrind (and override the existing valgrind arguments)."
589 echo " define the variable SCILAB_VALGRIND_OPT to add custom arguments to" 685 echo " -profiling-visu : Start Scilab under callgrind (Unix/linux only)."
590 echo " callgrind (and override the existing callgrind arguments)." 686 echo " define the variable SCILAB_VALGRIND_OPT to add custom arguments to"
591 echo " -electric-fence : Start Scilab with the Electric Fence (Unix/linux only)." 687 echo " callgrind (and override the existing callgrind arguments)."
592 echo " " 688 echo " -electric-fence : Start Scilab with the Electric Fence (Unix/linux only)."
593 echo " All these arguments can be retrieved by the Scilab function sciargs." 689 echo " "
594 echo " " 690fi
595 exit 691 echo " All these arguments can be retrieved by the Scilab function sciargs."
692 echo " "
693 exit
596} 694}
597 695
598do_compile() 696do_compile()
599{ 697{
600 umask 002 698 umask 002
601 rm -f report 699 rm -f report
602 name=`basename $1 .sci` 700 name=`basename $1 .sci`
603 echo generating $name.bin 701 echo generating $name.bin
604 echo "predef();exec('$name.sci');save('$name.bin');quit"\ 702 echo "predef();exec('$name.sci');save('$name.bin');quit"\
605 | $SCILABBIN -ns -nwni | sed 1,8d 1>report 2>&1 703 | $SCILABBIN -ns -nwni | sed 1,8d 1>report 2>&1
606 if (grep error report 1> /dev/null 2>&1); 704 if (grep error report 1> /dev/null 2>&1);
607 then cat report;echo " " 705 then cat report;echo " "
608 echo see `pwd`/report for more informations 706 echo see `pwd`/report for more information
609 grep libok report>/dev/null; 707 grep libok report>/dev/null;
610 else rm -f report; 708 else rm -f report;
611 fi 709 fi
612 umask 022 710 umask 022
613 exit 0 711 exit 0
614} 712}
615 713
616do_lib() 714do_lib()
617{ 715{
618 umask 002 716 umask 002
619 rm -f report 717 rm -f report
620 echo "$1=lib('$2/');save('$2/lib',$1);quit"\ 718 echo "$1=lib('$2/');save('$2/lib',$1);quit"\
621 | $SCILABBIN -ns -nwni |sed 1,/--\>/d 1>report 2>&1 719 | $SCILABBIN -ns -nwni |sed 1,/--\>/d 1>report 2>&1
622 if (grep error report 1> /dev/null 2>&1); 720 if (grep error report 1> /dev/null 2>&1);
623 then cat report;echo " " 721 then cat report;echo " "
624 echo see `pwd`/report for more informations 722 echo see `pwd`/report for more information
625 grep libok report>/dev/null; 723 grep libok report>/dev/null;
626 else rm -f report; 724 else rm -f report;
627 fi 725 fi
628 umask 022 726 umask 022
629 exit 0 727 exit 0
630} 728}
631 729
632MORE_OPT="" 730MORE_OPT=""
633if test "$SCILAB_MODE" = "nw"; then 731if test "$SCILAB_MODE" = "nw"; then
634 MORE_OPT="-nw" 732 MORE_OPT="-nw"
635fi 733fi
636 734
637# calling Scilab with no argument or special cases of calling Scilab 735# calling Scilab with no argument or special cases of calling Scilab
638rest="no" 736rest="no"
639case $# in 737case $# in
640 0) # No arg, run Scilab 738 0) # No arg, run Scilab
641 do_scilex $MORE_OPT 739 do_scilex $MORE_OPT
642 ;; 740 ;;
643 2) # Only two arg 741 2) # Only two arg
644 case $1 in 742 case $1 in
645 -comp) 743 -comp)
646 do_compile $2 744 do_compile $2
647 ;; 745 ;;
648 *) 746 *)
649 rest="yes" 747 rest="yes"
650 ;; 748 ;;
651 esac 749 esac
652 ;; 750 ;;
653 3) 751 3)
654 case $1 in 752 case $1 in
655 -lib) 753 -lib)
656 do_lib $2 $3 754 do_lib $2 $3
657 ;; 755 ;;
658 *) 756 *)
659 rest="yes" 757 rest="yes"
660 ;; 758 ;;
661 esac 759 esac
662 ;; 760 ;;
663 *) 761 *)
664 case $1 in 762 case $1 in
665 *) 763 *)
666 rest="yes" 764 rest="yes"
667 ;; 765 ;;
668 esac 766 esac
669 ;; 767 ;;
@@ -672,85 +770,85 @@ esac
672# really calling Scilab with arguments 770# really calling Scilab with arguments
673 771
674if test "$rest" = "yes"; then 772if test "$rest" = "yes"; then
675 debug= 773 debug=
676 debug_kdbg= 774 debug_kdbg=
677 profiling= 775 profiling=
678 profiling_visu= 776 profiling_visu=
679 electric_fence= 777 electric_fence=
680 prevarg= 778 prevarg=
681 for sciarg in "$@" 779 for sciarg in "$@"
682 do 780 do
683 781
684 # If the previous argument needs an argument, skip current one. 782 # If the previous argument needs an argument, skip current one.
685 if test -n "$prevarg"; then 783 if test -n "$prevarg"; then
686 prevarg= 784 prevarg=
687 continue 785 continue
688 fi 786 fi
689 787
690 case $sciarg in 788 case $sciarg in
691 -nogui|-version|-ns|-nb|-nw|-nouserstartup|--texmacs|-nwni) 789 -nogui|-version|-ns|-nb|-nw|-nouserstartup|--texmacs|-nwni)
692 ;; 790 ;;
693 -psn_*) 791 -psn_*)
694 # Under Mac OS X, .app is adding the arg -psn_0_xxxx 792 # Under Mac OS X, .app is adding the arg -psn_0_xxxx
695 # (psn = ProcessSerialNumber). It is not used (but could be in the future) 793 # (psn = ProcessSerialNumber). It is not used (but could be in the future)
696 ;; 794 ;;
697 -display|-f|-l|-e|-d|-mem) 795 -display|-f|-l|-e|-d|-mem)
698 prevarg=1 796 prevarg=1
699 ;; 797 ;;
700 -args) # Accept extra arguments 798 -args) # Accept extra arguments
701 extraarg=1 799 extraarg=1
702 ;; 800 ;;
703 -debug) 801 -debug)
704 DEBUG="-debug" 802 DEBUG="-debug"
705 ;; 803 ;;
706 -debug-kdbg) 804 -debug-kdbg)
707 DEBUG_KDBG="-debug-kdbg" 805 DEBUG_KDBG="-debug-kdbg"
708 ;; 806 ;;
709 -profiling) 807 -profiling)
710 PROFILING="-profiling" 808 PROFILING="-profiling"
711 ;; 809 ;;
712 -profiling-visu) 810 -profiling-visu)
713 PROFILING_VISU="-profiling-visu" 811 PROFILING_VISU="-profiling-visu"
714 ;; 812 ;;
715 -electric-fence) 813 -electric-fence)
716 ELECTRIC_FENCE="-electric-fence" 814 ELECTRIC_FENCE="-electric-fence"
717 ;; 815 ;;
718 -h|--help) 816 -h|--help)
719 do_help 817 do_help
720 ;; 818 ;;
721 *) 819 *)
722 foundUnknownArg=1 820 foundUnknownArg=1
723 # Do nothing. Gives unknown args to Scilab binaries if -a is provided 821 # Do nothing. Gives unknown args to Scilab binaries if -a is provided
724 ;; 822 ;;
725 esac 823 esac
726 done 824 done
727 825
728 826
729# If the argument -a is not provided (extraarg) and we found unknown args 827# If the argument -a is not provided (extraarg) and we found unknown args
730# fail and provide help 828# fail and provide help
731 if test -z "$extraarg" -a -n "$foundUnknownArg"; then 829 if test -z "$extraarg" -a -n "$foundUnknownArg"; then
732 do_help 830 do_help
733 fi 831 fi
734 832
735 if test -n "$DEBUG"; then 833 if test -n "$DEBUG"; then
736 start_debug "$@" $MORE_OPT 834 start_debug "$@" $MORE_OPT
737 else 835 else
738 if test -n "$DEBUG_KDBG"; then 836 if test -n "$DEBUG_KDBG"; then
739 start_debug_kdbg "$@" $MORE_OPT 837 start_debug_kdbg "$@" $MORE_OPT
740 else 838 else
741 if test -n "$PROFILING"; then 839 if test -n "$PROFILING"; then
742 start_profiling "$@" $MORE_OPT 840 start_profiling "$@" $MORE_OPT
743 else 841 else
744 if test -n "$PROFILING_VISU"; then 842 if test -n "$PROFILING_VISU"; then
745 start_profiling_visu "$@" $MORE_OPT 843 start_profiling_visu "$@" $MORE_OPT
746 else 844 else
747 if test -n "$ELECTRIC_FENCE"; then 845 if test -n "$ELECTRIC_FENCE"; then
748 start_electric_fence "$@" $MORE_OPT 846 start_electric_fence "$@" $MORE_OPT
749 else 847 else
750 do_scilex "$@" $MORE_OPT 848 do_scilex "$@" $MORE_OPT
751 fi # not electric fense 849 fi # not electric fense
752 fi # not profiling visu 850 fi # not profiling visu
753 fi # not profiling 851 fi # not profiling
754 fi # not debug kdbg 852 fi # not debug kdbg
755 fi # not debug 853 fi # not debug
756fi # if rest 854fi # if rest
diff --git a/scilab/build.incl.xml b/scilab/build.incl.xml
index 00d35ef..fcf03f5 100644
--- a/scilab/build.incl.xml
+++ b/scilab/build.incl.xml
@@ -182,7 +182,7 @@
182 <classfileset dir="${build.test.dir}" includes="**/*.class"/> 182 <classfileset dir="${build.test.dir}" includes="**/*.class"/>
183 <jvmarg value="-DdisableLoadJNIScilab=1"/> 183 <jvmarg value="-DdisableLoadJNIScilab=1"/>
184 <jvmarg value="-DSCI=${base.dir}"/> 184 <jvmarg value="-DSCI=${base.dir}"/>
185 <jvmarg value="-Djava.library.path=${base.dir}/modules/.libs/:${base.dir}/modules/javasci/.libs/"/> 185 <jvmarg value="-Djava.library.path=${base.dir}/modules/.libs/:${base.dir}/modules/javasci/.libs/:/usr/lib/jni/"/>
186 </testng> 186 </testng>
187 </target> 187 </target>
188 188
diff --git a/scilab/configure b/scilab/configure
index 23f881d..b4496fd 100755
--- a/scilab/configure
+++ b/scilab/configure
@@ -790,6 +790,10 @@ USE_DYNAMIC_STACK_FALSE
790USE_DYNAMIC_STACK_TRUE 790USE_DYNAMIC_STACK_TRUE
791IS_64_BITS_CPU_FALSE 791IS_64_BITS_CPU_FALSE
792IS_64_BITS_CPU_TRUE 792IS_64_BITS_CPU_TRUE
793CODE_COVERAGE_FALSE
794CODE_COVERAGE_TRUE
795GENHTML
796LCOV
793IS_MIPS_SGI_IRIX_FALSE 797IS_MIPS_SGI_IRIX_FALSE
794IS_MIPS_SGI_IRIX_TRUE 798IS_MIPS_SGI_IRIX_TRUE
795IS_SOLARIS_FALSE 799IS_SOLARIS_FALSE
@@ -924,6 +928,7 @@ enable_debug_CXX
924enable_debug_java 928enable_debug_java
925enable_debug_fortran 929enable_debug_fortran
926enable_debug_linker 930enable_debug_linker
931enable_code_coverage
927enable_stopOnWarning 932enable_stopOnWarning
928with_gcc 933with_gcc
929with_g77 934with_g77
@@ -1636,6 +1641,7 @@ Optional Features:
1636 --enable-debug-fortran Do not optimize and print warning messages (Fortran 1641 --enable-debug-fortran Do not optimize and print warning messages (Fortran
1637 code) 1642 code)
1638 --enable-debug-linker Print warning messages from the linker (ld) 1643 --enable-debug-linker Print warning messages from the linker (ld)
1644 --enable-code-coverage Enable code coverage
1639 --enable-stop-on-warning 1645 --enable-stop-on-warning
1640 Stop the compilation on the first warning found in 1646 Stop the compilation on the first warning found in
1641 the C/C++ code 1647 the C/C++ code
@@ -5540,6 +5546,12 @@ if test "${enable_debug_linker+set}" = set; then :
5540fi 5546fi
5541 5547
5542 5548
5549# Check whether --enable-code-coverage was given.
5550if test "${enable_code_coverage+set}" = set; then :
5551 enableval=$enable_code_coverage;
5552fi
5553
5554
5543# Check whether --enable-stopOnWarning was given. 5555# Check whether --enable-stopOnWarning was given.
5544if test "${enable_stopOnWarning+set}" = set; then : 5556if test "${enable_stopOnWarning+set}" = set; then :
5545 enableval=$enable_stopOnWarning; 5557 enableval=$enable_stopOnWarning;
@@ -8946,6 +8958,12 @@ fi
8946###################### 8958######################
8947 8959
8948if test -n "$F77"; then 8960if test -n "$F77"; then
8961
8962 # enable the code coverage
8963 if test "$enable_code_coverage" = yes; then
8964 FFLAGS="$FFLAGS -fprofile-arcs -ftest-coverage"
8965 fi
8966
8949 if test "$enable_debug_fortran" = yes; then 8967 if test "$enable_debug_fortran" = yes; then
8950 # -D_FORTIFY_SOURCE=2 8968 # -D_FORTIFY_SOURCE=2
8951 ac_ext=f 8969 ac_ext=f
@@ -8953,7 +8971,7 @@ ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5'
8953ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' 8971ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
8954ac_compiler_gnu=$ac_cv_f77_compiler_gnu 8972ac_compiler_gnu=$ac_cv_f77_compiler_gnu
8955 8973
8956 for flag in -g -Wall -Wimplicit -Wsurprising ; do 8974 for flag in -g -Wall -Wsurprising; do
8957 case " ${FFLAGS} " in 8975 case " ${FFLAGS} " in
8958 *\ ${flag}\ *) 8976 *\ ${flag}\ *)
8959 # flag is already present 8977 # flag is already present
@@ -9116,6 +9134,12 @@ fi
9116case "$CXX" in 9134case "$CXX" in
9117 g++-* | g++ | ccache*g++ | ccache*g++-* ) 9135 g++-* | g++ | ccache*g++ | ccache*g++-* )
9118 ## With GNU C++ Compiler 9136 ## With GNU C++ Compiler
9137
9138 # enable the code coverage
9139 if test "$enable_code_coverage" = yes; then
9140 CPPFLAGS="$CPPFLAGS -fprofile-arcs -ftest-coverage"
9141 fi
9142
9119 if test "$enable_debug_CXX" = yes; then 9143 if test "$enable_debug_CXX" = yes; then
9120 CPPFLAGS="$CPPFLAGS -pipe -Wshadow -Wpointer-arith -Wcast-align -Wreturn-type -Wswitch -Wtrigraphs -Wcomment -W -Wchar-subscripts -Wformat -Wparentheses -Wsign-compare -Wwrite-strings -Wunused -Wno-strict-aliasing -Wextra -Wall -g3" 9144 CPPFLAGS="$CPPFLAGS -pipe -Wshadow -Wpointer-arith -Wcast-align -Wreturn-type -Wswitch -Wtrigraphs -Wcomment -W -Wchar-subscripts -Wformat -Wparentheses -Wsign-compare -Wwrite-strings -Wunused -Wno-strict-aliasing -Wextra -Wall -g3"
9121 case "$host" in 9145 case "$host" in
@@ -9148,6 +9172,12 @@ esac
9148case "$CC" in 9172case "$CC" in
9149 gcc-* | gcc | ccache*gcc | ccache*gcc-* ) 9173 gcc-* | gcc | ccache*gcc | ccache*gcc-* )
9150 ## With GNU Compiler 9174 ## With GNU Compiler
9175
9176 # enable the code coverage
9177 if test "$enable_code_coverage" = yes; then
9178 CFLAGS="$CFLAGS -fprofile-arcs -ftest-coverage"
9179 fi
9180
9151 if test "$enable_debug_C" = yes; then 9181 if test "$enable_debug_C" = yes; then
9152 CFLAGS="$CFLAGS -pipe -Wformat -Wshadow -Wfloat-equal -Wpointer-arith -Wcast-align -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes -Wmissing-noreturn -Wendif-labels -Wpointer-arith -Wbad-function-cast -Wcast-qual -Wwrite-strings -Winline -Wredundant-decls -Wall -Wchar-subscripts -Wextra -Wuninitialized -Wno-format-y2k -Wmissing-format-attribute -Wno-missing-field-initializers -Wno-strict-aliasing -Wold-style-definition -g3" 9182 CFLAGS="$CFLAGS -pipe -Wformat -Wshadow -Wfloat-equal -Wpointer-arith -Wcast-align -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes -Wmissing-noreturn -Wendif-labels -Wpointer-arith -Wbad-function-cast -Wcast-qual -Wwrite-strings -Winline -Wredundant-decls -Wall -Wchar-subscripts -Wextra -Wuninitialized -Wno-format-y2k -Wmissing-format-attribute -Wno-missing-field-initializers -Wno-strict-aliasing -Wold-style-definition -g3"
9153 # used to be -O 9183 # used to be -O
@@ -9271,6 +9301,104 @@ esac
9271;; # end of not a gcc compiler 9301;; # end of not a gcc compiler
9272esac 9302esac
9273 9303
9304# enable the code coverage
9305if test "$enable_code_coverage" = yes; then
9306 # Extract the first word of "lcov", so it can be a program name with args.
9307set dummy lcov; ac_word=$2
9308{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
9309$as_echo_n "checking for $ac_word... " >&6; }
9310if test "${ac_cv_path_LCOV+set}" = set; then :
9311 $as_echo_n "(cached) " >&6
9312else
9313 case $LCOV in
9314 [\\/]* | ?:[\\/]*)
9315 ac_cv_path_LCOV="$LCOV" # Let the user override the test with a path.
9316 ;;
9317 *)
9318 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
9319for as_dir in $PATH
9320do
9321 IFS=$as_save_IFS
9322 test -z "$as_dir" && as_dir=.
9323 for ac_exec_ext in '' $ac_executable_extensions; do
9324 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
9325 ac_cv_path_LCOV="$as_dir/$ac_word$ac_exec_ext"
9326 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
9327 break 2
9328 fi
9329done
9330 done
9331IFS=$as_save_IFS
9332
9333 ;;
9334esac
9335fi
9336LCOV=$ac_cv_path_LCOV
9337if test -n "$LCOV"; then
9338 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LCOV" >&5
9339$as_echo "$LCOV" >&6; }
9340else
9341 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
9342$as_echo "no" >&6; }
9343fi
9344
9345
9346 if test -z "$LCOV" ; then
9347 as_fn_error $? "Cannot find lcov. Please install it (package lcov under Debian) or remove the option --enable-code-coverage" "$LINENO" 5
9348 fi
9349 # Extract the first word of "genhtml", so it can be a program name with args.
9350set dummy genhtml; ac_word=$2
9351{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
9352$as_echo_n "checking for $ac_word... " >&6; }
9353if test "${ac_cv_path_GENHTML+set}" = set; then :
9354 $as_echo_n "(cached) " >&6
9355else
9356 case $GENHTML in
9357 [\\/]* | ?:[\\/]*)
9358 ac_cv_path_GENHTML="$GENHTML" # Let the user override the test with a path.
9359 ;;
9360 *)
9361 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
9362for as_dir in $PATH
9363do
9364 IFS=$as_save_IFS
9365 test -z "$as_dir" && as_dir=.
9366 for ac_exec_ext in '' $ac_executable_extensions; do
9367 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
9368 ac_cv_path_GENHTML="$as_dir/$ac_word$ac_exec_ext"
9369 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
9370 break 2
9371 fi
9372done
9373 done
9374IFS=$as_save_IFS
9375
9376 ;;
9377esac
9378fi
9379GENHTML=$ac_cv_path_GENHTML
9380if test -n "$GENHTML"; then
9381 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GENHTML" >&5
9382$as_echo "$GENHTML" >&6; }
9383else
9384 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
9385$as_echo "no" >&6; }
9386fi
9387
9388
9389 if test -z "$GENHTML" ; then
9390 as_fn_error $? "Cannot find genhtml. Please install it (package lcov under Debian) or remove the option --enable-code-coverage" "$LINENO" 5
9391 fi
9392 LDFLAGS="$LDFLAGS -coverage"
9393fi
9394 if test "$enable_code_coverage" = yes; then
9395 CODE_COVERAGE_TRUE=
9396 CODE_COVERAGE_FALSE='#'
9397else
9398 CODE_COVERAGE_TRUE='#'
9399 CODE_COVERAGE_FALSE=
9400fi
9401
9274 9402
9275# flag for possible compilations in configure 9403# flag for possible compilations in configure
9276CFLAGS="$CFLAGS "'-I$(top_srcdir)/modules/core/includes/ -I$(top_srcdir)/libs/MALLOC/includes/ -I$(top_srcdir)/modules/localization/includes/' 9404CFLAGS="$CFLAGS "'-I$(top_srcdir)/modules/core/includes/ -I$(top_srcdir)/libs/MALLOC/includes/ -I$(top_srcdir)/modules/localization/includes/'
@@ -9920,7 +10048,7 @@ $as_echo "$ac_java_classpath" >&6; }
9920$as_echo_n "checking to see if the java compiler works... " >&6; } 10048$as_echo_n "checking to see if the java compiler works... " >&6; }
9921 10049
9922 cat << \EOF > conftest.java 10050 cat << \EOF > conftest.java
9923// #line 9923 "configure" 10051// #line 10051 "configure"
9924 10052
9925 10053
9926public class conftest { 10054public class conftest {
@@ -9986,7 +10114,7 @@ $as_echo_n "checking type of jvm... " >&6; }
9986 if test "x$ac_java_jvm_name" = "x" ; then 10114 if test "x$ac_java_jvm_name" = "x" ; then
9987 10115
9988 cat << \EOF > conftest.java 10116 cat << \EOF > conftest.java
9989// #line 9989 "configure" 10117// #line 10117 "configure"
9990import gnu.java.io.EncodingManager; 10118import gnu.java.io.EncodingManager;
9991 10119
9992public class conftest { 10120public class conftest {
@@ -10050,7 +10178,7 @@ $as_echo_n "checking java API version... " >&6; }
10050 10178
10051 10179
10052 cat << \EOF > conftest.java 10180 cat << \EOF > conftest.java
10053// #line 10053 "configure" 10181// #line 10181 "configure"
10054import java.nio.charset.Charset; 10182import java.nio.charset.Charset;
10055 10183
10056public class conftest { 10184public class conftest {
@@ -10095,7 +10223,7 @@ EOF
10095 10223
10096 10224
10097 cat << \EOF > conftest.java 10225 cat << \EOF > conftest.java
10098// #line 10098 "configure" 10226// #line 10226 "configure"
10099import java.lang.StringBuilder; 10227import java.lang.StringBuilder;
10100 10228
10101public class conftest { 10229public class conftest {
@@ -11464,7 +11592,7 @@ $as_echo_n "checking jgraphx... " >&6; }
11464 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 11592 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
11465 11593
11466 cat << \EOF > conftest.java 11594 cat << \EOF > conftest.java
11467// #line 11467 "configure" 11595// #line 11595 "configure"
11468import com.mxgraph.model.mxCell; 11596import com.mxgraph.model.mxCell;
11469 11597
11470public class conftest { 11598public class conftest {
@@ -11558,7 +11686,7 @@ $as_echo_n "checking minimal version (1.4.1.0) of jgraphx... " >&6; }
11558 if test "x=" == "x"; then 11686 if test "x=" == "x"; then
11559 11687
11560 cat << \EOF > conftest.java 11688 cat << \EOF > conftest.java
11561// #line 11561 "configure" 11689// #line 11689 "configure"
11562import com.mxgraph.view.mxGraph; 11690import com.mxgraph.view.mxGraph;
11563 11691
11564public class conftest { 11692public class conftest {
@@ -11609,7 +11737,7 @@ EOF
11609 else 11737 else
11610 11738
11611 cat << \EOF > conftest.java 11739 cat << \EOF > conftest.java
11612// #line 11612 "configure" 11740// #line 11740 "configure"
11613import com.mxgraph.view.mxGraph; 11741import com.mxgraph.view.mxGraph;
11614 11742
11615public class conftest { 11743public class conftest {
@@ -11682,7 +11810,7 @@ $as_echo_n "checking flexdock... " >&6; }
11682 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 11810 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
11683 11811
11684 cat << \EOF > conftest.java 11812 cat << \EOF > conftest.java
11685// #line 11685 "configure" 11813// #line 11813 "configure"
11686import org.flexdock.docking.DockingManager; 11814import org.flexdock.docking.DockingManager;
11687 11815
11688public class conftest { 11816public class conftest {
@@ -11776,7 +11904,7 @@ $as_echo_n "checking minimal version (0.5.2) of flexdock... " >&6; }
11776 if test "x" == "x"; then 11904 if test "x" == "x"; then
11777 11905
11778 cat << \EOF > conftest.java 11906 cat << \EOF > conftest.java
11779// #line 11779 "configure" 11907// #line 11907 "configure"
11780import org.flexdock.util.Utilities; 11908import org.flexdock.util.Utilities;
11781 11909
11782public class conftest { 11910public class conftest {
@@ -11827,7 +11955,7 @@ EOF
11827 else 11955 else
11828 11956
11829 cat << \EOF > conftest.java 11957 cat << \EOF > conftest.java
11830// #line 11830 "configure" 11958// #line 11958 "configure"
11831import org.flexdock.util.Utilities; 11959import org.flexdock.util.Utilities;
11832 11960
11833public class conftest { 11961public class conftest {
@@ -11900,7 +12028,7 @@ $as_echo_n "checking looks... " >&6; }
11900 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 12028 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
11901 12029
11902 cat << \EOF > conftest.java 12030 cat << \EOF > conftest.java
11903// #line 11903 "configure" 12031// #line 12031 "configure"
11904import com.jgoodies.looks.common.RenderingUtils; 12032import com.jgoodies.looks.common.RenderingUtils;
11905 12033
11906public class conftest { 12034public class conftest {
@@ -12007,7 +12135,7 @@ $as_echo_n "checking jgoodies-looks... " >&6; }
12007 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 12135 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
12008 12136
12009 cat << \EOF > conftest.java 12137 cat << \EOF > conftest.java
12010// #line 12010 "configure" 12138// #line 12138 "configure"
12011import com.jgoodies.looks.common.RenderingUtils; 12139import com.jgoodies.looks.common.RenderingUtils;
12012 12140
12013public class conftest { 12141public class conftest {
@@ -12115,7 +12243,7 @@ $as_echo_n "checking skinlf... " >&6; }
12115 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 12243 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
12116 12244
12117 cat << \EOF > conftest.java 12245 cat << \EOF > conftest.java
12118// #line 12118 "configure" 12246// #line 12246 "configure"
12119import com.l2fprod.util.AccessUtils; 12247import com.l2fprod.util.AccessUtils;
12120 12248
12121public class conftest { 12249public class conftest {
@@ -12222,7 +12350,7 @@ $as_echo_n "checking jogl... " >&6; }
12222 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 12350 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
12223 12351
12224 cat << \EOF > conftest.java 12352 cat << \EOF > conftest.java
12225// #line 12225 "configure" 12353// #line 12353 "configure"
12226import javax.media.opengl.glu.GLUnurbs; 12354import javax.media.opengl.glu.GLUnurbs;
12227 12355
12228public class conftest { 12356public class conftest {
@@ -12434,7 +12562,7 @@ $as_echo_n "checking gluegen-rt... " >&6; }
12434 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 12562 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
12435 12563
12436 cat << \EOF > conftest.java 12564 cat << \EOF > conftest.java
12437// #line 12437 "configure" 12565// #line 12565 "configure"
12438import com.sun.gluegen.runtime.CPU; 12566import com.sun.gluegen.runtime.CPU;
12439 12567
12440public class conftest { 12568public class conftest {
@@ -12595,7 +12723,7 @@ $as_echo_n "checking jhall... " >&6; }
12595 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 12723 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
12596 12724
12597 cat << \EOF > conftest.java 12725 cat << \EOF > conftest.java
12598// #line 12598 "configure" 12726// #line 12726 "configure"
12599import javax.help.JHelp; 12727import javax.help.JHelp;
12600 12728
12601public class conftest { 12729public class conftest {
@@ -12702,7 +12830,7 @@ $as_echo_n "checking javahelp2... " >&6; }
12702 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 12830 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
12703 12831
12704 cat << \EOF > conftest.java 12832 cat << \EOF > conftest.java
12705// #line 12705 "configure" 12833// #line 12833 "configure"
12706import javax.help.JHelp; 12834import javax.help.JHelp;
12707 12835
12708public class conftest { 12836public class conftest {
@@ -12810,7 +12938,7 @@ $as_echo_n "checking jrosetta-API... " >&6; }
12810 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 12938 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
12811 12939
12812 cat << \EOF > conftest.java 12940 cat << \EOF > conftest.java
12813// #line 12813 "configure" 12941// #line 12941 "configure"
12814import com.artenum.rosetta.interfaces.core.ConsoleConfiguration; 12942import com.artenum.rosetta.interfaces.core.ConsoleConfiguration;
12815 12943
12816public class conftest { 12944public class conftest {
@@ -12917,7 +13045,7 @@ $as_echo_n "checking jrosetta-engine... " >&6; }
12917 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 13045 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
12918 13046
12919 cat << \EOF > conftest.java 13047 cat << \EOF > conftest.java
12920// #line 12920 "configure" 13048// #line 13048 "configure"
12921import com.artenum.rosetta.core.action.AbstractConsoleAction; 13049import com.artenum.rosetta.core.action.AbstractConsoleAction;
12922 13050
12923public class conftest { 13051public class conftest {
@@ -13026,7 +13154,7 @@ $as_echo_n "checking jeuclid-core... " >&6; }
13026 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 13154 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
13027 13155
13028 cat << \EOF > conftest.java 13156 cat << \EOF > conftest.java
13029// #line 13029 "configure" 13157// #line 13157 "configure"
13030import net.sourceforge.jeuclid.LayoutContext; 13158import net.sourceforge.jeuclid.LayoutContext;
13031 13159
13032public class conftest { 13160public class conftest {
@@ -13135,7 +13263,7 @@ $as_echo_n "checking fop... " >&6; }
13135 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 13263 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
13136 13264
13137 cat << \EOF > conftest.java 13265 cat << \EOF > conftest.java
13138// #line 13138 "configure" 13266// #line 13266 "configure"
13139import org.apache.fop.pdf.PDFInfo; 13267import org.apache.fop.pdf.PDFInfo;
13140 13268
13141public class conftest { 13269public class conftest {
@@ -13242,7 +13370,7 @@ $as_echo_n "checking batik-all... " >&6; }
13242 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 13370 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
13243 13371
13244 cat << \EOF > conftest.java 13372 cat << \EOF > conftest.java
13245// #line 13245 "configure" 13373// #line 13373 "configure"
13246import org.apache.batik.parser.Parser; 13374import org.apache.batik.parser.Parser;
13247 13375
13248public class conftest { 13376public class conftest {
@@ -13349,7 +13477,7 @@ $as_echo_n "checking batik... " >&6; }
13349 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 13477 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
13350 13478
13351 cat << \EOF > conftest.java 13479 cat << \EOF > conftest.java
13352// #line 13352 "configure" 13480// #line 13480 "configure"
13353import org.apache.batik.parser.Parser; 13481import org.apache.batik.parser.Parser;
13354 13482
13355public class conftest { 13483public class conftest {
@@ -13443,7 +13571,7 @@ $as_echo_n "checking minimal version (1.7) of batik... " >&6; }
13443 if test "x" == "x"; then 13571 if test "x" == "x"; then
13444 13572
13445 cat << \EOF > conftest.java 13573 cat << \EOF > conftest.java
13446// #line 13446 "configure" 13574// #line 13574 "configure"
13447import org.apache.batik.Version; 13575import org.apache.batik.Version;
13448 13576
13449public class conftest { 13577public class conftest {
@@ -13494,7 +13622,7 @@ EOF
13494 else 13622 else
13495 13623
13496 cat << \EOF > conftest.java 13624 cat << \EOF > conftest.java
13497// #line 13497 "configure" 13625// #line 13625 "configure"
13498import org.apache.batik.Version; 13626import org.apache.batik.Version;
13499 13627
13500public class conftest { 13628public class conftest {
@@ -13567,7 +13695,7 @@ $as_echo_n "checking commons-io... " >&6; }
13567 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 13695 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
13568 13696
13569 cat << \EOF > conftest.java 13697 cat << \EOF > conftest.java
13570// #line 13570 "configure" 13698// #line 13698 "configure"
13571import org.apache.commons.io.output.CountingOutputStream; 13699import org.apache.commons.io.output.CountingOutputStream;
13572 13700
13573public class conftest { 13701public class conftest {
@@ -13674,7 +13802,7 @@ $as_echo_n "checking xmlgraphics-commons... " >&6; }
13674 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 13802 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
13675 13803
13676 cat << \EOF > conftest.java 13804 cat << \EOF > conftest.java
13677// #line 13677 "configure" 13805// #line 13805 "configure"
13678import org.apache.xmlgraphics.util.Service; 13806import org.apache.xmlgraphics.util.Service;
13679 13807
13680public class conftest { 13808public class conftest {
@@ -13781,7 +13909,7 @@ $as_echo_n "checking avalon-framework... " >&6; }
13781 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 13909 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
13782 13910
13783 cat << \EOF > conftest.java 13911 cat << \EOF > conftest.java
13784// #line 13784 "configure" 13912// #line 13912 "configure"
13785import org.apache.avalon.framework.configuration.ConfigurationException; 13913import org.apache.avalon.framework.configuration.ConfigurationException;
13786 13914
13787public class conftest { 13915public class conftest {
@@ -13888,7 +14016,7 @@ $as_echo_n "checking xml-apis-ext... " >&6; }
13888 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 14016 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
13889 14017
13890 cat << \EOF > conftest.java 14018 cat << \EOF > conftest.java
13891// #line 13891 "configure" 14019// #line 14019 "configure"
13892import org.w3c.dom.svg.SVGDocument; 14020import org.w3c.dom.svg.SVGDocument;
13893 14021
13894public class conftest { 14022public class conftest {
@@ -13995,7 +14123,7 @@ $as_echo_n "checking xml-commons-apis-ext... " >&6; }
13995 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 14123 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
13996 14124
13997 cat << \EOF > conftest.java 14125 cat << \EOF > conftest.java
13998// #line 13998 "configure" 14126// #line 14126 "configure"
13999import org.w3c.dom.svg.SVGDocument; 14127import org.w3c.dom.svg.SVGDocument;
14000 14128
14001public class conftest { 14129public class conftest {
@@ -14106,7 +14234,7 @@ $as_echo_n "checking commons-logging... " >&6; }
14106 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 14234 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
14107 14235
14108 cat << \EOF > conftest.java 14236 cat << \EOF > conftest.java
14109// #line 14109 "configure" 14237// #line 14237 "configure"
14110import org.apache.commons.logging.LogFactory; 14238import org.apache.commons.logging.LogFactory;
14111 14239
14112public class conftest { 14240public class conftest {
@@ -14213,7 +14341,7 @@ $as_echo_n "checking jlatexmath... " >&6; }
14213 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 14341 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
14214 14342
14215 cat << \EOF > conftest.java 14343 cat << \EOF > conftest.java
14216// #line 14216 "configure" 14344// #line 14344 "configure"
14217import org.scilab.forge.jlatexmath.TeXFormula; 14345import org.scilab.forge.jlatexmath.TeXFormula;
14218 14346
14219public class conftest { 14347public class conftest {
@@ -14307,7 +14435,7 @@ $as_echo_n "checking minimal version (0.9.3) of jlatexmath... " >&6; }
14307 if test "x" == "x"; then 14435 if test "x" == "x"; then
14308 14436
14309 cat << \EOF > conftest.java 14437 cat << \EOF > conftest.java
14310// #line 14310 "configure" 14438// #line 14438 "configure"
14311import org.scilab.forge.jlatexmath.TeXFormula; 14439import org.scilab.forge.jlatexmath.TeXFormula;
14312 14440
14313public class conftest { 14441public class conftest {
@@ -14358,7 +14486,7 @@ EOF
14358 else 14486 else
14359 14487
14360 cat << \EOF > conftest.java 14488 cat << \EOF > conftest.java
14361// #line 14361 "configure" 14489// #line 14489 "configure"
14362import org.scilab.forge.jlatexmath.TeXFormula; 14490import org.scilab.forge.jlatexmath.TeXFormula;
14363 14491
14364public class conftest { 14492public class conftest {
@@ -14437,7 +14565,7 @@ $as_echo_n "checking checkstyle... " >&6; }
14437 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 14565 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
14438 14566
14439 cat << \EOF > conftest.java 14567 cat << \EOF > conftest.java
14440// #line 14440 "configure" 14568// #line 14568 "configure"
14441import com.puppycrawl.tools.checkstyle.CheckStyleTask; 14569import com.puppycrawl.tools.checkstyle.CheckStyleTask;
14442 14570
14443public class conftest { 14571public class conftest {
@@ -14544,7 +14672,7 @@ $as_echo_n "checking commons-beanutils... " >&6; }
14544 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 14672 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
14545 14673
14546 cat << \EOF > conftest.java 14674 cat << \EOF > conftest.java
14547// #line 14547 "configure" 14675// #line 14675 "configure"
14548import org.apache.commons.beanutils.Converter; 14676import org.apache.commons.beanutils.Converter;
14549 14677
14550public class conftest { 14678public class conftest {
@@ -14651,7 +14779,7 @@ $as_echo_n "checking antlr... " >&6; }
14651 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 14779 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
14652 14780
14653 cat << \EOF > conftest.java 14781 cat << \EOF > conftest.java
14654// #line 14654 "configure" 14782// #line 14782 "configure"
14655import antlr.TokenStreamException; 14783import antlr.TokenStreamException;
14656 14784
14657public class conftest { 14785public class conftest {
@@ -14758,7 +14886,7 @@ $as_echo_n "checking testng... " >&6; }
14758 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 14886 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
14759 14887
14760 cat << \EOF > conftest.java 14888 cat << \EOF > conftest.java
14761// #line 14761 "configure" 14889// #line 14889 "configure"
14762import org.testng.TestNG; 14890import org.testng.TestNG;
14763 14891
14764public class conftest { 14892public class conftest {
@@ -14865,7 +14993,7 @@ $as_echo_n "checking qdox... " >&6; }
14865 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 14993 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
14866 14994
14867 cat << \EOF > conftest.java 14995 cat << \EOF > conftest.java
14868// #line 14868 "configure" 14996// #line 14996 "configure"
14869import com.thoughtworks.qdox.tools.QDoxTester; 14997import com.thoughtworks.qdox.tools.QDoxTester;
14870 14998
14871public class conftest { 14999public class conftest {
@@ -14972,7 +15100,7 @@ $as_echo_n "checking bsh... " >&6; }
14972 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 15100 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
14973 15101
14974 cat << \EOF > conftest.java 15102 cat << \EOF > conftest.java
14975// #line 14975 "configure" 15103// #line 15103 "configure"
14976import bsh.Console; 15104import bsh.Console;
14977 15105
14978public class conftest { 15106public class conftest {
@@ -15079,7 +15207,7 @@ $as_echo_n "checking junit... " >&6; }
15079 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 15207 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
15080 15208
15081 cat << \EOF > conftest.java 15209 cat << \EOF > conftest.java
15082// #line 15082 "configure" 15210// #line 15210 "configure"
15083import junit.framework.Assert; 15211import junit.framework.Assert;
15084 15212
15085public class conftest { 15213public class conftest {
@@ -15186,7 +15314,7 @@ $as_echo_n "checking ccsm-commons... " >&6; }
15186 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 15314 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
15187 15315
15188 cat << \EOF > conftest.java 15316 cat << \EOF > conftest.java
15189// #line 15189 "configure" 15317// #line 15317 "configure"
15190import edu.tum.cs.commons.logging.*; 15318import edu.tum.cs.commons.logging.*;
15191 15319
15192public class conftest { 15320public class conftest {
@@ -15293,7 +15421,7 @@ $as_echo_n "checking simulink... " >&6; }
15293 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 15421 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
15294 15422
15295 cat << \EOF > conftest.java 15423 cat << \EOF > conftest.java
15296// #line 15296 "configure" 15424// #line 15424 "configure"
15297import edu.tum.cs.simulink.model.*; 15425import edu.tum.cs.simulink.model.*;
15298 15426
15299public class conftest { 15427public class conftest {
@@ -15400,7 +15528,7 @@ $as_echo_n "checking cup-runtime... " >&6; }
15400 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 15528 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
15401 15529
15402 cat << \EOF > conftest.java 15530 cat << \EOF > conftest.java
15403// #line 15403 "configure" 15531// #line 15531 "configure"
15404import java_cup.runtime.*; 15532import java_cup.runtime.*;
15405 15533
15406public class conftest { 15534public class conftest {
@@ -19420,7 +19548,7 @@ $as_echo_n "checking jhdf5... " >&6; }
19420 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 19548 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
19421 19549
19422 cat << \EOF > conftest.java 19550 cat << \EOF > conftest.java
19423// #line 19423 "configure" 19551// #line 19551 "configure"
19424import ncsa.hdf.hdf5lib.HDF5Constants; 19552import ncsa.hdf.hdf5lib.HDF5Constants;
19425 19553
19426public class conftest { 19554public class conftest {
@@ -19569,7 +19697,7 @@ $as_echo_n "checking minimal version (1.8.4) of hdf5... " >&6; }
19569 if test "x" == "x"; then 19697 if test "x" == "x"; then
19570 19698
19571 cat << \EOF > conftest.java 19699 cat << \EOF > conftest.java
19572// #line 19572 "configure" 19700// #line 19700 "configure"
19573import ncsa.hdf.hdf5lib.H5; 19701import ncsa.hdf.hdf5lib.H5;
19574 19702
19575public class conftest { 19703public class conftest {
@@ -19624,7 +19752,7 @@ EOF
19624 else 19752 else
19625 19753
19626 cat << \EOF > conftest.java 19754 cat << \EOF > conftest.java
19627// #line 19627 "configure" 19755// #line 19755 "configure"
19628import ncsa.hdf.hdf5lib.H5; 19756import ncsa.hdf.hdf5lib.H5;
19629 19757
19630public class conftest { 19758public class conftest {
@@ -24193,7 +24321,7 @@ CPPFLAGS="$CPPFLAGS -I$CHK_TCL_INCLUDE_PATH"
24193{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if tcl is version $CHK_TCL_MAJOR.$CHK_TCL_MINOR or later" >&5 24321{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if tcl is version $CHK_TCL_MAJOR.$CHK_TCL_MINOR or later" >&5
24194$as_echo_n "checking if tcl is version $CHK_TCL_MAJOR.$CHK_TCL_MINOR or later... " >&6; } 24322$as_echo_n "checking if tcl is version $CHK_TCL_MAJOR.$CHK_TCL_MINOR or later... " >&6; }
24195cat > conftest.$ac_ext <<EOF 24323cat > conftest.$ac_ext <<EOF
24196#line 24196 "configure" 24324#line 24324 "configure"
24197#include "confdefs.h" 24325#include "confdefs.h"
24198 24326
24199#include "$CHK_TCL_INCLUDE_PATH/$CHK_TCL_INC_NAME" 24327#include "$CHK_TCL_INCLUDE_PATH/$CHK_TCL_INC_NAME"
@@ -24503,7 +24631,7 @@ CPPFLAGS="$CPPFLAGS $TCL_INC_PATH -I$CHK_TK_INCLUDE_PATH $X_CFLAGS"
24503$as_echo_n "checking if tk is version $CHK_TK_MAJOR.$CHK_TK_MINOR or later... " >&6; } 24631$as_echo_n "checking if tk is version $CHK_TK_MAJOR.$CHK_TK_MINOR or later... " >&6; }
24504 24632
24505cat > conftest.$ac_ext <<EOF 24633cat > conftest.$ac_ext <<EOF
24506#line 24506 "configure" 24634#line 24634 "configure"
24507#include "confdefs.h" 24635#include "confdefs.h"
24508 24636
24509#include "$CHK_TK_INCLUDE_PATH/$CHK_TK_INC_NAME" 24637#include "$CHK_TK_INCLUDE_PATH/$CHK_TK_INC_NAME"
@@ -25084,7 +25212,7 @@ $as_echo_n "checking saxon... " >&6; }
25084 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 25212 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
25085 25213
25086 cat << \EOF > conftest.java 25214 cat << \EOF > conftest.java
25087// #line 25087 "configure" 25215// #line 25215 "configure"
25088import com.icl.saxon.Loader; 25216import com.icl.saxon.Loader;
25089 25217
25090public class conftest { 25218public class conftest {
@@ -25191,7 +25319,7 @@ $as_echo_n "checking jlatexmath-fop... " >&6; }
25191 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 25319 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
25192 25320
25193 cat << \EOF > conftest.java 25321 cat << \EOF > conftest.java
25194// #line 25194 "configure" 25322// #line 25322 "configure"
25195import org.scilab.forge.jlatexmath.fop.JLaTeXMathObj; 25323import org.scilab.forge.jlatexmath.fop.JLaTeXMathObj;
25196 25324
25197public class conftest { 25325public class conftest {
@@ -31492,7 +31620,7 @@ else
31492 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 31620 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
31493 lt_status=$lt_dlunknown 31621 lt_status=$lt_dlunknown
31494 cat > conftest.$ac_ext <<_LT_EOF 31622 cat > conftest.$ac_ext <<_LT_EOF
31495#line 31495 "configure" 31623#line 31623 "configure"
31496#include "confdefs.h" 31624#include "confdefs.h"
31497 31625
31498#if HAVE_DLFCN_H 31626#if HAVE_DLFCN_H
@@ -31598,7 +31726,7 @@ else
31598 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 31726 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
31599 lt_status=$lt_dlunknown 31727 lt_status=$lt_dlunknown
31600 cat > conftest.$ac_ext <<_LT_EOF 31728 cat > conftest.$ac_ext <<_LT_EOF
31601#line 31601 "configure" 31729#line 31729 "configure"
31602#include "confdefs.h" 31730#include "confdefs.h"
31603 31731
31604#if HAVE_DLFCN_H 31732#if HAVE_DLFCN_H
@@ -37802,6 +37930,10 @@ if test -z "${IS_MIPS_SGI_IRIX_TRUE}" && test -z "${IS_MIPS_SGI_IRIX_FALSE}"; th
37802 as_fn_error $? "conditional \"IS_MIPS_SGI_IRIX\" was never defined. 37930 as_fn_error $? "conditional \"IS_MIPS_SGI_IRIX\" was never defined.
37803Usually this means the macro was only invoked conditionally." "$LINENO" 5 37931Usually this means the macro was only invoked conditionally." "$LINENO" 5
37804fi 37932fi
37933if test -z "${CODE_COVERAGE_TRUE}" && test -z "${CODE_COVERAGE_FALSE}"; then
37934 as_fn_error $? "conditional \"CODE_COVERAGE\" was never defined.
37935Usually this means the macro was only invoked conditionally." "$LINENO" 5
37936fi
37805if test -z "${IS_64_BITS_CPU_TRUE}" && test -z "${IS_64_BITS_CPU_FALSE}"; then 37937if test -z "${IS_64_BITS_CPU_TRUE}" && test -z "${IS_64_BITS_CPU_FALSE}"; then
37806 as_fn_error $? "conditional \"IS_64_BITS_CPU\" was never defined. 37938 as_fn_error $? "conditional \"IS_64_BITS_CPU\" was never defined.
37807Usually this means the macro was only invoked conditionally." "$LINENO" 5 37939Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -40932,6 +41064,15 @@ fi
40932fi 41064fi
40933 41065
40934echo "" 41066echo ""
41067if test "$enable_code_coverage" = yes; then
41068 echo "Code coverage configuration:"
41069 echo " LCOV .............. = $LCOV"
41070 echo " GENHTML ........... = $GENHTML"
41071else
41072 echo "Not using code coverage"
41073fi
41074
41075echo ""
40935if test $OPENMP_ENABLE = yes; then 41076if test $OPENMP_ENABLE = yes; then
40936 echo "OpenMP Configuration:" 41077 echo "OpenMP Configuration:"
40937 echo "OpenMP CFLAGS ...... = $OPENMP_CFLAGS" 41078 echo "OpenMP CFLAGS ...... = $OPENMP_CFLAGS"
diff --git a/scilab/configure.ac b/scilab/configure.ac
index 87fa550..2ed08e3 100644
--- a/scilab/configure.ac
+++ b/scilab/configure.ac
@@ -96,6 +96,9 @@ AC_ARG_ENABLE(debug-fortran,
96AC_ARG_ENABLE(debug-linker, 96AC_ARG_ENABLE(debug-linker,
97 AC_HELP_STRING([--enable-debug-linker],[Print warning messages from the linker (ld)])) 97 AC_HELP_STRING([--enable-debug-linker],[Print warning messages from the linker (ld)]))
98 98
99AC_ARG_ENABLE(code-coverage,
100 AC_HELP_STRING([--enable-code-coverage],[Enable code coverage]))
101
99AC_ARG_ENABLE(stopOnWarning, 102AC_ARG_ENABLE(stopOnWarning,
100 AC_HELP_STRING([--enable-stop-on-warning],[Stop the compilation on the first warning found in the C/C++ code])) 103 AC_HELP_STRING([--enable-stop-on-warning],[Stop the compilation on the first warning found in the C/C++ code]))
101 104
@@ -355,10 +358,16 @@ fi
355 358
356if test -n "$F77"; then 359if test -n "$F77"; then
357dnl @TODO : Maybe we should check that it is actually gfortran 360dnl @TODO : Maybe we should check that it is actually gfortran
361
362 # enable the code coverage
363 if test "$enable_code_coverage" = yes; then
364 FFLAGS="$FFLAGS -fprofile-arcs -ftest-coverage"
365 fi
366
358 if test "$enable_debug_fortran" = yes; then 367 if test "$enable_debug_fortran" = yes; then
359 # -D_FORTIFY_SOURCE=2 368 # -D_FORTIFY_SOURCE=2
360 AC_LANG_PUSH([Fortran 77]) 369 AC_LANG_PUSH([Fortran 77])
361 for flag in -g -Wall -Wimplicit -Wsurprising ; do 370 for flag in -g -Wall -Wsurprising; do
362 case " ${FFLAGS} " in 371 case " ${FFLAGS} " in
363 *\ ${flag}\ *) 372 *\ ${flag}\ *)
364 # flag is already present 373 # flag is already present
@@ -470,6 +479,12 @@ fi
470case "$CXX" in 479case "$CXX" in
471 g++-* | g++ | ccache*g++ | ccache*g++-* ) 480 g++-* | g++ | ccache*g++ | ccache*g++-* )
472 ## With GNU C++ Compiler 481 ## With GNU C++ Compiler
482
483 # enable the code coverage
484 if test "$enable_code_coverage" = yes; then
485 CPPFLAGS="$CPPFLAGS -fprofile-arcs -ftest-coverage"
486 fi
487
473 if test "$enable_debug_CXX" = yes; then 488 if test "$enable_debug_CXX" = yes; then
474 CPPFLAGS="$CPPFLAGS -pipe -Wshadow -Wpointer-arith -Wcast-align -Wreturn-type -Wswitch -Wtrigraphs -Wcomment -W -Wchar-subscripts -Wformat -Wparentheses -Wsign-compare -Wwrite-strings -Wunused -Wno-strict-aliasing -Wextra -Wall -g3" 489 CPPFLAGS="$CPPFLAGS -pipe -Wshadow -Wpointer-arith -Wcast-align -Wreturn-type -Wswitch -Wtrigraphs -Wcomment -W -Wchar-subscripts -Wformat -Wparentheses -Wsign-compare -Wwrite-strings -Wunused -Wno-strict-aliasing -Wextra -Wall -g3"
475 case "$host" in 490 case "$host" in
@@ -502,6 +517,12 @@ esac
502case "$CC" in 517case "$CC" in
503 gcc-* | gcc | ccache*gcc | ccache*gcc-* ) 518 gcc-* | gcc | ccache*gcc | ccache*gcc-* )
504 ## With GNU Compiler 519 ## With GNU Compiler
520
521 # enable the code coverage
522 if test "$enable_code_coverage" = yes; then
523 CFLAGS="$CFLAGS -fprofile-arcs -ftest-coverage"
524 fi
525
505 if test "$enable_debug_C" = yes; then 526 if test "$enable_debug_C" = yes; then
506 CFLAGS="$CFLAGS -pipe -Wformat -Wshadow -Wfloat-equal -Wpointer-arith -Wcast-align -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes -Wmissing-noreturn -Wendif-labels -Wpointer-arith -Wbad-function-cast -Wcast-qual -Wwrite-strings -Winline -Wredundant-decls -Wall -Wchar-subscripts -Wextra -Wuninitialized -Wno-format-y2k -Wmissing-format-attribute -Wno-missing-field-initializers -Wno-strict-aliasing -Wold-style-definition -g3" 527 CFLAGS="$CFLAGS -pipe -Wformat -Wshadow -Wfloat-equal -Wpointer-arith -Wcast-align -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes -Wmissing-noreturn -Wendif-labels -Wpointer-arith -Wbad-function-cast -Wcast-qual -Wwrite-strings -Winline -Wredundant-decls -Wall -Wchar-subscripts -Wextra -Wuninitialized -Wno-format-y2k -Wmissing-format-attribute -Wno-missing-field-initializers -Wno-strict-aliasing -Wold-style-definition -g3"
507 # used to be -O 528 # used to be -O
@@ -624,6 +645,19 @@ esac
624;; # end of not a gcc compiler 645;; # end of not a gcc compiler
625esac 646esac
626 647
648# enable the code coverage
649if test "$enable_code_coverage" = yes; then
650 AC_PATH_PROG(LCOV, lcov)
651 if test -z "$LCOV" ; then
652 AC_MSG_ERROR([Cannot find lcov. Please install it (package lcov under Debian) or remove the option --enable-code-coverage])
653 fi
654 AC_PATH_PROG(GENHTML, genhtml)
655 if test -z "$GENHTML" ; then
656 AC_MSG_ERROR([Cannot find genhtml. Please install it (package lcov under Debian) or remove the option --enable-code-coverage])
657 fi
658 LDFLAGS="$LDFLAGS -coverage"
659fi
660AM_CONDITIONAL(CODE_COVERAGE, test "$enable_code_coverage" = yes)
627 661
628# flag for possible compilations in configure 662# flag for possible compilations in configure
629CFLAGS="$CFLAGS "'-I$(top_srcdir)/modules/core/includes/ -I$(top_srcdir)/libs/MALLOC/includes/ -I$(top_srcdir)/modules/localization/includes/' 663CFLAGS="$CFLAGS "'-I$(top_srcdir)/modules/core/includes/ -I$(top_srcdir)/libs/MALLOC/includes/ -I$(top_srcdir)/modules/localization/includes/'
@@ -1875,6 +1909,15 @@ fi
1875fi 1909fi
1876 1910
1877echo "" 1911echo ""
1912if test "$enable_code_coverage" = yes; then
1913 echo "Code coverage configuration:"
1914 echo " LCOV .............. = $LCOV"
1915 echo " GENHTML ........... = $GENHTML"
1916else
1917 echo "Not using code coverage"
1918fi
1919
1920echo ""
1878if test $OPENMP_ENABLE = yes; then 1921if test $OPENMP_ENABLE = yes; then
1879 echo "OpenMP Configuration:" 1922 echo "OpenMP Configuration:"
1880 echo "OpenMP CFLAGS ...... = $OPENMP_CFLAGS" 1923 echo "OpenMP CFLAGS ...... = $OPENMP_CFLAGS"
diff --git a/scilab/contrib/Makefile.in b/scilab/contrib/Makefile.in
index 930564c..9459645 100644
--- a/scilab/contrib/Makefile.in
+++ b/scilab/contrib/Makefile.in
@@ -115,6 +115,7 @@ FGREP = @FGREP@
115FLEXDOCK = @FLEXDOCK@ 115FLEXDOCK = @FLEXDOCK@
116FLIBS = @FLIBS@ 116FLIBS = @FLIBS@
117FOP = @FOP@ 117FOP = @FOP@
118GENHTML = @GENHTML@
118GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ 119GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
119GIWS_BIN = @GIWS_BIN@ 120GIWS_BIN = @GIWS_BIN@
120GLUEGEN_RT = @GLUEGEN_RT@ 121GLUEGEN_RT = @GLUEGEN_RT@
@@ -159,6 +160,7 @@ JROSETTA_API = @JROSETTA_API@
159JROSETTA_ENGINE = @JROSETTA_ENGINE@ 160JROSETTA_ENGINE = @JROSETTA_ENGINE@
160JUNIT = @JUNIT@ 161JUNIT = @JUNIT@
161LAPACK_LIBS = @LAPACK_LIBS@ 162LAPACK_LIBS = @LAPACK_LIBS@
163LCOV = @LCOV@
162LD = @LD@ 164LD = @LD@
163LDFLAGS = @LDFLAGS@ 165LDFLAGS = @LDFLAGS@
164LIBICONV = @LIBICONV@ 166LIBICONV = @LIBICONV@
diff --git a/scilab/libs/GetWindowsVersion/GetWindowsVersion.rc b/scilab/libs/GetWindowsVersion/GetWindowsVersion.rc
index fee4959..864b775 100644
--- a/scilab/libs/GetWindowsVersion/GetWindowsVersion.rc
+++ b/scilab/libs/GetWindowsVersion/GetWindowsVersion.rc
@@ -48,8 +48,8 @@ END
48// 48//
49 49
50VS_VERSION_INFO VERSIONINFO 50VS_VERSION_INFO VERSIONINFO
51 FILEVERSION 5,3,0,0 51 FILEVERSION 5,3,1,0
52 PRODUCTVERSION 5,3,0,0 52 PRODUCTVERSION 5,3,1,0
53 FILEFLAGSMASK 0x17L 53 FILEFLAGSMASK 0x17L
54#ifdef _DEBUG 54#ifdef _DEBUG
55 FILEFLAGS 0x1L 55 FILEFLAGS 0x1L
@@ -65,12 +65,12 @@ BEGIN
65 BLOCK "040c04b0" 65 BLOCK "040c04b0"
66 BEGIN 66 BEGIN
67 VALUE "FileDescription", "GetWindowsVersion library for Scilab 5.x" 67 VALUE "FileDescription", "GetWindowsVersion library for Scilab 5.x"
68 VALUE "FileVersion", "5, 3, 0, 0" 68 VALUE "FileVersion", "5, 3, 1, 0"
69 VALUE "InternalName", "GetWindowsVersion library for Scilab 5.x" 69 VALUE "InternalName", "GetWindowsVersion library for Scilab 5.x"
70 VALUE "LegalCopyright", "Copyright (C) 2010" 70 VALUE "LegalCopyright", "Copyright (C) 2011"
71 VALUE "OriginalFilename", "GetWindowsVersion.dll" 71 VALUE "OriginalFilename", "GetWindowsVersion.dll"
72 VALUE "ProductName", "GetWindowsVersion library for Scilab 5.x" 72 VALUE "ProductName", "GetWindowsVersion library for Scilab 5.x"
73 VALUE "ProductVersion", "5, 3, 0, 0" 73 VALUE "ProductVersion", "5, 3, 1, 0"
74 END 74 END
75 END 75 END
76 BLOCK "VarFileInfo" 76 BLOCK "VarFileInfo"
diff --git a/scilab/libs/LibScilab/libscilab.rc b/scilab/libs/LibScilab/libscilab.rc
index 930f66b..0a89a1d 100644
--- a/scilab/libs/LibScilab/libscilab.rc
+++ b/scilab/libs/LibScilab/libscilab.rc
@@ -49,8 +49,8 @@ END
49// 49//
50 50
51VS_VERSION_INFO VERSIONINFO 51VS_VERSION_INFO VERSIONINFO
52 FILEVERSION 5,3,0,0 52 FILEVERSION 5,3,1,0
53 PRODUCTVERSION 5,3,0,0 53 PRODUCTVERSION 5,3,1,0
54 FILEFLAGSMASK 0x17L 54 FILEFLAGSMASK 0x17L
55#ifdef _DEBUG 55#ifdef _DEBUG
56 FILEFLAGS 0x1L 56 FILEFLAGS 0x1L
@@ -66,12 +66,12 @@ BEGIN
66 BLOCK "040c04b0" 66 BLOCK "040c04b0"
67 BEGIN 67 BEGIN
68 VALUE "FileDescription", "Scilab library" 68 VALUE "FileDescription", "Scilab library"
69 VALUE "FileVersion", "5, 3, 0, 0" 69 VALUE "FileVersion", "5, 3, 1, 0"
70 VALUE "InternalName", "Scilab library" 70 VALUE "InternalName", "Scilab library"
71 VALUE "LegalCopyright", "Copyright (C) 2010" 71 VALUE "LegalCopyright", "Copyright (C) 2011"
72 VALUE "OriginalFilename", "libscilab.dll" 72 VALUE "OriginalFilename", "libscilab.dll"
73 VALUE "ProductName", "Scilab library (Intel Fortran)" 73 VALUE "ProductName", "Scilab library (Intel Fortran)"
74 VALUE "ProductVersion", "5, 3, 0, 0" 74 VALUE "ProductVersion", "5, 3, 1, 0"
75 END 75 END
76 END 76 END