summaryrefslogtreecommitdiffstats
path: root/scilab/modules/intersci
diff options
context:
space:
mode:
authorClément DAVID <clement.david@scilab.org>2011-03-07 10:25:41 +0100
committerClément DAVID <clement.david@scilab.org>2011-03-07 10:37:10 +0100
commit1de9fa2f978a5820f818b48d9d500af204ec9da8 (patch)
tree403a34f945586a452106e0d83784584440feb6da /scilab/modules/intersci
parent2835e08091d79405f8a4ef74787b5aace3e935ab (diff)
parent77dd731c7106bcb6043a597c9bade2a12c11d1fe (diff)
downloadscilab-1de9fa2f978a5820f818b48d9d500af204ec9da8.zip
scilab-1de9fa2f978a5820f818b48d9d500af204ec9da8.tar.gz
Merge remote-tracking branch 'origin/5.3' into simulinkimport
Conflicts: scilab/Makefile.in scilab/aclocal.m4 scilab/build.incl.xml scilab/configure scilab/contrib/Makefile.in scilab/libs/MALLOC/Makefile.in scilab/libs/Makefile.in scilab/libs/doublylinkedlist/Makefile.in scilab/libs/dynamiclibrary/Makefile.in scilab/libs/hashtable/Makefile.in scilab/libs/libst/Makefile.in scilab/modules/Makefile.in scilab/modules/action_binding/Makefile.in scilab/modules/api_scilab/Makefile.in scilab/modules/arnoldi/Makefile.in scilab/modules/atoms/Makefile.in scilab/modules/boolean/Makefile.in scilab/modules/cacsd/Makefile.in scilab/modules/call_scilab/Makefile.in scilab/modules/commons/Makefile.in scilab/modules/compatibility_functions/Makefile.in scilab/modules/completion/Makefile.in scilab/modules/console/Makefile.in scilab/modules/core/Makefile.in scilab/modules/data_structures/Makefile.in scilab/modules/demo_tools/Makefile.in scilab/modules/development_tools/Makefile.in scilab/modules/development_tools/src/fake/Makefile.in scilab/modules/differential_equations/Makefile.in scilab/modules/double/Makefile.in scilab/modules/dynamic_link/Makefile.in scilab/modules/elementary_functions/Makefile.in scilab/modules/fftw/Makefile.in scilab/modules/fileio/Makefile.in scilab/modules/functions/Makefile.in scilab/modules/genetic_algorithms/Makefile.in scilab/modules/graph/Makefile.in scilab/modules/graphic_export/Makefile.in scilab/modules/graphics/Makefile.in scilab/modules/gui/Makefile.in scilab/modules/hdf5/Makefile.in scilab/modules/helptools/Makefile.in scilab/modules/history_browser/Makefile.in scilab/modules/history_manager/Makefile.in scilab/modules/integer/Makefile.in scilab/modules/interpolation/Makefile.in scilab/modules/intersci/Makefile.in scilab/modules/io/Makefile.in scilab/modules/javasci/Makefile.in scilab/modules/jvm/Makefile.in scilab/modules/linear_algebra/Makefile.in scilab/modules/localization/Makefile.in scilab/modules/m2sci/Makefile.in scilab/modules/maple2scilab/Makefile.in scilab/modules/matio/Makefile.in scilab/modules/mexlib/Makefile.in scilab/modules/modules_manager/Makefile.in scilab/modules/optimization/Makefile.in scilab/modules/output_stream/Makefile.in scilab/modules/overloading/Makefile.in scilab/modules/parallel/Makefile.in scilab/modules/parameters/Makefile.in scilab/modules/polynomials/Makefile.in scilab/modules/pvm/Makefile.in scilab/modules/randlib/Makefile.in scilab/modules/renderer/Makefile.in scilab/modules/scicos/Makefile.in scilab/modules/scicos_blocks/Makefile.in scilab/modules/scinotes/Makefile.in scilab/modules/shell/Makefile.in scilab/modules/signal_processing/Makefile.in scilab/modules/simulated_annealing/Makefile.in scilab/modules/sound/Makefile.in scilab/modules/sparse/Makefile.in scilab/modules/special_functions/Makefile.in scilab/modules/spreadsheet/Makefile.in scilab/modules/statistics/Makefile.in scilab/modules/string/Makefile.in scilab/modules/symbolic/Makefile.in scilab/modules/tclsci/Makefile.in scilab/modules/texmacs/Makefile.in scilab/modules/time/Makefile.in scilab/modules/types/Makefile.in scilab/modules/ui_data/Makefile.in scilab/modules/umfpack/Makefile.in scilab/modules/windows_tools/Makefile.in scilab/modules/xcos/Makefile.in Change-Id: I7fc05b70adca908a233ce3c191516df161cebf1e
Diffstat (limited to 'scilab/modules/intersci')
-rw-r--r--scilab/modules/intersci/Makefile.am4
-rw-r--r--scilab/modules/intersci/Makefile.in43
-rw-r--r--scilab/modules/intersci/changelog.txt1
-rw-r--r--scilab/modules/intersci/help/en_US/intersci.xml4
-rwxr-xr-xscilab/modules/intersci/help/ja_JP/addchapter.sce11
-rw-r--r--scilab/modules/intersci/intersci.iss2
-rw-r--r--scilab/modules/intersci/locales/fr_FR.po (renamed from scilab/modules/intersci/locales/fr_FR/intersci.po)0
-rw-r--r--scilab/modules/intersci/locales/intersci.pot (renamed from scilab/modules/intersci/locales/en_US/intersci.pot)0
-rw-r--r--scilab/modules/intersci/readme.txt1
-rw-r--r--scilab/modules/intersci/src/exe/crerhs.c2
10 files changed, 41 insertions, 27 deletions
diff --git a/scilab/modules/intersci/Makefile.am b/scilab/modules/intersci/Makefile.am
index 311997c..cacaeb5 100644
--- a/scilab/modules/intersci/Makefile.am
+++ b/scilab/modules/intersci/Makefile.am
@@ -26,7 +26,7 @@ libsciintersci_la_include_HEADERS = includes/libinter.h
26 26
27pkglib_LTLIBRARIES = libsciintersci.la 27pkglib_LTLIBRARIES = libsciintersci.la
28 28
29libsciintersci_la_LDFLAGS = -version-info $(SCILAB_LIBRARY_VERSION) 29libsciintersci_la_LDFLAGS = -version-number $(SCILAB_LIBRARY_VERSION)
30 30
31bin_PROGRAMS = intersci 31bin_PROGRAMS = intersci
32intersci_SOURCES = $(INTERSCI_EXE_C_SOURCES) 32intersci_SOURCES = $(INTERSCI_EXE_C_SOURCES)
@@ -53,7 +53,7 @@ modulename=intersci
53 53
54#### intersci : Conf files #### 54#### intersci : Conf files ####
55libsciintersci_la_rootdir = $(mydatadir) 55libsciintersci_la_rootdir = $(mydatadir)
56libsciintersci_la_root_DATA = changelog.txt license.txt readme.txt version.xml 56libsciintersci_la_root_DATA = license.txt version.xml
57 57
58 58
59#### intersci : init scripts #### 59#### intersci : init scripts ####
diff --git a/scilab/modules/intersci/Makefile.in b/scilab/modules/intersci/Makefile.in
index 33f9d6d..4f54491 100644
--- a/scilab/modules/intersci/Makefile.in
+++ b/scilab/modules/intersci/Makefile.in
@@ -63,9 +63,6 @@ DIST_COMMON = $(libsciintersci_la_include_HEADERS) \
63 $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ 63 $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
64 $(top_srcdir)/Makefile.incl.am 64 $(top_srcdir)/Makefile.incl.am
65@NEED_JAVA_TRUE@am__append_1 = java 65@NEED_JAVA_TRUE@am__append_1 = java
66
67# With --enable-compilation-tests, launch java unitary tests
68@COMPILATION_TESTS_TRUE@am__append_2 = test
69subdir = modules/intersci 66subdir = modules/intersci
70ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 67ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
71am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \ 68am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \
@@ -73,16 +70,16 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \
73 $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \ 70 $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
74 $(top_srcdir)/m4/intel_compiler.m4 \ 71 $(top_srcdir)/m4/intel_compiler.m4 \
75 $(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \ 72 $(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
76 $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/libsmath.m4 \ 73 $(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lib-ld.m4 \
77 $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libxml2.m4 \ 74 $(top_srcdir)/m4/libsmath.m4 $(top_srcdir)/m4/libtool.m4 \
78 $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ 75 $(top_srcdir)/m4/libxml2.m4 $(top_srcdir)/m4/ltoptions.m4 \
79 $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ 76 $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
80 $(top_srcdir)/m4/macosx.m4 $(top_srcdir)/m4/ocaml.m4 \ 77 $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/macosx.m4 \
81 $(top_srcdir)/m4/pcre.m4 $(top_srcdir)/m4/pkg.m4 \ 78 $(top_srcdir)/m4/ocaml.m4 $(top_srcdir)/m4/pcre.m4 \
82 $(top_srcdir)/m4/pvm.m4 $(top_srcdir)/m4/relocatable.m4 \ 79 $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/pvm.m4 \
83 $(top_srcdir)/m4/swig.m4 $(top_srcdir)/m4/symlinks.m4 \ 80 $(top_srcdir)/m4/relocatable.m4 $(top_srcdir)/m4/swig.m4 \
84 $(top_srcdir)/m4/tcltk.m4 $(top_srcdir)/m4/umfpack.m4 \ 81 $(top_srcdir)/m4/symlinks.m4 $(top_srcdir)/m4/tcltk.m4 \
85 $(top_srcdir)/configure.ac 82 $(top_srcdir)/m4/umfpack.m4 $(top_srcdir)/configure.ac
86am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ 83am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
87 $(ACLOCAL_M4) 84 $(ACLOCAL_M4)
88mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs 85mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
@@ -225,11 +222,11 @@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
225JAR = @JAR@ 222JAR = @JAR@
226JAVA = @JAVA@ 223JAVA = @JAVA@
227JAVAC = @JAVAC@ 224JAVAC = @JAVAC@
225JAVAC_DEBUG = @JAVAC_DEBUG@
228JAVADOC = @JAVADOC@ 226JAVADOC = @JAVADOC@
229JAVAH = @JAVAH@ 227JAVAH = @JAVAH@
230JAVASCI_ENABLE = @JAVASCI_ENABLE@ 228JAVASCI_ENABLE = @JAVASCI_ENABLE@
231JAVA_CUP = @JAVA_CUP@ 229JAVA_CUP = @JAVA_CUP@
232JAVA_DEBUG_OPTIONS = @JAVA_DEBUG_OPTIONS@
233JAVA_ENABLE = @JAVA_ENABLE@ 230JAVA_ENABLE = @JAVA_ENABLE@
234JAVA_G = @JAVA_G@ 231JAVA_G = @JAVA_G@
235JAVA_HOME = @JAVA_HOME@ 232JAVA_HOME = @JAVA_HOME@
@@ -313,8 +310,11 @@ RANLIB = @RANLIB@
313RELOCATABLE = @RELOCATABLE@ 310RELOCATABLE = @RELOCATABLE@
314RT_LIB = @RT_LIB@ 311RT_LIB = @RT_LIB@
315SAXON = @SAXON@ 312SAXON = @SAXON@
316SCICOS_ENABLE = @SCICOS_ENABLE@ 313SCILAB_BINARY_VERSION = @SCILAB_BINARY_VERSION@
317SCILAB_LIBRARY_VERSION = @SCILAB_LIBRARY_VERSION@ 314SCILAB_LIBRARY_VERSION = @SCILAB_LIBRARY_VERSION@
315SCILAB_VERSION_MAINTENANCE = @SCILAB_VERSION_MAINTENANCE@
316SCILAB_VERSION_MAJOR = @SCILAB_VERSION_MAJOR@
317SCILAB_VERSION_MINOR = @SCILAB_VERSION_MINOR@
318SED = @SED@ 318SED = @SED@
319SET_MAKE = @SET_MAKE@ 319SET_MAKE = @SET_MAKE@
320SET_RELOCATABLE = @SET_RELOCATABLE@ 320SET_RELOCATABLE = @SET_RELOCATABLE@
@@ -336,6 +336,7 @@ USE_NLS = @USE_NLS@
336VERSION = @VERSION@ 336VERSION = @VERSION@
337WITH_OCAML = @WITH_OCAML@ 337WITH_OCAML = @WITH_OCAML@
338WITH_TKSCI = @WITH_TKSCI@ 338WITH_TKSCI = @WITH_TKSCI@
339XCOS_ENABLE = @XCOS_ENABLE@
339XGETTEXT = @XGETTEXT@ 340XGETTEXT = @XGETTEXT@
340XGETTEXT_015 = @XGETTEXT_015@ 341XGETTEXT_015 = @XGETTEXT_015@
341XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ 342XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
@@ -424,7 +425,7 @@ src/exe/check.c
424libsciintersci_la_includedir = $(pkgincludedir) 425libsciintersci_la_includedir = $(pkgincludedir)
425libsciintersci_la_include_HEADERS = includes/libinter.h 426libsciintersci_la_include_HEADERS = includes/libinter.h
426pkglib_LTLIBRARIES = libsciintersci.la 427pkglib_LTLIBRARIES = libsciintersci.la
427libsciintersci_la_LDFLAGS = -version-info $(SCILAB_LIBRARY_VERSION) 428libsciintersci_la_LDFLAGS = -version-number $(SCILAB_LIBRARY_VERSION)
428intersci_SOURCES = $(INTERSCI_EXE_C_SOURCES) 429intersci_SOURCES = $(INTERSCI_EXE_C_SOURCES)
429libsciintersci_la_SOURCES = $(INTERSCI_LIB_C_SOURCES) 430libsciintersci_la_SOURCES = $(INTERSCI_LIB_C_SOURCES)
430libsciintersci_la_CFLAGS = -I$(top_srcdir)/libs/MALLOC/includes/ \ 431libsciintersci_la_CFLAGS = -I$(top_srcdir)/libs/MALLOC/includes/ \
@@ -447,7 +448,7 @@ modulename = intersci
447 448
448#### intersci : Conf files #### 449#### intersci : Conf files ####
449libsciintersci_la_rootdir = $(mydatadir) 450libsciintersci_la_rootdir = $(mydatadir)
450libsciintersci_la_root_DATA = changelog.txt license.txt readme.txt version.xml 451libsciintersci_la_root_DATA = license.txt version.xml
451 452
452#### intersci : init scripts #### 453#### intersci : init scripts ####
453libsciintersci_la_etcdir = $(mydatadir)/etc 454libsciintersci_la_etcdir = $(mydatadir)/etc
@@ -464,7 +465,7 @@ SPLINT_OPTIONS = -weak -booltype BOOL
464#### the procedure will be the same with Microsoft Windows (C) 465#### the procedure will be the same with Microsoft Windows (C)
465#### and Linux/Unix 466#### and Linux/Unix
466####################################################################### 467#######################################################################
467TARGETS_ALL = $(am__append_1) $(am__append_2) 468TARGETS_ALL = $(am__append_1)
468 469
469################ MACROS ###################### 470################ MACROS ######################
470# Rule to build a macro 471# Rule to build a macro
@@ -1209,6 +1210,12 @@ all-local: $(TARGETS_ALL)
1209 fi ) 1210 fi )
1210 1211
1211install-html-local: 1212install-html-local:
1213
1214install-data-local-local:
1215# Mainly for javasci
1216 @if test -d $(srcdir)/javadoc; then \
1217 cp -R $(srcdir)/javadoc $(DESTDIR)/$(mydatadir)/; \
1218 fi
1212# If the user wants the help sources to be installed 1219# If the user wants the help sources to be installed
1213@INSTALL_HELP_XML_TRUE@ @echo "-------- Install of XML sources of help files --------"; \ 1220@INSTALL_HELP_XML_TRUE@ @echo "-------- Install of XML sources of help files --------"; \
1214@INSTALL_HELP_XML_TRUE@ for lang in $(ALL_LINGUAS); do \ 1221@INSTALL_HELP_XML_TRUE@ for lang in $(ALL_LINGUAS); do \
diff --git a/scilab/modules/intersci/changelog.txt b/scilab/modules/intersci/changelog.txt
deleted file mode 100644
index 1f7fb8e..0000000
--- a/scilab/modules/intersci/changelog.txt
+++ /dev/null
@@ -1 +0,0 @@
1changelog module \ No newline at end of file
diff --git a/scilab/modules/intersci/help/en_US/intersci.xml b/scilab/modules/intersci/help/en_US/intersci.xml
index e858b9b..5a9be97 100644
--- a/scilab/modules/intersci/help/en_US/intersci.xml
+++ b/scilab/modules/intersci/help/en_US/intersci.xml
@@ -39,8 +39,8 @@
39 <para>Refer to intersci documentation for more details.</para> 39 <para>Refer to intersci documentation for more details.</para>
40 <para>Note that this feature is obsolete and unsupported and will be replaced by a Scilab SWIG wrapper in an upcoming version.</para> 40 <para>Note that this feature is obsolete and unsupported and will be replaced by a Scilab SWIG wrapper in an upcoming version.</para>
41 </refsection> 41 </refsection>
42 <refsection> 42 <refsection role="see also">
43 <title>See Also</title> 43<title>See Also</title>
44 <simplelist type="inline"> 44 <simplelist type="inline">
45 <member> 45 <member>
46 <link linkend="fort">fort</link> 46 <link linkend="fort">fort</link>
diff --git a/scilab/modules/intersci/help/ja_JP/addchapter.sce b/scilab/modules/intersci/help/ja_JP/addchapter.sce
new file mode 100755
index 0000000..0601d20
--- /dev/null
+++ b/scilab/modules/intersci/help/ja_JP/addchapter.sce
@@ -0,0 +1,11 @@
1// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
2// Copyright (C) 2009 - DIGITEO
3//
4// This file must be used under the terms of the CeCILL.
5// This source file is licensed as described in the file COPYING, which
6// you should have received as part of this distribution. The terms
7// are also available at
8// http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
9
10add_help_chapter("Intersci",SCI+"/modules/intersci/help/ja_JP",%T);
11
diff --git a/scilab/modules/intersci/intersci.iss b/scilab/modules/intersci/intersci.iss
index 77ce495..58821e7 100644
--- a/scilab/modules/intersci/intersci.iss
+++ b/scilab/modules/intersci/intersci.iss
@@ -22,9 +22,7 @@ Source: bin\{#INTERSCI}.lib; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
22Source: bin\{#INTERSCI}.dll; DestDir: {app}\bin; Components: {#COMPN_SCILAB} 22Source: bin\{#INTERSCI}.dll; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
23; 23;
24Source: modules\{#INTERSCI}\VERSION.xml; DestDir: {app}\modules\{#INTERSCI}; Components: {#COMPN_INTERSCI} 24Source: modules\{#INTERSCI}\VERSION.xml; DestDir: {app}\modules\{#INTERSCI}; Components: {#COMPN_INTERSCI}
25Source: modules\{#INTERSCI}\readme.txt; DestDir: {app}\modules\{#INTERSCI}; Components: {#COMPN_INTERSCI}
26Source: modules\{#INTERSCI}\license.txt; DestDir: {app}\modules\{#INTERSCI}; Components: {#COMPN_INTERSCI} 25Source: modules\{#INTERSCI}\license.txt; DestDir: {app}\modules\{#INTERSCI}; Components: {#COMPN_INTERSCI}
27Source: modules\{#INTERSCI}\changelog.txt; DestDir: {app}\modules\{#INTERSCI}; Components: {#COMPN_INTERSCI}
28; 26;
29Source: modules\{#INTERSCI}\etc\{#INTERSCI}.quit; DestDir: {app}\modules\{#INTERSCI}\etc; Components: {#COMPN_INTERSCI} 27Source: modules\{#INTERSCI}\etc\{#INTERSCI}.quit; DestDir: {app}\modules\{#INTERSCI}\etc; Components: {#COMPN_INTERSCI}
30Source: modules\{#INTERSCI}\etc\{#INTERSCI}.start; DestDir: {app}\modules\{#INTERSCI}\etc; Components: {#COMPN_INTERSCI} 28Source: modules\{#INTERSCI}\etc\{#INTERSCI}.start; DestDir: {app}\modules\{#INTERSCI}\etc; Components: {#COMPN_INTERSCI}
diff --git a/scilab/modules/intersci/locales/fr_FR/intersci.po b/scilab/modules/intersci/locales/fr_FR.po
index e69de29..e69de29 100644
--- a/scilab/modules/intersci/locales/fr_FR/intersci.po
+++ b/scilab/modules/intersci/locales/fr_FR.po
diff --git a/scilab/modules/intersci/locales/en_US/intersci.pot b/scilab/modules/intersci/locales/intersci.pot
index d6d295b..d6d295b 100644
--- a/scilab/modules/intersci/locales/en_US/intersci.pot
+++ b/scilab/modules/intersci/locales/intersci.pot
diff --git a/scilab/modules/intersci/readme.txt b/scilab/modules/intersci/readme.txt
deleted file mode 100644
index 057a0b4..0000000
--- a/scilab/modules/intersci/readme.txt
+++ /dev/null
@@ -1 +0,0 @@
1readme.txt about module \ No newline at end of file
diff --git a/scilab/modules/intersci/src/exe/crerhs.c b/scilab/modules/intersci/src/exe/crerhs.c
index 8e80ee6..789f8ae 100644
--- a/scilab/modules/intersci/src/exe/crerhs.c
+++ b/scilab/modules/intersci/src/exe/crerhs.c
@@ -543,7 +543,7 @@ void GetDim(char *lstr,IVAR ivar)
543 char *s; 543 char *s;
544 s=Forname2Int(variables[ivar-1],0); 544 s=Forname2Int(variables[ivar-1],0);
545 if ( strncmp(s,"stk",3)==0 || strncmp(s,"istk",4)==0 545 if ( strncmp(s,"stk",3)==0 || strncmp(s,"istk",4)==0
546 || strncmp(s,"sstk",4)==0 || strncmp(s,"stk",3)==0 || 546 || strncmp(s,"sstk",4)==0 ||
547 strncmp(s,"cstk",4)==0 ) 547 strncmp(s,"cstk",4)==0 )
548 { 548 {
549 strcpy(lstr,s); 549 strcpy(lstr,s);