diff options
| author | Max Brazhnikov <makc@FreeBSD.org> | 2020-05-31 13:11:27 +0000 |
|---|---|---|
| committer | Max Brazhnikov <makc@FreeBSD.org> | 2020-05-31 13:11:27 +0000 |
| commit | 436139c7b36f4bd469949c7fbca5de7bdaec42cb (patch) | |
| tree | d037dd9c9e92b5fc3afcf2325ed42be420317c81 /math/scilab/files | |
| parent | 9b5ecb4b05e2f6c7a569d877660320d1c683916e (diff) | |
| download | ports-436139c7b36f4bd469949c7fbca5de7bdaec42cb.tar.gz ports-436139c7b36f4bd469949c7fbca5de7bdaec42cb.zip | |
math/scilab:
- Update to 6.1.0. Requires decent c++ compiler and iconv from ports.
- Clean up patch target: remove no longer needed patches and those ones which
don't affect build - at least for me.
- Remove MAKE_JOBS_UNSAFE. It was added in svn r417126 arguing that many
ocaml-dependent ports are not jobs safe, but there were no logs to analyse.
The plist change in that commit is unrelated to jobs safety.
Notes
Notes:
svn path=/head/; revision=537160
Diffstat (limited to 'math/scilab/files')
22 files changed, 205 insertions, 980 deletions
diff --git a/math/scilab/files/extra-patch-Makefile.in b/math/scilab/files/extra-patch-Makefile.in deleted file mode 100644 index a9cc5e6b3039..000000000000 --- a/math/scilab/files/extra-patch-Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- Makefile.in.orig 2015-10-02 17:25:36.689224000 +0000 -+++ Makefile.in 2015-10-02 17:25:47.634538000 +0000 -@@ -2110,7 +2110,7 @@ - # This is not done in the module itself because its needs also the "types" - # module - javadoc: -- $(JAVADOC) -noindex -nohelp -nonavbar -notree \ -+ $(JAVADOC) -Xdoclint:none -noindex -nohelp -nonavbar -notree \ - -d $(top_builddir)/modules/javasci/javadoc \ - -sourcepath $(top_srcdir)/modules/javasci/src/java:$(top_srcdir)/modules/types/src/java::$(top_srcdir)/modules/localization/src/java \ - org.scilab.modules.javasci org.scilab.modules.types diff --git a/math/scilab/files/extra-patch-bin-JAVA_HOME b/math/scilab/files/extra-patch-bin-JAVA_HOME index e8c5c6783844..f9adc22ad19b 100644 --- a/math/scilab/files/extra-patch-bin-JAVA_HOME +++ b/math/scilab/files/extra-patch-bin-JAVA_HOME @@ -1,9 +1,9 @@ ---- bin/scilab.orig 2010-09-01 19:31:19.000000000 -0700 -+++ bin/scilab 2010-09-01 19:32:29.000000000 -0700 +--- bin/scilab.orig 2020-02-25 09:59:42 UTC ++++ bin/scilab @@ -1,4 +1,7 @@ #!/bin/sh + -+export JAVA_HOME=%%JAVA_HOME%% ++[ -z "$JAVA_HOME" ] && JAVA_HOME=%%JAVA_HOME%% + # # Scilab ( http://www.scilab.org/ ) - This file is part of Scilab diff --git a/math/scilab/files/patch-Makefile.in b/math/scilab/files/patch-Makefile.in deleted file mode 100644 index 93fcefce4924..000000000000 --- a/math/scilab/files/patch-Makefile.in +++ /dev/null @@ -1,35 +0,0 @@ ---- Makefile.in.orig 2015-07-19 11:02:48 UTC -+++ Makefile.in -@@ -108,6 +108,7 @@ bin_PROGRAMS = scilab-bin$(EXEEXT) scila - @IS_MACOSX_TRUE@am__append_2 = -framework Cocoa - @NEED_JAVA_TRUE@am__append_3 = \ - @NEED_JAVA_TRUE@ $(top_builddir)/modules/console/libsciconsole.la \ -+@NEED_JAVA_TRUE@ $(top_builddir)/modules/console/libsciconsole-minimal.la \ - @NEED_JAVA_TRUE@ $(top_builddir)/modules/jvm/libscijvm.la \ - @NEED_JAVA_TRUE@ $(top_builddir)/modules/commons/libscicommons.la - -@@ -831,12 +832,22 @@ scilab_cli_bin_CPPFLAGS = -DWITHOUT_GUI - scilab_bin_LDADD = $(top_builddir)/modules/libscilab.la \ - $(top_builddir)/modules/libscilab-cli.la $(OPENMPI_LIBS) \ - $(XML_LIBS) $(COMMON_LIBS) $(FLIBS) $(am__append_3) \ -- $(am__append_4) $(am__append_11) -+ $(am__append_4) $(am__append_11) \ -+ $(top_builddir)/modules/history_manager/libscihistory_manager.la \ -+ $(top_builddir)/modules/ui_data/libsciui_data-disable.la \ -+ $(top_builddir)/modules/hdf5/libscihdf5.la \ -+ $(top_builddir)/modules/functions/libscifunctions.la \ -+ $(top_builddir)/modules/history_browser/libscihistory_browser-disable.la - scilab_cli_bin_LDADD = $(top_builddir)/modules/libscilab-cli.la \ - $(top_builddir)/modules/console/libsciconsole-minimal.la \ - $(top_builddir)/modules/jvm/libscijvm-disable.la \ - $(OPENMPI_LIBS) $(XML_LIBS) $(COMMON_LIBS) $(FLIBS) \ -- $(am__append_12) -+ $(am__append_12) \ -+ $(top_builddir)/modules/history_manager/libscihistory_manager.la \ -+ $(top_builddir)/modules/ui_data/libsciui_data-disable.la \ -+ $(top_builddir)/modules/hdf5/libscihdf5.la \ -+ $(top_builddir)/modules/functions/libscifunctions.la \ -+ $(top_builddir)/modules/history_browser/libscihistory_browser-disable.la - LANG_DOMAIN = scilab - TARGETS_ALL = macros $(am__append_13) $(am__append_14) - diff --git a/math/scilab/files/patch-batik-1.8 b/math/scilab/files/patch-batik-1.8 deleted file mode 100644 index 415da3688215..000000000000 --- a/math/scilab/files/patch-batik-1.8 +++ /dev/null @@ -1,11 +0,0 @@ ---- modules/graph/src/java/org/scilab/modules/graph/utils/ScilabGraphUtils.java -+++ modules/graph/src/java/org/scilab/modules/graph/utils/ScilabGraphUtils.java -@@ -28,7 +28,7 @@ import org.apache.batik.bridge.DocumentL - import org.apache.batik.bridge.GVTBuilder; - import org.apache.batik.bridge.UserAgent; - import org.apache.batik.bridge.UserAgentAdapter; --import org.apache.batik.dom.svg.SAXSVGDocumentFactory; -+import org.apache.batik.anim.dom.SAXSVGDocumentFactory; - import org.apache.batik.gvt.GraphicsNode; - import org.apache.batik.util.XMLResourceDescriptor; - import org.scilab.forge.jlatexmath.ParseException; diff --git a/math/scilab/files/patch-clang b/math/scilab/files/patch-clang deleted file mode 100644 index d479512a40f4..000000000000 --- a/math/scilab/files/patch-clang +++ /dev/null @@ -1,19 +0,0 @@ ---- modules/core/includes/core_math.h.orig 2014-04-11 09:51:38.000000000 +0000 -+++ modules/core/includes/core_math.h 2014-07-23 08:27:27.143519955 +0000 -@@ -53,11 +53,11 @@ - #define DEG2RAD(x) ((x) * PI_OVER_180 ) - #define RAD2DEG(x) ((x) * _180_OVER_PI ) - --#ifdef round --#undef round --#endif -- --#define round(a) (int)(((a)<0.0)?(a)-.5:(a)+.5) -+// #ifdef round -+// #undef round -+// #endif -+// -+// #define round(a) (int)(((a)<0.0)?(a)-.5:(a)+.5) - #define EPSILON 1.0e-13 - - diff --git a/math/scilab/files/patch-configure b/math/scilab/files/patch-configure index 517bb451f5e0..e62769947c7e 100644 --- a/math/scilab/files/patch-configure +++ b/math/scilab/files/patch-configure @@ -1,11 +1,29 @@ ---- configure.orig 2015-10-02 17:09:45.251035000 +0000 -+++ configure 2015-10-02 17:07:21.796652000 +0000 -@@ -11863,7 +11863,7 @@ - fi - fi - ac_java_jvm_jni_lib_runtime_path="${ac_java_jvm_jni_lib_runtime_path}:$D" -- ac_java_jvm_jni_lib_flags="$ac_java_jvm_jni_lib_flags -L$D -ljvm" -+ ac_java_jvm_jni_lib_flags="$ac_java_jvm_jni_lib_flags -L$D -ljvm -pthread" - D=$ac_java_jvm_dir/jre/lib/$machine/native_threads - if test -d $D; then - ac_java_jvm_jni_lib_runtime_path="${ac_java_jvm_jni_lib_runtime_path}:$D" +--- configure.orig 2020-02-25 09:59:42 UTC ++++ configure +@@ -9995,7 +9995,7 @@ if test -z "$CXX"; then + fi + + case "$CXX" in +- g++-* | g++ | ccache*g++ | ccache*g++-* ) ++ g++-* | g++ | ccache*g++ | ccache*g++-* | c++ | clang++* ) + ## With GNU C++ Compiler + + # enable the code coverage +@@ -10022,7 +10022,7 @@ esac + #### 64 bits detection + IS_64_BITS_CPU=false + case "$host" in +- x86_64-*-linux-gnu | x86_64-linux-gnu | ia64-*-linux-gnu | alpha-*-linux-gnu | alpha-*-netbsd* | x86_64-*-netbsd* | sparc64-*-netbsd*) ++ x86_64-*-linux-gnu | x86_64-linux-gnu | ia64-*-linux-gnu | alpha-*-linux-gnu | alpha-*-netbsd* | x86_64-*-netbsd* | sparc64-*-netbsd* | amd64-*-freebsd* ) + IS_64_BITS_CPU=true + ;; + esac +@@ -10030,7 +10030,7 @@ esac + ##########" + + case "$CC" in +- gcc-* | gcc | ccache*gcc | ccache*gcc-* ) ++ gcc-* | gcc | ccache*gcc | ccache*gcc-* | cc | clang* ) + ## With GNU Compiler + + # enable the code coverage diff --git a/math/scilab/files/patch-etc-librarypath.xml b/math/scilab/files/patch-etc-librarypath.xml deleted file mode 100644 index 9abfbd13ff6b..000000000000 --- a/math/scilab/files/patch-etc-librarypath.xml +++ /dev/null @@ -1,9 +0,0 @@ ---- etc/librarypath.xml.orig 2015-03-31 09:31:16 UTC -+++ etc/librarypath.xml -@@ -62,4 +62,6 @@ - <!-- Standard path for 64 bits --> - <path value="/usr/lib64/scilab/"/> - -+ <path value="%%JAVALIBDIR%%"/> -+ <path value="%%LOCALBASE%%/lib"/> - </librarypaths> diff --git a/math/scilab/files/patch-etc_librarypath.xml b/math/scilab/files/patch-etc_librarypath.xml new file mode 100644 index 000000000000..5ad49eb39c63 --- /dev/null +++ b/math/scilab/files/patch-etc_librarypath.xml @@ -0,0 +1,12 @@ +--- etc/librarypath.xml.orig 2020-02-25 09:59:42 UTC ++++ etc/librarypath.xml +@@ -42,6 +42,9 @@ + <!-- Some distributions (like openSUSE) put gluegen-rt in /usr/lib instead pf /usr/lib/jni --> + <path value="/usr/lib/" /> + <path value="/usr/lib64/" /> ++ <!-- FreeBSD ports --> ++ <path value="/usr/local/share/java/classes" /> ++ <path value="/usr/local/lib" /> + + <!-- SCILAB LIBRARIES --> + <!-- Developpement environment --> diff --git a/math/scilab/files/patch-fop2 b/math/scilab/files/patch-fop2 deleted file mode 100644 index a6e084f340e8..000000000000 --- a/math/scilab/files/patch-fop2 +++ /dev/null @@ -1,32 +0,0 @@ -Fix build with fop 2.0 - ---- modules/helptools/src/java/org/scilab/modules/helptools/FopConverter.java.orig 2014-04-11 09:51:59 UTC -+++ modules/helptools/src/java/org/scilab/modules/helptools/FopConverter.java -@@ -43,10 +43,9 @@ public class FopConverter extends Contai - String fileName = outputDirectory + "/" + baseName + "." + format.name().toLowerCase(); - - try { -- FopFactory fopFactory = FopFactory.newInstance(); -+ FopFactory fopFactory = FopFactory.newInstance(new File(System.getenv("SCI") + "/modules/helptools/etc/fopconf.xml")); - fopFactory.addElementMapping(new JLaTeXMathElementMapping()); - fopFactory.getXMLHandlerRegistry().addXMLHandler(new JLaTeXMathXMLHandler()); -- fopFactory.setUserConfig(new File(System.getenv("SCI") + "/modules/helptools/etc/fopconf.xml")); - - // Step 3: Construct fop with desired output format - OutputStream out = new BufferedOutputStream(new FileOutputStream(fileName)); ---- modules/scinotes/src/java/org/scilab/modules/scinotes/utils/CodeExporter.java.orig 2014-04-11 09:52:10 UTC -+++ modules/scinotes/src/java/org/scilab/modules/scinotes/utils/CodeExporter.java -@@ -114,11 +114,11 @@ public class CodeExporter extends FOCode - * @param format the page format - */ - public void convert(String code, int[] lineNumberArray, String fileName, String type, String title, PageFormat format) { -- FopFactory fopFactory = FopFactory.newInstance(); -+ FopFactory fopFactory; - OutputStream out = null; - - try { -- fopFactory.setUserConfig(new File(ScilabConstants.SCI + "/modules/helptools/etc/fopconf.xml")); -+ fopFactory = FopFactory.newInstance(new File(ScilabConstants.SCI + "/modules/helptools/etc/fopconf.xml")); - FOUserAgent userAgent = fopFactory.newFOUserAgent(); - userAgent.setProducer(CREATOR); - userAgent.setTitle(title); diff --git a/math/scilab/files/patch-gfortran8 b/math/scilab/files/patch-gfortran8 deleted file mode 100644 index 5f57ae017942..000000000000 --- a/math/scilab/files/patch-gfortran8 +++ /dev/null @@ -1,57 +0,0 @@ -From f49b185c678c07526ef59c1531d41575f9266bdc Mon Sep 17 00:00:00 2001 -From: =?utf8?q?Cl=C3=A9ment=20DAVID?= <clement.david@esi-group.com> -Date: Mon, 26 Feb 2018 23:43:14 +0100 -Subject: [PATCH] Fortran: fix errors with gfortran 8 - -Change-Id: Ib890c6ea2dcba2f70d3c22dc86bbe38e4f22b061 ---- modules/differential_equations/src/fortran/ddaskr.f -+++ modules/differential_equations/src/fortran/ddaskr.f -@@ -1409,6 +1409,7 @@ C - DIMENSION RWORK(LRW),IWORK(LIW) - DIMENSION RTOL(*),ATOL(*) - DIMENSION RPAR(*),IPAR(*) -+ DIMENSION JROOT(NRT) - CHARACTER MSG*80 - EXTERNAL RES, JAC, PSOL, RT, DDASID, DDASIK, DNEDD, DNEDK - C -@@ -2530,7 +2531,8 @@ C Pointers into RWORK: - DOUBLE PRECISION TN, TOUT, Y, YP, PHI, PSI, R0, R1, RX, UROUND, - * RWORK, RPAR - DIMENSION Y(*), YP(*), PHI(NEQ,*), PSI(*), -- * R0(*), R1(*), RX(*), JROOT(*), RWORK(*), IWORK(*) -+ * R0(*), R1(*), RX(*), JROOT(NRT), RWORK(*), IWORK(*), -+ * RPAR(*), IPAR(*) - INTEGER I, JFLAG - DOUBLE PRECISION H - DOUBLE PRECISION HMINR, T1, TEMP1, TEMP2, X, ZERO ---- modules/differential_equations/src/fortran/ddasrt.f -+++ modules/differential_equations/src/fortran/ddasrt.f -@@ -870,6 +870,7 @@ C - DIMENSION RWORK(*),IWORK(*) - DIMENSION RTOL(*),ATOL(*) - DIMENSION RPAR(*),IPAR(*) -+ DIMENSION JROOT(NG) - CHARACTER MSG*80 - C - C SET POINTERS INTO IWORK -@@ -1594,7 +1595,8 @@ C - DOUBLE PRECISION TN, TOUT, Y, YP, PHI, PSI, G0, G1, GX, UROUND, - * RWORK, RPAR - DIMENSION Y(*), YP(*), PHI(NEQ,*), PSI(*), -- 1 G0(*), G1(*), GX(*), JROOT(*), RWORK(*), IWORK(*) -+ 1 G0(*), G1(*), GX(*), JROOT(NG), RWORK(*), IWORK(*), RPAR(*), -+ 1 IPAR(*) - INTEGER I, JFLAG - DOUBLE PRECISION H - DOUBLE PRECISION HMING, T1, TEMP1, TEMP2, X ---- modules/differential_equations/src/fortran/twodq.f -+++ modules/differential_equations/src/fortran/twodq.f -@@ -900,7 +900,7 @@ C - END - - subroutine tridv(node,node1,node2,coef,rank) -- double precision node(10),node1(10),node2(10),coef -+ double precision node(9),node1(9),node2(9),coef - integer rank - double precision s(3),coef1,temp - integer t(3) diff --git a/math/scilab/files/patch-jogamp-jogl-2.3.2 b/math/scilab/files/patch-jogamp-jogl-2.3.2 index d54a9a712785..bef5c3b7737d 100644 --- a/math/scilab/files/patch-jogamp-jogl-2.3.2 +++ b/math/scilab/files/patch-jogamp-jogl-2.3.2 @@ -1,112 +1,6 @@ ---- modules/gui/src/java/org/scilab/modules/gui/SwingView.java -+++ modules/gui/src/java/org/scilab/modules/gui/SwingView.java -@@ -84,10 +84,10 @@ import java.util.Map; - import java.util.Set; - import java.util.UUID; - --import javax.media.opengl.GL; --import javax.media.opengl.GLCapabilities; --import javax.media.opengl.GLProfile; --import javax.media.opengl.awt.GLCanvas; -+import com.jogamp.opengl.GL; -+import com.jogamp.opengl.GLCapabilities; -+import com.jogamp.opengl.GLProfile; -+import com.jogamp.opengl.awt.GLCanvas; - import javax.swing.JComponent; - import javax.swing.JSeparator; - import javax.swing.SwingUtilities; ---- modules/gui/src/java/org/scilab/modules/gui/bridge/ScilabBridge.java -+++ modules/gui/src/java/org/scilab/modules/gui/bridge/ScilabBridge.java -@@ -20,7 +20,7 @@ import java.awt.Cursor; - import java.awt.Font; - import java.awt.image.BufferedImage; - --import javax.media.opengl.GL; -+import com.jogamp.opengl.GL; - - import org.scilab.modules.gui.canvas.Canvas; - import org.scilab.modules.gui.canvas.ScilabCanvas; ---- modules/gui/src/java/org/scilab/modules/gui/bridge/canvas/SwingScilabCanvas.java -+++ modules/gui/src/java/org/scilab/modules/gui/bridge/canvas/SwingScilabCanvas.java -@@ -32,8 +32,8 @@ import java.awt.event.MouseListener; - import java.awt.event.MouseMotionListener; - import java.awt.image.BufferedImage; - --import javax.media.opengl.GL; --import javax.media.opengl.GLAutoDrawable; -+import com.jogamp.opengl.GL; -+import com.jogamp.opengl.GLAutoDrawable; - import javax.swing.JPanel; - - import org.scilab.forge.scirenderer.Canvas; ---- modules/gui/src/java/org/scilab/modules/gui/bridge/canvas/SwingScilabCanvasImpl.java -+++ modules/gui/src/java/org/scilab/modules/gui/bridge/canvas/SwingScilabCanvasImpl.java -@@ -19,12 +19,12 @@ import java.awt.HeadlessException; - import java.util.Calendar; - import java.util.StringTokenizer; - --import javax.media.opengl.GL; --import javax.media.opengl.GLCapabilities; --import javax.media.opengl.GLException; --import javax.media.opengl.GLProfile; --import javax.media.opengl.awt.GLCanvas; --import javax.media.opengl.awt.GLJPanel; -+import com.jogamp.opengl.GL; -+import com.jogamp.opengl.GLCapabilities; -+import com.jogamp.opengl.GLException; -+import com.jogamp.opengl.GLProfile; -+import com.jogamp.opengl.awt.GLCanvas; -+import com.jogamp.opengl.awt.GLJPanel; - - import org.scilab.modules.action_binding.InterpreterManagement; - import org.scilab.modules.commons.OS; ---- modules/gui/src/java/org/scilab/modules/gui/canvas/Canvas.java -+++ modules/gui/src/java/org/scilab/modules/gui/canvas/Canvas.java -@@ -14,7 +14,7 @@ package org.scilab.modules.gui.canvas; - - import java.awt.image.BufferedImage; - --import javax.media.opengl.GL; -+import com.jogamp.opengl.GL; - - import org.scilab.modules.gui.dockable.Dockable; - ---- modules/gui/src/java/org/scilab/modules/gui/canvas/ScilabCanvas.java -+++ modules/gui/src/java/org/scilab/modules/gui/canvas/ScilabCanvas.java -@@ -16,7 +16,7 @@ package org.scilab.modules.gui.canvas; - - import java.awt.image.BufferedImage; - --import javax.media.opengl.GL; -+import com.jogamp.opengl.GL; - - import org.scilab.modules.gui.bridge.ScilabBridge; - import org.scilab.modules.gui.dockable.ScilabDockable; ---- modules/gui/src/java/org/scilab/modules/gui/canvas/ScilabCanvasBridge.java -+++ modules/gui/src/java/org/scilab/modules/gui/canvas/ScilabCanvasBridge.java -@@ -14,7 +14,7 @@ package org.scilab.modules.gui.canvas; - - import java.awt.image.BufferedImage; - --import javax.media.opengl.GL; -+import com.jogamp.opengl.GL; - - import org.scilab.modules.gui.bridge.canvas.SwingScilabCanvas; - import org.scilab.modules.gui.utils.Position; ---- modules/gui/src/java/org/scilab/modules/gui/canvas/SimpleCanvas.java -+++ modules/gui/src/java/org/scilab/modules/gui/canvas/SimpleCanvas.java -@@ -15,7 +15,7 @@ package org.scilab.modules.gui.canvas; - import org.scilab.modules.gui.utils.Position; - import org.scilab.modules.gui.utils.Size; - --import javax.media.opengl.GL; -+import com.jogamp.opengl.GL; - import java.awt.image.BufferedImage; - - /** --- modules/scirenderer/examples/org/scilab/forge/scirenderer/examples/JScrollPaneExample.java +++ modules/scirenderer/examples/org/scilab/forge/scirenderer/examples/JScrollPaneExample.java -@@ -13,8 +13,8 @@ import org.scilab.forge.scirenderer.tran +@@ -13,8 +13,8 @@ import org.scilab.forge.scirenderer.tranformations.TransformationFactory; import org.scilab.forge.scirenderer.utils.shapes.geometry.CubeFactory; @@ -119,7 +13,7 @@ --- modules/scirenderer/examples/org/scilab/forge/scirenderer/examples/utils/ExampleFrame.java +++ modules/scirenderer/examples/org/scilab/forge/scirenderer/examples/utils/ExampleFrame.java -@@ -15,7 +15,7 @@ import com.jogamp.opengl.util.Animator; +@@ -18,7 +18,7 @@ import org.scilab.forge.scirenderer.Canvas; import org.scilab.forge.scirenderer.implementation.jogl.JoGLCanvasFactory; @@ -130,13 +24,14 @@ import java.awt.BorderLayout; --- modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLCanvas.java +++ modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLCanvas.java -@@ -16,16 +16,16 @@ import java.awt.image.BufferedImage; +@@ -20,17 +20,17 @@ import java.lang.reflect.InvocationTargetException; import java.util.concurrent.Semaphore; -import javax.media.opengl.DebugGL2; -import javax.media.opengl.GL2; -import javax.media.opengl.GLAutoDrawable; +-import javax.media.opengl.awt.GLJPanel; -import javax.media.opengl.GLCapabilities; -import javax.media.opengl.GLContext; -import javax.media.opengl.GLDrawableFactory; @@ -147,6 +42,7 @@ +import com.jogamp.opengl.DebugGL2; +import com.jogamp.opengl.GL2; +import com.jogamp.opengl.GLAutoDrawable; ++import com.jogamp.opengl.awt.GLJPanel; +import com.jogamp.opengl.GLCapabilities; +import com.jogamp.opengl.GLContext; +import com.jogamp.opengl.GLDrawableFactory; @@ -159,7 +55,7 @@ import org.scilab.forge.scirenderer.Canvas; --- modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLCanvasFactory.java +++ modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLCanvasFactory.java -@@ -13,7 +13,7 @@ package org.scilab.forge.scirenderer.imp +@@ -16,7 +16,7 @@ import org.scilab.forge.scirenderer.Canvas; @@ -170,7 +66,7 @@ * @author Pierre Lando --- modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLCapacity.java +++ modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLCapacity.java -@@ -11,7 +11,7 @@ +@@ -14,7 +14,7 @@ package org.scilab.forge.scirenderer.implementation.jogl; @@ -181,7 +77,7 @@ * This class store current OpenGl context capacity. --- modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLDrawingTools.java +++ modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLDrawingTools.java -@@ -30,7 +30,7 @@ import org.scilab.forge.scirenderer.tran +@@ -34,7 +34,7 @@ import org.scilab.forge.scirenderer.tranformations.TransformationManagerListener; import org.scilab.forge.scirenderer.tranformations.Vector3d; @@ -192,7 +88,7 @@ * --- modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLParameters.java +++ modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLParameters.java -@@ -11,8 +11,8 @@ +@@ -14,8 +14,8 @@ package org.scilab.forge.scirenderer.implementation.jogl; @@ -205,7 +101,7 @@ * @author Pierre Lando --- modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/buffers/JoGLBuffersManager.java +++ modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/buffers/JoGLBuffersManager.java -@@ -16,7 +16,7 @@ import org.scilab.forge.scirenderer.buff +@@ -19,7 +19,7 @@ import org.scilab.forge.scirenderer.buffers.ElementsBuffer; import org.scilab.forge.scirenderer.buffers.IndicesBuffer; @@ -216,7 +112,7 @@ import java.util.Set; --- modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/buffers/JoGLDataBuffer.java +++ modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/buffers/JoGLDataBuffer.java -@@ -13,7 +13,7 @@ package org.scilab.forge.scirenderer.imp +@@ -16,7 +16,7 @@ import org.scilab.forge.scirenderer.buffers.DataBuffer; @@ -227,7 +123,7 @@ /** --- modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/buffers/JoGLElementsBuffer.java +++ modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/buffers/JoGLElementsBuffer.java -@@ -13,7 +13,7 @@ package org.scilab.forge.scirenderer.imp +@@ -16,7 +16,7 @@ import org.scilab.forge.scirenderer.buffers.ElementsBuffer; @@ -238,7 +134,7 @@ --- modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/buffers/JoGLIndicesBuffer.java +++ modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/buffers/JoGLIndicesBuffer.java -@@ -13,7 +13,7 @@ package org.scilab.forge.scirenderer.imp +@@ -16,7 +16,7 @@ import org.scilab.forge.scirenderer.buffers.IndicesBuffer; @@ -249,7 +145,7 @@ import java.util.Collection; --- modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/clipping/JoGLClippingManager.java +++ modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/clipping/JoGLClippingManager.java -@@ -15,7 +15,7 @@ import org.scilab.forge.scirenderer.clip +@@ -18,7 +18,7 @@ import org.scilab.forge.scirenderer.clipping.ClippingPlane; import org.scilab.forge.scirenderer.implementation.jogl.JoGLDrawingTools; @@ -260,7 +156,7 @@ * @author Pierre Lando --- modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/clipping/JoGLClippingPlane.java +++ modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/clipping/JoGLClippingPlane.java -@@ -17,7 +17,7 @@ import org.scilab.forge.scirenderer.tran +@@ -20,7 +20,7 @@ import org.scilab.forge.scirenderer.tranformations.TransformationFactory; import org.scilab.forge.scirenderer.tranformations.Vector4d; @@ -271,7 +167,7 @@ * @author Pierre Lando --- modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/drawer/JoGLShapeDrawer.java +++ modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/drawer/JoGLShapeDrawer.java -@@ -23,7 +23,7 @@ import org.scilab.forge.scirenderer.text +@@ -26,7 +26,7 @@ import org.scilab.forge.scirenderer.lightning.LightManager; import org.scilab.forge.scirenderer.shapes.appearance.Material; @@ -282,7 +178,7 @@ --- modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/lightning/JoGLLight.java +++ modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/lightning/JoGLLight.java -@@ -11,7 +11,7 @@ +@@ -14,7 +14,7 @@ package org.scilab.forge.scirenderer.implementation.jogl.lightning; @@ -293,7 +189,7 @@ import org.scilab.forge.scirenderer.lightning.Light; --- modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/lightning/JoGLLightManager.java +++ modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/lightning/JoGLLightManager.java -@@ -17,7 +17,7 @@ import org.scilab.forge.scirenderer.ligh +@@ -20,7 +20,7 @@ import org.scilab.forge.scirenderer.lightning.LightManager; import org.scilab.forge.scirenderer.shapes.appearance.Material; @@ -304,7 +200,7 @@ * JoGL implementation of {@link LightManager} --- modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/picking/GLPickingManager.java +++ modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/picking/GLPickingManager.java -@@ -11,7 +11,7 @@ +@@ -14,7 +14,7 @@ package org.scilab.forge.scirenderer.implementation.jogl.picking; @@ -315,7 +211,7 @@ * @author Pierre Lando --- modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/picking/JoGLPickingTools.java +++ modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/picking/JoGLPickingTools.java -@@ -16,7 +16,7 @@ import org.scilab.forge.scirenderer.impl +@@ -19,7 +19,7 @@ import org.scilab.forge.scirenderer.picking.PickingTools; import org.scilab.forge.scirenderer.tranformations.Vector3d; @@ -326,7 +222,7 @@ --- modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/renderer/JoGLRenderer.java +++ modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/renderer/JoGLRenderer.java -@@ -15,7 +15,7 @@ import org.scilab.forge.scirenderer.Draw +@@ -18,7 +18,7 @@ import org.scilab.forge.scirenderer.implementation.jogl.JoGLDrawingTools; import org.scilab.forge.scirenderer.renderer.Renderer; @@ -337,7 +233,7 @@ * @author Pierre Lando --- modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/renderer/JoGLRendererManager.java +++ modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/renderer/JoGLRendererManager.java -@@ -15,7 +15,7 @@ import org.scilab.forge.scirenderer.impl +@@ -18,7 +18,7 @@ import org.scilab.forge.scirenderer.renderer.Renderer; import org.scilab.forge.scirenderer.renderer.RendererManager; @@ -348,7 +244,7 @@ import java.util.Stack; --- modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/texture/JoGLTextureManager.java +++ modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/texture/JoGLTextureManager.java -@@ -28,11 +28,11 @@ import org.scilab.forge.scirenderer.tran +@@ -32,11 +32,11 @@ import org.scilab.forge.scirenderer.tranformations.Vector3d; @@ -367,7 +263,7 @@ import java.nio.FloatBuffer; --- modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/utils/GLShortCuts.java +++ modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/utils/GLShortCuts.java -@@ -14,7 +14,7 @@ package org.scilab.forge.scirenderer.imp +@@ -17,7 +17,7 @@ import org.scilab.forge.scirenderer.shapes.appearance.Appearance; import org.scilab.forge.scirenderer.shapes.appearance.Color; @@ -376,3 +272,109 @@ /** * +--- modules/gui/src/java/org/scilab/modules/gui/SwingView.java ++++ modules/gui/src/java/org/scilab/modules/gui/SwingView.java +@@ -88,10 +88,10 @@ + import java.util.Set; + import java.util.UUID; + +-import javax.media.opengl.GL; +-import javax.media.opengl.GLCapabilities; +-import javax.media.opengl.GLProfile; +-import javax.media.opengl.awt.GLCanvas; ++import com.jogamp.opengl.GL; ++import com.jogamp.opengl.GLCapabilities; ++import com.jogamp.opengl.GLProfile; ++import com.jogamp.opengl.awt.GLCanvas; + import javax.swing.JComponent; + import javax.swing.JSeparator; + import javax.swing.SwingUtilities; +--- modules/gui/src/java/org/scilab/modules/gui/bridge/ScilabBridge.java ++++ modules/gui/src/java/org/scilab/modules/gui/bridge/ScilabBridge.java +@@ -23,7 +23,7 @@ + import java.awt.Font; + import java.awt.image.BufferedImage; + +-import javax.media.opengl.GL; ++import com.jogamp.opengl.GL; + + import org.scilab.modules.gui.canvas.Canvas; + import org.scilab.modules.gui.canvas.ScilabCanvas; +--- modules/gui/src/java/org/scilab/modules/gui/bridge/canvas/SwingScilabCanvas.java ++++ modules/gui/src/java/org/scilab/modules/gui/bridge/canvas/SwingScilabCanvas.java +@@ -35,8 +35,8 @@ + import java.awt.event.MouseMotionListener; + import java.awt.image.BufferedImage; + +-import javax.media.opengl.GL; +-import javax.media.opengl.GLAutoDrawable; ++import com.jogamp.opengl.GL; ++import com.jogamp.opengl.GLAutoDrawable; + import javax.swing.JPanel; + + import org.scilab.forge.scirenderer.Canvas; +--- modules/gui/src/java/org/scilab/modules/gui/bridge/canvas/SwingScilabCanvasImpl.java ++++ modules/gui/src/java/org/scilab/modules/gui/bridge/canvas/SwingScilabCanvasImpl.java +@@ -22,12 +22,12 @@ + import java.util.Calendar; + import java.util.StringTokenizer; + +-import javax.media.opengl.GL; +-import javax.media.opengl.GLCapabilities; +-import javax.media.opengl.GLException; +-import javax.media.opengl.GLProfile; +-import javax.media.opengl.awt.GLCanvas; +-import javax.media.opengl.awt.GLJPanel; ++import com.jogamp.opengl.GL; ++import com.jogamp.opengl.GLCapabilities; ++import com.jogamp.opengl.GLException; ++import com.jogamp.opengl.GLProfile; ++import com.jogamp.opengl.awt.GLCanvas; ++import com.jogamp.opengl.awt.GLJPanel; + + import org.scilab.modules.action_binding.InterpreterManagement; + import org.scilab.modules.commons.OS; +--- modules/gui/src/java/org/scilab/modules/gui/canvas/Canvas.java ++++ modules/gui/src/java/org/scilab/modules/gui/canvas/Canvas.java +@@ -17,7 +17,7 @@ + + import java.awt.image.BufferedImage; + +-import javax.media.opengl.GL; ++import com.jogamp.opengl.GL; + + import org.scilab.modules.gui.dockable.Dockable; + +--- modules/gui/src/java/org/scilab/modules/gui/canvas/ScilabCanvas.java ++++ modules/gui/src/java/org/scilab/modules/gui/canvas/ScilabCanvas.java +@@ -19,7 +19,7 @@ + + import java.awt.image.BufferedImage; + +-import javax.media.opengl.GL; ++import com.jogamp.opengl.GL; + + import org.scilab.modules.gui.bridge.ScilabBridge; + import org.scilab.modules.gui.dockable.ScilabDockable; +--- modules/gui/src/java/org/scilab/modules/gui/canvas/ScilabCanvasBridge.java ++++ modules/gui/src/java/org/scilab/modules/gui/canvas/ScilabCanvasBridge.java +@@ -17,7 +17,7 @@ + + import java.awt.image.BufferedImage; + +-import javax.media.opengl.GL; ++import com.jogamp.opengl.GL; + + import org.scilab.modules.gui.bridge.canvas.SwingScilabCanvas; + import org.scilab.modules.gui.utils.Position; +--- modules/gui/src/java/org/scilab/modules/gui/canvas/SimpleCanvas.java ++++ modules/gui/src/java/org/scilab/modules/gui/canvas/SimpleCanvas.java +@@ -18,7 +18,7 @@ + import org.scilab.modules.gui.utils.Position; + import org.scilab.modules.gui.utils.Size; + +-import javax.media.opengl.GL; ++import com.jogamp.opengl.GL; + import java.awt.image.BufferedImage; + + /** diff --git a/math/scilab/files/patch-modules-core-includes-Thread_Wrapper.h b/math/scilab/files/patch-modules-core-includes-Thread_Wrapper.h deleted file mode 100644 index 7933502d5563..000000000000 --- a/math/scilab/files/patch-modules-core-includes-Thread_Wrapper.h +++ /dev/null @@ -1,16 +0,0 @@ ---- modules/core/includes/Thread_Wrapper.h.orig 2010-09-01 02:34:21.000000000 -0700 -+++ modules/core/includes/Thread_Wrapper.h 2010-09-01 02:34:47.000000000 -0700 -@@ -70,13 +70,6 @@ - #define __Lock(lockName) pthread_mutex_lock(lockName) - - #define __UnLock(lockName) pthread_mutex_unlock(lockName) --/* PTHREAD_MUTEX_ERRORCHECK needed for a safe release atexit when we try to release without knowing if we own the lock --PTHREAD_PROCESS_SHARED needed for interprocess synch (plus alloc in shared mem thread_mutexattr_settype --Linux uses PTHREAD_MUTEX_ERRORCHECK_NP other Posix use PTHREAD_MUTEX_ERRORCHECK --*/ --#ifndef PTHREAD_MUTEX_ERRORCHECK --#define PTHREAD_MUTEX_ERRORCHECK PTHREAD_MUTEX_ERRORCHECK_NP --#endif - #define __InitSignalLock(lockName) \ - do { \ - pthread_mutexattr_t attr; \ diff --git a/math/scilab/files/patch-modules-dynamic_link-macros-ilib_gen_Make_unix.sci b/math/scilab/files/patch-modules-dynamic_link-macros-ilib_gen_Make_unix.sci deleted file mode 100644 index fb082e297fa9..000000000000 --- a/math/scilab/files/patch-modules-dynamic_link-macros-ilib_gen_Make_unix.sci +++ /dev/null @@ -1,32 +0,0 @@ ---- ./modules/dynamic_link/macros/ilib_gen_Make_unix.sci.orig 2014-04-11 09:51:43.000000000 +0000 -+++ ./modules/dynamic_link/macros/ilib_gen_Make_unix.sci 2014-07-24 23:46:32.896279292 +0000 -@@ -65,20 +65,6 @@ - linkBuildDir = TMPDIR+"/"+libname; - mkdir(linkBuildDir); - commandpath = SCI+"/modules/dynamic_link/src/scripts"; -- [fd,ierr] = mopen(commandpath+"/write.test","w+"); -- -- if (ierr<>0) then -- writePerm=%F -- else -- writePerm=%T -- mclose(fd) -- mdelete(commandpath+"/write.test"); -- end -- -- if (writePerm == %T & ( fileinfo(commandpath+"/Makefile.orig") == [] | fileinfo(commandpath+"/libtool") == [] )) then -- // We have write permission on the scilab tree, then generate the stuff into the directory in order to avoid the configure each time. -- generateConfigure(commandpath); -- end - - - // Copy files => linkBuildDir -@@ -187,7 +173,7 @@ - end - end - -- if ldflags <> "" | cflags <> "" | fflags <> "" | cc <> "" | fileinfo(commandpath+"/Makefile.orig") == [] | fileinfo(commandpath+"/libtool") == [] then -+ if %T then - // Makefile.orig doesn't exists or may be invalid regarding the flags - // run the ./configure with the flags - diff --git a/math/scilab/files/patch-modules_fileio_includes_os__wfopen.h b/math/scilab/files/patch-modules_fileio_includes_os__wfopen.h new file mode 100644 index 000000000000..cd26f5ec35b0 --- /dev/null +++ b/math/scilab/files/patch-modules_fileio_includes_os__wfopen.h @@ -0,0 +1,11 @@ +--- modules/fileio/includes/os_wfopen.h.orig 2020-02-25 09:59:50 UTC ++++ modules/fileio/includes/os_wfopen.h +@@ -25,7 +25,7 @@ + #endif + + // Linux +-#ifdef __linux__ ++#if defined(__linux__) || defined(__FreeBSD__) + #define os_wfopen linux_fopen + FILE* linux_fopen(const wchar_t* _pstFilename, const wchar_t* _pstMode); + #endif diff --git a/math/scilab/files/patch-modules_hdf5_includes_HDF5Objects.h b/math/scilab/files/patch-modules_hdf5_includes_HDF5Objects.h deleted file mode 100644 index dc5764331998..000000000000 --- a/math/scilab/files/patch-modules_hdf5_includes_HDF5Objects.h +++ /dev/null @@ -1,19 +0,0 @@ ---- modules/hdf5/includes/HDF5Objects.h.orig 2015-03-31 09:31:29 UTC -+++ modules/hdf5/includes/HDF5Objects.h -@@ -13,15 +13,13 @@ - #ifndef __HDF5OBJECTS_H__ - #define __HDF5OBJECTS_H__ - --#define H5_NO_DEPRECATED_SYMBOLS - #undef H5_USE_16_API -+#define H5_USE_18_API - - #define H5Eset_auto_vers 2 - #include <hdf5.h> - #include <hdf5_hl.h> - --#undef H5_NO_DEPRECATED_SYMBOLS -- - //#define __HDF5OBJECTS_DEBUG__ - //#define __HDF5ERROR_PRINT__ - diff --git a/math/scilab/files/patch-modules_hdf5_src_c_h5__readDataFromFile.c b/math/scilab/files/patch-modules_hdf5_src_c_h5__readDataFromFile.c deleted file mode 100644 index eef7c45dc2ef..000000000000 --- a/math/scilab/files/patch-modules_hdf5_src_c_h5__readDataFromFile.c +++ /dev/null @@ -1,11 +0,0 @@ ---- modules/hdf5/src/c/h5_readDataFromFile.c.orig 2015-03-31 09:31:29 UTC -+++ modules/hdf5/src/c/h5_readDataFromFile.c -@@ -10,7 +10,7 @@ - * - */ - --#define H5_NO_DEPRECATED_SYMBOLS -+#define H5_USE_18_API - - #ifndef _MSC_VER - #include <sys/time.h> diff --git a/math/scilab/files/patch-modules_hdf5_src_c_h5__readDataFromFile__v1.c b/math/scilab/files/patch-modules_hdf5_src_c_h5__readDataFromFile__v1.c deleted file mode 100644 index e6ba74babe17..000000000000 --- a/math/scilab/files/patch-modules_hdf5_src_c_h5__readDataFromFile__v1.c +++ /dev/null @@ -1,11 +0,0 @@ ---- modules/hdf5/src/c/h5_readDataFromFile_v1.c.orig 2015-03-31 09:31:29 UTC -+++ modules/hdf5/src/c/h5_readDataFromFile_v1.c -@@ -10,7 +10,7 @@ - * - */ - --#define H5_NO_DEPRECATED_SYMBOLS -+#define H5_USE_18_API - - #ifndef _MSC_VER - #include <sys/time.h> diff --git a/math/scilab/files/patch-modules_output__stream_src_cpp_diary__manager.cpp b/math/scilab/files/patch-modules_output__stream_src_cpp_diary__manager.cpp deleted file mode 100644 index ce52281545cb..000000000000 --- a/math/scilab/files/patch-modules_output__stream_src_cpp_diary__manager.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- modules/output_stream/src/cpp/diary_manager.cpp.orig 2015-03-31 09:31:36 UTC -+++ modules/output_stream/src/cpp/diary_manager.cpp -@@ -61,7 +61,7 @@ wchar_t **getDiaryFilenames(int *array_s - if (SCIDIARY) - { - std::wstring * wstringFilenames = SCIDIARY->getFilenames(array_size); -- if (array_size > 0) -+ if (*array_size > 0) - { - wchar_t **wcFilenames = (wchar_t **) MALLOC (sizeof(wchar_t*) * (*array_size)); - for (int i = 0; i < *array_size; i++) diff --git a/math/scilab/files/patch-modules_scicos_Makefile.in b/math/scilab/files/patch-modules_scicos_Makefile.in deleted file mode 100644 index ff35a57a7cd7..000000000000 --- a/math/scilab/files/patch-modules_scicos_Makefile.in +++ /dev/null @@ -1,478 +0,0 @@ ---- modules/scicos/Makefile.in.orig 2015-03-31 09:31:38 UTC -+++ modules/scicos/Makefile.in -@@ -438,7 +438,7 @@ libscisundials_la_OBJECTS = $(am_libscisundials_la_OBJ - @OCAML_TRUE@@XCOS_TRUE@ modelicat$(EXEEXT) - PROGRAMS = $(bin_PROGRAMS) - am__XML2Modelica_SOURCES_DIST = $(srcdir)/src/xml2modelica/xMLTree.ml \ -- $(srcdir)/src/xml2modelica/linenum.mll \ -+ $(srcdir)/src/modelica_compiler/linenum.mll \ - $(srcdir)/src/xml2modelica/stringParser.ml \ - $(srcdir)/src/xml2modelica/stringLexer.ml \ - $(srcdir)/src/xml2modelica/xMLParser.ml \ -@@ -1146,7 +1146,7 @@ HELP_CHAPTERLANG = en_US fr_FR pt_BR - ### XML2Modelica - @OCAML_TRUE@@XCOS_TRUE@XML2Modelica_SOURCES = \ - @OCAML_TRUE@@XCOS_TRUE@ $(srcdir)/src/xml2modelica/xMLTree.ml \ --@OCAML_TRUE@@XCOS_TRUE@ $(srcdir)/src/xml2modelica/linenum.mll \ -+@OCAML_TRUE@@XCOS_TRUE@ $(srcdir)/src/modelica_compiler/linenum.mll \ - @OCAML_TRUE@@XCOS_TRUE@ $(srcdir)/src/xml2modelica/stringParser.ml \ - @OCAML_TRUE@@XCOS_TRUE@ $(srcdir)/src/xml2modelica/stringLexer.ml \ - @OCAML_TRUE@@XCOS_TRUE@ $(srcdir)/src/xml2modelica/xMLParser.ml \ -@@ -3392,35 +3392,10 @@ distclean-local: - @OCAML_TRUE@@XCOS_TRUE@ $(OCAMLDEP) -all $(INCLUDE) $(MLS_XML2Modelica) $(MLIS_XML2Modelica) > .depend - @OCAML_TRUE@@XCOS_TRUE@ $(OCAMLDEP) -all $(INCLUDE_modelicat) $(MLS_modelicat) $(MLIS_modelicat) >> .depend - @OCAML_TRUE@@XCOS_TRUE@ $(OCAMLDEP) -all $(INCLUDE) $(MLS_modelicac) $(MLIS_modelicac) >> .depend --@OCAML_TRUE@@XCOS_TRUE@./src/xml2modelica/xMLTree.cmo ./src/xml2modelica/xMLTree.cmi : \ --@OCAML_TRUE@@XCOS_TRUE@ ./src/xml2modelica/xMLTree.ml --@OCAML_TRUE@@XCOS_TRUE@./src/xml2modelica/xMLTree.cmx ./src/xml2modelica/xMLTree.o \ --@OCAML_TRUE@@XCOS_TRUE@ ./src/xml2modelica/xMLTree.cmi : ./src/xml2modelica/xMLTree.ml --@OCAML_TRUE@@XCOS_TRUE@./src/xml2modelica/linenum.cmo ./src/xml2modelica/linenum.cmi : \ --@OCAML_TRUE@@XCOS_TRUE@ ./src/xml2modelica/linenum.ml --@OCAML_TRUE@@XCOS_TRUE@./src/xml2modelica/linenum.cmx ./src/xml2modelica/linenum.o \ --@OCAML_TRUE@@XCOS_TRUE@ ./src/xml2modelica/linenum.cmi : ./src/xml2modelica/linenum.ml --@OCAML_TRUE@@XCOS_TRUE@./src/xml2modelica/stringParser.cmo ./src/xml2modelica/stringParser.cmi : \ --@OCAML_TRUE@@XCOS_TRUE@ ./src/xml2modelica/stringParser.ml --@OCAML_TRUE@@XCOS_TRUE@./src/xml2modelica/stringParser.cmx ./src/xml2modelica/stringParser.o \ --@OCAML_TRUE@@XCOS_TRUE@ ./src/xml2modelica/stringParser.cmi : ./src/xml2modelica/stringParser.ml --@OCAML_TRUE@@XCOS_TRUE@./src/xml2modelica/stringLexer.cmo ./src/xml2modelica/stringLexer.cmi : \ --@OCAML_TRUE@@XCOS_TRUE@ ./src/xml2modelica/stringParser.cmi ./src/xml2modelica/stringLexer.ml --@OCAML_TRUE@@XCOS_TRUE@./src/xml2modelica/stringLexer.cmx ./src/xml2modelica/stringLexer.o \ --@OCAML_TRUE@@XCOS_TRUE@ ./src/xml2modelica/stringLexer.cmi : ./src/xml2modelica/stringParser.cmi \ --@OCAML_TRUE@@XCOS_TRUE@ ./src/xml2modelica/stringParser.cmx ./src/xml2modelica/stringLexer.ml --@OCAML_TRUE@@XCOS_TRUE@./src/xml2modelica/xMLParser.cmo ./src/xml2modelica/xMLParser.cmi : \ --@OCAML_TRUE@@XCOS_TRUE@ ./src/xml2modelica/xMLTree.cmi ./src/modelica_compiler/linenum.cmi \ --@OCAML_TRUE@@XCOS_TRUE@ ./src/xml2modelica/xMLParser.ml --@OCAML_TRUE@@XCOS_TRUE@./src/xml2modelica/xMLParser.cmx ./src/xml2modelica/xMLParser.o \ --@OCAML_TRUE@@XCOS_TRUE@ ./src/xml2modelica/xMLParser.cmi : ./src/xml2modelica/xMLTree.cmi \ --@OCAML_TRUE@@XCOS_TRUE@ ./src/xml2modelica/xMLTree.cmx ./src/modelica_compiler/linenum.cmi \ --@OCAML_TRUE@@XCOS_TRUE@ ./src/modelica_compiler/linenum.cmx ./src/xml2modelica/xMLParser.ml --@OCAML_TRUE@@XCOS_TRUE@./src/xml2modelica/xMLLexer.cmo ./src/xml2modelica/xMLLexer.cmi : \ --@OCAML_TRUE@@XCOS_TRUE@ ./src/xml2modelica/xMLParser.cmi ./src/xml2modelica/xMLLexer.ml --@OCAML_TRUE@@XCOS_TRUE@./src/xml2modelica/xMLLexer.cmx ./src/xml2modelica/xMLLexer.o \ --@OCAML_TRUE@@XCOS_TRUE@ ./src/xml2modelica/xMLLexer.cmi : ./src/xml2modelica/xMLParser.cmi \ --@OCAML_TRUE@@XCOS_TRUE@ ./src/xml2modelica/xMLParser.cmx ./src/xml2modelica/xMLLexer.ml -+@OCAML_TRUE@@XCOS_TRUE@./src/modelica_compiler/linenum.cmo ./src/modelica_compiler/linenum.cmi : \ -+@OCAML_TRUE@@XCOS_TRUE@ ./src/modelica_compiler/linenum.ml -+@OCAML_TRUE@@XCOS_TRUE@./src/modelica_compiler/linenum.cmx ./src/modelica_compiler/linenum.o \ -+@OCAML_TRUE@@XCOS_TRUE@ ./src/modelica_compiler/linenum.cmi : ./src/modelica_compiler/linenum.ml - @OCAML_TRUE@@XCOS_TRUE@./src/xml2modelica/modelicaCodeGenerator.cmo \ - @OCAML_TRUE@@XCOS_TRUE@ ./src/xml2modelica/modelicaCodeGenerator.cmi : \ - @OCAML_TRUE@@XCOS_TRUE@ ./src/xml2modelica/xMLTree.cmi ./src/xml2modelica/stringParser.cmi \ -@@ -3433,6 +3408,15 @@ distclean-local: - @OCAML_TRUE@@XCOS_TRUE@ ./src/xml2modelica/stringParser.cmi ./src/xml2modelica/stringParser.cmx \ - @OCAML_TRUE@@XCOS_TRUE@ ./src/xml2modelica/stringLexer.cmi ./src/xml2modelica/stringLexer.cmx \ - @OCAML_TRUE@@XCOS_TRUE@ ./src/xml2modelica/modelicaCodeGenerator.ml -+@OCAML_TRUE@@XCOS_TRUE@./src/xml2modelica/stringLexer.cmo ./src/xml2modelica/stringLexer.cmi : \ -+@OCAML_TRUE@@XCOS_TRUE@ ./src/xml2modelica/stringParser.cmi ./src/xml2modelica/stringLexer.ml -+@OCAML_TRUE@@XCOS_TRUE@./src/xml2modelica/stringLexer.cmx ./src/xml2modelica/stringLexer.o \ -+@OCAML_TRUE@@XCOS_TRUE@ ./src/xml2modelica/stringLexer.cmi : ./src/xml2modelica/stringParser.cmi \ -+@OCAML_TRUE@@XCOS_TRUE@ ./src/xml2modelica/stringParser.cmx ./src/xml2modelica/stringLexer.ml -+@OCAML_TRUE@@XCOS_TRUE@./src/xml2modelica/stringParser.cmo ./src/xml2modelica/stringParser.cmi : \ -+@OCAML_TRUE@@XCOS_TRUE@ ./src/xml2modelica/stringParser.ml -+@OCAML_TRUE@@XCOS_TRUE@./src/xml2modelica/stringParser.cmx ./src/xml2modelica/stringParser.o \ -+@OCAML_TRUE@@XCOS_TRUE@ ./src/xml2modelica/stringParser.cmi : ./src/xml2modelica/stringParser.ml - @OCAML_TRUE@@XCOS_TRUE@./src/xml2modelica/xML2Modelica.cmo ./src/xml2modelica/xML2Modelica.cmi : \ - @OCAML_TRUE@@XCOS_TRUE@ ./src/xml2modelica/xMLParser.cmi ./src/xml2modelica/xMLLexer.cmi \ - @OCAML_TRUE@@XCOS_TRUE@ ./src/xml2modelica/modelicaCodeGenerator.cmi \ -@@ -3444,31 +3428,22 @@ distclean-local: - @OCAML_TRUE@@XCOS_TRUE@ ./src/xml2modelica/modelicaCodeGenerator.cmi \ - @OCAML_TRUE@@XCOS_TRUE@ ./src/xml2modelica/modelicaCodeGenerator.cmx \ - @OCAML_TRUE@@XCOS_TRUE@ ./src/xml2modelica/xML2Modelica.ml --@OCAML_TRUE@@XCOS_TRUE@./src/translator/parsing/syntax.cmo ./src/translator/parsing/syntax.cmi : \ --@OCAML_TRUE@@XCOS_TRUE@ ./src/translator/parsing/syntax.ml --@OCAML_TRUE@@XCOS_TRUE@./src/translator/parsing/syntax.cmx ./src/translator/parsing/syntax.o \ --@OCAML_TRUE@@XCOS_TRUE@ ./src/translator/parsing/syntax.cmi : ./src/translator/parsing/syntax.ml --@OCAML_TRUE@@XCOS_TRUE@./src/translator/parsing/parser.cmo ./src/translator/parsing/parser.cmi : \ --@OCAML_TRUE@@XCOS_TRUE@ ./src/translator/parsing/syntax.cmi ./src/translator/parsing/parser.ml --@OCAML_TRUE@@XCOS_TRUE@./src/translator/parsing/parser.cmx ./src/translator/parsing/parser.o \ --@OCAML_TRUE@@XCOS_TRUE@ ./src/translator/parsing/parser.cmi : ./src/translator/parsing/syntax.cmi \ --@OCAML_TRUE@@XCOS_TRUE@ ./src/translator/parsing/syntax.cmx ./src/translator/parsing/parser.ml --@OCAML_TRUE@@XCOS_TRUE@./src/translator/parsing/lexer.cmo ./src/translator/parsing/lexer.cmi : \ --@OCAML_TRUE@@XCOS_TRUE@ ./src/translator/parsing/parser.cmi ./src/translator/parsing/lexer.ml --@OCAML_TRUE@@XCOS_TRUE@./src/translator/parsing/lexer.cmx ./src/translator/parsing/lexer.o \ --@OCAML_TRUE@@XCOS_TRUE@ ./src/translator/parsing/lexer.cmi : ./src/translator/parsing/parser.cmi \ --@OCAML_TRUE@@XCOS_TRUE@ ./src/translator/parsing/parser.cmx ./src/translator/parsing/lexer.ml --@OCAML_TRUE@@XCOS_TRUE@./src/translator/parsing/linenum.cmo ./src/translator/parsing/linenum.cmi : \ --@OCAML_TRUE@@XCOS_TRUE@ ./src/translator/parsing/linenum.ml --@OCAML_TRUE@@XCOS_TRUE@./src/translator/parsing/linenum.cmx ./src/translator/parsing/linenum.o \ --@OCAML_TRUE@@XCOS_TRUE@ ./src/translator/parsing/linenum.cmi : \ --@OCAML_TRUE@@XCOS_TRUE@ ./src/translator/parsing/linenum.ml --@OCAML_TRUE@@XCOS_TRUE@./src/translator/compilation/types.cmo \ --@OCAML_TRUE@@XCOS_TRUE@ ./src/translator/compilation/types.cmi : \ --@OCAML_TRUE@@XCOS_TRUE@ ./src/translator/compilation/types.ml --@OCAML_TRUE@@XCOS_TRUE@./src/translator/compilation/types.cmx ./src/translator/compilation/types.o \ --@OCAML_TRUE@@XCOS_TRUE@ ./src/translator/compilation/types.cmi : \ --@OCAML_TRUE@@XCOS_TRUE@ ./src/translator/compilation/types.ml -+@OCAML_TRUE@@XCOS_TRUE@./src/xml2modelica/xMLLexer.cmo ./src/xml2modelica/xMLLexer.cmi : \ -+@OCAML_TRUE@@XCOS_TRUE@ ./src/xml2modelica/xMLParser.cmi ./src/xml2modelica/xMLLexer.ml -+@OCAML_TRUE@@XCOS_TRUE@./src/xml2modelica/xMLLexer.cmx ./src/xml2modelica/xMLLexer.o \ -+@OCAML_TRUE@@XCOS_TRUE@ ./src/xml2modelica/xMLLexer.cmi : ./src/xml2modelica/xMLParser.cmi \ -+@OCAML_TRUE@@XCOS_TRUE@ ./src/xml2modelica/xMLParser.cmx ./src/xml2modelica/xMLLexer.ml -+@OCAML_TRUE@@XCOS_TRUE@./src/xml2modelica/xMLParser.cmo ./src/xml2modelica/xMLParser.cmi : \ -+@OCAML_TRUE@@XCOS_TRUE@ ./src/xml2modelica/xMLTree.cmi ./src/modelica_compiler/linenum.cmi \ -+@OCAML_TRUE@@XCOS_TRUE@ ./src/xml2modelica/xMLParser.ml -+@OCAML_TRUE@@XCOS_TRUE@./src/xml2modelica/xMLParser.cmx ./src/xml2modelica/xMLParser.o \ -+@OCAML_TRUE@@XCOS_TRUE@ ./src/xml2modelica/xMLParser.cmi : ./src/xml2modelica/xMLTree.cmi \ -+@OCAML_TRUE@@XCOS_TRUE@ ./src/xml2modelica/xMLTree.cmx ./src/modelica_compiler/linenum.cmi \ -+@OCAML_TRUE@@XCOS_TRUE@ ./src/modelica_compiler/linenum.cmx ./src/xml2modelica/xMLParser.ml -+@OCAML_TRUE@@XCOS_TRUE@./src/xml2modelica/xMLTree.cmo ./src/xml2modelica/xMLTree.cmi : \ -+@OCAML_TRUE@@XCOS_TRUE@ ./src/xml2modelica/xMLTree.ml -+@OCAML_TRUE@@XCOS_TRUE@./src/xml2modelica/xMLTree.cmx ./src/xml2modelica/xMLTree.o \ -+@OCAML_TRUE@@XCOS_TRUE@ ./src/xml2modelica/xMLTree.cmi : ./src/xml2modelica/xMLTree.ml - @OCAML_TRUE@@XCOS_TRUE@./src/translator/compilation/nameResolve.cmo \ - @OCAML_TRUE@@XCOS_TRUE@ ./src/translator/compilation/nameResolve.cmi : \ - @OCAML_TRUE@@XCOS_TRUE@ ./src/translator/compilation/types.cmi \ -@@ -3482,29 +3457,12 @@ distclean-local: - @OCAML_TRUE@@XCOS_TRUE@ ./src/translator/parsing/syntax.cmi ./src/translator/parsing/syntax.cmx \ - @OCAML_TRUE@@XCOS_TRUE@ ./src/translator/parsing/parser.cmi ./src/translator/parsing/parser.cmx \ - @OCAML_TRUE@@XCOS_TRUE@ ./src/translator/compilation/nameResolve.ml --@OCAML_TRUE@@XCOS_TRUE@./src/translator/instantiation/instantiation.cmo \ --@OCAML_TRUE@@XCOS_TRUE@ ./src/translator/instantiation/instantiation.cmi : \ --@OCAML_TRUE@@XCOS_TRUE@ ./src/translator/compilation/types.cmi \ --@OCAML_TRUE@@XCOS_TRUE@ ./src/translator/parsing/syntax.cmi ./src/translator/parsing/parser.cmi \ --@OCAML_TRUE@@XCOS_TRUE@ ./src/translator/compilation/nameResolve.cmi \ --@OCAML_TRUE@@XCOS_TRUE@ ./src/translator/instantiation/instantiation.ml --@OCAML_TRUE@@XCOS_TRUE@./src/translator/instantiation/instantiation.cmx \ --@OCAML_TRUE@@XCOS_TRUE@ ./src/translator/instantiation/instantiation.o \ --@OCAML_TRUE@@XCOS_TRUE@ ./src/translator/instantiation/instantiation.cmi : \ --@OCAML_TRUE@@XCOS_TRUE@ ./src/translator/compilation/types.cmi \ --@OCAML_TRUE@@XCOS_TRUE@ ./src/translator/compilation/types.cmx \ --@OCAML_TRUE@@XCOS_TRUE@ ./src/translator/parsing/syntax.cmi ./src/translator/parsing/syntax.cmx \ --@OCAML_TRUE@@XCOS_TRUE@ ./src/translator/parsing/parser.cmi ./src/translator/parsing/parser.cmx \ --@OCAML_TRUE@@XCOS_TRUE@ ./src/translator/compilation/nameResolve.cmi \ --@OCAML_TRUE@@XCOS_TRUE@ ./src/translator/compilation/nameResolve.cmx \ --@OCAML_TRUE@@XCOS_TRUE@ ./src/translator/instantiation/instantiation.ml --@OCAML_TRUE@@XCOS_TRUE@./src/translator/exceptionHandling/msgDico.cmo \ --@OCAML_TRUE@@XCOS_TRUE@ ./src/translator/exceptionHandling/msgDico.cmi : \ --@OCAML_TRUE@@XCOS_TRUE@ ./src/translator/exceptionHandling/msgDico.ml --@OCAML_TRUE@@XCOS_TRUE@./src/translator/exceptionHandling/msgDico.cmx \ --@OCAML_TRUE@@XCOS_TRUE@ ./src/translator/exceptionHandling/msgDico.o \ --@OCAML_TRUE@@XCOS_TRUE@ ./src/translator/exceptionHandling/msgDico.cmi : \ --@OCAML_TRUE@@XCOS_TRUE@ ./src/translator/exceptionHandling/msgDico.ml -+@OCAML_TRUE@@XCOS_TRUE@./src/translator/compilation/types.cmo \ -+@OCAML_TRUE@@XCOS_TRUE@ ./src/translator/compilation/types.cmi : \ -+@OCAML_TRUE@@XCOS_TRUE@ ./src/translator/compilation/types.ml -+@OCAML_TRUE@@XCOS_TRUE@./src/translator/compilation/types.cmx ./src/translator/compilation/types.o \ -+@OCAML_TRUE@@XCOS_TRUE@ ./src/translator/compilation/types.cmi : \ -+@OCAML_TRUE@@XCOS_TRUE@ ./src/translator/compilation/types.ml - @OCAML_TRUE@@XCOS_TRUE@./src/translator/exceptionHandling/errorDico.cmo \ - @OCAML_TRUE@@XCOS_TRUE@ ./src/translator/exceptionHandling/errorDico.cmi : \ - @OCAML_TRUE@@XCOS_TRUE@ ./src/translator/parsing/parser.cmi \ -@@ -3543,19 +3501,48 @@ distclean-local: - @OCAML_TRUE@@XCOS_TRUE@ ./src/translator/exceptionHandling/errorDico.cmi \ - @OCAML_TRUE@@XCOS_TRUE@ ./src/translator/exceptionHandling/errorDico.cmx \ - @OCAML_TRUE@@XCOS_TRUE@ ./src/translator/exceptionHandling/exceptHandler.ml --@OCAML_TRUE@@XCOS_TRUE@./src/translator/translation/libraryManager.cmo \ --@OCAML_TRUE@@XCOS_TRUE@ ./src/translator/translation/libraryManager.cmi : \ --@OCAML_TRUE@@XCOS_TRUE@ ./src/translator/parsing/parser.cmi ./src/translator/parsing/lexer.cmi \ --@OCAML_TRUE@@XCOS_TRUE@ ./src/translator/exceptionHandling/exceptHandler.cmi \ --@OCAML_TRUE@@XCOS_TRUE@ ./src/translator/translation/libraryManager.ml --@OCAML_TRUE@@XCOS_TRUE@./src/translator/translation/libraryManager.cmx \ --@OCAML_TRUE@@XCOS_TRUE@ ./src/translator/translation/libraryManager.o \ --@OCAML_TRUE@@XCOS_TRUE@ ./src/translator/translation/libraryManager.cmi : \ -+@OCAML_TRUE@@XCOS_TRUE@./src/translator/exceptionHandling/msgDico.cmo \ -+@OCAML_TRUE@@XCOS_TRUE@ ./src/translator/exceptionHandling/msgDico.cmi : \ -+@OCAML_TRUE@@XCOS_TRUE@ ./src/translator/exceptionHandling/msgDico.ml -+@OCAML_TRUE@@XCOS_TRUE@./src/translator/exceptionHandling/msgDico.cmx \ -+@OCAML_TRUE@@XCOS_TRUE@ ./src/translator/exceptionHandling/msgDico.o \ -+@OCAML_TRUE@@XCOS_TRUE@ ./src/translator/exceptionHandling/msgDico.cmi : \ -+@OCAML_TRUE@@XCOS_TRUE@ ./src/translator/exceptionHandling/msgDico.ml -+@OCAML_TRUE@@XCOS_TRUE@./src/translator/instantiation/instantiation.cmo \ -+@OCAML_TRUE@@XCOS_TRUE@ ./src/translator/instantiation/instantiation.cmi : \ -+@OCAML_TRUE@@XCOS_TRUE@ ./src/translator/compilation/types.cmi \ -+@OCAML_TRUE@@XCOS_TRUE@ ./src/translator/parsing/syntax.cmi ./src/translator/parsing/parser.cmi \ -+@OCAML_TRUE@@XCOS_TRUE@ ./src/translator/compilation/nameResolve.cmi \ -+@OCAML_TRUE@@XCOS_TRUE@ ./src/translator/instantiation/instantiation.ml -+@OCAML_TRUE@@XCOS_TRUE@./src/translator/instantiation/instantiation.cmx \ -+@OCAML_TRUE@@XCOS_TRUE@ ./src/translator/instantiation/instantiation.o \ -+@OCAML_TRUE@@XCOS_TRUE@ ./src/translator/instantiation/instantiation.cmi : \ -+@OCAML_TRUE@@XCOS_TRUE@ ./src/translator/compilation/types.cmi \ -+@OCAML_TRUE@@XCOS_TRUE@ ./src/translator/compilation/types.cmx \ -+@OCAML_TRUE@@XCOS_TRUE@ ./src/translator/parsing/syntax.cmi ./src/translator/parsing/syntax.cmx \ - @OCAML_TRUE@@XCOS_TRUE@ ./src/translator/parsing/parser.cmi ./src/translator/parsing/parser.cmx \ --@OCAML_TRUE@@XCOS_TRUE@ ./src/translator/parsing/lexer.cmi ./src/translator/parsing/lexer.cmx \ --@OCAML_TRUE@@XCOS_TRUE@ ./src/translator/exceptionHandling/exceptHandler.cmi \ --@OCAML_TRUE@@XCOS_TRUE@ ./src/translator/exceptionHandling/exceptHandler.cmx \ --@OCAML_TRUE@@XCOS_TRUE@ ./src/translator/translation/libraryManager.ml -+@OCAML_TRUE@@XCOS_TRUE@ ./src/translator/compilation/nameResolve.cmi \ -+@OCAML_TRUE@@XCOS_TRUE@ ./src/translator/compilation/nameResolve.cmx \ -+@OCAML_TRUE@@XCOS_TRUE@ ./src/translator/instantiation/instantiation.ml -+@OCAML_TRUE@@XCOS_TRUE@./src/translator/parsing/lexer.cmo ./src/translator/parsing/lexer.cmi : \ -+@OCAML_TRUE@@XCOS_TRUE@ ./src/translator/parsing/parser.cmi ./src/translator/parsing/lexer.ml -+@OCAML_TRUE@@XCOS_TRUE@./src/translator/parsing/lexer.cmx ./src/translator/parsing/lexer.o \ -+@OCAML_TRUE@@XCOS_TRUE@ ./src/translator/parsing/lexer.cmi : ./src/translator/parsing/parser.cmi \ -+@OCAML_TRUE@@XCOS_TRUE@ ./src/translator/parsing/parser.cmx ./src/translator/parsing/lexer.ml -+@OCAML_TRUE@@XCOS_TRUE@./src/translator/parsing/linenum.cmo ./src/translator/parsing/linenum.cmi : \ -+@OCAML_TRUE@@XCOS_TRUE@ ./src/translator/parsing/linenum.ml -+@OCAML_TRUE@@XCOS_TRUE@./src/translator/parsing/linenum.cmx ./src/translator/parsing/linenum.o \ -+@OCAML_TRUE@@XCOS_TRUE@ ./src/translator/parsing/linenum.cmi : \ -+@OCAML_TRUE@@XCOS_TRUE@ ./src/translator/parsing/linenum.ml -+@OCAML_TRUE@@XCOS_TRUE@./src/translator/parsing/parser.cmo ./src/translator/parsing/parser.cmi : \ -+@OCAML_TRUE@@XCOS_TRUE@ ./src/translator/parsing/syntax.cmi ./src/translator/parsing/parser.ml -+@OCAML_TRUE@@XCOS_TRUE@./src/translator/parsing/parser.cmx ./src/translator/parsing/parser.o \ -+@OCAML_TRUE@@XCOS_TRUE@ ./src/translator/parsing/parser.cmi : ./src/translator/parsing/syntax.cmi \ -+@OCAML_TRUE@@XCOS_TRUE@ ./src/translator/parsing/syntax.cmx ./src/translator/parsing/parser.ml -+@OCAML_TRUE@@XCOS_TRUE@./src/translator/parsing/syntax.cmo ./src/translator/parsing/syntax.cmi : \ -+@OCAML_TRUE@@XCOS_TRUE@ ./src/translator/parsing/syntax.ml -+@OCAML_TRUE@@XCOS_TRUE@./src/translator/parsing/syntax.cmx ./src/translator/parsing/syntax.o \ -+@OCAML_TRUE@@XCOS_TRUE@ ./src/translator/parsing/syntax.cmi : ./src/translator/parsing/syntax.ml - @OCAML_TRUE@@XCOS_TRUE@./src/translator/translation/codeGeneration.cmo \ - @OCAML_TRUE@@XCOS_TRUE@ ./src/translator/translation/codeGeneration.cmi : \ - @OCAML_TRUE@@XCOS_TRUE@ ./src/translator/compilation/types.cmi \ -@@ -3575,13 +3562,19 @@ distclean-local: - @OCAML_TRUE@@XCOS_TRUE@ ./src/translator/exceptionHandling/errorDico.cmi \ - @OCAML_TRUE@@XCOS_TRUE@ ./src/translator/exceptionHandling/errorDico.cmx \ - @OCAML_TRUE@@XCOS_TRUE@ ./src/translator/translation/codeGeneration.ml --@OCAML_TRUE@@XCOS_TRUE@./src/translator/translation/versiondate.cmo \ --@OCAML_TRUE@@XCOS_TRUE@ ./src/translator/translation/versiondate.cmi : \ --@OCAML_TRUE@@XCOS_TRUE@ ./src/translator/translation/versiondate.ml --@OCAML_TRUE@@XCOS_TRUE@./src/translator/translation/versiondate.cmx \ --@OCAML_TRUE@@XCOS_TRUE@ ./src/translator/translation/versiondate.o \ --@OCAML_TRUE@@XCOS_TRUE@ ./src/translator/translation/versiondate.cmi : \ --@OCAML_TRUE@@XCOS_TRUE@ ./src/translator/translation/versiondate.ml -+@OCAML_TRUE@@XCOS_TRUE@./src/translator/translation/libraryManager.cmo \ -+@OCAML_TRUE@@XCOS_TRUE@ ./src/translator/translation/libraryManager.cmi : \ -+@OCAML_TRUE@@XCOS_TRUE@ ./src/translator/parsing/parser.cmi ./src/translator/parsing/lexer.cmi \ -+@OCAML_TRUE@@XCOS_TRUE@ ./src/translator/exceptionHandling/exceptHandler.cmi \ -+@OCAML_TRUE@@XCOS_TRUE@ ./src/translator/translation/libraryManager.ml -+@OCAML_TRUE@@XCOS_TRUE@./src/translator/translation/libraryManager.cmx \ -+@OCAML_TRUE@@XCOS_TRUE@ ./src/translator/translation/libraryManager.o \ -+@OCAML_TRUE@@XCOS_TRUE@ ./src/translator/translation/libraryManager.cmi : \ -+@OCAML_TRUE@@XCOS_TRUE@ ./src/translator/parsing/parser.cmi ./src/translator/parsing/parser.cmx \ -+@OCAML_TRUE@@XCOS_TRUE@ ./src/translator/parsing/lexer.cmi ./src/translator/parsing/lexer.cmx \ -+@OCAML_TRUE@@XCOS_TRUE@ ./src/translator/exceptionHandling/exceptHandler.cmi \ -+@OCAML_TRUE@@XCOS_TRUE@ ./src/translator/exceptionHandling/exceptHandler.cmx \ -+@OCAML_TRUE@@XCOS_TRUE@ ./src/translator/translation/libraryManager.ml - @OCAML_TRUE@@XCOS_TRUE@./src/translator/translation/translator.cmo \ - @OCAML_TRUE@@XCOS_TRUE@ ./src/translator/translation/translator.cmi : \ - @OCAML_TRUE@@XCOS_TRUE@ ./src/translator/translation/versiondate.cmi \ -@@ -3607,39 +3600,27 @@ distclean-local: - @OCAML_TRUE@@XCOS_TRUE@ ./src/translator/translation/codeGeneration.cmi \ - @OCAML_TRUE@@XCOS_TRUE@ ./src/translator/translation/codeGeneration.cmx \ - @OCAML_TRUE@@XCOS_TRUE@ ./src/translator/translation/translator.ml --@OCAML_TRUE@@XCOS_TRUE@./src/modelica_compiler/parseTree.cmo : \ --@OCAML_TRUE@@XCOS_TRUE@ ./src/modelica_compiler/parseTree.cmi \ --@OCAML_TRUE@@XCOS_TRUE@ ./src/modelica_compiler/parseTree.ml --@OCAML_TRUE@@XCOS_TRUE@./src/modelica_compiler/parseTree.cmx ./src/modelica_compiler/parseTree.o : \ --@OCAML_TRUE@@XCOS_TRUE@ ./src/modelica_compiler/parseTree.cmi \ --@OCAML_TRUE@@XCOS_TRUE@ ./src/modelica_compiler/parseTree.ml --@OCAML_TRUE@@XCOS_TRUE@./src/modelica_compiler/linenum.cmo ./src/modelica_compiler/linenum.cmi : \ --@OCAML_TRUE@@XCOS_TRUE@ ./src/modelica_compiler/linenum.ml --@OCAML_TRUE@@XCOS_TRUE@./src/modelica_compiler/linenum.cmx ./src/modelica_compiler/linenum.o \ --@OCAML_TRUE@@XCOS_TRUE@ ./src/modelica_compiler/linenum.cmi : ./src/modelica_compiler/linenum.ml --@OCAML_TRUE@@XCOS_TRUE@./src/modelica_compiler/parser.cmo ./src/modelica_compiler/parser.cmi : \ --@OCAML_TRUE@@XCOS_TRUE@ ./src/modelica_compiler/parseTree.cmi ./src/modelica_compiler/linenum.cmi \ --@OCAML_TRUE@@XCOS_TRUE@ ./src/modelica_compiler/parser.ml --@OCAML_TRUE@@XCOS_TRUE@./src/modelica_compiler/parser.cmx ./src/modelica_compiler/parser.o \ --@OCAML_TRUE@@XCOS_TRUE@ ./src/modelica_compiler/parser.cmi : \ --@OCAML_TRUE@@XCOS_TRUE@ ./src/modelica_compiler/parseTree.cmi \ --@OCAML_TRUE@@XCOS_TRUE@ ./src/modelica_compiler/parseTree.cmx ./src/modelica_compiler/linenum.cmi \ --@OCAML_TRUE@@XCOS_TRUE@ ./src/modelica_compiler/linenum.cmx ./src/modelica_compiler/parser.ml --@OCAML_TRUE@@XCOS_TRUE@./src/modelica_compiler/lexer.cmo ./src/modelica_compiler/lexer.cmi : \ --@OCAML_TRUE@@XCOS_TRUE@ ./src/modelica_compiler/parser.cmi ./src/modelica_compiler/lexer.ml --@OCAML_TRUE@@XCOS_TRUE@./src/modelica_compiler/lexer.cmx ./src/modelica_compiler/lexer.o \ --@OCAML_TRUE@@XCOS_TRUE@ ./src/modelica_compiler/lexer.cmi : ./src/modelica_compiler/parser.cmi \ --@OCAML_TRUE@@XCOS_TRUE@ ./src/modelica_compiler/parser.cmx ./src/modelica_compiler/lexer.ml --@OCAML_TRUE@@XCOS_TRUE@./src/modelica_compiler/precompilation.cmo : \ --@OCAML_TRUE@@XCOS_TRUE@ ./src/modelica_compiler/parseTree.cmi \ --@OCAML_TRUE@@XCOS_TRUE@ ./src/modelica_compiler/precompilation.cmi \ --@OCAML_TRUE@@XCOS_TRUE@ ./src/modelica_compiler/precompilation.ml --@OCAML_TRUE@@XCOS_TRUE@./src/modelica_compiler/precompilation.cmx \ --@OCAML_TRUE@@XCOS_TRUE@ ./src/modelica_compiler/precompilation.o : \ --@OCAML_TRUE@@XCOS_TRUE@ ./src/modelica_compiler/parseTree.cmi \ --@OCAML_TRUE@@XCOS_TRUE@ ./src/modelica_compiler/parseTree.cmx \ --@OCAML_TRUE@@XCOS_TRUE@ ./src/modelica_compiler/precompilation.cmi \ --@OCAML_TRUE@@XCOS_TRUE@ ./src/modelica_compiler/precompilation.ml -+@OCAML_TRUE@@XCOS_TRUE@./src/translator/translation/versiondate.cmo \ -+@OCAML_TRUE@@XCOS_TRUE@ ./src/translator/translation/versiondate.cmi : \ -+@OCAML_TRUE@@XCOS_TRUE@ ./src/translator/translation/versiondate.ml -+@OCAML_TRUE@@XCOS_TRUE@./src/translator/translation/versiondate.cmx \ -+@OCAML_TRUE@@XCOS_TRUE@ ./src/translator/translation/versiondate.o \ -+@OCAML_TRUE@@XCOS_TRUE@ ./src/translator/translation/versiondate.cmi : \ -+@OCAML_TRUE@@XCOS_TRUE@ ./src/translator/translation/versiondate.ml -+@OCAML_TRUE@@XCOS_TRUE@./src/modelica_compiler/bipartiteGraph.cmo : \ -+@OCAML_TRUE@@XCOS_TRUE@ ./src/modelica_compiler/bipartiteGraph.cmi \ -+@OCAML_TRUE@@XCOS_TRUE@ ./src/modelica_compiler/bipartiteGraph.ml -+@OCAML_TRUE@@XCOS_TRUE@./src/modelica_compiler/bipartiteGraph.cmx \ -+@OCAML_TRUE@@XCOS_TRUE@ ./src/modelica_compiler/bipartiteGraph.o : \ -+@OCAML_TRUE@@XCOS_TRUE@ ./src/modelica_compiler/bipartiteGraph.cmi \ -+@OCAML_TRUE@@XCOS_TRUE@ ./src/modelica_compiler/bipartiteGraph.ml -+@OCAML_TRUE@@XCOS_TRUE@./src/modelica_compiler/causalityGraph.cmo : \ -+@OCAML_TRUE@@XCOS_TRUE@ ./src/modelica_compiler/causalityGraph.cmi \ -+@OCAML_TRUE@@XCOS_TRUE@ ./src/modelica_compiler/causalityGraph.ml -+@OCAML_TRUE@@XCOS_TRUE@./src/modelica_compiler/causalityGraph.cmx \ -+@OCAML_TRUE@@XCOS_TRUE@ ./src/modelica_compiler/causalityGraph.o : \ -+@OCAML_TRUE@@XCOS_TRUE@ ./src/modelica_compiler/causalityGraph.cmi \ -+@OCAML_TRUE@@XCOS_TRUE@ ./src/modelica_compiler/causalityGraph.ml - @OCAML_TRUE@@XCOS_TRUE@./src/modelica_compiler/compilation.cmo : \ - @OCAML_TRUE@@XCOS_TRUE@ ./src/modelica_compiler/precompilation.cmi \ - @OCAML_TRUE@@XCOS_TRUE@ ./src/modelica_compiler/parseTree.cmi \ -@@ -3653,16 +3634,6 @@ distclean-local: - @OCAML_TRUE@@XCOS_TRUE@ ./src/modelica_compiler/parseTree.cmx \ - @OCAML_TRUE@@XCOS_TRUE@ ./src/modelica_compiler/compilation.cmi \ - @OCAML_TRUE@@XCOS_TRUE@ ./src/modelica_compiler/compilation.ml --@OCAML_TRUE@@XCOS_TRUE@./src/modelica_compiler/instantiation.cmo : \ --@OCAML_TRUE@@XCOS_TRUE@ ./src/modelica_compiler/compilation.cmi \ --@OCAML_TRUE@@XCOS_TRUE@ ./src/modelica_compiler/instantiation.cmi \ --@OCAML_TRUE@@XCOS_TRUE@ ./src/modelica_compiler/instantiation.ml --@OCAML_TRUE@@XCOS_TRUE@./src/modelica_compiler/instantiation.cmx \ --@OCAML_TRUE@@XCOS_TRUE@ ./src/modelica_compiler/instantiation.o : \ --@OCAML_TRUE@@XCOS_TRUE@ ./src/modelica_compiler/compilation.cmi \ --@OCAML_TRUE@@XCOS_TRUE@ ./src/modelica_compiler/compilation.cmx \ --@OCAML_TRUE@@XCOS_TRUE@ ./src/modelica_compiler/instantiation.cmi \ --@OCAML_TRUE@@XCOS_TRUE@ ./src/modelica_compiler/instantiation.ml - @OCAML_TRUE@@XCOS_TRUE@./src/modelica_compiler/graphNodeSet.cmo : \ - @OCAML_TRUE@@XCOS_TRUE@ ./src/modelica_compiler/graphNodeSet.cmi \ - @OCAML_TRUE@@XCOS_TRUE@ ./src/modelica_compiler/graphNodeSet.ml -@@ -3670,30 +3641,6 @@ distclean-local: - @OCAML_TRUE@@XCOS_TRUE@ ./src/modelica_compiler/graphNodeSet.o : \ - @OCAML_TRUE@@XCOS_TRUE@ ./src/modelica_compiler/graphNodeSet.cmi \ - @OCAML_TRUE@@XCOS_TRUE@ ./src/modelica_compiler/graphNodeSet.ml --@OCAML_TRUE@@XCOS_TRUE@./src/modelica_compiler/symbolicExpression.cmo : \ --@OCAML_TRUE@@XCOS_TRUE@ ./src/modelica_compiler/graphNodeSet.cmi \ --@OCAML_TRUE@@XCOS_TRUE@ ./src/modelica_compiler/symbolicExpression.cmi \ --@OCAML_TRUE@@XCOS_TRUE@ ./src/modelica_compiler/symbolicExpression.ml --@OCAML_TRUE@@XCOS_TRUE@./src/modelica_compiler/symbolicExpression.cmx \ --@OCAML_TRUE@@XCOS_TRUE@ ./src/modelica_compiler/symbolicExpression.o : \ --@OCAML_TRUE@@XCOS_TRUE@ ./src/modelica_compiler/graphNodeSet.cmi \ --@OCAML_TRUE@@XCOS_TRUE@ ./src/modelica_compiler/graphNodeSet.cmx \ --@OCAML_TRUE@@XCOS_TRUE@ ./src/modelica_compiler/symbolicExpression.cmi \ --@OCAML_TRUE@@XCOS_TRUE@ ./src/modelica_compiler/symbolicExpression.ml --@OCAML_TRUE@@XCOS_TRUE@./src/modelica_compiler/squareSparseMatrix.cmo : \ --@OCAML_TRUE@@XCOS_TRUE@ ./src/modelica_compiler/squareSparseMatrix.cmi \ --@OCAML_TRUE@@XCOS_TRUE@ ./src/modelica_compiler/squareSparseMatrix.ml --@OCAML_TRUE@@XCOS_TRUE@./src/modelica_compiler/squareSparseMatrix.cmx \ --@OCAML_TRUE@@XCOS_TRUE@ ./src/modelica_compiler/squareSparseMatrix.o : \ --@OCAML_TRUE@@XCOS_TRUE@ ./src/modelica_compiler/squareSparseMatrix.cmi \ --@OCAML_TRUE@@XCOS_TRUE@ ./src/modelica_compiler/squareSparseMatrix.ml --@OCAML_TRUE@@XCOS_TRUE@./src/modelica_compiler/bipartiteGraph.cmo : \ --@OCAML_TRUE@@XCOS_TRUE@ ./src/modelica_compiler/bipartiteGraph.cmi \ --@OCAML_TRUE@@XCOS_TRUE@ ./src/modelica_compiler/bipartiteGraph.ml --@OCAML_TRUE@@XCOS_TRUE@./src/modelica_compiler/bipartiteGraph.cmx \ --@OCAML_TRUE@@XCOS_TRUE@ ./src/modelica_compiler/bipartiteGraph.o : \ --@OCAML_TRUE@@XCOS_TRUE@ ./src/modelica_compiler/bipartiteGraph.cmi \ --@OCAML_TRUE@@XCOS_TRUE@ ./src/modelica_compiler/bipartiteGraph.ml - @OCAML_TRUE@@XCOS_TRUE@./src/modelica_compiler/hungarianMethod.cmo : \ - @OCAML_TRUE@@XCOS_TRUE@ ./src/modelica_compiler/hungarianMethod.cmi \ - @OCAML_TRUE@@XCOS_TRUE@ ./src/modelica_compiler/hungarianMethod.ml -@@ -3701,13 +3648,25 @@ distclean-local: - @OCAML_TRUE@@XCOS_TRUE@ ./src/modelica_compiler/hungarianMethod.o : \ - @OCAML_TRUE@@XCOS_TRUE@ ./src/modelica_compiler/hungarianMethod.cmi \ - @OCAML_TRUE@@XCOS_TRUE@ ./src/modelica_compiler/hungarianMethod.ml --@OCAML_TRUE@@XCOS_TRUE@./src/modelica_compiler/causalityGraph.cmo : \ --@OCAML_TRUE@@XCOS_TRUE@ ./src/modelica_compiler/causalityGraph.cmi \ --@OCAML_TRUE@@XCOS_TRUE@ ./src/modelica_compiler/causalityGraph.ml --@OCAML_TRUE@@XCOS_TRUE@./src/modelica_compiler/causalityGraph.cmx \ --@OCAML_TRUE@@XCOS_TRUE@ ./src/modelica_compiler/causalityGraph.o : \ --@OCAML_TRUE@@XCOS_TRUE@ ./src/modelica_compiler/causalityGraph.cmi \ --@OCAML_TRUE@@XCOS_TRUE@ ./src/modelica_compiler/causalityGraph.ml -+@OCAML_TRUE@@XCOS_TRUE@./src/modelica_compiler/instantiation.cmo : \ -+@OCAML_TRUE@@XCOS_TRUE@ ./src/modelica_compiler/compilation.cmi \ -+@OCAML_TRUE@@XCOS_TRUE@ ./src/modelica_compiler/instantiation.cmi \ -+@OCAML_TRUE@@XCOS_TRUE@ ./src/modelica_compiler/instantiation.ml -+@OCAML_TRUE@@XCOS_TRUE@./src/modelica_compiler/instantiation.cmx \ -+@OCAML_TRUE@@XCOS_TRUE@ ./src/modelica_compiler/instantiation.o : \ -+@OCAML_TRUE@@XCOS_TRUE@ ./src/modelica_compiler/compilation.cmi \ -+@OCAML_TRUE@@XCOS_TRUE@ ./src/modelica_compiler/compilation.cmx \ -+@OCAML_TRUE@@XCOS_TRUE@ ./src/modelica_compiler/instantiation.cmi \ -+@OCAML_TRUE@@XCOS_TRUE@ ./src/modelica_compiler/instantiation.ml -+@OCAML_TRUE@@XCOS_TRUE@./src/modelica_compiler/lexer.cmo ./src/modelica_compiler/lexer.cmi : \ -+@OCAML_TRUE@@XCOS_TRUE@ ./src/modelica_compiler/parser.cmi ./src/modelica_compiler/lexer.ml -+@OCAML_TRUE@@XCOS_TRUE@./src/modelica_compiler/lexer.cmx ./src/modelica_compiler/lexer.o \ -+@OCAML_TRUE@@XCOS_TRUE@ ./src/modelica_compiler/lexer.cmi : ./src/modelica_compiler/parser.cmi \ -+@OCAML_TRUE@@XCOS_TRUE@ ./src/modelica_compiler/parser.cmx ./src/modelica_compiler/lexer.ml -+@OCAML_TRUE@@XCOS_TRUE@./src/modelica_compiler/linenum.cmo ./src/modelica_compiler/linenum.cmi : \ -+@OCAML_TRUE@@XCOS_TRUE@ ./src/modelica_compiler/linenum.ml -+@OCAML_TRUE@@XCOS_TRUE@./src/modelica_compiler/linenum.cmx ./src/modelica_compiler/linenum.o \ -+@OCAML_TRUE@@XCOS_TRUE@ ./src/modelica_compiler/linenum.cmi : ./src/modelica_compiler/linenum.ml - @OCAML_TRUE@@XCOS_TRUE@./src/modelica_compiler/optimization.cmo : \ - @OCAML_TRUE@@XCOS_TRUE@ ./src/modelica_compiler/symbolicExpression.cmi \ - @OCAML_TRUE@@XCOS_TRUE@ ./src/modelica_compiler/squareSparseMatrix.cmi \ -@@ -3736,19 +3695,6 @@ distclean-local: - @OCAML_TRUE@@XCOS_TRUE@ ./src/modelica_compiler/bipartiteGraph.cmx \ - @OCAML_TRUE@@XCOS_TRUE@ ./src/modelica_compiler/optimization.cmi \ - @OCAML_TRUE@@XCOS_TRUE@ ./src/modelica_compiler/optimization.ml --@OCAML_TRUE@@XCOS_TRUE@./src/modelica_compiler/xMLCodeGeneration.cmo : \ --@OCAML_TRUE@@XCOS_TRUE@ ./src/modelica_compiler/symbolicExpression.cmi \ --@OCAML_TRUE@@XCOS_TRUE@ ./src/modelica_compiler/optimization.cmi \ --@OCAML_TRUE@@XCOS_TRUE@ ./src/modelica_compiler/xMLCodeGeneration.cmi \ --@OCAML_TRUE@@XCOS_TRUE@ ./src/modelica_compiler/xMLCodeGeneration.ml --@OCAML_TRUE@@XCOS_TRUE@./src/modelica_compiler/xMLCodeGeneration.cmx \ --@OCAML_TRUE@@XCOS_TRUE@ ./src/modelica_compiler/xMLCodeGeneration.o : \ --@OCAML_TRUE@@XCOS_TRUE@ ./src/modelica_compiler/symbolicExpression.cmi \ --@OCAML_TRUE@@XCOS_TRUE@ ./src/modelica_compiler/symbolicExpression.cmx \ --@OCAML_TRUE@@XCOS_TRUE@ ./src/modelica_compiler/optimization.cmi \ --@OCAML_TRUE@@XCOS_TRUE@ ./src/modelica_compiler/optimization.cmx \ --@OCAML_TRUE@@XCOS_TRUE@ ./src/modelica_compiler/xMLCodeGeneration.cmi \ --@OCAML_TRUE@@XCOS_TRUE@ ./src/modelica_compiler/xMLCodeGeneration.ml - @OCAML_TRUE@@XCOS_TRUE@./src/modelica_compiler/optimizingCompiler.cmo : \ - @OCAML_TRUE@@XCOS_TRUE@ ./src/modelica_compiler/xMLCodeGeneration.cmi \ - @OCAML_TRUE@@XCOS_TRUE@ ./src/modelica_compiler/precompilation.cmi \ -@@ -3775,6 +3721,30 @@ distclean-local: - @OCAML_TRUE@@XCOS_TRUE@ ./src/modelica_compiler/compilation.cmx \ - @OCAML_TRUE@@XCOS_TRUE@ ./src/modelica_compiler/optimizingCompiler.cmi \ - @OCAML_TRUE@@XCOS_TRUE@ ./src/modelica_compiler/optimizingCompiler.ml -+@OCAML_TRUE@@XCOS_TRUE@./src/modelica_compiler/parseTree.cmo : \ -+@OCAML_TRUE@@XCOS_TRUE@ ./src/modelica_compiler/parseTree.cmi \ -+@OCAML_TRUE@@XCOS_TRUE@ ./src/modelica_compiler/parseTree.ml -+@OCAML_TRUE@@XCOS_TRUE@./src/modelica_compiler/parseTree.cmx ./src/modelica_compiler/parseTree.o : \ -+@OCAML_TRUE@@XCOS_TRUE@ ./src/modelica_compiler/parseTree.cmi \ -+@OCAML_TRUE@@XCOS_TRUE@ ./src/modelica_compiler/parseTree.ml -+@OCAML_TRUE@@XCOS_TRUE@./src/modelica_compiler/parser.cmo ./src/modelica_compiler/parser.cmi : \ -+@OCAML_TRUE@@XCOS_TRUE@ ./src/modelica_compiler/parseTree.cmi ./src/modelica_compiler/linenum.cmi \ -+@OCAML_TRUE@@XCOS_TRUE@ ./src/modelica_compiler/parser.ml -+@OCAML_TRUE@@XCOS_TRUE@./src/modelica_compiler/parser.cmx ./src/modelica_compiler/parser.o \ -+@OCAML_TRUE@@XCOS_TRUE@ ./src/modelica_compiler/parser.cmi : \ -+@OCAML_TRUE@@XCOS_TRUE@ ./src/modelica_compiler/parseTree.cmi \ -+@OCAML_TRUE@@XCOS_TRUE@ ./src/modelica_compiler/parseTree.cmx ./src/modelica_compiler/linenum.cmi \ -+@OCAML_TRUE@@XCOS_TRUE@ ./src/modelica_compiler/linenum.cmx ./src/modelica_compiler/parser.ml -+@OCAML_TRUE@@XCOS_TRUE@./src/modelica_compiler/precompilation.cmo : \ -+@OCAML_TRUE@@XCOS_TRUE@ ./src/modelica_compiler/parseTree.cmi \ -+@OCAML_TRUE@@XCOS_TRUE@ ./src/modelica_compiler/precompilation.cmi \ -+@OCAML_TRUE@@XCOS_TRUE@ ./src/modelica_compiler/precompilation.ml -+@OCAML_TRUE@@XCOS_TRUE@./src/modelica_compiler/precompilation.cmx \ -+@OCAML_TRUE@@XCOS_TRUE@ ./src/modelica_compiler/precompilation.o : \ -+@OCAML_TRUE@@XCOS_TRUE@ ./src/modelica_compiler/parseTree.cmi \ -+@OCAML_TRUE@@XCOS_TRUE@ ./src/modelica_compiler/parseTree.cmx \ -+@OCAML_TRUE@@XCOS_TRUE@ ./src/modelica_compiler/precompilation.cmi \ -+@OCAML_TRUE@@XCOS_TRUE@ ./src/modelica_compiler/precompilation.ml - @OCAML_TRUE@@XCOS_TRUE@./src/modelica_compiler/scicosCodeGeneration.cmo : \ - @OCAML_TRUE@@XCOS_TRUE@ ./src/modelica_compiler/symbolicExpression.cmi \ - @OCAML_TRUE@@XCOS_TRUE@ ./src/modelica_compiler/optimization.cmi \ -@@ -3804,6 +3774,36 @@ distclean-local: - @OCAML_TRUE@@XCOS_TRUE@ ./src/modelica_compiler/optimizingCompiler.cmi \ - @OCAML_TRUE@@XCOS_TRUE@ ./src/modelica_compiler/optimizingCompiler.cmx \ - @OCAML_TRUE@@XCOS_TRUE@ ./src/modelica_compiler/scicosOptimizingCompiler.ml -+@OCAML_TRUE@@XCOS_TRUE@./src/modelica_compiler/squareSparseMatrix.cmo : \ -+@OCAML_TRUE@@XCOS_TRUE@ ./src/modelica_compiler/squareSparseMatrix.cmi \ -+@OCAML_TRUE@@XCOS_TRUE@ ./src/modelica_compiler/squareSparseMatrix.ml -+@OCAML_TRUE@@XCOS_TRUE@./src/modelica_compiler/squareSparseMatrix.cmx \ -+@OCAML_TRUE@@XCOS_TRUE@ ./src/modelica_compiler/squareSparseMatrix.o : \ -+@OCAML_TRUE@@XCOS_TRUE@ ./src/modelica_compiler/squareSparseMatrix.cmi \ -+@OCAML_TRUE@@XCOS_TRUE@ ./src/modelica_compiler/squareSparseMatrix.ml -+@OCAML_TRUE@@XCOS_TRUE@./src/modelica_compiler/symbolicExpression.cmo : \ -+@OCAML_TRUE@@XCOS_TRUE@ ./src/modelica_compiler/graphNodeSet.cmi \ -+@OCAML_TRUE@@XCOS_TRUE@ ./src/modelica_compiler/symbolicExpression.cmi \ -+@OCAML_TRUE@@XCOS_TRUE@ ./src/modelica_compiler/symbolicExpression.ml -+@OCAML_TRUE@@XCOS_TRUE@./src/modelica_compiler/symbolicExpression.cmx \ -+@OCAML_TRUE@@XCOS_TRUE@ ./src/modelica_compiler/symbolicExpression.o : \ -+@OCAML_TRUE@@XCOS_TRUE@ ./src/modelica_compiler/graphNodeSet.cmi \ -+@OCAML_TRUE@@XCOS_TRUE@ ./src/modelica_compiler/graphNodeSet.cmx \ -+@OCAML_TRUE@@XCOS_TRUE@ ./src/modelica_compiler/symbolicExpression.cmi \ -+@OCAML_TRUE@@XCOS_TRUE@ ./src/modelica_compiler/symbolicExpression.ml -+@OCAML_TRUE@@XCOS_TRUE@./src/modelica_compiler/xMLCodeGeneration.cmo : \ -+@OCAML_TRUE@@XCOS_TRUE@ ./src/modelica_compiler/symbolicExpression.cmi \ -+@OCAML_TRUE@@XCOS_TRUE@ ./src/modelica_compiler/optimization.cmi \ -+@OCAML_TRUE@@XCOS_TRUE@ ./src/modelica_compiler/xMLCodeGeneration.cmi \ -+@OCAML_TRUE@@XCOS_TRUE@ ./src/modelica_compiler/xMLCodeGeneration.ml -+@OCAML_TRUE@@XCOS_TRUE@./src/modelica_compiler/xMLCodeGeneration.cmx \ -+@OCAML_TRUE@@XCOS_TRUE@ ./src/modelica_compiler/xMLCodeGeneration.o : \ -+@OCAML_TRUE@@XCOS_TRUE@ ./src/modelica_compiler/symbolicExpression.cmi \ -+@OCAML_TRUE@@XCOS_TRUE@ ./src/modelica_compiler/symbolicExpression.cmx \ -+@OCAML_TRUE@@XCOS_TRUE@ ./src/modelica_compiler/optimization.cmi \ -+@OCAML_TRUE@@XCOS_TRUE@ ./src/modelica_compiler/optimization.cmx \ -+@OCAML_TRUE@@XCOS_TRUE@ ./src/modelica_compiler/xMLCodeGeneration.cmi \ -+@OCAML_TRUE@@XCOS_TRUE@ ./src/modelica_compiler/xMLCodeGeneration.ml - - # Build modelica stuff - diff --git a/math/scilab/files/patch-modules_threads_src_cpp_Thread__Wrapper.cpp b/math/scilab/files/patch-modules_threads_src_cpp_Thread__Wrapper.cpp new file mode 100644 index 000000000000..d37dfcd8dc83 --- /dev/null +++ b/math/scilab/files/patch-modules_threads_src_cpp_Thread__Wrapper.cpp @@ -0,0 +1,16 @@ +--- modules/threads/src/cpp/Thread_Wrapper.cpp.orig 2020-02-25 10:00:14 UTC ++++ modules/threads/src/cpp/Thread_Wrapper.cpp +@@ -52,13 +52,6 @@ void __InitSignalLock(__threadSignalLock *lockName) + #ifdef _MSC_VER + InitializeCriticalSection(lockName); + #else +- /* PTHREAD_MUTEX_ERRORCHECK needed for a safe release atexit when we try to release without knowing if we own the lock +- PTHREAD_PROCESS_SHARED needed for interprocess synch (plus alloc in shared mem thread_mutexattr_settype +- Linux uses PTHREAD_MUTEX_ERRORCHECK_NP other Posix use PTHREAD_MUTEX_ERRORCHECK +- */ +-#ifndef PTHREAD_MUTEX_ERRORCHECK +-#define PTHREAD_MUTEX_ERRORCHECK PTHREAD_MUTEX_ERRORCHECK_NP +-#endif + pthread_mutexattr_t attr; + pthread_mutexattr_init (&attr); + pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_ERRORCHECK); diff --git a/math/scilab/files/patch-xdg-open b/math/scilab/files/patch-xdg-open index a6be94d82fd7..3774a711d4a4 100644 --- a/math/scilab/files/patch-xdg-open +++ b/math/scilab/files/patch-xdg-open @@ -1,6 +1,6 @@ ---- ./modules/gui/src/java/org/scilab/modules/gui/utils/WebBrowser.java.orig 2014-07-24 22:44:04.242274707 +0000 -+++ ./modules/gui/src/java/org/scilab/modules/gui/utils/WebBrowser.java 2014-07-24 22:50:25.305278583 +0000 -@@ -98,14 +98,14 @@ +--- modules/gui/src/java/org/scilab/modules/gui/utils/WebBrowser.java.orig 2020-02-25 09:59:55 UTC ++++ modules/gui/src/java/org/scilab/modules/gui/utils/WebBrowser.java +@@ -101,14 +101,14 @@ public final class WebBrowser implements XConfiguratio // We have <pierre.marechal@scilab.org> String mail = "mailto:" + url.substring(1, url.length() - 1); if (webprefs.defaultMailer) { @@ -17,7 +17,7 @@ } else { Runtime.getRuntime().exec(webprefs.cmdMailer + " " + new URI(url).toString()); } -@@ -113,7 +113,7 @@ +@@ -116,7 +116,7 @@ public final class WebBrowser implements XConfiguratio if (webprefs.defaultBrowser) { // Under Windows, ShellExecute is called with the URI and under Linux it is gnome_url_show. // So to handle different protocol in URI, user must config its OS to handle them. diff --git a/math/scilab/files/patch-xmlgraphics-commons-2.0 b/math/scilab/files/patch-xmlgraphics-commons-2.0 deleted file mode 100644 index ba2ec9faafcf..000000000000 --- a/math/scilab/files/patch-xmlgraphics-commons-2.0 +++ /dev/null @@ -1,82 +0,0 @@ ---- modules/graphic_export/src/java/org/scilab/modules/graphic_export/Export.java -+++ modules/graphic_export/src/java/org/scilab/modules/graphic_export/Export.java -@@ -857,7 +857,7 @@ public class Export { - } - - @Override -- public int processShape(Shape s) throws IOException { -+ public int processShape(Shape s, boolean cached) throws IOException { - if (s instanceof Ellipse2D.Double) { - Ellipse2D.Double ell = (Ellipse2D.Double) s; - if (ell.height == ell.width) { -@@ -880,10 +880,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, cached); - } - } else { -- return super.processShape(s); -+ return super.processShape(s, cached); - } - - for (; !it.isDone(); it.next()) { -@@ -891,7 +891,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, cached); - } - } - buffer.append("] DP"); -@@ -899,7 +899,7 @@ public class Export { - return PathIterator.WIND_NON_ZERO; - } - -- return super.processShape(s); -+ return super.processShape(s, cached); - } - }; - g2d.setGraphicContext(new GraphicContext()); -@@ -1029,7 +1029,7 @@ public class Export { - } - - @Override -- public int processShape(Shape s) throws IOException { -+ public int processShape(Shape s, boolean cached) throws IOException { - if (s instanceof Ellipse2D.Double) { - Ellipse2D.Double ell = (Ellipse2D.Double) s; - if (ell.height == ell.width) { -@@ -1052,10 +1052,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, cached); - } - } else { -- return super.processShape(s); -+ return super.processShape(s, cached); - } - - for (; !it.isDone(); it.next()) { -@@ -1063,7 +1063,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, cached); - } - } - buffer.append("] DP"); -@@ -1071,7 +1071,7 @@ public class Export { - return PathIterator.WIND_NON_ZERO; - } - -- return super.processShape(s); -+ return super.processShape(s, cached); - } - - }; |