* Enforce a minimal version of JLaTeXMath (1.0.2). 32/11132/2
Sylvestre Ledru [Thu, 28 Mar 2013 10:07:23 +0000 (11:07 +0100)]
Change-Id: Ia5520ce1c0dc697ec3a7c0eadf4cace3ea895121

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

index 847c1c8..753ed5f 100644 (file)
@@ -149,7 +149,7 @@ Compilation
 
 * Enforce a minimal version of Flexdock (1.2.3).
 
-* Enforce a minimal version of JLaTeXMath (1.0.1).
+* Enforce a minimal version of JLaTeXMath (1.0.2).
 
 
 Obsolete functions
index 8c05ae4..78291a8 100755 (executable)
@@ -16088,8 +16088,8 @@ $as_echo "$as_me: WARNING: Could not find or use the Java package/jar jlatexmath
 
 
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking minimal version (1.0.1) of jlatexmath" >&5
-$as_echo_n "checking minimal version (1.0.1) of jlatexmath... " >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking minimal version (1.0.2) of jlatexmath" >&5
+$as_echo_n "checking minimal version (1.0.2) of jlatexmath... " >&6; }
    saved_ac_java_classpath=$ac_java_classpath
    export ac_java_classpath="$JLATEXMATH:$ac_java_classpath"
    if test "x" == "x"; then
