* Switch to Scirenderer 0.5.4. 62/8462/1
Vincent COUVERT [Wed, 1 Aug 2012 10:04:01 +0000 (12:04 +0200)]
Change-Id: I46c288054c413a154c832468c8e6cf07149e37c2

scilab/CHANGES_5.4.X
scilab/configure
scilab/configure.ac
scilab/etc/classpath.xml.vc
scilab/modules/renderer/renderer.iss
scilab/scilab-lib.properties.vc

index 7123d7d..5a332c3 100644 (file)
@@ -70,7 +70,7 @@ Compilation
 
 * Switch to flexdock 1.2.0.
 
-* Switch to Scirenderer 0.5.3.
+* Switch to Scirenderer 0.5.4.
 
 * BLAS_LIBS variable can now be set by the user (See bug #9824).
 
index 13052e4..0d07c12 100755 (executable)
@@ -12904,7 +12904,7 @@ EOF
                 fi
 
 
-                               # scirenderer
+                # scirenderer
 
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking scirenderer" >&5
 $as_echo_n "checking scirenderer... " >&6; }
@@ -13018,12 +13018,12 @@ $as_echo "$as_me: WARNING: Could not find or use the Java package/jar scirendere
       fi
     fi
 
-                               SCIRENDERER=$PACKAGE_JAR_FILE
+                SCIRENDERER=$PACKAGE_JAR_FILE
 
 
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking minimal version (0.5.3) of scirenderer" >&5
-$as_echo_n "checking minimal version (0.5.3) of scirenderer... " >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking minimal version (0.5.4) of scirenderer" >&5
+$as_echo_n "checking minimal version (0.5.4) of scirenderer... " >&6; }
    saved_ac_java_classpath=$ac_java_classpath
    export ac_java_classpath="$SCIRENDERER:$ac_java_classpath"
    if test "x" == "x"; then
@@ -13036,7 +13036,7 @@ import org.scilab.forge.scirenderer.PackageInfo;
 
 public class conftest {
     public static void main(String[] argv) {
-        String minVersion="0.5.3";
+        String minVersion="0.5.4";
 
                             System.out.println(PackageInfo.VERSION);
                                   if (compare(minVersion, PackageInfo.VERSION) > 0) {
@@ -13085,7 +13085,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.3. Found $STDOUT" "$LINENO" 5
+                  as_fn_error $? "Wrong version of scirenderer. Expected at least 0.5.4. Found $STDOUT" "$LINENO" 5
                             fi
         fi
         if test -f conftest.java.output; then
@@ -13095,7 +13095,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.3. Found $STDOUT" "$LINENO" 5
+          as_fn_error $? "Wrong version of scirenderer. Expected at least 0.5.4. Found $STDOUT" "$LINENO" 5
             fi
 
    else
@@ -13108,7 +13108,7 @@ import org.scilab.forge.scirenderer.PackageInfo;
 
 public class conftest {
     public static void main(String[] argv) {
-        String minVersion="0.5.3";
+        String minVersion="0.5.4";
 
                             System.out.println(PackageInfo.VERSION);
                                   if (compare(minVersion, PackageInfo.VERSION) != 0) {
@@ -13157,7 +13157,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.3. Found $STDOUT" "$LINENO" 5
+                  as_fn_error $? "Wrong version of scirenderer. Expected exact version 0.5.4. Found $STDOUT" "$LINENO" 5
                             fi
         fi
         if test -f conftest.java.output; then
@@ -13167,7 +13167,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.3. Found $STDOUT" "$LINENO" 5
+          as_fn_error $? "Wrong version of scirenderer. Expected exact version 0.5.4. Found $STDOUT" "$LINENO" 5
             fi
 
     fi
index 7abbc63..253c9b0 100644 (file)
@@ -846,12 +846,12 @@ if test "$with_javasci" != no -o "$with_gui" != no -o "$enable_build_help" != no
                 fi
 
 
-                               # scirenderer
-                               AC_JAVA_CHECK_PACKAGE([scirenderer],[org.scilab.forge.scirenderer.PackageInfo],[Scilab Renderer])
-                               SCIRENDERER=$PACKAGE_JAR_FILE
-                               AC_SUBST(SCIRENDERER)
+                # scirenderer
+                AC_JAVA_CHECK_PACKAGE([scirenderer],[org.scilab.forge.scirenderer.PackageInfo],[Scilab Renderer])
+                SCIRENDERER=$PACKAGE_JAR_FILE
+                AC_SUBST(SCIRENDERER)
 
-                AC_JAVA_CHECK_VERSION_PACKAGE([scirenderer],[import org.scilab.forge.scirenderer.PackageInfo;],$SCIRENDERER,[0.5.3],[PackageInfo.VERSION])
+                AC_JAVA_CHECK_VERSION_PACKAGE([scirenderer],[import org.scilab.forge.scirenderer.PackageInfo;],$SCIRENDERER,[0.5.4],[PackageInfo.VERSION])
 
                # Docking system
                 AC_JAVA_CHECK_PACKAGE([flexdock],[org.flexdock.docking.DockingManager],[Scilab Gui])
index e423ad3..6b97c11 100644 (file)
@@ -67,7 +67,7 @@ The option is "disableUnderMode" and can be:
        <load on="HDF5"/>
 </path>
 
-<path value="$SCILAB/thirdparty/scirenderer-0.5.3.jar" load="onUse">
+<path value="$SCILAB/thirdparty/scirenderer-0.5.4.jar" load="onUse">
     <load on="graphics"/>
     <load on="graphic_ojects"/>
     <load on="Xcos"/>
index db178bb..748061e 100644 (file)
@@ -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.3.jar;DestDir: {app}\thirdparty; Components: {#COMPN_GRAPHICS}
+Source: thirdparty\scirenderer-0.5.4.jar;DestDir: {app}\thirdparty; Components: {#COMPN_GRAPHICS}
 ;
 Source: thirdparty\fonts\scilabsymbols.ttf;DestDir: {app}\thirdparty\fonts; Components: {#COMPN_GRAPHICS}
 ;
index 566ab42..f1c51e3 100644 (file)
@@ -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.3.jar
+scirenderer.jar=${thirdparty.dir}/scirenderer-0.5.4.jar
 
 jogl2.jar=${thirdparty.dir}/jogl2.jar