davidcl pushed to scilab (f21). "Merge branch 'f22' into f21"
notifications at fedoraproject.org
notifications at fedoraproject.org
Wed May 6 12:34:47 UTC 2015
>From c366ecf784ca5ac6ceb4331ea2940491883e7569 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20DAVID?=
<clement.david at scilab-enterprises.com>
Date: Fri, 12 Dec 2014 11:54:31 +0100
Subject: Re-enable the arm build to check
diff --git a/scilab.spec b/scilab.spec
index a86adcb..15bc72b 100644
--- a/scilab.spec
+++ b/scilab.spec
@@ -1,7 +1,7 @@
# baserelease defines which build revision of this version we're building.
# The magical name baserelease is matched by the rpmdev-bumpspec tool, which
# you should use.
-%global baserelease 2
+%global baserelease 3
# On a released (stable or beta) version set it to 1
%define is_release 1
@@ -188,8 +188,6 @@ License: CeCILL
Summary: Scientific software package (documentation files)
BuildArch: noarch
-# See https://bugzilla.redhat.com/show_bug.cgi?id=993239
-ExcludeArch: %{arm}
Requires: %{name} = %{version}-%{release}
%description doc
@@ -344,6 +342,9 @@ fi
%{_datadir}/%{name}/modules/*/tests
%changelog
+* Fri Dec 12 2014 Clément David <c.david86 at gmail.com> - 5.5.1-3
+- Re-enable the arm build to check
+
* Wed Nov 19 2014 Clément David <c.david86 at gmail.com> - 5.5.1-2
- Fix Release value
--
cgit v0.10.2
>From 8fa2a38d0f14815e908d4b258cbedda5e0bf3ca8 Mon Sep 17 00:00:00 2001
From: Orion Poplawski <orion at cora.nwra.com>
Date: Wed, 7 Jan 2015 15:00:20 -0700
Subject: Rebuild for hdf5 1.8.14
diff --git a/scilab.spec b/scilab.spec
index 15bc72b..7bc5aef 100644
--- a/scilab.spec
+++ b/scilab.spec
@@ -1,7 +1,7 @@
# baserelease defines which build revision of this version we're building.
# The magical name baserelease is matched by the rpmdev-bumpspec tool, which
# you should use.
-%global baserelease 3
+%global baserelease 4
# On a released (stable or beta) version set it to 1
%define is_release 1
@@ -342,6 +342,9 @@ fi
%{_datadir}/%{name}/modules/*/tests
%changelog
+* Wed Jan 07 2015 Orion Poplawski <orion at cora.nwra.com> - 5.5.1-4
+- Rebuild for hdf5 1.8.14
+
* Fri Dec 12 2014 Clément David <c.david86 at gmail.com> - 5.5.1-3
- Re-enable the arm build to check
--
cgit v0.10.2
>From 2b8bf2f342be4081c0b88b8db6cc288cd8959298 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20DAVID?=
<clement.david at scilab-enterprises.com>
Date: Tue, 3 Feb 2015 10:23:03 +0100
Subject: Remove xcos.desktop scinotes.desktop
diff --git a/scilab.spec b/scilab.spec
index 7bc5aef..93cbef4 100644
--- a/scilab.spec
+++ b/scilab.spec
@@ -1,7 +1,7 @@
# baserelease defines which build revision of this version we're building.
# The magical name baserelease is matched by the rpmdev-bumpspec tool, which
# you should use.
-%global baserelease 4
+%global baserelease 5
# On a released (stable or beta) version set it to 1
%define is_release 1
@@ -262,8 +262,10 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop
appdata-validate -relax %{buildroot}%{_datadir}/appdata/%{name}.appdata.xml
%find_lang %{name}
-# Remove more advanced repl, user should use CLI options instead
-rm -fr %{buildroot}%{_datadir}/applications/%{name}-*.desktop
+# Remove specific applications, user should use CLI options instead
+rm -fr %{buildroot}%{_datadir}/applications/%{name}-*.desktop \
+ %{buildroot}%{_datadir}/applications/scinotes.desktop \
+ %{buildroot}%{_datadir}/applications/xcos.desktop
# Remove la files
rm -fr %{buildroot}%{_libdir}/%{name}/*.la
@@ -342,6 +344,9 @@ fi
%{_datadir}/%{name}/modules/*/tests
%changelog
+* Tue Feb 03 2015 Clément David <c.david86 at gmail.com> - 5.5.1-5
+- Remove xcos.desktop scinotes.desktop
+
* Wed Jan 07 2015 Orion Poplawski <orion at cora.nwra.com> - 5.5.1-4
- Rebuild for hdf5 1.8.14
--
cgit v0.10.2
>From fe22098d94bd32445f39c793c8436d574ad80a4a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20DAVID?=
<clement.david at scilab-enterprises.com>
Date: Tue, 3 Feb 2015 18:26:02 +0100
Subject: Update to the latest xmlgraphics-commons
diff --git a/scilab-0005-xmlgraphics-commons.patch b/scilab-0005-xmlgraphics-commons.patch
new file mode 100644
index 0000000..bb6a4c6
--- /dev/null
+++ b/scilab-0005-xmlgraphics-commons.patch
@@ -0,0 +1,84 @@
+Index: scilab-5.5.1/modules/graphic_export/src/java/org/scilab/modules/graphic_export/Export.java
+===================================================================
+--- scilab-5.5.1.orig/modules/graphic_export/src/java/org/scilab/modules/graphic_export/Export.java
++++ scilab-5.5.1/modules/graphic_export/src/java/org/scilab/modules/graphic_export/Export.java
+@@ -832,7 +832,7 @@ public class Export {
+ }
+
+ @Override
+- public int processShape(Shape s) throws IOException {
++ public int processShape(Shape s, boolean b) throws IOException {
+ if (s instanceof Ellipse2D.Double) {
+ Ellipse2D.Double ell = (Ellipse2D.Double) s;
+ if (ell.height == ell.width) {
+@@ -855,10 +855,10 @@ public class Export {
+ buffer.append("[").append(gen.formatDouble(coords[0])).append(" ").append(gen.formatDouble(coords[1]));
+ it.next();
+ } else {
+- return super.processShape(s);
++ return super.processShape(s,true);
+ }
+ } else {
+- return super.processShape(s);
++ return super.processShape(s,true);
+ }
+
+ for (; !it.isDone(); it.next()) {
+@@ -866,7 +866,7 @@ public class Export {
+ if (type == PathIterator.SEG_LINETO) {
+ buffer.append(" ").append(gen.formatDouble(coords[0])).append(" ").append(gen.formatDouble(coords[1]));
+ } else {
+- return super.processShape(s);
++ return super.processShape(s,true);
+ }
+ }
+ buffer.append("] DP");
+@@ -874,7 +874,7 @@ public class Export {
+ return PathIterator.WIND_NON_ZERO;
+ }
+
+- return super.processShape(s);
++ return super.processShape(s,true);
+ }
+ };
+ g2d.setGraphicContext(new GraphicContext());
+@@ -1003,7 +1003,7 @@ public class Export {
+ }
+
+ @Override
+- public int processShape(Shape s) throws IOException {
++ public int processShape(Shape s, boolean b) throws IOException {
+ if (s instanceof Ellipse2D.Double) {
+ Ellipse2D.Double ell = (Ellipse2D.Double) s;
+ if (ell.height == ell.width) {
+@@ -1026,10 +1026,10 @@ public class Export {
+ buffer.append("[").append(gen.formatDouble(coords[0])).append(" ").append(gen.formatDouble(coords[1]));
+ it.next();
+ } else {
+- return super.processShape(s);
++ return super.processShape(s,true);
+ }
+ } else {
+- return super.processShape(s);
++ return super.processShape(s,true);
+ }
+
+ for (; !it.isDone(); it.next()) {
+@@ -1037,7 +1037,7 @@ public class Export {
+ if (type == PathIterator.SEG_LINETO) {
+ buffer.append(" ").append(gen.formatDouble(coords[0])).append(" ").append(gen.formatDouble(coords[1]));
+ } else {
+- return super.processShape(s);
++ return super.processShape(s,true);
+ }
+ }
+ buffer.append("] DP");
+@@ -1045,7 +1045,7 @@ public class Export {
+ return PathIterator.WIND_NON_ZERO;
+ }
+
+- return super.processShape(s);
++ return super.processShape(s,true);
+ }
+
+ };
diff --git a/scilab.spec b/scilab.spec
index 93cbef4..da0d49e 100644
--- a/scilab.spec
+++ b/scilab.spec
@@ -59,6 +59,8 @@ Patch2: %{name}-0002-fix-asan-issues.patch
Patch3: %{name}-0003-fix-make-doc-ja_JP.patch
# Disable scirenderer build
Patch4: %{name}-0004-disable-scirenderer-build.patch
+# Update to the latest xmlgraphics-commons
+Patch5: %{name}-0005-xmlgraphics-commons.patch
# Dependencies are extracted from :
# "http://wiki.scilab.org/Dependencies of Scilab 5.X"
@@ -233,6 +235,7 @@ This package provide test files for Scilab.
%patch2 -p1 -b .asan
%patch3 -p1 -b .ja_JP-doc
%patch4 -p1 -b .scirenderer
+%patch5 -p1 -b .xmlgraphics
# Fix Class-Path in manifest
sed -i '/name="Class-Path"/d' build.incl.xml
@@ -346,6 +349,7 @@ fi
%changelog
* Tue Feb 03 2015 Clément David <c.david86 at gmail.com> - 5.5.1-5
- Remove xcos.desktop scinotes.desktop
+- Update to the latest xmlgraphics-common
* Wed Jan 07 2015 Orion Poplawski <orion at cora.nwra.com> - 5.5.1-4
- Rebuild for hdf5 1.8.14
--
cgit v0.10.2
>From 83a05be2cd664b65319e5fe4277d8a7a7a71c9a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20DAVID?=
<clement.david at scilab-enterprises.com>
Date: Wed, 18 Feb 2015 08:37:50 +0100
Subject: Disable ARM build as make CHECK-tests does not pass
diff --git a/scilab.spec b/scilab.spec
index da0d49e..da81044 100644
--- a/scilab.spec
+++ b/scilab.spec
@@ -34,6 +34,7 @@ Name: scilab
Version: 5.5.1
Release: %{pkg_release}
Summary: Scientific software package for numerical computations
+ExcludeArch: %{arm}
Group: Applications/Engineering
License: CeCILL
--
cgit v0.10.2
>From f9ebc6e80b2007d10274b96bb1f74dc976006eb8 Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk at redhat.com>
Date: Tue, 24 Mar 2015 13:21:48 +0100
Subject: Remove unneeded BR on cobertura
diff --git a/scilab.spec b/scilab.spec
index da81044..8f6085f 100644
--- a/scilab.spec
+++ b/scilab.spec
@@ -1,7 +1,7 @@
# baserelease defines which build revision of this version we're building.
# The magical name baserelease is matched by the rpmdev-bumpspec tool, which
# you should use.
-%global baserelease 5
+%global baserelease 6
# On a released (stable or beta) version set it to 1
%define is_release 1
@@ -144,7 +144,6 @@ BuildRequires: liberation-sans-fonts
# QA tests and validation
BuildRequires: checkstyle
BuildRequires: junit
-BuildRequires: cobertura
# All optional dependencies are needed to provide a full-featured Scilab
BuildRequires: gettext-devel
@@ -348,6 +347,9 @@ fi
%{_datadir}/%{name}/modules/*/tests
%changelog
+* Tue Mar 24 2015 Mikolaj Izdebski <mizdebsk at redhat.com> - 5.5.1-6
+- Remove unneeded BR on cobertura
+
* Tue Feb 03 2015 Clément David <c.david86 at gmail.com> - 5.5.1-5
- Remove xcos.desktop scinotes.desktop
- Update to the latest xmlgraphics-common
--
cgit v0.10.2
>From aeec429f11f027815c4b2b92fe7719d0c7dbcfe9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20DAVID?=
<clement.david at scilab-enterprises.com>
Date: Sat, 4 Apr 2015 14:46:58 +0200
Subject: Update to scilab 5.5.2
diff --git a/scilab-0006-fix-javadocs-br.patch b/scilab-0006-fix-javadocs-br.patch
new file mode 100644
index 0000000..5afda55
--- /dev/null
+++ b/scilab-0006-fix-javadocs-br.patch
@@ -0,0 +1,988 @@
+From e086dc2da565c23a289cca2d29897b909f0c7b91 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Cl=C3=A9ment=20DAVID?=
+ <clement.david at scilab-enterprises.com>
+Date: Wed, 6 May 2015 08:43:13 +0200
+Subject: [PATCH] Update the javadoc comments to "JEP 172: DocLint"
+
+Accordingly to the Javadoc team, the <br /> tag is not a valid HTML tag
+and it will generate an error at javadoc build with a recent JDK.
+
+Change-Id: Iae8fa8f2ea80a6da5938a0f5a70bb164d8da38a2
+---
+ .../java/org/scilab/modules/javasci/Scilab.java | 398 ++++++++++-----------
+ .../org/scilab/modules/types/ScilabBoolean.java | 6 +-
+ .../modules/types/ScilabBooleanReference.java | 4 +-
+ .../scilab/modules/types/ScilabBooleanSparse.java | 2 +-
+ .../org/scilab/modules/types/ScilabDouble.java | 14 +-
+ .../modules/types/ScilabDoubleReference.java | 12 +-
+ .../org/scilab/modules/types/ScilabInteger.java | 6 +-
+ .../modules/types/ScilabIntegerReference.java | 4 +-
+ .../java/org/scilab/modules/types/ScilabList.java | 10 +-
+ .../java/org/scilab/modules/types/ScilabMList.java | 10 +-
+ .../org/scilab/modules/types/ScilabPolynomial.java | 2 +-
+ .../org/scilab/modules/types/ScilabSparse.java | 2 +-
+ .../org/scilab/modules/types/ScilabString.java | 6 +-
+ .../java/org/scilab/modules/types/ScilabTList.java | 10 +-
+ .../java/org/scilab/modules/types/ScilabType.java | 2 +-
+ 15 files changed, 244 insertions(+), 244 deletions(-)
+
+diff --git a/scilab/modules/javasci/src/java/org/scilab/modules/javasci/Scilab.java b/scilab/modules/javasci/src/java/org/scilab/modules/javasci/Scilab.java
+index 207b8f1..e32bb91 100644
+--- a/scilab/modules/javasci/src/java/org/scilab/modules/javasci/Scilab.java
++++ b/scilab/modules/javasci/src/java/org/scilab/modules/javasci/Scilab.java
+@@ -38,17 +38,17 @@ import org.scilab.modules.javasci.JavasciException.ScilabErrorException;
+
+ /**
+ * This class provides the capability to access to the Scilab engine from
+- * a Java application.<br />
+- * <br />
+- * Example:<br />
++ * a Java application.<BR>
++ * <BR>
++ * Example:<BR>
+ * <code>
+- * Scilab sci = new Scilab();<br />
+- * if (sci.open()) {<br />
+- * double [][]a={{21.2, 22.0, 42.0, 39.0},{23.2, 24.0, 44.0, 40.0}};<br />
+- * ScilabDouble aOriginal = new ScilabDouble(a);<br />
+- * sci.put("a",aOriginal);<br />
+- * ScilabDouble aFromScilab = (ScilabDouble)sci.get("a");<br />
+- * }<br />
++ * Scilab sci = new Scilab();<BR>
++ * if (sci.open()) {<BR>
++ * double [][]a={{21.2, 22.0, 42.0, 39.0},{23.2, 24.0, 44.0, 40.0}};<BR>
++ * ScilabDouble aOriginal = new ScilabDouble(a);<BR>
++ * sci.put("a",aOriginal);<BR>
++ * ScilabDouble aFromScilab = (ScilabDouble)sci.get("a");<BR>
++ * }<BR>
+ * </code>
+ * @see org.scilab.modules.types
+ */
+@@ -60,7 +60,7 @@ public class Scilab {
+ private boolean advancedMode = false;
+
+ /**
+- * Creator of the Scilab Javasci object. <br />
++ * Creator of the Scilab Javasci object. <BR>
+ * Scilab data path is autodetected and advanced features disabled
+ */
+ public Scilab() throws InitializationException {
+@@ -68,13 +68,13 @@ public class Scilab {
+ }
+
+ /**
+- * Creator of the Scilab Javasci object with a specific Scilab path.<br />
++ * Creator of the Scilab Javasci object with a specific Scilab path.<BR>
+ * Advanced features are disabled (faster)
+- * <br />
+- * Example:<br />
++ * <BR>
++ * Example:<BR>
+ * <code>
+- * Scilab sci = new Scilab("/path/to/Scilab/data/dir/");<br />
+- * <br />
++ * Scilab sci = new Scilab("/path/to/Scilab/data/dir/");<BR>
++ * <BR>
+ * </code>
+ * @param SCI provide the path to Scilab data
+ */
+@@ -83,13 +83,13 @@ public class Scilab {
+ }
+
+ /**
+- * Creator of the Scilab Javasci object in advanced mode<br />
++ * Creator of the Scilab Javasci object in advanced mode<BR>
+ * Scilab data path is autodetected
+- * <br />
+- * Example:<br />
++ * <BR>
++ * Example:<BR>
+ * <code>
+- * Scilab sci = new Scilab(true); // Starts in advanced mode<br />
+- * <br />
++ * Scilab sci = new Scilab(true); // Starts in advanced mode<BR>
++ * <BR>
+ * </code>
+ * @param advancedMode true enables the advanced mode (GUI, graphics, Tcl/Tk, sciNotes...). Smaller.
+ */
+@@ -98,17 +98,17 @@ public class Scilab {
+ }
+
+ /**
+- * Creator of the Scilab Javasci object. <br />
+- * Under GNU/Linux / Mac OS X, try to detect Scilab base path<br />
+- * if the property SCI is set, use it<br />
+- * if not, try with the global variable SCI<br />
+- * if not, throws a new exception<br />
+- * Under Windows, use also the registery<br />
+- * <br />
+- * Example:<br />
++ * Creator of the Scilab Javasci object. <BR>
++ * Under GNU/Linux / Mac OS X, try to detect Scilab base path<BR>
++ * if the property SCI is set, use it<BR>
++ * if not, try with the global variable SCI<BR>
++ * if not, throws a new exception<BR>
++ * Under Windows, use also the registery<BR>
++ * <BR>
++ * Example:<BR>
+ * <code>
+- * Scilab sci = new Scilab("/path/to/Scilab/data/dir/",true); // Starts in advanced mode<br />
+- * <br />
++ * Scilab sci = new Scilab("/path/to/Scilab/data/dir/",true); // Starts in advanced mode<BR>
++ * <BR>
+ * </code>
+ * @param SCIPath the path to Scilab data
+ * @param advancedMode true enables the advanced mode (GUI, graphics, Tcl/Tk, sciNotes...). Smaller.
+@@ -150,16 +150,16 @@ public class Scilab {
+ }
+
+ /**
+- * Open a connection to the Scilab engine<br />
+- * This function is based on Call_ScilabOpen from call_scilab<br />
+- * Note: For now, only one instance of Scilab can be launched<br />
+- * A second launch will return FALSE<br />
+- * <br />
+- * Example:<br />
++ * Open a connection to the Scilab engine<BR>
++ * This function is based on Call_ScilabOpen from call_scilab<BR>
++ * Note: For now, only one instance of Scilab can be launched<BR>
++ * A second launch will return FALSE<BR>
++ * <BR>
++ * Example:<BR>
+ * <code>
+- * Scilab sci = new Scilab();<br />
+- * sci.open();<br />
+- * <br />
++ * Scilab sci = new Scilab();<BR>
++ * sci.open();<BR>
++ * <BR>
+ * </code>
+ * @return if the operation is successful
+ * @throws AlreadyRunningException Scilab is already running
+@@ -185,16 +185,16 @@ public class Scilab {
+ }
+
+ /**
+- * Open a connection to the Scilab engine and run the command job<br />
+- * This function is based on Call_ScilabOpen from call_scilab<br />
+- * Note: For now, only one instance of Scilab can be launched<br />
+- * A second launch will return FALSE<br />
+- * <br />
+- * Example:<br />
++ * Open a connection to the Scilab engine and run the command job<BR>
++ * This function is based on Call_ScilabOpen from call_scilab<BR>
++ * Note: For now, only one instance of Scilab can be launched<BR>
++ * A second launch will return FALSE<BR>
++ * <BR>
++ * Example:<BR>
+ * <code>
+- * Scilab sci = new Scilab();<br />
+- * sci.open("a=%pi;");<br />
+- * <br />
++ * Scilab sci = new Scilab();<BR>
++ * sci.open("a=%pi;");<BR>
++ * <BR>
+ * </code>
+ * @param job The job to run on startup
+ * @return if the operation is successful
+@@ -208,16 +208,16 @@ public class Scilab {
+ }
+
+ /**
+- * Open a connection to the Scilab engine and run commands job<br />
+- * This function is based on Call_ScilabOpen from call_scilab<br />
+- * Note: For now, only one instance of Scilab can be launched<br />
+- * A second launch will return FALSE<br />
+- * <br />
+- * Example:<br />
++ * Open a connection to the Scilab engine and run commands job<BR>
++ * This function is based on Call_ScilabOpen from call_scilab<BR>
++ * Note: For now, only one instance of Scilab can be launched<BR>
++ * A second launch will return FALSE<BR>
++ * <BR>
++ * Example:<BR>
+ * <code>
+- * Scilab sci = new Scilab();<br />
+- * sci.open(new String[]{"a=42*2;","b=44*2", "c=(a==b)"});<br />
+- * <br />
++ * Scilab sci = new Scilab();<BR>
++ * sci.open(new String[]{"a=42*2;","b=44*2", "c=(a==b)"});<BR>
++ * <BR>
+ * </code>
+ * @param jobs The serie of jobs to run on startup
+ * @return if the operation is successful
+@@ -231,16 +231,16 @@ public class Scilab {
+
+
+ /**
+- * Open a connection to the Scilab engine and run thefile scriptFilename<br />
+- * This function is based on Call_ScilabOpen from call_scilab<br />
+- * Note: For now, only one instance of Scilab can be launched<br />
+- * A second launch will return FALSE<br />
+- * <br />
+- * Example:<br />
++ * Open a connection to the Scilab engine and run thefile scriptFilename<BR>
++ * This function is based on Call_ScilabOpen from call_scilab<BR>
++ * Note: For now, only one instance of Scilab can be launched<BR>
++ * A second launch will return FALSE<BR>
++ * <BR>
++ * Example:<BR>
+ * <code>
+- * Scilab sci = new Scilab();<br />
+- * sci.open(new File("/tmp/myscript.sce"));<br />
+- * <br />
++ * Scilab sci = new Scilab();<BR>
++ * sci.open(new File("/tmp/myscript.sce"));<BR>
++ * <BR>
+ * </code>
+ * @param scriptFilename The script to execute on startup
+ * @return if the operation is successful
+@@ -255,13 +255,13 @@ public class Scilab {
+
+
+ /**
+- * Execute a single command in Scilab<br />
++ * Execute a single command in Scilab<BR>
+ * This function is based on SendScilabJob from call_scilab
+- * <br />
+- * Example:<br />
++ * <BR>
++ * Example:<BR>
+ * <code>
+- * sci.exec("a=2*%pi");<br />
+- * <br />
++ * sci.exec("a=2*%pi");<BR>
++ * <BR>
+ * </code>
+ * @param job the job to execute
+ * @return if the operation is successful
+@@ -277,14 +277,14 @@ public class Scilab {
+
+
+ /**
+- * Execute a single command in Scilab<br />
+- * Returns a ScilabErrorException in case of Scilab problem<br />
++ * Execute a single command in Scilab<BR>
++ * Returns a ScilabErrorException in case of Scilab problem<BR>
+ * This function is based on SendScilabJob from call_scilab
+- * <br />
+- * Example:<br />
++ * <BR>
++ * Example:<BR>
+ * <code>
+- * sci.exec("a=2*%pi");<br />
+- * <br />
++ * sci.exec("a=2*%pi");<BR>
++ * <BR>
+ * </code>
+ * @param job the job to execute
+ * @since 5.4.0
+@@ -298,13 +298,13 @@ public class Scilab {
+
+
+ /**
+- * Execute several commands in Scilab<br />
++ * Execute several commands in Scilab<BR>
+ * This function is based on SendScilabJob from call_scilab
+- * <br />
+- * Example:<br />
++ * <BR>
++ * Example:<BR>
+ * <code>
+- * sci.exec(new String[]{"a=42*2;","b=44*2", "c=(a==b)"});<br />
+- * <br />
++ * sci.exec(new String[]{"a=42*2;","b=44*2", "c=(a==b)"});<BR>
++ * <BR>
+ * </code>
+ * @param jobs the serie of job to execute
+ * @return if the operation is successful
+@@ -319,14 +319,14 @@ public class Scilab {
+ }
+
+ /**
+- * Execute several commands in Scilab<br />
+- * Returns a ScilabErrorException in case of Scilab problem<br />
++ * Execute several commands in Scilab<BR>
++ * Returns a ScilabErrorException in case of Scilab problem<BR>
+ * This function is based on SendScilabJob from call_scilab
+- * <br />
+- * Example:<br />
++ * <BR>
++ * Example:<BR>
+ * <code>
+- * sci.exec(new String[]{"a=42*2;","b=44*2", "c=(a==b)"});<br />
+- * <br />
++ * sci.exec(new String[]{"a=42*2;","b=44*2", "c=(a==b)"});<BR>
++ * <BR>
+ * </code>
+ * @param jobs the serie of job to execute
+ * @since 5.4.0
+@@ -339,17 +339,17 @@ public class Scilab {
+ }
+
+ /**
+- * Execute a Scilab script .sce/.sci and throws an exception in case<br />
+- * of a Scilab error<br />
+- * Returns a ScilabErrorException in case of Scilab problem<br />
+- * This function is based on SendScilabJob from call_scilab<br />
++ * Execute a Scilab script .sce/.sci and throws an exception in case<BR>
++ * of a Scilab error<BR>
++ * Returns a ScilabErrorException in case of Scilab problem<BR>
++ * This function is based on SendScilabJob from call_scilab<BR>
+ * Note that this function is a direct call on the Scilab function exec:
+ * <code> this.exec("exec('" + scriptFilename + "');");</code>
+- * <br />
+- * Example:<br />
++ * <BR>
++ * Example:<BR>
+ * <code>
+- * sci.exec(new File("/tmp/myscript.sci"));<br />
+- * <br />
++ * sci.exec(new File("/tmp/myscript.sci"));<BR>
++ * <BR>
+ * </code>
+ * @param scriptFilename the script to execute
+ * @since 5.4.0
+@@ -362,16 +362,16 @@ public class Scilab {
+ }
+
+ /**
+- * Execute a Scilab script .sce/.sci and throws an exception in case<br />
+- * the file is not found<br />
+- * This function is based on SendScilabJob from call_scilab<br />
++ * Execute a Scilab script .sce/.sci and throws an exception in case<BR>
++ * the file is not found<BR>
++ * This function is based on SendScilabJob from call_scilab<BR>
+ * Note that this function is a direct call on the Scilab function exec:
+ * <code> this.exec("exec('" + scriptFilename + "');");</code>
+- * <br />
+- * Example:<br />
++ * <BR>
++ * Example:<BR>
+ * <code>
+- * sci.exec(new File("/tmp/myscript.sci"));<br />
+- * <br />
++ * sci.exec(new File("/tmp/myscript.sci"));<BR>
++ * <BR>
+ * </code>
+ * @param scriptFilename the script to execute
+ * @return if the operation is successful
+@@ -386,14 +386,14 @@ public class Scilab {
+
+ /**
+ * Detect if a variable (varname) exists in Scilab
+- * <br />
+- * Example:<br />
++ * <BR>
++ * Example:<BR>
+ * <code>
+- * double [][]a={{21.2, 22.0, 42.0, 39.0},{23.2, 24.0, 44.0, 40.0}};<br />
+- * ScilabDouble aOriginal = new ScilabDouble(a);<br />
+- * sci.put("a",aOriginal);<br />
+- * assert sci.isExistingVariable("a") == true;<br />
+- * <br />
++ * double [][]a={{21.2, 22.0, 42.0, 39.0},{23.2, 24.0, 44.0, 40.0}};<BR>
++ * ScilabDouble aOriginal = new ScilabDouble(a);<BR>
++ * sci.put("a",aOriginal);<BR>
++ * assert sci.isExistingVariable("a") == true;<BR>
++ * <BR>
+ * </code>
+ * @param varname the variable to check
+ * @return if the variable exists or not
+@@ -404,13 +404,13 @@ public class Scilab {
+
+
+ /**
+- * Shutdown Scilab<br />
++ * Shutdown Scilab<BR>
+ * This function is based on TerminateScilab from call_scilab
+- * <br />
+- * Example:<br />
++ * <BR>
++ * Example:<BR>
+ * <code>
+- * sci.close();<br />
+- * <br />
++ * sci.close();<BR>
++ * <BR>
+ * </code>
+ * @return if the operation is successful
+ */
+@@ -421,12 +421,12 @@ public class Scilab {
+
+ /**
+ * Return the last error code
+- * <br />
+- * Example:<br />
++ * <BR>
++ * Example:<BR>
+ * <code>
+- * sci.open("a=1+"); // Wrong operation<br />
+- * sci.getLastErrorCode() // Returns 2<br />
+- * <br />
++ * sci.open("a=1+"); // Wrong operation<BR>
++ * sci.getLastErrorCode() // Returns 2<BR>
++ * <BR>
+ * </code>
+ * @return the error code
+ */
+@@ -437,12 +437,12 @@ public class Scilab {
+
+ /**
+ * Return the last error message
+- * <br />
+- * Example:<br />
++ * <BR>
++ * Example:<BR>
+ * <code>
+- * sci.open("a=1+");<br />
+- * System.err.println(sci.getLastErrorMessage());<br />
+- * <br />
++ * sci.open("a=1+");<BR>
++ * System.err.println(sci.getLastErrorMessage());<BR>
++ * <BR>
+ * </code>
+ * @return the error message itself
+ */
+@@ -452,14 +452,14 @@ public class Scilab {
+
+
+ /**
+- * Detect if a Scilab graphic window is still opened<br />
++ * Detect if a Scilab graphic window is still opened<BR>
+ * This function is based on ScilabHaveAGraph from call_scilab
+- * <br />
+- * Example:<br />
++ * <BR>
++ * Example:<BR>
+ * <code>
+- * sci.exec("plot3d();");<br />
+- * sci.isGraphicOpened();<br />
+- * <br />
++ * sci.exec("plot3d();");<BR>
++ * sci.isGraphicOpened();<BR>
++ * <BR>
+ * </code>
+ * @return if the graphic is open or not
+ */
+@@ -469,14 +469,14 @@ public class Scilab {
+
+ /**
+ * Return the code type of a variable varname
+- * <br />
+- * Example:<br />
++ * <BR>
++ * Example:<BR>
+ * <code>
+- * sci.exec("a = 2*%pi");<br />
+- * if (sci.getVariableType("a") == ScilabTypeEnum.sci_matrix) {<br />
+- * System.out.println("a is a double matrix");<br />
+- * }<br />
+- * <br />
++ * sci.exec("a = 2*%pi");<BR>
++ * if (sci.getVariableType("a") == ScilabTypeEnum.sci_matrix) {<BR>
++ * System.out.println("a is a double matrix");<BR>
++ * }<BR>
++ * <BR>
+ * </code>
+ * @param varName the name of the variable
+ * @return the type of the variable
+@@ -489,14 +489,14 @@ public class Scilab {
+
+ /**
+ * Return the code type of a variable varname in the current Scilab session
+- * <br />
+- * Example:<br />
++ * <BR>
++ * Example:<BR>
+ * <code>
+- * sci.exec("a = 2*%pi");<br />
+- * if (sci.getVariableType("a") == ScilabTypeEnum.sci_matrix) {<br />
+- * System.out.println("a is a double matrix");<br />
+- * }<br />
+- * <br />
++ * sci.exec("a = 2*%pi");<BR>
++ * if (sci.getVariableType("a") == ScilabTypeEnum.sci_matrix) {<BR>
++ * System.out.println("a is a double matrix");<BR>
++ * }<BR>
++ * <BR>
+ * </code>
+ * @param varName the name of the variable
+ * @return the type of the variable
+@@ -522,17 +522,17 @@ public class Scilab {
+ }
+
+ /**
+- * Returns a variable named varname<br />
++ * Returns a variable named varname<BR>
+ * Throws an exception if the datatype is not managed or if the variable is not available
+- * <br />
+- * Example:<br />
++ * <BR>
++ * Example:<BR>
+ * <code>
+- * double [][]a={{21.2, 22.0, 42.0, 39.0},{23.2, 24.0, 44.0, 40.0}};<br />
+- * double [][]aImg={{212.2, 221.0, 423.0, 393.0},{234.2, 244.0, 441.0, 407.0}};<br />
+- * ScilabDouble aOriginal = new ScilabDouble(a, aImg);<br />
+- * sci.put("a",aOriginal);<br />
+- * ScilabDouble aFromScilab = (ScilabDouble)sci.get("a");<br />
+- * <br />
++ * double [][]a={{21.2, 22.0, 42.0, 39.0},{23.2, 24.0, 44.0, 40.0}};<BR>
++ * double [][]aImg={{212.2, 221.0, 423.0, 393.0},{234.2, 244.0, 441.0, 407.0}};<BR>
++ * ScilabDouble aOriginal = new ScilabDouble(a, aImg);<BR>
++ * sci.put("a",aOriginal);<BR>
++ * ScilabDouble aFromScilab = (ScilabDouble)sci.get("a");<BR>
++ * <BR>
+ * </code>
+ * @param varname the name of the variable
+ * @return return the variable
+@@ -543,17 +543,17 @@ public class Scilab {
+ }
+
+ /**
+- * Returns a reference variable named varname<br />
++ * Returns a reference variable named varname<BR>
+ * Throws an exception if the datatype is not managed or if the variable is not available
+- * <br />
+- * Example:<br />
++ * <BR>
++ * Example:<BR>
+ * <code>
+- * double [][]a={{21.2, 22.0, 42.0, 39.0},{23.2, 24.0, 44.0, 40.0}};<br />
+- * double [][]aImg={{212.2, 221.0, 423.0, 393.0},{234.2, 244.0, 441.0, 407.0}};<br />
+- * ScilabDouble aOriginal = new ScilabDouble(a, aImg);<br />
+- * sci.put("a",aOriginal);<br />
+- * ScilabDouble aFromScilab = (ScilabDouble)sci.get("a");<br />
+- * <br />
++ * double [][]a={{21.2, 22.0, 42.0, 39.0},{23.2, 24.0, 44.0, 40.0}};<BR>
++ * double [][]aImg={{212.2, 221.0, 423.0, 393.0},{234.2, 244.0, 441.0, 407.0}};<BR>
++ * ScilabDouble aOriginal = new ScilabDouble(a, aImg);<BR>
++ * sci.put("a",aOriginal);<BR>
++ * ScilabDouble aFromScilab = (ScilabDouble)sci.get("a");<BR>
++ * <BR>
+ * </code>
+ * @param varname the name of the variable
+ * @return return the variable
+@@ -564,17 +564,17 @@ public class Scilab {
+ }
+
+ /**
+- * Returns a variable named varname in the current Scilab session<br />
++ * Returns a variable named varname in the current Scilab session<BR>
+ * Throws an exception if the datatype is not managed or if the variable is not available
+- * <br />
+- * Example:<br />
++ * <BR>
++ * Example:<BR>
+ * <code>
+- * double [][]a={{21.2, 22.0, 42.0, 39.0},{23.2, 24.0, 44.0, 40.0}};<br />
+- * double [][]aImg={{212.2, 221.0, 423.0, 393.0},{234.2, 244.0, 441.0, 407.0}};<br />
+- * ScilabDouble aOriginal = new ScilabDouble(a, aImg);<br />
+- * sci.put("a",aOriginal);<br />
+- * ScilabDouble aFromScilab = (ScilabDouble)sci.get("a");<br />
+- * <br />
++ * double [][]a={{21.2, 22.0, 42.0, 39.0},{23.2, 24.0, 44.0, 40.0}};<BR>
++ * double [][]aImg={{212.2, 221.0, 423.0, 393.0},{234.2, 244.0, 441.0, 407.0}};<BR>
++ * ScilabDouble aOriginal = new ScilabDouble(a, aImg);<BR>
++ * sci.put("a",aOriginal);<BR>
++ * ScilabDouble aFromScilab = (ScilabDouble)sci.get("a");<BR>
++ * <BR>
+ * </code>
+ * @param varname the name of the variable
+ * @return return the variable
+@@ -585,17 +585,17 @@ public class Scilab {
+ }
+
+ /**
+- * Returns a variable named varname in the current Scilab session<br />
++ * Returns a variable named varname in the current Scilab session<BR>
+ * Throws an exception if the datatype is not managed or if the variable is not available
+- * <br />
+- * Example:<br />
++ * <BR>
++ * Example:<BR>
+ * <code>
+- * double [][]a={{21.2, 22.0, 42.0, 39.0},{23.2, 24.0, 44.0, 40.0}};<br />
+- * double [][]aImg={{212.2, 221.0, 423.0, 393.0},{234.2, 244.0, 441.0, 407.0}};<br />
+- * ScilabDouble aOriginal = new ScilabDouble(a, aImg);<br />
+- * sci.put("a",aOriginal);<br />
+- * ScilabDouble aFromScilab = (ScilabDouble)sci.get("a");<br />
+- * <br />
++ * double [][]a={{21.2, 22.0, 42.0, 39.0},{23.2, 24.0, 44.0, 40.0}};<BR>
++ * double [][]aImg={{212.2, 221.0, 423.0, 393.0},{234.2, 244.0, 441.0, 407.0}};<BR>
++ * ScilabDouble aOriginal = new ScilabDouble(a, aImg);<BR>
++ * sci.put("a",aOriginal);<BR>
++ * ScilabDouble aFromScilab = (ScilabDouble)sci.get("a");<BR>
++ * <BR>
+ * </code>
+ * @param varname the name of the variable
+ * @return return the variable
+@@ -639,16 +639,16 @@ public class Scilab {
+ }
+
+ /**
+- * Send to Scilab a variable theVariable named varname<br />
++ * Send to Scilab a variable theVariable named varname<BR>
+ * Throws an exception if the datatype is not managed or if the variable is not available
+- * <br />
+- * Example:<br />
++ * <BR>
++ * Example:<BR>
+ * <code>
+- * boolean [][]a={{true, true, false, false},{true, false, true, false}};<br />
+- * ScilabBoolean aOriginal = new ScilabBoolean(a);<br />
+- * sci.put("a",aOriginal);<br />
+- * ScilabBoolean aFromScilab = (ScilabBoolean)sci.get("a");<br />
+- * <br />
++ * boolean [][]a={{true, true, false, false},{true, false, true, false}};<BR>
++ * ScilabBoolean aOriginal = new ScilabBoolean(a);<BR>
++ * sci.put("a",aOriginal);<BR>
++ * ScilabBoolean aFromScilab = (ScilabBoolean)sci.get("a");<BR>
++ * <BR>
+ * </code>
+ * @param varname the name of the variable
+ * @param theVariable the variable itself
+@@ -660,16 +660,16 @@ public class Scilab {
+ }
+
+ /**
+- * Send to the current Scilab session a variable theVariable named varname<br />
++ * Send to the current Scilab session a variable theVariable named varname<BR>
+ * Throws an exception if the datatype is not managed or if the variable is not available
+- * <br />
+- * Example:<br />
++ * <BR>
++ * Example:<BR>
+ * <code>
+- * boolean [][]a={{true, true, false, false},{true, false, true, false}};<br />
+- * ScilabBoolean aOriginal = new ScilabBoolean(a);<br />
+- * sci.put("a",aOriginal);<br />
+- * ScilabBoolean aFromScilab = (ScilabBoolean)sci.get("a");<br />
+- * <br />
++ * boolean [][]a={{true, true, false, false},{true, false, true, false}};<BR>
++ * ScilabBoolean aOriginal = new ScilabBoolean(a);<BR>
++ * sci.put("a",aOriginal);<BR>
++ * ScilabBoolean aFromScilab = (ScilabBoolean)sci.get("a");<BR>
++ * <BR>
+ * </code>
+ * @param varname the name of the variable
+ * @param theVariable the variable itself
+@@ -734,7 +734,7 @@ public class Scilab {
+ err = Call_Scilab.putInt(varname, sciInteger.getDataAsInt());
+ break;
+ case sci_uint64:
+- // err = Call_Scilab.putUnsignedLong(varname, sciInteger.getData_());
++ // err = Call_Scilab.putUnsignedLong(varname, sciInteger.getData_());
+ case sci_int64:
+ // err = Call_Scilab.putLong(varname, sciInteger.getData_());
+ break;
+diff --git a/scilab/modules/types/src/java/org/scilab/modules/types/ScilabBoolean.java b/scilab/modules/types/src/java/org/scilab/modules/types/ScilabBoolean.java
+index 64b15f2..06078d9 100644
+--- a/scilab/modules/types/src/java/org/scilab/modules/types/ScilabBoolean.java
++++ b/scilab/modules/types/src/java/org/scilab/modules/types/ScilabBoolean.java
+@@ -24,9 +24,9 @@ import java.io.ObjectOutput;
+ * This class is {@link java.io.Serializable} and any modification could impact
+ * load and store of data (Xcos files, Javasci saved data, etc...).<br>
+ * <br>
+- * Example:<br />
++ * Example:<BR>
+ * <code>
+- * boolean [][]a={{true,false,true}, {true,true,true}};<br />
++ * boolean [][]a={{true,false,true}, {true,true,true}};<BR>
+ * ScilabBoolean aMatrix = new ScilabBoolean(a);
+ * </code>
+ *
+@@ -250,7 +250,7 @@ public class ScilabBoolean implements ScilabType {
+ }
+
+ /**
+- * Display the representation in the Scilab language of the type<br />
++ * Display the representation in the Scilab language of the type<BR>
+ * Note that the representation can be copied/pasted straight into Scilab
+ *
+ * @return the pretty print
+diff --git a/scilab/modules/types/src/java/org/scilab/modules/types/ScilabBooleanReference.java b/scilab/modules/types/src/java/org/scilab/modules/types/ScilabBooleanReference.java
+index c45ba30..86bddbd 100644
+--- a/scilab/modules/types/src/java/org/scilab/modules/types/ScilabBooleanReference.java
++++ b/scilab/modules/types/src/java/org/scilab/modules/types/ScilabBooleanReference.java
+@@ -23,9 +23,9 @@ import java.nio.IntBuffer;
+ * This class is {@link java.io.Serializable} and any modification could impact
+ * load and store of data (Xcos files, Javasci saved data, etc...).<br>
+ * <br>
+- * Example:<br />
++ * Example:<BR>
+ * <code>
+- * boolean [][]a={{true,false,true}, {true,true,true}};<br />
++ * boolean [][]a={{true,false,true}, {true,true,true}};<BR>
+ * ScilabBoolean aMatrix = new ScilabBoolean(a);
+ * </code>
+ *
+diff --git a/scilab/modules/types/src/java/org/scilab/modules/types/ScilabBooleanSparse.java b/scilab/modules/types/src/java/org/scilab/modules/types/ScilabBooleanSparse.java
+index 627347c..6f469f6 100644
+--- a/scilab/modules/types/src/java/org/scilab/modules/types/ScilabBooleanSparse.java
++++ b/scilab/modules/types/src/java/org/scilab/modules/types/ScilabBooleanSparse.java
+@@ -370,7 +370,7 @@ public class ScilabBooleanSparse implements ScilabType {
+ }
+
+ /**
+- * Display the representation in the Scilab language of the type<br />
++ * Display the representation in the Scilab language of the type<BR>
+ * Note that the representation can be copied/pasted straight into Scilab
+ *
+ * @return a Scilab-like String representation of the data.
+diff --git a/scilab/modules/types/src/java/org/scilab/modules/types/ScilabDouble.java b/scilab/modules/types/src/java/org/scilab/modules/types/ScilabDouble.java
+index 6c77957..e1f01f4 100644
+--- a/scilab/modules/types/src/java/org/scilab/modules/types/ScilabDouble.java
++++ b/scilab/modules/types/src/java/org/scilab/modules/types/ScilabDouble.java
+@@ -25,15 +25,15 @@ import java.io.ObjectOutput;
+ * This class is {@link java.io.Serializable} and any modification could impact
+ * load and store of data (Xcos files, Javasci saved data, etc...).<br>
+ * <br>
+- * Example (real):<br />
++ * Example (real):<BR>
+ * <code>
+- * double [][]a={{21.2, 22.0, 42.0, 39.0},{23.2, 24.0, 44.0, 40.0}};<br />
+- * ScilabDouble aMatrix = new ScilabDouble(a);<br />
++ * double [][]a={{21.2, 22.0, 42.0, 39.0},{23.2, 24.0, 44.0, 40.0}};<BR>
++ * ScilabDouble aMatrix = new ScilabDouble(a);<BR>
+ * </code> <br>
+- * Example (complex):<br />
++ * Example (complex):<BR>
+ * <code>
+- * double [][]a={{21.2, 22.0, 42.0, 39.0},{23.2, 24.0, 44.0, 40.0}};<br />
+- * double [][]aImg={{210.2, 220.0, 420.0, 390.0},{230.2, 240.0, 440.0, 400.0}};<br />
++ * double [][]a={{21.2, 22.0, 42.0, 39.0},{23.2, 24.0, 44.0, 40.0}};<BR>
++ * double [][]aImg={{210.2, 220.0, 420.0, 390.0},{230.2, 240.0, 440.0, 400.0}};<BR>
+ * ScilabDouble aMatrix = new ScilabDouble(a, aImg);
+ * </code>
+ *
+@@ -406,7 +406,7 @@ public class ScilabDouble implements ScilabType {
+ }
+
+ /**
+- * Display the representation in the Scilab language of the type<br />
++ * Display the representation in the Scilab language of the type<BR>
+ * Note that the representation can be copied/pasted straight into Scilab
+ *
+ * @return a Scilab-like String representation of the data.
+diff --git a/scilab/modules/types/src/java/org/scilab/modules/types/ScilabDoubleReference.java b/scilab/modules/types/src/java/org/scilab/modules/types/ScilabDoubleReference.java
+index cd2dad0..23deca2 100644
+--- a/scilab/modules/types/src/java/org/scilab/modules/types/ScilabDoubleReference.java
++++ b/scilab/modules/types/src/java/org/scilab/modules/types/ScilabDoubleReference.java
+@@ -24,15 +24,15 @@ import java.nio.DoubleBuffer;
+ * This class is {@link java.io.Serializable} and any modification could impact
+ * load and store of data (Xcos files, Javasci saved data, etc...).<br>
+ * <br>
+- * Example (real):<br />
++ * Example (real):<BR>
+ * <code>
+- * double [][]a={{21.2, 22.0, 42.0, 39.0},{23.2, 24.0, 44.0, 40.0}};<br />
+- * ScilabDouble aMatrix = new ScilabDouble(a);<br />
++ * double [][]a={{21.2, 22.0, 42.0, 39.0},{23.2, 24.0, 44.0, 40.0}};<BR>
++ * ScilabDouble aMatrix = new ScilabDouble(a);<BR>
+ * </code> <br>
+- * Example (complex):<br />
++ * Example (complex):<BR>
+ * <code>
+- * double [][]a={{21.2, 22.0, 42.0, 39.0},{23.2, 24.0, 44.0, 40.0}};<br />
+- * double [][]aImg={{210.2, 220.0, 420.0, 390.0},{230.2, 240.0, 440.0, 400.0}};<br />
++ * double [][]a={{21.2, 22.0, 42.0, 39.0},{23.2, 24.0, 44.0, 40.0}};<BR>
++ * double [][]aImg={{210.2, 220.0, 420.0, 390.0},{230.2, 240.0, 440.0, 400.0}};<BR>
+ * ScilabDouble aMatrix = new ScilabDouble(a, aImg);
+ * </code>
+ *
+diff --git a/scilab/modules/types/src/java/org/scilab/modules/types/ScilabInteger.java b/scilab/modules/types/src/java/org/scilab/modules/types/ScilabInteger.java
+index 4ed3842..ee916f6 100644
+--- a/scilab/modules/types/src/java/org/scilab/modules/types/ScilabInteger.java
++++ b/scilab/modules/types/src/java/org/scilab/modules/types/ScilabInteger.java
+@@ -23,9 +23,9 @@ import java.io.ObjectOutput;
+ * This class is {@link java.io.Serializable} and any modification could impact
+ * load and store of data (Xcos files, Javasci saved data, etc...).<br>
+ * <br>
+- * Example:<br />
++ * Example:<BR>
+ * <code>
+- * byte [][]a={{32,42,41}, {12,13,32}};<br />
++ * byte [][]a={{32,42,41}, {12,13,32}};<BR>
+ * ScilabInteger aMatrix = new ScilabInteger(a, true); // true = unsigned
+ * </code>
+ *
+@@ -832,7 +832,7 @@ public class ScilabInteger implements ScilabType {
+ }
+
+ /**
+- * Display the representation in the Scilab language of the type<br />
++ * Display the representation in the Scilab language of the type<BR>
+ * Note that the representation can be copied/pasted straight into Scilab
+ *
+ * @return the pretty-printed values
+diff --git a/scilab/modules/types/src/java/org/scilab/modules/types/ScilabIntegerReference.java b/scilab/modules/types/src/java/org/scilab/modules/types/ScilabIntegerReference.java
+index d7e8522..2c651f7 100644
+--- a/scilab/modules/types/src/java/org/scilab/modules/types/ScilabIntegerReference.java
++++ b/scilab/modules/types/src/java/org/scilab/modules/types/ScilabIntegerReference.java
+@@ -26,9 +26,9 @@ import java.nio.ShortBuffer;
+ * This class is {@link java.io.Serializable} and any modification could impact
+ * load and store of data (Xcos files, Javasci saved data, etc...).<br>
+ * <br>
+- * Example:<br />
++ * Example:<BR>
+ * <code>
+- * byte [][]a={{32,42,41}, {12,13,32}};<br />
++ * byte [][]a={{32,42,41}, {12,13,32}};<BR>
+ * ScilabInteger aMatrix = new ScilabInteger(a, true); // true = unsigned
+ * </code>
+ *
+diff --git a/scilab/modules/types/src/java/org/scilab/modules/types/ScilabList.java b/scilab/modules/types/src/java/org/scilab/modules/types/ScilabList.java
+index 5c326f0..f423ca2 100644
+--- a/scilab/modules/types/src/java/org/scilab/modules/types/ScilabList.java
++++ b/scilab/modules/types/src/java/org/scilab/modules/types/ScilabList.java
+@@ -25,11 +25,11 @@ import java.util.Collection;
+ * This class is {@link java.io.Serializable} and any modification could impact
+ * load and store of data (Xcos files, Javasci saved data, etc...).<br>
+ * <br>
+- * Example:<br />
++ * Example:<BR>
+ * <code>
+- * ScilabList data = new ScilabList();<br />
+- * data.add(new ScilabString("hello"));<br />
+- * data.add(new ScilabDouble(2));<br />
++ * ScilabList data = new ScilabList();<BR>
++ * data.add(new ScilabString("hello"));<BR>
++ * data.add(new ScilabDouble(2));<BR>
+ * </code>
+ *
+ * @see org.scilab.modules.javasci.Scilab
+@@ -188,7 +188,7 @@ public class ScilabList extends ArrayList<ScilabType> implements ScilabType {
+ }
+
+ /**
+- * Display the representation in the Scilab language of the type<br />
++ * Display the representation in the Scilab language of the type<BR>
+ * Note that the representation can be copied/pasted straight into Scilab
+ *
+ * @return the pretty-printed data
+diff --git a/scilab/modules/types/src/java/org/scilab/modules/types/ScilabMList.java b/scilab/modules/types/src/java/org/scilab/modules/types/ScilabMList.java
+index c725067..b07fd78 100644
+--- a/scilab/modules/types/src/java/org/scilab/modules/types/ScilabMList.java
++++ b/scilab/modules/types/src/java/org/scilab/modules/types/ScilabMList.java
+@@ -27,11 +27,11 @@ import java.util.Map;
+ * This class is {@link java.io.Serializable} and any modification could impact
+ * load and store of data (Xcos files, Javasci saved data, etc...).<br>
+ * <br>
+- * Example:<br />
++ * Example:<BR>
+ * <code>
+- * ScilabMList data = new ScilabMList();<br />
+- * data.add(new ScilabString("hello"));<br />
+- * data.add(new ScilabDouble(2));<br />
++ * ScilabMList data = new ScilabMList();<BR>
++ * data.add(new ScilabString("hello"));<BR>
++ * data.add(new ScilabDouble(2));<BR>
+ * </code>
+ *
+ * @see org.scilab.modules.javasci.Scilab
+@@ -261,7 +261,7 @@ public class ScilabMList extends ArrayList<ScilabType> implements ScilabType {
+ }
+
+ /**
+- * Display the representation in the Scilab language of the type<br />
++ * Display the representation in the Scilab language of the type<BR>
+ * Note that the representation can be copied/pasted straight into Scilab
+ *
+ * @return the pretty-printed data
+diff --git a/scilab/modules/types/src/java/org/scilab/modules/types/ScilabPolynomial.java b/scilab/modules/types/src/java/org/scilab/modules/types/ScilabPolynomial.java
+index 0221b3e..52a114a 100644
+--- a/scilab/modules/types/src/java/org/scilab/modules/types/ScilabPolynomial.java
++++ b/scilab/modules/types/src/java/org/scilab/modules/types/ScilabPolynomial.java
+@@ -368,7 +368,7 @@ public class ScilabPolynomial implements ScilabType {
+ }
+
+ /**
+- * Display the representation in the Scilab language of the type<br />
++ * Display the representation in the Scilab language of the type<BR>
+ * Note that the representation can be copied/pasted straight into Scilab
+ *
+ * @return a Scilab-like String representation of the data.
+diff --git a/scilab/modules/types/src/java/org/scilab/modules/types/ScilabSparse.java b/scilab/modules/types/src/java/org/scilab/modules/types/ScilabSparse.java
+index 845b00b..c090ef1 100644
+--- a/scilab/modules/types/src/java/org/scilab/modules/types/ScilabSparse.java
++++ b/scilab/modules/types/src/java/org/scilab/modules/types/ScilabSparse.java
+@@ -947,7 +947,7 @@ public class ScilabSparse implements ScilabType {
+ }
+
+ /**
+- * Display the representation in the Scilab language of the type<br />
++ * Display the representation in the Scilab language of the type<BR>
+ * Note that the representation can be copied/pasted straight into Scilab
+ *
+ * @return a Scilab-like String representation of the data.
+diff --git a/scilab/modules/types/src/java/org/scilab/modules/types/ScilabString.java b/scilab/modules/types/src/java/org/scilab/modules/types/ScilabString.java
+index fbbd2c7..83cd415 100644
+--- a/scilab/modules/types/src/java/org/scilab/modules/types/ScilabString.java
++++ b/scilab/modules/types/src/java/org/scilab/modules/types/ScilabString.java
+@@ -24,9 +24,9 @@ import java.util.Arrays;
+ * This class is {@link java.io.Serializable} and any modification could impact
+ * load and store of data (Xcos files, Javasci saved data, etc...).<br>
+ * <br>
+- * Example:<br />
++ * Example:<BR>
+ * <code>
+- * String [][]a={{"This","is","my","string"},{"and","I want to", "compare"," them"}};<br />
++ * String [][]a={{"This","is","my","string"},{"and","I want to", "compare"," them"}};<BR>
+ * ScilabString aMatrix = new ScilabString(a);
+ * </code>
+ *
+@@ -229,7 +229,7 @@ public class ScilabString implements ScilabType {
+ }
+
+ /**
+- * Display the representation in the Scilab language of the type<br />
++ * Display the representation in the Scilab language of the type<BR>
+ * Note that the representation can be copied/pasted straight into Scilab
+ *
+ * @return a Scilab-like String representation of the data.
+diff --git a/scilab/modules/types/src/java/org/scilab/modules/types/ScilabTList.java b/scilab/modules/types/src/java/org/scilab/modules/types/ScilabTList.java
+index 6c748e8..e4a46ad 100644
+--- a/scilab/modules/types/src/java/org/scilab/modules/types/ScilabTList.java
++++ b/scilab/modules/types/src/java/org/scilab/modules/types/ScilabTList.java
+@@ -27,11 +27,11 @@ import java.util.Map;
+ * This class is {@link java.io.Serializable} and any modification could impact
+ * load and store of data (Xcos files, Javasci saved data, etc...).<br>
+ * <br>
+- * Example:<br />
++ * Example:<BR>
+ * <code>
+- * ScilabTList data = new ScilabTList();<br />
+- * data.add(new ScilabString("hello"));<br />
+- * data.add(new ScilabDouble(2));<br />
++ * ScilabTList data = new ScilabTList();<BR>
++ * data.add(new ScilabString("hello"));<BR>
++ * data.add(new ScilabDouble(2));<BR>
+ * </code>
+ *
+ * @see org.scilab.modules.javasci.Scilab
+@@ -261,7 +261,7 @@ public class ScilabTList extends ArrayList<ScilabType> implements ScilabType {
+ }
+
+ /**
+- * Display the representation in the Scilab language of the type<br />
++ * Display the representation in the Scilab language of the type<BR>
+ * Note that the representation can be copied/pasted straight into Scilab
+ *
+ * @return the pretty-printed data
+diff --git a/scilab/modules/types/src/java/org/scilab/modules/types/ScilabType.java b/scilab/modules/types/src/java/org/scilab/modules/types/ScilabType.java
+index 70dab05..66f79e4 100644
+--- a/scilab/modules/types/src/java/org/scilab/modules/types/ScilabType.java
++++ b/scilab/modules/types/src/java/org/scilab/modules/types/ScilabType.java
+@@ -89,7 +89,7 @@ public interface ScilabType extends Externalizable, Cloneable {
+ public Object getSerializedObject();
+
+ /**
+- * Display the representation in the Scilab language of the type<br />
++ * Display the representation in the Scilab language of the type<BR>
+ * Note that the representation can be copied/pasted straight into Scilab
+ *
+ * @return the pretty print
+--
+2.1.0
+
diff --git a/scilab.spec b/scilab.spec
index 8f6085f..a703f5e 100644
--- a/scilab.spec
+++ b/scilab.spec
@@ -1,7 +1,7 @@
# baserelease defines which build revision of this version we're building.
# The magical name baserelease is matched by the rpmdev-bumpspec tool, which
# you should use.
-%global baserelease 6
+%global baserelease 1
# On a released (stable or beta) version set it to 1
%define is_release 1
@@ -31,7 +31,7 @@
%endif
Name: scilab
-Version: 5.5.1
+Version: 5.5.2
Release: %{pkg_release}
Summary: Scientific software package for numerical computations
ExcludeArch: %{arm}
@@ -58,10 +58,10 @@ Patch1: %{name}-0001-Use-pkcon-to-install-doc-package.patch
Patch2: %{name}-0002-fix-asan-issues.patch
# Fix make doc-ja_JP
Patch3: %{name}-0003-fix-make-doc-ja_JP.patch
-# Disable scirenderer build
-Patch4: %{name}-0004-disable-scirenderer-build.patch
# Update to the latest xmlgraphics-commons
Patch5: %{name}-0005-xmlgraphics-commons.patch
+# Apply https://codereview.scilab.org/16448
+Patch6: %{name}-0006-fix-javadocs-br.patch
# Dependencies are extracted from :
# "http://wiki.scilab.org/Dependencies of Scilab 5.X"
@@ -92,12 +92,10 @@ BuildRequires: java-devel
BuildRequires: ant
BuildRequires: flexdock
-BuildRequires: scirenderer
BuildRequires: jogl2
BuildRequires: mesa-libGL-devel
Requires: flexdock
-Requires: scirenderer
Requires: jogl2
BuildRequires: jrosetta
@@ -234,8 +232,8 @@ This package provide test files for Scilab.
%patch1 -p1 -b .pkgcon
%patch2 -p1 -b .asan
%patch3 -p1 -b .ja_JP-doc
-%patch4 -p1 -b .scirenderer
%patch5 -p1 -b .xmlgraphics
+%patch6 -p2 -b .javadoc
# Fix Class-Path in manifest
sed -i '/name="Class-Path"/d' build.incl.xml
@@ -253,7 +251,6 @@ rm -fr ~/.Scilab
# it is a windows specific format
%configure \
--disable-static-system-lib \
- --with-external-scirenderer \
--without-emf
make %{?_smp_mflags}
@@ -347,6 +344,9 @@ fi
%{_datadir}/%{name}/modules/*/tests
%changelog
+* Tue Apr 14 2015 Clément David <c.david86 at gmail.com> - 5.5.2-1
+- Update version
+
* Tue Mar 24 2015 Mikolaj Izdebski <mizdebsk at redhat.com> - 5.5.1-6
- Remove unneeded BR on cobertura
diff --git a/sources b/sources
index b3de7d5..ab8c8db 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ce3dcf7b95abd0fc57e51bf8c3ebd805 scilab-5.5.1-src.tar.gz
+b6fab39d76841f41ddf8cab927dea305 scilab-5.5.2-src.tar.gz
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/scilab.git/commit/?h=f21&id=a8b3ea20ddec335db86bc4f7e8e66e0f16f9d099
More information about the scm-commits
mailing list