SCI_SRCDIR_FULL="`cd $SCI_SRCDIR && pwd`"
SCILAB_VERSION_MAJOR=5
-SCILAB_VERSION_MINOR=5
-SCILAB_VERSION_MAINTENANCE=1
+SCILAB_VERSION_MINOR=6
+SCILAB_VERSION_MAINTENANCE=0
END
as_fn_error $? "Your 'rm' program is bad, sorry." "$LINENO" 5
fi
- fi
- # Not using -Werror because we override {C,F}FLAGS in order to disable optimisation
+ fi # Not using -Werror because we override {C,F}FLAGS in order to disable optimisation
$as_echo_n "checking to see if the java compiler works... " >&6; }
cat << \EOF > conftest.java
- // #line 11052 "configure"
+ // #line 11051 "configure"
import java.util.regex.Pattern;
if test "x$ac_java_jvm_name" = "x" ; then
cat << \EOF > conftest.java
- // #line 11139 "configure"
+ // #line 11138 "configure"
import java.util.regex.Pattern;
import gnu.java.io.EncodingManager;
# The class java.nio.charset.Charset is new to 1.4
cat << \EOF > conftest.java
- // #line 11223 "configure"
+ // #line 11222 "configure"
import java.util.regex.Pattern;
import java.nio.charset.Charset;
# The class java.lang.StringBuilder is new to 1.5
cat << \EOF > conftest.java
- // #line 11288 "configure"
+ // #line 11287 "configure"
import java.util.regex.Pattern;
import java.lang.StringBuilder;
# The class java.util.ArrayDeque is new to 1.6
cat << \EOF > conftest.java
- // #line 11353 "configure"
+ // #line 11352 "configure"
import java.util.regex.Pattern;
import java.util.ArrayDeque;
# The class java.nio.file.Path is new to 1.7
cat << \EOF > conftest.java
- // #line 11418 "configure"
+ // #line 11417 "configure"
import java.util.regex.Pattern;
import java.nio.file.Path;
# The class java.util.stream.DoubleStream is new to 1.8
cat << \EOF > conftest.java
- // #line 11483 "configure"
+ // #line 11482 "configure"
import java.util.regex.Pattern;
import java.util.stream.DoubleStream;
export ac_java_classpath="$jar_resolved:$ac_java_classpath"
cat << \EOF > conftest.java
- // #line 12861 "configure"
+ // #line 12860 "configure"
import java.util.regex.Pattern;
import com.mxgraph.model.mxCell;
if test "x" == "x"; then
cat << \EOF > conftest.java
- // #line 12968 "configure"
+ // #line 12967 "configure"
import java.util.regex.Pattern;
import com.mxgraph.view.mxGraph;
else
cat << \EOF > conftest.java
- // #line 13040 "configure"
+ // #line 13039 "configure"
import java.util.regex.Pattern;
import com.mxgraph.view.mxGraph;
export ac_java_classpath="$jar_resolved:$ac_java_classpath"
cat << \EOF > conftest.java
- // #line 13134 "configure"
+ // #line 13133 "configure"
import java.util.regex.Pattern;
import org.scilab.forge.scirenderer.PackageInfo;
if test "x" == "x"; then
cat << \EOF > conftest.java
- // #line 13241 "configure"
+ // #line 13240 "configure"
import java.util.regex.Pattern;
import org.scilab.forge.scirenderer.PackageInfo;
else
cat << \EOF > conftest.java
- // #line 13313 "configure"
+ // #line 13312 "configure"
import java.util.regex.Pattern;
import org.scilab.forge.scirenderer.PackageInfo;
export ac_java_classpath="$jar_resolved:$ac_java_classpath"
cat << \EOF > conftest.java
- // #line 13412 "configure"
+ // #line 13411 "configure"
import java.util.regex.Pattern;
import org.flexdock.docking.DockingManager;
if test "x" == "x"; then
cat << \EOF > conftest.java
- // #line 13519 "configure"
+ // #line 13518 "configure"
import java.util.regex.Pattern;
import org.flexdock.util.Utilities;
else
cat << \EOF > conftest.java
- // #line 13591 "configure"
+ // #line 13590 "configure"
import java.util.regex.Pattern;
import org.flexdock.util.Utilities;
export ac_java_classpath="$jar_resolved:$ac_java_classpath"
cat << \EOF > conftest.java
- // #line 13682 "configure"
+ // #line 13681 "configure"
import java.util.regex.Pattern;
import com.jgoodies.looks.common.MenuItemRenderer;
export ac_java_classpath="$jar_resolved:$ac_java_classpath"
cat << \EOF > conftest.java
- // #line 13799 "configure"
+ // #line 13798 "configure"
import java.util.regex.Pattern;
import com.jgoodies.looks.common.MenuItemRenderer;
export ac_java_classpath="$jar_resolved:$ac_java_classpath"
cat << \EOF > conftest.java
- // #line 13917 "configure"
+ // #line 13916 "configure"
import java.util.regex.Pattern;
import com.l2fprod.util.AccessUtils;
export ac_java_classpath="$jar_resolved:$ac_java_classpath"
cat << \EOF > conftest.java
- // #line 14034 "configure"
+ // #line 14033 "configure"
import java.util.regex.Pattern;
import javax.media.opengl.glu.GLUnurbs;
export ac_java_classpath="$jar_resolved:$ac_java_classpath"
cat << \EOF > conftest.java
- // #line 14257 "configure"
+ // #line 14256 "configure"
import java.util.regex.Pattern;
import jogamp.common.os.MachineDescriptionRuntime;
export ac_java_classpath="$jar_resolved:$ac_java_classpath"
cat << \EOF > conftest.java
- // #line 14431 "configure"
+ // #line 14430 "configure"
import java.util.regex.Pattern;
import javax.help.JHelp;
fi
fi
- JHALL=$PACKAGE_JAR_FILE
-
# Named differently under Mandriva or Fedora
- if test -z "$JHALL"; then
+ if test -z "$PACKAGE_JAR_FILE"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking javahelp2" >&5
$as_echo_n "checking javahelp2... " >&6; }
export ac_java_classpath="$jar_resolved:$ac_java_classpath"
cat << \EOF > conftest.java
- // #line 14548 "configure"
+ // #line 14545 "configure"
import java.util.regex.Pattern;
import javax.help.JHelp;
fi
fi
- JHALL=$PACKAGE_JAR_FILE
fi
+ JHALL=$PACKAGE_JAR_FILE
# Console API
export ac_java_classpath="$jar_resolved:$ac_java_classpath"
cat << \EOF > conftest.java
- // #line 14666 "configure"
+ // #line 14663 "configure"
import java.util.regex.Pattern;
import com.artenum.rosetta.interfaces.core.ConsoleConfiguration;
fi
fi
- JROSETTA_API=$PACKAGE_JAR_FILE
- if test -z "$JROSETTA_API"; then
+ if test -z "$PACKAGE_JAR_FILE"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking jrosetta-api" >&5
$as_echo_n "checking jrosetta-api... " >&6; }
export ac_java_classpath="$jar_resolved:$ac_java_classpath"
cat << \EOF > conftest.java
- // #line 14781 "configure"
+ // #line 14777 "configure"
import java.util.regex.Pattern;
import com.artenum.rosetta.interfaces.core.ConsoleConfiguration;
fi
fi
- JROSETTA_API=$PACKAGE_JAR_FILE
- fi
+ fi
+ JROSETTA_API=$PACKAGE_JAR_FILE
# Console Core
export ac_java_classpath="$jar_resolved:$ac_java_classpath"
cat << \EOF > conftest.java
- // #line 14899 "configure"
+ // #line 14895 "configure"
import java.util.regex.Pattern;
import com.artenum.rosetta.core.action.AbstractConsoleAction;
if test "x" == "x"; then
cat << \EOF > conftest.java
- // #line 15005 "configure"
+ // #line 15001 "configure"
import java.util.regex.Pattern;
import com.artenum.rosetta.util.ConfigurationBuilder;
else
cat << \EOF > conftest.java
- // #line 15077 "configure"
+ // #line 15073 "configure"
import java.util.regex.Pattern;
import com.artenum.rosetta.util.ConfigurationBuilder;
export ac_java_classpath="$jar_resolved:$ac_java_classpath"
cat << \EOF > conftest.java
- // #line 15170 "configure"
+ // #line 15166 "configure"
import java.util.regex.Pattern;
import net.sourceforge.jeuclid.LayoutContext;
export ac_java_classpath="$jar_resolved:$ac_java_classpath"
cat << \EOF > conftest.java
- // #line 15289 "configure"
+ // #line 15285 "configure"
import java.util.regex.Pattern;
import org.apache.fop.pdf.PDFInfo;
export ac_java_classpath="$jar_resolved:$ac_java_classpath"
cat << \EOF > conftest.java
- // #line 15413 "configure"
+ // #line 15409 "configure"
import java.util.regex.Pattern;
import org.freehep.graphics2d.VectorGraphics;
export ac_java_classpath="$jar_resolved:$ac_java_classpath"
cat << \EOF > conftest.java
- // #line 15530 "configure"
+ // #line 15526 "configure"
import java.util.regex.Pattern;
import org.freehep.graphicsio.emf.EMFGraphics2D;
export ac_java_classpath="$jar_resolved:$ac_java_classpath"
cat << \EOF > conftest.java
- // #line 15647 "configure"
+ // #line 15643 "configure"
import java.util.regex.Pattern;
import org.freehep.graphicsio.VectorGraphicsIO;
export ac_java_classpath="$jar_resolved:$ac_java_classpath"
cat << \EOF > conftest.java
- // #line 15764 "configure"
+ // #line 15760 "configure"
import java.util.regex.Pattern;
import org.freehep.util.io.XMLSequence;
export ac_java_classpath="$jar_resolved:$ac_java_classpath"
cat << \EOF > conftest.java
- // #line 15881 "configure"
+ // #line 15877 "configure"
import java.util.regex.Pattern;
import org.freehep.util.StringUtilities;
export ac_java_classpath="$jar_resolved:$ac_java_classpath"
cat << \EOF > conftest.java
- // #line 15999 "configure"
+ // #line 15995 "configure"
import java.util.regex.Pattern;
import org.apache.batik.parser.Parser;
export ac_java_classpath="$jar_resolved:$ac_java_classpath"
cat << \EOF > conftest.java
- // #line 16116 "configure"
+ // #line 16112 "configure"
import java.util.regex.Pattern;
import org.apache.batik.parser.Parser;
if test "x" == "x"; then
cat << \EOF > conftest.java
- // #line 16223 "configure"
+ // #line 16219 "configure"
import java.util.regex.Pattern;
import org.apache.batik.Version;
else
cat << \EOF > conftest.java
- // #line 16295 "configure"
+ // #line 16291 "configure"
import java.util.regex.Pattern;
import org.apache.batik.Version;
export ac_java_classpath="$jar_resolved:$ac_java_classpath"
cat << \EOF > conftest.java
- // #line 16386 "configure"
+ // #line 16382 "configure"
import java.util.regex.Pattern;
import org.apache.commons.io.output.CountingOutputStream;
export ac_java_classpath="$jar_resolved:$ac_java_classpath"
cat << \EOF > conftest.java
- // #line 16503 "configure"
+ // #line 16499 "configure"
import java.util.regex.Pattern;
import org.apache.xmlgraphics.util.Service;
export ac_java_classpath="$jar_resolved:$ac_java_classpath"
cat << \EOF > conftest.java
- // #line 16620 "configure"
+ // #line 16616 "configure"
import java.util.regex.Pattern;
import org.apache.avalon.framework.configuration.ConfigurationException;
export ac_java_classpath="$jar_resolved:$ac_java_classpath"
cat << \EOF > conftest.java
- // #line 16737 "configure"
+ // #line 16733 "configure"
import java.util.regex.Pattern;
import org.w3c.dom.svg.SVGDocument;
export ac_java_classpath="$jar_resolved:$ac_java_classpath"
cat << \EOF > conftest.java
- // #line 16854 "configure"
+ // #line 16850 "configure"
import java.util.regex.Pattern;
import org.w3c.dom.svg.SVGDocument;
export ac_java_classpath="$jar_resolved:$ac_java_classpath"
cat << \EOF > conftest.java
- // #line 16975 "configure"
+ // #line 16971 "configure"
import java.util.regex.Pattern;
import org.apache.commons.logging.LogFactory;
export ac_java_classpath="$jar_resolved:$ac_java_classpath"
cat << \EOF > conftest.java
- // #line 17092 "configure"
+ // #line 17088 "configure"
import java.util.regex.Pattern;
import org.scilab.forge.jlatexmath.TeXFormula;
if test "x" == "x"; then
cat << \EOF > conftest.java
- // #line 17199 "configure"
+ // #line 17195 "configure"
import java.util.regex.Pattern;
import org.scilab.forge.jlatexmath.TeXFormula;
else
cat << \EOF > conftest.java
- // #line 17271 "configure"
+ // #line 17267 "configure"
import java.util.regex.Pattern;
import org.scilab.forge.jlatexmath.TeXFormula;
export ac_java_classpath="$jar_resolved:$ac_java_classpath"
cat << \EOF > conftest.java
- // #line 17362 "configure"
+ // #line 17358 "configure"
import java.util.regex.Pattern;
import org.scilab.forge.jlatexmath.fop.JLaTeXMathObj;
export ac_java_classpath="$jar_resolved:$ac_java_classpath"
cat << \EOF > conftest.java
- // #line 17485 "configure"
+ // #line 17481 "configure"
import java.util.regex.Pattern;
import com.puppycrawl.tools.checkstyle.CheckStyleTask;
export ac_java_classpath="$jar_resolved:$ac_java_classpath"
cat << \EOF > conftest.java
- // #line 17602 "configure"
+ // #line 17598 "configure"
import java.util.regex.Pattern;
import org.apache.commons.beanutils.Converter;
export ac_java_classpath="$jar_resolved:$ac_java_classpath"
cat << \EOF > conftest.java
- // #line 17719 "configure"
+ // #line 17715 "configure"
import java.util.regex.Pattern;
import antlr.TokenStreamException;
export ac_java_classpath="$jar_resolved:$ac_java_classpath"
cat << \EOF > conftest.java
- // #line 17836 "configure"
+ // #line 17832 "configure"
import java.util.regex.Pattern;
import org.junit.Assert;
fi
fi
+ if test -z "$PACKAGE_JAR_FILE"; then
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking junit" >&5
+ $as_echo_n "checking junit... " >&6; }
+ PACKAGE_JAR_FILE=
+ found_jar=no
+ saved_ac_java_classpath=$ac_java_classpath
+ DEFAULT_JAR_DIR="/usr/share/java /usr/lib/java /usr/share/java /usr/share/java/jar /opt/java/lib /usr/local/java /usr/local/java/jar /usr/local/share/java /usr/local/share/java/jar /usr/local/lib/java $(find /usr/share/java/ -maxdepth 1 -type d 2>/dev/null) $(find /usr/lib64/ -maxdepth 1 -type d 2>/dev/null) $(find /usr/lib/ -maxdepth 1 -type d 2>/dev/null) $(find /usr/share/*/lib -maxdepth 1 -type d 2>/dev/null)"
+ for jardir in "`pwd`/thirdparty" "`pwd`/jar" $DEFAULT_JAR_DIR; do
+ for jar in "$jardir/junit.jar" "$jardir/libjunit.jar" "$jardir/libjunit-java.jar" "$jardir/junit*.jar"; do
+
+ # TODO check the behaviour when spaces
+ jars_resolved=`ls $jar 2>/dev/null`
+ for jar_resolved in $jars_resolved; do # If several jars matches
+ if test -e "$jar_resolved"; then
+ export ac_java_classpath="$jar_resolved:$ac_java_classpath"
+
+ cat << \EOF > conftest.java
+ // #line 17946 "configure"
+ import java.util.regex.Pattern;
+
+ import org.junit.Assert;
+
+ public class conftest {
+ public static void main(String[] argv) {
+
+ }
+
+ private static int compare(String v1, String v2) {
+ String s1 = normalisedVersion(v1);
+ String s2 = normalisedVersion(v2);
+ return s1.compareTo(s2);
+ }
+
+ private static String normalisedVersion(String version) {
+ return normalisedVersion(version, ".", 4);
+ }
+
+ private static String normalisedVersion(String version, String sep, int maxWidth) {
+ String[] split = Pattern.compile(sep, Pattern.LITERAL).split(version);
+ StringBuilder sb = new StringBuilder();
+ for (String s : split) {
+ sb.append(String.format("%" + maxWidth + 's', s));
+ }
+ return sb.toString();
+ }
+ }
+ EOF
+
+ CLASSPATH=$ac_java_classpath
+ export CLASSPATH
+ cmd="$JAVAC ${JAVAC_FLAGS} conftest.java"
+ if (echo $cmd >&5 ; eval $cmd >conftest.java.output 2>&5) ; then
+ if test ""no"" = "no"; then
+ echo "yes" >&5
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $jar_resolved" >&5
+ $as_echo "$jar_resolved" >&6; }
+ found_jar=yes
+ PACKAGE_JAR_FILE=$jar_resolved
+ break 3
+
+ else
+ cmd="$JAVA conftest"
+ if (echo $cmd >&5 ; eval $cmd >conftest.java.output 2>&5); then
+ echo "yes" >&5
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $jar_resolved" >&5
+ $as_echo "$jar_resolved" >&6; }
+ found_jar=yes
+ PACKAGE_JAR_FILE=$jar_resolved
+ break 3
+
+ else
+ echo "configure: failed program was:" >&5
+ cat conftest.java >&5
+ if test -s conftest.java.output; then
+ STDOUT=`cat conftest.java.output`
+ fi
+ echo "configure: CLASSPATH was $CLASSPATH" >&5
+
+ ac_java_classpath=$saved_ac_java_classpath
+
+
+ fi
+ fi
+ if test -f conftest.java.output; then
+ rm conftest.java.output
+ fi
+ else
+ echo "configure: failed program was:" >&5
+ cat conftest.java >&5
+ echo "configure: CLASSPATH was $CLASSPATH" >&5
+
+ ac_java_classpath=$saved_ac_java_classpath
+
+
+ fi
+
+ fi
+ done
+ done
+ done
+ if test "$found_jar" = "no"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ if test ""yes"" = "yes"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Could not find or use the Java package/jar junit used by Junit4 -
+ Unit tests (looking for package org.junit.Assert)" >&5
+ $as_echo "$as_me: WARNING: Could not find or use the Java package/jar junit used by Junit4 -
+ Unit tests (looking for package org.junit.Assert)" >&2;}
+ else
+ as_fn_error $? "Could not find or use the Java package/jar junit used by Junit4 -
+ Unit tests (looking for package org.junit.Assert)" "$LINENO" 5
+ fi
+ fi
+
+ fi
JUNIT4=$PACKAGE_JAR_FILE
export ac_java_classpath="$jar_resolved:$ac_java_classpath"
cat << \EOF > conftest.java
- // #line 17953 "configure"
+ // #line 18067 "configure"
import java.util.regex.Pattern;
import net.sourceforge.cobertura.merge.Main;
export ac_java_classpath="$jar_resolved:$ac_java_classpath"
cat << \EOF > conftest.java
- // #line 18070 "configure"
+ // #line 18184 "configure"
import java.util.regex.Pattern;
import org.objectweb.asm.Type;
fi
fi
- ASM3=$PACKAGE_JAR_FILE
-
if test -z "$ASM3"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking asm" >&5
export ac_java_classpath="$jar_resolved:$ac_java_classpath"
cat << \EOF > conftest.java
- // #line 18186 "configure"
+ // #line 18298 "configure"
import java.util.regex.Pattern;
import org.objectweb.asm.Type;
fi
fi
- ASM3=$PACKAGE_JAR_FILE
fi
+ ASM3=$PACKAGE_JAR_FILE
+
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking ecj" >&5
export ac_java_classpath="$jar_resolved:$ac_java_classpath"
cat << \EOF > conftest.java
- // #line 18302 "configure"
+ // #line 18415 "configure"
import java.util.regex.Pattern;
import org.eclipse.jdt.core.compiler.batch.BatchCompiler;
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if tcl is version $CHK_TCL_MAJOR.$CHK_TCL_MINOR or later" >&5
$as_echo_n "checking if tcl is version $CHK_TCL_MAJOR.$CHK_TCL_MINOR or later... " >&6; }
cat > conftest.$ac_ext <<EOF
- #line 26845 "configure"
+ #line 26958 "configure"
#include "confdefs.h"
#include "$CHK_TCL_INCLUDE_PATH/$CHK_TCL_INC_NAME"
$as_echo_n "checking if tk is version $CHK_TK_MAJOR.$CHK_TK_MINOR or later... " >&6; }
cat > conftest.$ac_ext <<EOF
- #line 27156 "configure"
+ #line 27269 "configure"
#include "confdefs.h"
#include "$CHK_TK_INCLUDE_PATH/$CHK_TK_INC_NAME"
export ac_java_classpath="$jar_resolved:$ac_java_classpath"
cat << \EOF > conftest.java
- // #line 27740 "configure"
+ // #line 27853 "configure"
import java.util.regex.Pattern;
import net.sf.saxon.Version;
export ac_java_classpath="$jar_resolved:$ac_java_classpath"
cat << \EOF > conftest.java
- // #line 27855 "configure"
+ // #line 27968 "configure"
import java.util.regex.Pattern;
import net.sf.saxon.Version;
export ac_java_classpath="$jar_resolved:$ac_java_classpath"
cat << \EOF > conftest.java
- // #line 27971 "configure"
+ // #line 28084 "configure"
import java.util.regex.Pattern;
import com.icl.saxon.Loader;
projects / scilab.git / commitdiff