Scirenderer 0.5.6 => 0.5.7

Change-Id: Ie3d71c15c1d49b562c4e0f9f0593c38fe4fec775

diff --git a/scilab/CHANGES_5.4.X b/scilab/CHANGES_5.4.X
index e2728d1..a47338c 100644 (file)
--- a/scilab/CHANGES_5.4.X
+++ b/scilab/CHANGES_5.4.X
@@ -47,7 +47,7 @@ Compilation
 
 * Scilab dependency on Java HDF has been removed.
 
-* Update to Scirenderer 0.5.6.
+* Update to Scirenderer 0.5.7.
 
 * Update to JOGL 2.0 rc9
 

diff --git a/scilab/configure b/scilab/configure
index cf6833f..b36e22f 100755 (executable)
--- a/scilab/configure
+++ b/scilab/configure
@@ -12719,8 +12719,8 @@ $as_echo "$as_me: WARNING: Could not find or use the Java package/jar scirendere
 
 
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking minimal version (0.5.6) of scirenderer" >&5
-$as_echo_n "checking minimal version (0.5.6) of scirenderer... " >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking minimal version (0.5.7) of scirenderer" >&5
+$as_echo_n "checking minimal version (0.5.7) of scirenderer... " >&6; }
    saved_ac_java_classpath=$ac_java_classpath
    export ac_java_classpath="$SCIRENDERER:$ac_java_classpath"
    if test "x" == "x"; then
