summaryrefslogtreecommitdiffstats
path: root/scilab/modules
diff options
context:
space:
mode:
authorPierre MARECHAL <pierre.marechal@scilab.org>2010-04-14 10:44:21 +0200
committerPierre MARECHAL <pierre.marechal@scilab.org>2010-04-14 10:44:21 +0200
commitd5ec130218f86ced2e72096ab24feeafa14373dd (patch)
treeff59bffb70de4544f946ea33965648d39893cfcd /scilab/modules
parent735d3e217f1a1b3eb62bc5dbdefb7d9693226954 (diff)
parent033309380f01622698f2ea0cf744cf6cc72250db (diff)
downloadscilab-d5ec130218f86ced2e72096ab24feeafa14373dd.zip
scilab-d5ec130218f86ced2e72096ab24feeafa14373dd.tar.gz
Merge commit 'origin/5.2'
Conflicts: scilab/modules/functions/tests/unit_tests/getf.tst Change-Id: Ic209624ec52e0615fce1f02c08a387aea90b8ded
Diffstat (limited to 'scilab/modules')
-rw-r--r--scilab/modules/Makefile.am2
-rw-r--r--scilab/modules/Makefile.in4
-rw-r--r--scilab/modules/functions/tests/nonreg_tests/bug_1074.tst2
-rw-r--r--scilab/modules/functions/tests/nonreg_tests/bug_1469.tst1
-rw-r--r--scilab/modules/functions/tests/nonreg_tests/bug_1794.tst2
-rw-r--r--scilab/modules/functions/tests/nonreg_tests/bug_1966.tst2
-rw-r--r--scilab/modules/functions/tests/nonreg_tests/bug_2098.tst2
-rw-r--r--scilab/modules/functions/tests/nonreg_tests/bug_2238.tst2
-rw-r--r--scilab/modules/functions/tests/nonreg_tests/bug_2347.tst2
-rw-r--r--scilab/modules/functions/tests/nonreg_tests/bug_2378.tst2
-rw-r--r--scilab/modules/functions/tests/nonreg_tests/bug_2420.tst2
-rw-r--r--scilab/modules/functions/tests/nonreg_tests/bug_2476.tst2
-rw-r--r--scilab/modules/functions/tests/nonreg_tests/bug_2509.tst2
-rw-r--r--scilab/modules/functions/tests/nonreg_tests/bug_2551.tst2
-rw-r--r--scilab/modules/functions/tests/nonreg_tests/bug_2553.tst2
-rw-r--r--scilab/modules/functions/tests/nonreg_tests/bug_2873.tst3
-rw-r--r--scilab/modules/functions/tests/nonreg_tests/bug_2987.tst2
-rw-r--r--scilab/modules/functions/tests/nonreg_tests/bug_3533.tst2
-rw-r--r--scilab/modules/functions/tests/nonreg_tests/bug_4192.tst1
-rw-r--r--scilab/modules/functions/tests/nonreg_tests/bug_4495.tst2
-rw-r--r--scilab/modules/functions/tests/nonreg_tests/bug_4608.tst2
-rw-r--r--scilab/modules/functions/tests/nonreg_tests/bug_4943.tst2
-rw-r--r--scilab/modules/functions/tests/nonreg_tests/bug_4966.tst2
-rw-r--r--scilab/modules/functions/tests/nonreg_tests/bug_4968.tstbin1270 -> 1297 bytes
-rw-r--r--scilab/modules/functions/tests/nonreg_tests/bug_4974.tst41
-rw-r--r--scilab/modules/functions/tests/nonreg_tests/bug_525.tst2
-rw-r--r--scilab/modules/functions/tests/nonreg_tests/bug_528.tst2
-rw-r--r--scilab/modules/functions/tests/nonreg_tests/bug_5286.tst3
-rw-r--r--scilab/modules/functions/tests/nonreg_tests/bug_5507.tst3
-rw-r--r--scilab/modules/functions/tests/nonreg_tests/bug_610.tst2
-rw-r--r--scilab/modules/functions/tests/nonreg_tests/bug_670.tst2
-rw-r--r--scilab/modules/functions/tests/nonreg_tests/bug_6841.tst3
-rw-r--r--scilab/modules/functions/tests/nonreg_tests/bug_731.tst2
-rw-r--r--scilab/modules/functions/tests/unit_tests/bytecode.tst2
-rw-r--r--scilab/modules/functions/tests/unit_tests/deff.tst2
-rw-r--r--scilab/modules/functions/tests/unit_tests/execstr.tst2
-rw-r--r--scilab/modules/functions/tests/unit_tests/fun2string.tst2
-rw-r--r--scilab/modules/functions/tests/unit_tests/lib.tst2
-rw-r--r--scilab/modules/graphic_export/src/java/org/scilab/modules/graphic_export/FileExporter.java9
-rw-r--r--scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/CallScilabBridge.java8
-rw-r--r--scilab/modules/javasci/build.xml1
41 files changed, 105 insertions, 30 deletions
diff --git a/scilab/modules/Makefile.am b/scilab/modules/Makefile.am
index 9d887f9..9647c96 100644
--- a/scilab/modules/Makefile.am
+++ b/scilab/modules/Makefile.am
@@ -34,8 +34,8 @@ shell \
34completion \ 34completion \
35console \ 35console \
36graphic_export \ 36graphic_export \
37jvm \
38gui \ 37gui \
38jvm \
39graphics \ 39graphics \
40optimization \ 40optimization \
41symbolic \ 41symbolic \
diff --git a/scilab/modules/Makefile.in b/scilab/modules/Makefile.in
index a65610b..78c547e 100644
--- a/scilab/modules/Makefile.in
+++ b/scilab/modules/Makefile.in
@@ -154,7 +154,7 @@ CTAGS = ctags
154DIST_SUBDIRS = core output_stream action_binding arnoldi \ 154DIST_SUBDIRS = core output_stream action_binding arnoldi \
155 elementary_functions string api_scilab dynamic_link fileio \ 155 elementary_functions string api_scilab dynamic_link fileio \
156 history_manager spreadsheet tclsci localization renderer shell \ 156 history_manager spreadsheet tclsci localization renderer shell \
157 completion console graphic_export jvm gui graphics \ 157 completion console graphic_export gui jvm graphics \
158 optimization symbolic randlib statistics special_functions \ 158 optimization symbolic randlib statistics special_functions \
159 interpolation linear_algebra integer data_structures mexlib \ 159 interpolation linear_algebra integer data_structures mexlib \
160 differential_equations cacsd polynomials boolean double pvm io \ 160 differential_equations cacsd polynomials boolean double pvm io \
@@ -436,7 +436,7 @@ top_srcdir = @top_srcdir@
436SUBDIRS = core output_stream action_binding arnoldi \ 436SUBDIRS = core output_stream action_binding arnoldi \
437 elementary_functions string api_scilab dynamic_link fileio \ 437 elementary_functions string api_scilab dynamic_link fileio \
438 history_manager spreadsheet tclsci localization renderer shell \ 438 history_manager spreadsheet tclsci localization renderer shell \
439 completion console graphic_export jvm gui graphics \ 439 completion console graphic_export gui jvm graphics \
440 optimization symbolic randlib statistics special_functions \ 440 optimization symbolic randlib statistics special_functions \
441 interpolation linear_algebra integer data_structures mexlib \ 441 interpolation linear_algebra integer data_structures mexlib \
442 differential_equations cacsd polynomials boolean double pvm io \ 442 differential_equations cacsd polynomials boolean double pvm io \
diff --git a/scilab/modules/functions/tests/nonreg_tests/bug_1074.tst b/scilab/modules/functions/tests/nonreg_tests/bug_1074.tst
index 60fa175..2029e4f 100644
--- a/scilab/modules/functions/tests/nonreg_tests/bug_1074.tst
+++ b/scilab/modules/functions/tests/nonreg_tests/bug_1074.tst
@@ -5,6 +5,8 @@
5// This file is distributed under the same license as the Scilab package. 5// This file is distributed under the same license as the Scilab package.
6// ============================================================================= 6// =============================================================================
7 7
8// <-- JVM NOT MANDATORY -->
9
8// <-- Non-regression test for bug 1074 --> 10// <-- Non-regression test for bug 1074 -->
9// 11//
10// <-- Bugzilla URL --> 12// <-- Bugzilla URL -->
diff --git a/scilab/modules/functions/tests/nonreg_tests/bug_1469.tst b/scilab/modules/functions/tests/nonreg_tests/bug_1469.tst
index 65222e9..aa5655b 100644
--- a/scilab/modules/functions/tests/nonreg_tests/bug_1469.tst
+++ b/scilab/modules/functions/tests/nonreg_tests/bug_1469.tst
@@ -5,6 +5,7 @@
5// This file is distributed under the same license as the Scilab package. 5// This file is distributed under the same license as the Scilab package.
6// ============================================================================= 6// =============================================================================
7// 7//
8// <-- JVM NOT MANDATORY -->
8// <-- ENGLISH IMPOSED --> 9// <-- ENGLISH IMPOSED -->
9// 10//
10// <-- Non-regression test for bug 1469 --> 11// <-- Non-regression test for bug 1469 -->
diff --git a/scilab/modules/functions/tests/nonreg_tests/bug_1794.tst b/scilab/modules/functions/tests/nonreg_tests/bug_1794.tst
index 1bd13f4..bcfa4cd 100644
--- a/scilab/modules/functions/tests/nonreg_tests/bug_1794.tst
+++ b/scilab/modules/functions/tests/nonreg_tests/bug_1794.tst
@@ -5,6 +5,8 @@
5// This file is distributed under the same license as the Scilab package. 5// This file is distributed under the same license as the Scilab package.
6// ============================================================================= 6// =============================================================================
7 7
8// <-- JVM NOT MANDATORY -->
9
8// <-- Non-regression test for bug 1794 --> 10// <-- Non-regression test for bug 1794 -->
9// 11//
10// <-- Bugzilla URL --> 12// <-- Bugzilla URL -->
diff --git a/scilab/modules/functions/tests/nonreg_tests/bug_1966.tst b/scilab/modules/functions/tests/nonreg_tests/bug_1966.tst
index 9219a41..f857f53 100644
--- a/scilab/modules/functions/tests/nonreg_tests/bug_1966.tst
+++ b/scilab/modules/functions/tests/nonreg_tests/bug_1966.tst
@@ -5,6 +5,8 @@
5// This file is distributed under the same license as the Scilab package. 5// This file is distributed under the same license as the Scilab package.
6// ============================================================================= 6// =============================================================================
7 7
8// <-- JVM NOT MANDATORY -->
9
8// <-- Non-regression test for bug 1966 --> 10// <-- Non-regression test for bug 1966 -->
9// 11//
10// <-- Bugzilla URL --> 12// <-- Bugzilla URL -->
diff --git a/scilab/modules/functions/tests/nonreg_tests/bug_2098.tst b/scilab/modules/functions/tests/nonreg_tests/bug_2098.tst
index f7d38f7..1276cfc 100644
--- a/scilab/modules/functions/tests/nonreg_tests/bug_2098.tst
+++ b/scilab/modules/functions/tests/nonreg_tests/bug_2098.tst
@@ -5,6 +5,8 @@
5// This file is distributed under the same license as the Scilab package. 5// This file is distributed under the same license as the Scilab package.
6// ============================================================================= 6// =============================================================================
7 7
8// <-- JVM NOT MANDATORY -->
9
8// <-- Non-regression test for bug 2098 --> 10// <-- Non-regression test for bug 2098 -->
9// 11//
10// <-- Bugzilla URL --> 12// <-- Bugzilla URL -->
diff --git a/scilab/modules/functions/tests/nonreg_tests/bug_2238.tst b/scilab/modules/functions/tests/nonreg_tests/bug_2238.tst
index 49e0ebb..dae71cc 100644
--- a/scilab/modules/functions/tests/nonreg_tests/bug_2238.tst
+++ b/scilab/modules/functions/tests/nonreg_tests/bug_2238.tst
@@ -5,6 +5,8 @@
5// This file is distributed under the same license as the Scilab package. 5// This file is distributed under the same license as the Scilab package.
6// ============================================================================= 6// =============================================================================
7 7
8// <-- JVM NOT MANDATORY -->
9
8// <-- Non-regression test for bug 2238 --> 10// <-- Non-regression test for bug 2238 -->
9// 11//
10// <-- Bugzilla URL --> 12// <-- Bugzilla URL -->
diff --git a/scilab/modules/functions/tests/nonreg_tests/bug_2347.tst b/scilab/modules/functions/tests/nonreg_tests/bug_2347.tst
index 116ae10..8e6fbe5 100644
--- a/scilab/modules/functions/tests/nonreg_tests/bug_2347.tst
+++ b/scilab/modules/functions/tests/nonreg_tests/bug_2347.tst
@@ -5,6 +5,8 @@
5// This file is distributed under the same license as the Scilab package. 5// This file is distributed under the same license as the Scilab package.
6// ============================================================================= 6// =============================================================================
7 7
8// <-- JVM NOT MANDATORY -->
9
8// <-- Non-regression test for bug 2347 --> 10// <-- Non-regression test for bug 2347 -->
9// 11//
10// <-- Bugzilla URL --> 12// <-- Bugzilla URL -->
diff --git a/scilab/modules/functions/tests/nonreg_tests/bug_2378.tst b/scilab/modules/functions/tests/nonreg_tests/bug_2378.tst
index d801b81..91d78ae 100644
--- a/scilab/modules/functions/tests/nonreg_tests/bug_2378.tst
+++ b/scilab/modules/functions/tests/nonreg_tests/bug_2378.tst
@@ -5,6 +5,8 @@
5// This file is distributed under the same license as the Scilab package. 5// This file is distributed under the same license as the Scilab package.
6// ============================================================================= 6// =============================================================================
7 7
8// <-- JVM NOT MANDATORY -->
9
8// <-- Non-regression test for bug 2378 --> 10// <-- Non-regression test for bug 2378 -->
9// 11//
10// <-- Bugzilla URL --> 12// <-- Bugzilla URL -->
diff --git a/scilab/modules/functions/tests/nonreg_tests/bug_2420.tst b/scilab/modules/functions/tests/nonreg_tests/bug_2420.tst
index 1a6d4ea..f456ff0 100644
--- a/scilab/modules/functions/tests/nonreg_tests/bug_2420.tst
+++ b/scilab/modules/functions/tests/nonreg_tests/bug_2420.tst
@@ -5,6 +5,8 @@
5// This file is distributed under the same license as the Scilab package. 5// This file is distributed under the same license as the Scilab package.
6// ============================================================================= 6// =============================================================================
7 7
8// <-- JVM NOT MANDATORY -->
9
8// <-- Non-regression test for bug 2420 --> 10// <-- Non-regression test for bug 2420 -->
9// 11//
10// <-- Bugzilla URL --> 12// <-- Bugzilla URL -->
diff --git a/scilab/modules/functions/tests/nonreg_tests/bug_2476.tst b/scilab/modules/functions/tests/nonreg_tests/bug_2476.tst
index 08185ac..4f0ae37 100644
--- a/scilab/modules/functions/tests/nonreg_tests/bug_2476.tst
+++ b/scilab/modules/functions/tests/nonreg_tests/bug_2476.tst
@@ -5,6 +5,8 @@
5// This file is distributed under the same license as the Scilab package. 5// This file is distributed under the same license as the Scilab package.
6// ============================================================================= 6// =============================================================================
7 7
8// <-- JVM NOT MANDATORY -->
9
8// <-- Non-regression test for bug 2476 --> 10// <-- Non-regression test for bug 2476 -->
9// 11//
10// <-- Bugzilla URL --> 12// <-- Bugzilla URL -->
diff --git a/scilab/modules/functions/tests/nonreg_tests/bug_2509.tst b/scilab/modules/functions/tests/nonreg_tests/bug_2509.tst
index 01743fc..1f30703 100644
--- a/scilab/modules/functions/tests/nonreg_tests/bug_2509.tst
+++ b/scilab/modules/functions/tests/nonreg_tests/bug_2509.tst
@@ -5,6 +5,8 @@
5// This file is distributed under the same license as the Scilab package. 5// This file is distributed under the same license as the Scilab package.
6// ============================================================================= 6// =============================================================================
7 7
8// <-- JVM NOT MANDATORY -->
9
8// <-- Non-regression test for bug 2509 --> 10// <-- Non-regression test for bug 2509 -->
9// 11//
10// <-- Bugzilla URL --> 12// <-- Bugzilla URL -->
diff --git a/scilab/modules/functions/tests/nonreg_tests/bug_2551.tst b/scilab/modules/functions/tests/nonreg_tests/bug_2551.tst
index c89339b..5e30012 100644
--- a/scilab/modules/functions/tests/nonreg_tests/bug_2551.tst
+++ b/scilab/modules/functions/tests/nonreg_tests/bug_2551.tst
@@ -5,6 +5,8 @@
5// This file is distributed under the same license as the Scilab package. 5// This file is distributed under the same license as the Scilab package.
6// ============================================================================= 6// =============================================================================
7 7
8// <-- JVM NOT MANDATORY -->
9
8// <-- Non-regression test for bug 2551 --> 10// <-- Non-regression test for bug 2551 -->
9// 11//
10// <-- Bugzilla URL --> 12// <-- Bugzilla URL -->
diff --git a/scilab/modules/functions/tests/nonreg_tests/bug_2553.tst b/scilab/modules/functions/tests/nonreg_tests/bug_2553.tst
index 11b4748..3430c6b 100644
--- a/scilab/modules/functions/tests/nonreg_tests/bug_2553.tst
+++ b/scilab/modules/functions/tests/nonreg_tests/bug_2553.tst
@@ -5,6 +5,8 @@
5// This file is distributed under the same license as the Scilab package. 5// This file is distributed under the same license as the Scilab package.
6// ============================================================================= 6// =============================================================================
7 7
8// <-- JVM NOT MANDATORY -->
9
8// <-- Non-regression test for bug 2553 --> 10// <-- Non-regression test for bug 2553 -->
9// 11//
10// <-- Bugzilla URL --> 12// <-- Bugzilla URL -->
diff --git a/scilab/modules/functions/tests/nonreg_tests/bug_2873.tst b/scilab/modules/functions/tests/nonreg_tests/bug_2873.tst
index adb5e8b..260a302 100644
--- a/scilab/modules/functions/tests/nonreg_tests/bug_2873.tst
+++ b/scilab/modules/functions/tests/nonreg_tests/bug_2873.tst
@@ -5,6 +5,9 @@
5// This file is distributed under the same license as the Scilab package. 5// This file is distributed under the same license as the Scilab package.
6// ============================================================================= 6// =============================================================================
7 7
8// <-- JVM NOT MANDATORY -->
9// <-- NO TRY CATCH -->
10
8// <-- Non-regression test for bug 2873 --> 11// <-- Non-regression test for bug 2873 -->
9// 12//
10// <-- Bugzilla URL --> 13// <-- Bugzilla URL -->
diff --git a/scilab/modules/functions/tests/nonreg_tests/bug_2987.tst b/scilab/modules/functions/tests/nonreg_tests/bug_2987.tst
index 6799927..bbc1c08 100644
--- a/scilab/modules/functions/tests/nonreg_tests/bug_2987.tst
+++ b/scilab/modules/functions/tests/nonreg_tests/bug_2987.tst
@@ -5,6 +5,8 @@
5// This file is distributed under the same license as the Scilab package. 5// This file is distributed under the same license as the Scilab package.
6// ============================================================================= 6// =============================================================================
7 7
8// <-- JVM NOT MANDATORY -->
9
8// <-- Non-regression test for bug 2987 --> 10// <-- Non-regression test for bug 2987 -->
9// 11//
10// <-- Bugzilla URL --> 12// <-- Bugzilla URL -->
diff --git a/scilab/modules/functions/tests/nonreg_tests/bug_3533.tst b/scilab/modules/functions/tests/nonreg_tests/bug_3533.tst
index 1893e6e..f3cfc01 100644
--- a/scilab/modules/functions/tests/nonreg_tests/bug_3533.tst
+++ b/scilab/modules/functions/tests/nonreg_tests/bug_3533.tst
@@ -5,6 +5,8 @@
5// This file is distributed under the same license as the Scilab package. 5// This file is distributed under the same license as the Scilab package.
6// ============================================================================= 6// =============================================================================
7 7
8// <-- JVM NOT MANDATORY -->
9
8// <-- Non-regression test for bug 3533 --> 10// <-- Non-regression test for bug 3533 -->
9// 11//
10// <-- Bugzilla URL --> 12// <-- Bugzilla URL -->
diff --git a/scilab/modules/functions/tests/nonreg_tests/bug_4192.tst b/scilab/modules/functions/tests/nonreg_tests/bug_4192.tst
index 51653af..3863ea8 100644
--- a/scilab/modules/functions/tests/nonreg_tests/bug_4192.tst
+++ b/scilab/modules/functions/tests/nonreg_tests/bug_4192.tst
@@ -5,6 +5,7 @@
5// This file is distributed under the same license as the Scilab package. 5// This file is distributed under the same license as the Scilab package.
6// ============================================================================= 6// =============================================================================
7 7
8// <-- JVM NOT MANDATORY -->
8// <-- ENGLISH IMPOSED --> 9// <-- ENGLISH IMPOSED -->
9 10
10// <-- Non-regression test for bug 4192 --> 11// <-- Non-regression test for bug 4192 -->
diff --git a/scilab/modules/functions/tests/nonreg_tests/bug_4495.tst b/scilab/modules/functions/tests/nonreg_tests/bug_4495.tst
index e3b3d14..c4e8193 100644
--- a/scilab/modules/functions/tests/nonreg_tests/bug_4495.tst
+++ b/scilab/modules/functions/tests/nonreg_tests/bug_4495.tst
@@ -5,6 +5,8 @@
5// This file is distributed under the same license as the Scilab package. 5// This file is distributed under the same license as the Scilab package.
6// ============================================================================= 6// =============================================================================
7 7
8// <-- JVM NOT MANDATORY -->
9
8// <-- Non-regression test for bug 4495 --> 10// <-- Non-regression test for bug 4495 -->
9// 11//
10// <-- Bugzilla URL --> 12// <-- Bugzilla URL -->
diff --git a/scilab/modules/functions/tests/nonreg_tests/bug_4608.tst b/scilab/modules/functions/tests/nonreg_tests/bug_4608.tst
index 59174d0..49886a4 100644
--- a/scilab/modules/functions/tests/nonreg_tests/bug_4608.tst
+++ b/scilab/modules/functions/tests/nonreg_tests/bug_4608.tst
@@ -5,6 +5,8 @@
5// This file is distributed under the same license as the Scilab package. 5// This file is distributed under the same license as the Scilab package.
6// ============================================================================= 6// =============================================================================
7 7
8// <-- JVM NOT MANDATORY -->
9
8// <-- Non-regression test for bug 4608 --> 10// <-- Non-regression test for bug 4608 -->
9// 11//
10// <-- Bugzilla URL --> 12// <-- Bugzilla URL -->
diff --git a/scilab/modules/functions/tests/nonreg_tests/bug_4943.tst b/scilab/modules/functions/tests/nonreg_tests/bug_4943.tst
index 9a1f922..88b2bbf 100644
--- a/scilab/modules/functions/tests/nonreg_tests/bug_4943.tst
+++ b/scilab/modules/functions/tests/nonreg_tests/bug_4943.tst
@@ -5,6 +5,8 @@
5// This file is distributed under the same license as the Scilab package. 5// This file is distributed under the same license as the Scilab package.
6// ============================================================================= 6// =============================================================================
7 7
8// <-- JVM NOT MANDATORY -->
9
8// <-- Non-regression test for bug 4943 --> 10// <-- Non-regression test for bug 4943 -->
9// 11//
10// <-- Bugzilla URL --> 12// <-- Bugzilla URL -->
diff --git a/scilab/modules/functions/tests/nonreg_tests/bug_4966.tst b/scilab/modules/functions/tests/nonreg_tests/bug_4966.tst
index 5ce660b..01bcc9e 100644
--- a/scilab/modules/functions/tests/nonreg_tests/bug_4966.tst
+++ b/scilab/modules/functions/tests/nonreg_tests/bug_4966.tst
@@ -5,6 +5,8 @@
5// This file is distributed under the same license as the Scilab package. 5// This file is distributed under the same license as the Scilab package.
6// ============================================================================= 6// =============================================================================
7 7
8// <-- JVM NOT MANDATORY -->
9
8// <-- Non-regression test for bug 4943 --> 10// <-- Non-regression test for bug 4943 -->
9// 11//
10// <-- Bugzilla URL --> 12// <-- Bugzilla URL -->
diff --git a/scilab/modules/functions/tests/nonreg_tests/bug_4968.tst b/scilab/modules/functions/tests/nonreg_tests/bug_4968.tst
index 5769a82..58ba6f5 100644
--- a/scilab/modules/functions/tests/nonreg_tests/bug_4968.tst
+++ b/scilab/modules/functions/tests/nonreg_tests/bug_4968.tst
Binary files differ
diff --git a/scilab/modules/functions/tests/nonreg_tests/bug_4974.tst b/scilab/modules/functions/tests/nonreg_tests/bug_4974.tst
index faf835e..a364b2e 100644
--- a/scilab/modules/functions/tests/nonreg_tests/bug_4974.tst
+++ b/scilab/modules/functions/tests/nonreg_tests/bug_4974.tst
@@ -1,19 +1,22 @@
1// ============================================================================= 1// =============================================================================
2// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab 2// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
3// Copyright (C) 2009 - DIGITEO - Allan CORNET 3// Copyright (C) 2009 - DIGITEO - Allan CORNET
4// 4//
5// This file is distributed under the same license as the Scilab package. 5// This file is distributed under the same license as the Scilab package.
6// ============================================================================= 6// =============================================================================
7// <-- Non-regression test for bug 4974 --> 7
8// 8// <-- JVM NOT MANDATORY -->
9// <-- Bugzilla URL --> 9
10// http://bugzilla.scilab.org/show_bug.cgi?id=4974 10// <-- Non-regression test for bug 4974 -->
11// 11//
12// <-- Short Description --> 12// <-- Bugzilla URL -->
13// exec('') crashs scilab 13// http://bugzilla.scilab.org/show_bug.cgi?id=4974
14// ============================================================================= 14//
15ierr = execstr("exec('''',-1);","errcatch"); 15// <-- Short Description -->
16if ierr == 0 then pause,end 16// exec('') crashs scilab
17ierr = execstr("exec('''');","errcatch"); 17// =============================================================================
18if ierr == 0 then pause,end 18ierr = execstr("exec('''',-1);","errcatch");
19// ============================================================================= 19if ierr == 0 then pause,end
20ierr = execstr("exec('''');","errcatch");
21if ierr == 0 then pause,end
22// =============================================================================
diff --git a/scilab/modules/functions/tests/nonreg_tests/bug_525.tst b/scilab/modules/functions/tests/nonreg_tests/bug_525.tst
index c704eca..d2bbac0 100644
--- a/scilab/modules/functions/tests/nonreg_tests/bug_525.tst
+++ b/scilab/modules/functions/tests/nonreg_tests/bug_525.tst
@@ -5,6 +5,8 @@
5// This file is distributed under the same license as the Scilab package. 5// This file is distributed under the same license as the Scilab package.
6// ============================================================================= 6// =============================================================================
7 7
8// <-- JVM NOT MANDATORY -->
9
8// <-- Non-regression test for bug 525 --> 10// <-- Non-regression test for bug 525 -->
9// 11//
10// <-- Bugzilla URL --> 12// <-- Bugzilla URL -->
diff --git a/scilab/modules/functions/tests/nonreg_tests/bug_528.tst b/scilab/modules/functions/tests/nonreg_tests/bug_528.tst
index 797c18b..1473abb 100644
--- a/scilab/modules/functions/tests/nonreg_tests/bug_528.tst
+++ b/scilab/modules/functions/tests/nonreg_tests/bug_528.tst
@@ -5,6 +5,8 @@
5// This file is distributed under the same license as the Scilab package. 5// This file is distributed under the same license as the Scilab package.
6// ============================================================================= 6// =============================================================================
7 7
8// <-- JVM NOT MANDATORY -->
9
8// <-- Non-regression test for bug 528 --> 10// <-- Non-regression test for bug 528 -->
9// 11//
10// <-- Bugzilla URL --> 12// <-- Bugzilla URL -->
diff --git a/scilab/modules/functions/tests/nonreg_tests/bug_5286.tst b/scilab/modules/functions/tests/nonreg_tests/bug_5286.tst
index fc1ddf9..8f0324d 100644
--- a/scilab/modules/functions/tests/nonreg_tests/bug_5286.tst
+++ b/scilab/modules/functions/tests/nonreg_tests/bug_5286.tst
@@ -4,6 +4,9 @@
4// 4//
5// This file is distributed under the same license as the Scilab package. 5// This file is distributed under the same license as the Scilab package.
6// ============================================================================= 6// =============================================================================
7
8// <-- JVM NOT MANDATORY -->
9
7// <-- Non-regression test for bug 5286 --> 10// <-- Non-regression test for bug 5286 -->
8// 11//
9// <-- Bugzilla URL --> 12// <-- Bugzilla URL -->
diff --git a/scilab/modules/functions/tests/nonreg_tests/bug_5507.tst b/scilab/modules/functions/tests/nonreg_tests/bug_5507.tst
index 489d451..42f4b3a 100644
--- a/scilab/modules/functions/tests/nonreg_tests/bug_5507.tst
+++ b/scilab/modules/functions/tests/nonreg_tests/bug_5507.tst
@@ -4,6 +4,9 @@
4// 4//
5// This file is distributed under the same license as the Scilab package. 5// This file is distributed under the same license as the Scilab package.
6// ============================================================================= 6// =============================================================================
7
8// <-- JVM NOT MANDATORY -->
9
7// <-- Non-regression test for bug 5507 --> 10// <-- Non-regression test for bug 5507 -->
8// 11//
9// <-- Bugzilla URL --> 12// <-- Bugzilla URL -->
diff --git a/scilab/modules/functions/tests/nonreg_tests/bug_610.tst b/scilab/modules/functions/tests/nonreg_tests/bug_610.tst
index fb228b4..37a6f8a 100644
--- a/scilab/modules/functions/tests/nonreg_tests/bug_610.tst
+++ b/scilab/modules/functions/tests/nonreg_tests/bug_610.tst
@@ -5,6 +5,8 @@
5// This file is distributed under the same license as the Scilab package. 5// This file is distributed under the same license as the Scilab package.
6// ============================================================================= 6// =============================================================================
7 7
8// <-- JVM NOT MANDATORY -->
9
8// <-- Non-regression test for bug 610 --> 10// <-- Non-regression test for bug 610 -->
9// 11//
10// <-- Bugzilla URL --> 12// <-- Bugzilla URL -->
diff --git a/scilab/modules/functions/tests/nonreg_tests/bug_670.tst b/scilab/modules/functions/tests/nonreg_tests/bug_670.tst
index c5e74bf..4caa89a 100644
--- a/scilab/modules/functions/tests/nonreg_tests/bug_670.tst
+++ b/scilab/modules/functions/tests/nonreg_tests/bug_670.tst
@@ -5,6 +5,8 @@
5// This file is distributed under the same license as the Scilab package. 5// This file is distributed under the same license as the Scilab package.
6// ============================================================================= 6// =============================================================================
7 7
8// <-- JVM NOT MANDATORY -->
9
8// <-- Non-regression test for bug 670 --> 10// <-- Non-regression test for bug 670 -->
9// 11//
10// <-- Bugzilla URL --> 12// <-- Bugzilla URL -->
diff --git a/scilab/modules/functions/tests/nonreg_tests/bug_6841.tst b/scilab/modules/functions/tests/nonreg_tests/bug_6841.tst
index dcf83ea..87f0b2f 100644
--- a/scilab/modules/functions/tests/nonreg_tests/bug_6841.tst
+++ b/scilab/modules/functions/tests/nonreg_tests/bug_6841.tst
@@ -4,6 +4,9 @@
4// 4//
5// This file is distributed under the same license as the Scilab package. 5// This file is distributed under the same license as the Scilab package.
6// ============================================================================= 6// =============================================================================
7
8// <-- JVM NOT MANDATORY -->
9
7// <-- Non-regression test for bug 6841 --> 10// <-- Non-regression test for bug 6841 -->
8// 11//
9// <-- Bugzilla URL --> 12// <-- Bugzilla URL -->
diff --git a/scilab/modules/functions/tests/nonreg_tests/bug_731.tst b/scilab/modules/functions/tests/nonreg_tests/bug_731.tst
index 10bab0e..a05406d 100644
--- a/scilab/modules/functions/tests/nonreg_tests/bug_731.tst
+++ b/scilab/modules/functions/tests/nonreg_tests/bug_731.tst
@@ -5,6 +5,8 @@
5// This file is distributed under the same license as the Scilab package. 5// This file is distributed under the same license as the Scilab package.
6// ============================================================================= 6// =============================================================================
7 7
8// <-- JVM NOT MANDATORY -->
9
8// <-- Non-regression test for bug 731 --> 10// <-- Non-regression test for bug 731 -->
9// 11//
10// <-- Bugzilla URL --> 12// <-- Bugzilla URL -->
diff --git a/scilab/modules/functions/tests/unit_tests/bytecode.tst b/scilab/modules/functions/tests/unit_tests/bytecode.tst
index b6b5d58..1bcb94f 100644
--- a/scilab/modules/functions/tests/unit_tests/bytecode.tst
+++ b/scilab/modules/functions/tests/unit_tests/bytecode.tst
@@ -6,6 +6,8 @@
6// This file is distributed under the same license as the Scilab package. 6// This file is distributed under the same license as the Scilab package.
7// ============================================================================= 7// =============================================================================
8 8
9// <-- JVM NOT MANDATORY -->
10
9//build the list of loaded libs 11//build the list of loaded libs
10 12
11%libs=[]; 13%libs=[];
diff --git a/scilab/modules/functions/tests/unit_tests/deff.tst b/scilab/modules/functions/tests/unit_tests/deff.tst
index a837660..e3ca827 100644
--- a/scilab/modules/functions/tests/unit_tests/deff.tst
+++ b/scilab/modules/functions/tests/unit_tests/deff.tst
@@ -5,6 +5,8 @@
5// This file is distributed under the same license as the Scilab package. 5// This file is distributed under the same license as the Scilab package.
6// ============================================================================= 6// =============================================================================
7 7
8// <-- JVM NOT MANDATORY -->
9
8deff('[x] = myplus(y,z)','x=y+z'); 10deff('[x] = myplus(y,z)','x=y+z');
9if isdef('myplus') <> %t then pause,end 11if isdef('myplus') <> %t then pause,end
10if myplus(3,2) <> 5 then pause,end 12if myplus(3,2) <> 5 then pause,end
diff --git a/scilab/modules/functions/tests/unit_tests/execstr.tst b/scilab/modules/functions/tests/unit_tests/execstr.tst
index c4c4335..854a226 100644
--- a/scilab/modules/functions/tests/unit_tests/execstr.tst
+++ b/scilab/modules/functions/tests/unit_tests/execstr.tst
@@ -5,6 +5,8 @@
5// This file is distributed under the same license as the Scilab package. 5// This file is distributed under the same license as the Scilab package.
6// ============================================================================= 6// =============================================================================
7 7
8// <-- JVM NOT MANDATORY -->
9
8execstr('a=1') // sets a=1. 10execstr('a=1') // sets a=1.
9if isdef('a')<> %t then pause,end 11if isdef('a')<> %t then pause,end
10if a<> 1 then pause,end 12if a<> 1 then pause,end
diff --git a/scilab/modules/functions/tests/unit_tests/fun2string.tst b/scilab/modules/functions/tests/unit_tests/fun2string.tst
index 1124b26..d2199aa 100644
--- a/scilab/modules/functions/tests/unit_tests/fun2string.tst
+++ b/scilab/modules/functions/tests/unit_tests/fun2string.tst
@@ -5,6 +5,8 @@
5// This file is distributed under the same license as the Scilab package. 5// This file is distributed under the same license as the Scilab package.
6// ============================================================================= 6// =============================================================================
7 7
8// <-- JVM NOT MANDATORY -->
9
8funcprot(0); 10funcprot(0);
9 11
10function y=foo(a) 12function y=foo(a)
diff --git a/scilab/modules/functions/tests/unit_tests/lib.tst b/scilab/modules/functions/tests/unit_tests/lib.tst
index c97f9b9..144e8c8 100644
--- a/scilab/modules/functions/tests/unit_tests/lib.tst
+++ b/scilab/modules/functions/tests/unit_tests/lib.tst
@@ -5,6 +5,8 @@
5// This file is distributed under the same license as the Scilab package. 5// This file is distributed under the same license as the Scilab package.
6// ============================================================================= 6// =============================================================================
7 7
8// <-- JVM NOT MANDATORY -->
9
8cd(TMPDIR); 10cd(TMPDIR);
9mkdir('test_lib'); 11mkdir('test_lib');
10cd('test_lib'); 12cd('test_lib');
diff --git a/scilab/modules/graphic_export/src/java/org/scilab/modules/graphic_export/FileExporter.java b/scilab/modules/graphic_export/src/java/org/scilab/modules/graphic_export/FileExporter.java
index 2b8ae66..1804a11 100644
--- a/scilab/modules/graphic_export/src/java/org/scilab/modules/graphic_export/FileExporter.java
+++ b/scilab/modules/graphic_export/src/java/org/scilab/modules/graphic_export/FileExporter.java
@@ -17,6 +17,7 @@ package org.scilab.modules.graphic_export;
17import java.io.File; 17import java.io.File;
18import org.scilab.modules.renderer.FigureMapper; 18import org.scilab.modules.renderer.FigureMapper;
19import org.scilab.modules.renderer.figureDrawing.DrawableFigureGL; 19import org.scilab.modules.renderer.figureDrawing.DrawableFigureGL;
20import org.scilab.modules.jvm.LoadClassPath;
20 21
21/** 22/**
22 * Static class used to create file export of graphic figures 23 * Static class used to create file export of graphic figures
@@ -27,6 +28,9 @@ public class FileExporter {
27 /** Export waiting message */ 28 /** Export waiting message */
28 private static final String exportingMessage = "Exporting figure, please wait..."; 29 private static final String exportingMessage = "Exporting figure, please wait...";
29 30
31 /** The id used on classpath.xml to load vectorial export JARs */
32 private static final String CLASSPATH_PDF_PS_EPS_EXPORT_NAME = "pdf_ps_eps_graphic_export";
33
30 /** 34 /**
31 * Default constructor 35 * Default constructor
32 */ 36 */
@@ -58,6 +62,11 @@ public class FileExporter {
58 String oldInfoMessage = exportedFig.getInfoMessage(); 62 String oldInfoMessage = exportedFig.getInfoMessage();
59 exportedFig.setInfoMessage(exportingMessage); 63 exportedFig.setInfoMessage(exportingMessage);
60 if (fileType == ExportRenderer.PDF_EXPORT || fileType == ExportRenderer.EPS_EXPORT || fileType == ExportRenderer.PS_EXPORT ) { 64 if (fileType == ExportRenderer.PDF_EXPORT || fileType == ExportRenderer.EPS_EXPORT || fileType == ExportRenderer.PS_EXPORT ) {
65
66 /* Under !Windows, make sure that the library for ps export
67 * are already loaded */
68 LoadClassPath.loadOnUse(CLASSPATH_PDF_PS_EPS_EXPORT_NAME);
69
61 String ext = ""; 70 String ext = "";
62 71
63 switch (fileType) { 72 switch (fileType) {
diff --git a/scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/CallScilabBridge.java b/scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/CallScilabBridge.java
index 7cec277..b01edf6 100644
--- a/scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/CallScilabBridge.java
+++ b/scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/CallScilabBridge.java
@@ -113,7 +113,6 @@ import org.scilab.modules.gui.waitbar.WaitBar;
113import org.scilab.modules.gui.widget.Widget; 113import org.scilab.modules.gui.widget.Widget;
114import org.scilab.modules.gui.window.ScilabWindow; 114import org.scilab.modules.gui.window.ScilabWindow;
115import org.scilab.modules.gui.window.Window; 115import org.scilab.modules.gui.window.Window;
116import org.scilab.modules.jvm.LoadClassPath;
117import org.scilab.modules.localization.Messages; 116import org.scilab.modules.localization.Messages;
118import org.scilab.modules.renderer.FigureMapper; 117import org.scilab.modules.renderer.FigureMapper;
119import org.scilab.modules.renderer.figureDrawing.DrawableFigureGL; 118import org.scilab.modules.renderer.figureDrawing.DrawableFigureGL;
@@ -166,9 +165,6 @@ public class CallScilabBridge {
166 165
167 private static final String CONSOLE = "Console"; 166 private static final String CONSOLE = "Console";
168 167
169 /** The id used on classpath.xml to load vectorial export JARs */
170 private static final String CLASSPATH_PDF_PS_EPS_EXPORT_NAME = "pdf_ps_eps_graphic_export";
171
172 /** 168 /**
173 * Constructor 169 * Constructor
174 */ 170 */
@@ -2365,10 +2361,6 @@ public class CallScilabBridge {
2365 String fileExtension = ".ps"; 2361 String fileExtension = ".ps";
2366 2362
2367 try { 2363 try {
2368 /* Under !Windows, make sure that the library for ps export
2369 * are already loaded */
2370 LoadClassPath.loadOnUse(CLASSPATH_PDF_PS_EPS_EXPORT_NAME);
2371
2372 /** Export image to PostScript */ 2364 /** Export image to PostScript */
2373 if (((PrintRequestAttribute) scilabPageFormat.get(OrientationRequested.class)) == OrientationRequested.PORTRAIT) { 2365 if (((PrintRequestAttribute) scilabPageFormat.get(OrientationRequested.class)) == OrientationRequested.PORTRAIT) {
2374 FileExporter.fileExport(figureID, 2366 FileExporter.fileExport(figureID,
diff --git a/scilab/modules/javasci/build.xml b/scilab/modules/javasci/build.xml
index 2e3d130..babcb5c 100644
--- a/scilab/modules/javasci/build.xml
+++ b/scilab/modules/javasci/build.xml
@@ -54,6 +54,7 @@
54 debug="off" 54 debug="off"
55 verbose="off" 55 verbose="off"
56 listfiles="on" 56 listfiles="on"
57 includeAntRuntime="no"
57 source="5" 58 source="5"
58 /> 59 />
59 60