@@ -16102,7 +16102,7 @@ import org.scilab.forge.jlatexmath.TeXFormula;
 
 public class conftest {
     public static void main(String[] argv) {
-        String minVersion="1.0.1";
+        String minVersion="1.0.2";
 
                             System.out.println(TeXFormula.VERSION);
                                   if (compare(minVersion, TeXFormula.VERSION) > 0) {
@@ -16151,7 +16151,7 @@ EOF
                    STDOUT=`cat conftest.java.output`
                 fi
                 echo "configure: CLASSPATH was $CLASSPATH" >&5
-                  as_fn_error $? "Wrong version of jlatexmath. Expected at least 1.0.1. Found $STDOUT" "$LINENO" 5
+                  as_fn_error $? "Wrong version of jlatexmath. Expected at least 1.0.2. Found $STDOUT" "$LINENO" 5
                             fi
         fi
         if test -f conftest.java.output; then
@@ -16161,7 +16161,7 @@ EOF
         echo "configure: failed program was:" >&5
         cat conftest.java >&5
         echo "configure: CLASSPATH was $CLASSPATH" >&5
-          as_fn_error $? "Wrong version of jlatexmath. Expected at least 1.0.1. Found $STDOUT" "$LINENO" 5
+          as_fn_error $? "Wrong version of jlatexmath. Expected at least 1.0.2. Found $STDOUT" "$LINENO" 5
             fi
 
    else
@@ -16174,7 +16174,7 @@ import org.scilab.forge.jlatexmath.TeXFormula;
 
 public class conftest {
     public static void main(String[] argv) {
-        String minVersion="1.0.1";
+        String minVersion="1.0.2";
 
                             System.out.println(TeXFormula.VERSION);
                                   if (compare(minVersion, TeXFormula.VERSION) != 0) {
@@ -16223,7 +16223,7 @@ EOF
                    STDOUT=`cat conftest.java.output`
                 fi
                 echo "configure: CLASSPATH was $CLASSPATH" >&5
-                  as_fn_error $? "Wrong version of jlatexmath. Expected exact version 1.0.1. Found $STDOUT" "$LINENO" 5
+                  as_fn_error $? "Wrong version of jlatexmath. Expected exact version 1.0.2. Found $STDOUT" "$LINENO" 5
                             fi
         fi
         if test -f conftest.java.output; then
@@ -16233,7 +16233,7 @@ EOF
         echo "configure: failed program was:" >&5
         cat conftest.java >&5
         echo "configure: CLASSPATH was $CLASSPATH" >&5
-          as_fn_error $? "Wrong version of jlatexmath. Expected exact version 1.0.1. Found $STDOUT" "$LINENO" 5
+          as_fn_error $? "Wrong version of jlatexmath. Expected exact version 1.0.2. Found $STDOUT" "$LINENO" 5
             fi
 
     fi
index 2b71b6f..df65247 100644 (file)
@@ -1025,7 +1025,7 @@ interface for JOGL2 - or libGL (OpenGL library) are installed and if the version
                 JLATEXMATH=$PACKAGE_JAR_FILE
                 AC_SUBST(JLATEXMATH)
 
-                AC_JAVA_CHECK_VERSION_PACKAGE([jlatexmath],[import org.scilab.forge.jlatexmath.TeXFormula;],$JLATEXMATH,[1.0.1],[TeXFormula.VERSION])
+                AC_JAVA_CHECK_VERSION_PACKAGE([jlatexmath],[import org.scilab.forge.jlatexmath.TeXFormula;],$JLATEXMATH,[1.0.2],[TeXFormula.VERSION])
 
                 AC_DEFINE([WITH_GUI],[],[With the JAVA stuff (GUI, Console, JOGL...)])
 
index d379ab4..2c1ff44 100644 (file)
@@ -79,7 +79,7 @@ The option is "disableUnderMode" and can be:
        <load on="xcos_mathml_rendering"/>
 </path>
 
-<path value="$SCILAB/thirdparty/jlatexmath-fop-1.0.1.jar" load="onUse">
+<path value="$SCILAB/thirdparty/jlatexmath-fop-1.0.2.jar" load="onUse">
        <load on="documentationGeneration"/>
        <load on="pdf_ps_eps_graphic_export"/>
 </path>
@@ -123,7 +123,7 @@ The option is "disableUnderMode" and can be:
        <load on="pdf_ps_eps_graphic_export"/>
 </path>
 
-<path value="$SCILAB/thirdparty/jlatexmath-1.0.1.jar" load="onUse">
+<path value="$SCILAB/thirdparty/jlatexmath-1.0.2.jar" load="onUse">
        <load on="documentationGeneration"/>
        <load on="graphics_latex_textrendering"/>
        <load on="pdf_ps_eps_graphic_export"/>
index 79dbbb5..9142925 100644 (file)
@@ -20,8 +20,8 @@
 ;
 Source: modules\{#GRAPHICS}\license.txt; DestDir: {app}\modules\{#GRAPHICS}; Components: {#COMPN_GRAPHICS}
 ;
-Source: thirdparty\jlatexmath-1.0.1.jar;DestDir: {app}\thirdparty; Components: {#COMPN_GRAPHICS}
-Source: thirdparty\jlatexmath-fop-1.0.1.jar;DestDir: {app}\thirdparty; Components: {#COMPN_GRAPHICS}
+Source: thirdparty\jlatexmath-1.0.2.jar;DestDir: {app}\thirdparty; Components: {#COMPN_GRAPHICS}
+Source: thirdparty\jlatexmath-fop-1.0.2.jar;DestDir: {app}\thirdparty; Components: {#COMPN_GRAPHICS}
 ;
 Source: bin\{#GRAPHICS}.dll; DestDir: {app}\bin; Components: {#COMPN_GRAPHICS}
 ;
index 0f2e2c2..46d23f6 100644 (file)
@@ -12,7 +12,7 @@ saxon.jar=${thirdparty.dir}/saxon.jar
 fop.jar=${thirdparty.dir}/fop.jar
 
 ; LaTeX plugin
-jlatexmath-fop.jar=${thirdparty.dir}/jlatexmath-fop-1.0.1.jar
+jlatexmath-fop.jar=${thirdparty.dir}/jlatexmath-fop-1.0.2.jar
 
 ; A complete MathML rendering solution
 jeuclid-core.jar=${thirdparty.dir}/jeuclid-core.jar
index c6b687f..17c970d 100644 (file)
@@ -18,9 +18,9 @@ jrosetta-API.jar=${thirdparty.dir}/jrosetta-API.jar
 
 jrosetta-engine.jar=${thirdparty.dir}/jrosetta-engine.jar
 
-jlatexmath.jar=${thirdparty.dir}/jlatexmath-1.0.1.jar
+jlatexmath.jar=${thirdparty.dir}/jlatexmath-1.0.2.jar
 
-jlatexmath-fop.jar=${thirdparty.dir}/jlatexmath-fop-1.0.1.jar
+jlatexmath-fop.jar=${thirdparty.dir}/jlatexmath-fop-1.0.2.jar
 
 checkstyle.jar=${thirdparty.dir}/checkstyle/checkstyle-5.3-all.jar