@@ -12733,7 +12733,7 @@ import org.scilab.forge.scirenderer.PackageInfo;
 
 public class conftest {
     public static void main(String[] argv) {
-        String minVersion="0.5.6";
+        String minVersion="0.5.7";
 
                             System.out.println(PackageInfo.VERSION);
                                   if (compare(minVersion, PackageInfo.VERSION) > 0) {
@@ -12782,7 +12782,7 @@ EOF
                    STDOUT=`cat conftest.java.output`
                 fi
                 echo "configure: CLASSPATH was $CLASSPATH" >&5
-                  as_fn_error $? "Wrong version of scirenderer. Expected at least 0.5.6. Found $STDOUT" "$LINENO" 5
+                  as_fn_error $? "Wrong version of scirenderer. Expected at least 0.5.7. Found $STDOUT" "$LINENO" 5
                             fi
         fi
         if test -f conftest.java.output; then
@@ -12792,7 +12792,7 @@ EOF
         echo "configure: failed program was:" >&5
         cat conftest.java >&5
         echo "configure: CLASSPATH was $CLASSPATH" >&5
-          as_fn_error $? "Wrong version of scirenderer. Expected at least 0.5.6. Found $STDOUT" "$LINENO" 5
+          as_fn_error $? "Wrong version of scirenderer. Expected at least 0.5.7. Found $STDOUT" "$LINENO" 5
             fi
 
    else
@@ -12805,7 +12805,7 @@ import org.scilab.forge.scirenderer.PackageInfo;
 
 public class conftest {
     public static void main(String[] argv) {
-        String minVersion="0.5.6";
+        String minVersion="0.5.7";
 
                             System.out.println(PackageInfo.VERSION);
                                   if (compare(minVersion, PackageInfo.VERSION) != 0) {
@@ -12854,7 +12854,7 @@ EOF
                    STDOUT=`cat conftest.java.output`
                 fi
                 echo "configure: CLASSPATH was $CLASSPATH" >&5
-                  as_fn_error $? "Wrong version of scirenderer. Expected exact version 0.5.6. Found $STDOUT" "$LINENO" 5
+                  as_fn_error $? "Wrong version of scirenderer. Expected exact version 0.5.7. Found $STDOUT" "$LINENO" 5
                             fi
         fi
         if test -f conftest.java.output; then
@@ -12864,7 +12864,7 @@ EOF
         echo "configure: failed program was:" >&5
         cat conftest.java >&5
         echo "configure: CLASSPATH was $CLASSPATH" >&5
-          as_fn_error $? "Wrong version of scirenderer. Expected exact version 0.5.6. Found $STDOUT" "$LINENO" 5
+          as_fn_error $? "Wrong version of scirenderer. Expected exact version 0.5.7. Found $STDOUT" "$LINENO" 5
             fi
 
     fi

diff --git a/scilab/configure.ac b/scilab/configure.ac
index 4b0ec38..4de87d4 100644 (file)
--- a/scilab/configure.ac
+++ b/scilab/configure.ac
@@ -859,7 +859,7 @@ if test "$with_javasci" != no -o "$with_gui" != no -o "$enable_build_help" != no
                 SCIRENDERER=$PACKAGE_JAR_FILE
                 AC_SUBST(SCIRENDERER)
 
-                AC_JAVA_CHECK_VERSION_PACKAGE([scirenderer],[import org.scilab.forge.scirenderer.PackageInfo;],$SCIRENDERER,[0.5.6],[PackageInfo.VERSION])
+                AC_JAVA_CHECK_VERSION_PACKAGE([scirenderer],[import org.scilab.forge.scirenderer.PackageInfo;],$SCIRENDERER,[0.5.7],[PackageInfo.VERSION])
 
                # Docking system
                 AC_JAVA_CHECK_PACKAGE([flexdock],[org.flexdock.docking.DockingManager],[Scilab Gui])

diff --git a/scilab/etc/classpath.xml.vc b/scilab/etc/classpath.xml.vc
index 7abc779..57fdd87 100644 (file)
--- a/scilab/etc/classpath.xml.vc
+++ b/scilab/etc/classpath.xml.vc
@@ -61,7 +61,7 @@ The option is "disableUnderMode" and can be:
        <load on="Xcos"/>
 </path>
 
-<path value="$SCILAB/thirdparty/scirenderer-0.5.6.jar" load="onUse">
+<path value="$SCILAB/thirdparty/scirenderer-0.5.7.jar" load="onUse">
     <load on="graphics"/>
     <load on="graphic_ojects"/>
     <load on="Xcos"/>

diff --git a/scilab/modules/renderer/renderer.iss b/scilab/modules/renderer/renderer.iss
index db645f8..5053a63 100644 (file)
--- a/scilab/modules/renderer/renderer.iss
+++ b/scilab/modules/renderer/renderer.iss
@@ -31,7 +31,7 @@ Source: bin\sci{#RENDERER}.dll; DestDir: {app}\bin; Components: {#COMPN_GRAPHICS
 Source: thirdparty\gluegen2-rt.jar; DestDir: {app}\thirdparty; Components: {#COMPN_GRAPHICS}
 Source: thirdparty\jogl2.jar;DestDir: {app}\thirdparty; Components: {#COMPN_GRAPHICS}
 ;
-Source: thirdparty\scirenderer-0.5.6.jar;DestDir: {app}\thirdparty; Components: {#COMPN_GRAPHICS}
+Source: thirdparty\scirenderer-0.5.7.jar;DestDir: {app}\thirdparty; Components: {#COMPN_GRAPHICS}
 ;
 Source: thirdparty\fonts\scilabsymbols.ttf;DestDir: {app}\thirdparty\fonts; Components: {#COMPN_GRAPHICS}
 ;

diff --git a/scilab/scilab-lib.properties.vc b/scilab/scilab-lib.properties.vc
index 75bc742..3a74251 100644 (file)
--- a/scilab/scilab-lib.properties.vc
+++ b/scilab/scilab-lib.properties.vc
@@ -6,7 +6,7 @@ flexdock.jar=${thirdparty.dir}/flexdock-1.2.0.jar
 
 jgraphx.jar=${thirdparty.dir}/jgraphx.jar
 
-scirenderer.jar=${thirdparty.dir}/scirenderer-0.5.6.jar
+scirenderer.jar=${thirdparty.dir}/scirenderer-0.5.7.jar
 
 jogl2.jar=${thirdparty.dir}/jogl2.jar