summaryrefslogtreecommitdiffstats
path: root/scilab/modules/compatibility_functions
diff options
context:
space:
mode:
authorPierre MARECHAL <pierre.marechal@scilab.org>2009-10-08 11:43:54 +0200
committerPierre MARECHAL <pierre.marechal@scilab.org>2009-10-08 11:43:54 +0200
commit065dba6a0d44c2111e57e3f2cfca0ec21b0a25cc (patch)
tree99240a3d0878eaf146282f82d0c46dd6477782d8 /scilab/modules/compatibility_functions
parent49be97c171c4e7281b53b0d1f5758cb330e3c844 (diff)
parente6bb34a2151dd4e126d51062e2ab389ecbb85439 (diff)
downloadscilab-065dba6a0d44c2111e57e3f2cfca0ec21b0a25cc.zip
scilab-065dba6a0d44c2111e57e3f2cfca0ec21b0a25cc.tar.gz
Merge commit 'origin/master' into Xcos
Conflicts: scilab/Version.incl scilab/configure scilab/modules/Makefile.in scilab/modules/core/includes/version.h
Diffstat (limited to 'scilab/modules/compatibility_functions')
-rw-r--r--scilab/modules/compatibility_functions/Makefile.in15
-rw-r--r--scilab/modules/compatibility_functions/help/en_US/mtlb_eig.xml39
-rw-r--r--scilab/modules/compatibility_functions/help/fr_FR/mtlb_eig.xml39
-rw-r--r--scilab/modules/compatibility_functions/macros/mtlb_eig.sci26
4 files changed, 10 insertions, 109 deletions
diff --git a/scilab/modules/compatibility_functions/Makefile.in b/scilab/modules/compatibility_functions/Makefile.in
index 62bf055..f8509ba 100644
--- a/scilab/modules/compatibility_functions/Makefile.in
+++ b/scilab/modules/compatibility_functions/Makefile.in
@@ -76,7 +76,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \
76 $(top_srcdir)/m4/umfpack.m4 $(top_srcdir)/configure.ac 76 $(top_srcdir)/m4/umfpack.m4 $(top_srcdir)/configure.ac
77am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ 77am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
78 $(ACLOCAL_M4) 78 $(ACLOCAL_M4)
79mkinstalldirs = $(install_sh) -d 79mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
80CONFIG_HEADER = $(top_builddir)/modules/core/includes/machine.h 80CONFIG_HEADER = $(top_builddir)/modules/core/includes/machine.h
81CONFIG_CLEAN_FILES = 81CONFIG_CLEAN_FILES =
82CONFIG_CLEAN_VPATH_FILES = 82CONFIG_CLEAN_VPATH_FILES =
@@ -113,6 +113,7 @@ ACLOCAL = @ACLOCAL@
113ALL_LINGUAS = @ALL_LINGUAS@ 113ALL_LINGUAS = @ALL_LINGUAS@
114AMTAR = @AMTAR@ 114AMTAR = @AMTAR@
115ANT = @ANT@ 115ANT = @ANT@
116ANTLR = @ANTLR@
116AR = @AR@ 117AR = @AR@
117AUTOCONF = @AUTOCONF@ 118AUTOCONF = @AUTOCONF@
118AUTOHEADER = @AUTOHEADER@ 119AUTOHEADER = @AUTOHEADER@
@@ -124,6 +125,8 @@ BLAS_LIBS = @BLAS_LIBS@
124CC = @CC@ 125CC = @CC@
125CCDEPMODE = @CCDEPMODE@ 126CCDEPMODE = @CCDEPMODE@
126CFLAGS = @CFLAGS@ 127CFLAGS = @CFLAGS@
128CHECKSTYLE = @CHECKSTYLE@
129COMMONS_BEANUTILS = @COMMONS_BEANUTILS@
127COMMONS_IO = @COMMONS_IO@ 130COMMONS_IO = @COMMONS_IO@
128COMMONS_LOGGING = @COMMONS_LOGGING@ 131COMMONS_LOGGING = @COMMONS_LOGGING@
129CPP = @CPP@ 132CPP = @CPP@
@@ -252,12 +255,12 @@ RT_LIB = @RT_LIB@
252SAXON = @SAXON@ 255SAXON = @SAXON@
253SCICOS_ENABLE = @SCICOS_ENABLE@ 256SCICOS_ENABLE = @SCICOS_ENABLE@
254SCILAB_LIBRARY_VERSION = @SCILAB_LIBRARY_VERSION@ 257SCILAB_LIBRARY_VERSION = @SCILAB_LIBRARY_VERSION@
255SCIPAD_ENABLE = @SCIPAD_ENABLE@
256SED = @SED@ 258SED = @SED@
257SET_MAKE = @SET_MAKE@ 259SET_MAKE = @SET_MAKE@
258SET_RELOCATABLE = @SET_RELOCATABLE@ 260SET_RELOCATABLE = @SET_RELOCATABLE@
259SHELL = @SHELL@ 261SHELL = @SHELL@
260SKINLF = @SKINLF@ 262SKINLF = @SKINLF@
263SPLINT = @SPLINT@
261STRIP = @STRIP@ 264STRIP = @STRIP@
262SWIG_BIN = @SWIG_BIN@ 265SWIG_BIN = @SWIG_BIN@
263SWIG_JAVA = @SWIG_JAVA@ 266SWIG_JAVA = @SWIG_JAVA@
@@ -659,10 +662,12 @@ check-local: $(top_builddir)/scilab-bin
659 export LANG=C;\ 662 export LANG=C;\
660 $(top_builddir)/bin/scilab -nwni -nb -e "$$COMMAND" 663 $(top_builddir)/bin/scilab -nwni -nb -e "$$COMMAND"
661check-code: 664check-code:
662 @if test -f build.xml; then \ 665 if test -f build.xml; then \
663 $(ANT) checkstyle; \ 666 $(ANT) checkstyle; \
664 fi;\ 667 fi
665 splint $(SPLINT_OPTIONS) -I$(top_srcdir)/modules/core/includes/ -I$(top_srcdir)/libs/MALLOC/includes/ -I$(top_srcdir)/modules/localization/includes/ $(INCLUDE_FLAGS) $(CHECK_SRC) 668 if test -x "$(SPLINT)"; then \
669 $(SPLINT) $(SPLINT_OPTIONS) -I$(top_srcdir)/modules/core/includes/ -I$(top_srcdir)/libs/MALLOC/includes/ -I$(top_srcdir)/modules/localization/includes/ $(INCLUDE_FLAGS) $(CHECK_SRC); \
670 fi
666@NEED_JAVA_TRUE@java: 671@NEED_JAVA_TRUE@java:
667# Some configurations needs to export JAVA_HOME in the current env 672# Some configurations needs to export JAVA_HOME in the current env
668@NEED_JAVA_TRUE@ @if test "$(JAVA_HOME)"; then export JAVA_HOME=$(JAVA_HOME); fi; \ 673@NEED_JAVA_TRUE@ @if test "$(JAVA_HOME)"; then export JAVA_HOME=$(JAVA_HOME); fi; \
diff --git a/scilab/modules/compatibility_functions/help/en_US/mtlb_eig.xml b/scilab/modules/compatibility_functions/help/en_US/mtlb_eig.xml
deleted file mode 100644
index b88c61a..0000000
--- a/scilab/modules/compatibility_functions/help/en_US/mtlb_eig.xml
+++ /dev/null
@@ -1,39 +0,0 @@
1<?xml version="1.0" encoding="UTF-8"?>
2<!--
3 * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
4 * Copyright (C) 2004-2007 - INRIA - Vincent COUVERT
5 *
6 * This file must be used under the terms of the CeCILL.
7 * This source file is licensed as described in the file COPYING, which
8 * you should have received as part of this distribution. The terms
9 * are also available at
10 * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
11 *
12 -->
13<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook" version="5.0-subset Scilab" xml:lang="en" xml:id="mtlb_eig">
14 <info>
15 <pubdate>$LastChangedDate$</pubdate>
16 </info>
17 <refnamediv>
18 <refname>mtlb_eig</refname>
19 <refpurpose>Matlab eig emulation function</refpurpose>
20 </refnamediv>
21 <refsection>
22 <title>Description</title>
23 <para>WARNING: This function is obsolete and will be removed in version 5.1.2, please use <link linkend="spec">spec</link> instead.</para>
24 </refsection>
25 <refsection>
26 <title>See Also</title>
27 <simplelist type="inline">
28 <member>
29 <link linkend="spec">spec</link>
30 </member>
31 </simplelist>
32 </refsection>
33 <refsection>
34 <title>Authors</title>
35 <simplelist type="vert">
36 <member>V.C.</member>
37 </simplelist>
38 </refsection>
39</refentry>
diff --git a/scilab/modules/compatibility_functions/help/fr_FR/mtlb_eig.xml b/scilab/modules/compatibility_functions/help/fr_FR/mtlb_eig.xml
deleted file mode 100644
index b68826f..0000000
--- a/scilab/modules/compatibility_functions/help/fr_FR/mtlb_eig.xml
+++ /dev/null
@@ -1,39 +0,0 @@
1<?xml version="1.0" encoding="UTF-8"?>
2<!--
3 * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
4 * Copyright (C) 2002-2004 - INRIA - Vincent COUVERT
5 *
6 * This file must be used under the terms of the CeCILL.
7 * This source file is licensed as described in the file COPYING, which
8 * you should have received as part of this distribution. The terms
9 * are also available at
10 * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
11 *
12 -->
13<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook" version="5.0-subset Scilab" xml:lang="fr" xml:id="mtlb_eig">
14 <info>
15 <pubdate>$LastChangedDate$</pubdate>
16 </info>
17 <refnamediv>
18 <refname>mtlb_eig</refname>
19 <refpurpose>Fonction d'émulation de la fonction Matlab eig</refpurpose>
20 </refnamediv>
21 <refsection>
22 <title>Description</title>
23 <para>ATTENTION: Cette fonction est obsolète et sera retirée dans la version 5.1.2, veuillez utiliser <link linkend="spec">spec</link> en remplacement.</para>
24 </refsection>
25 <refsection>
26 <title>Voir aussi</title>
27 <simplelist type="inline">
28 <member>
29 <link linkend="spec">spec</link>
30 </member>
31 </simplelist>
32 </refsection>
33 <refsection>
34 <title>Auteurs</title>
35 <simplelist type="vert">
36 <member>V.C.</member>
37 </simplelist>
38 </refsection>
39</refentry>
diff --git a/scilab/modules/compatibility_functions/macros/mtlb_eig.sci b/scilab/modules/compatibility_functions/macros/mtlb_eig.sci
deleted file mode 100644
index 4c7f9cf..0000000
--- a/scilab/modules/compatibility_functions/macros/mtlb_eig.sci
+++ /dev/null
@@ -1,26 +0,0 @@
1// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
2// Copyright (C) 2002-2004 - INRIA - Vincent COUVERT
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
10function [vd,D]=mtlb_eig(A,B)
11// Emulation function for eig() Matlab function
12
13warnobsolete("spec", "5.1.2")
14
15[lhs,rhs]=argn()
16
17if rhs==1 then
18 if lhs==1 then
19 vd=spec(A)
20 else
21 [vd,D]=spec(A)
22 end
23else
24 error(msprintf(gettext("%s: use with %d input argument(s) is not yet implemented.\n"),"mtlb_eig",2));
25end
26endfunction