Fix old VDMCheck Java version and flip jar to use VDMCheckPlus

INTO-CPS-Association · Jan 7, 2024 · dcea39c · dcea39c
1 parent 91efafe
commit dcea39c
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 3 deletions.
diff --git a/fmi3/vdmcheck/pom.xml b/fmi3/vdmcheck/pom.xml
@@ -58,7 +58,7 @@
                 <configuration>
                     <archive>
                         <manifestEntries>
-                            <Main-Class>VDMCheck</Main-Class>
+                            <Main-Class>VDMCheckPlus</Main-Class>
                             <Implementation-Version>${project.version} build ${maven.build.timestamp}
                             </Implementation-Version>
                             <Class-Path>.</Class-Path>

diff --git a/fmi3/vdmcheck/src/main/java/VDMCheck.java b/fmi3/vdmcheck/src/main/java/VDMCheck.java
@@ -301,7 +301,7 @@ private static boolean run(String filename, XMLFile tempXML, String vdmOUT)
 			args.add("-q");
 			args.add("-annotations");
 			args.add("-e");
-			args.add("isValidFMIConfiguration(" + varName + ")");
+			args.add("isValidFMIConfiguration(" + varName + ", nil, nil)");
 			args.add("model");
 
 			if (rules.exists())

diff --git a/fmi3/vdmcheck/src/main/java/VDMCheckPlus.java b/fmi3/vdmcheck/src/main/java/VDMCheckPlus.java
@@ -100,7 +100,6 @@ private static boolean run(File filename, String vdmOUT, String prefix)
 			args.add("java");
 			args.add("-Xmx1g");
 			args.add("-Dvdmj.parser.merge_comments=true");
-			args.add("-Dvdmj.parser.external_readers=.fmu=fmureader.FMUReader,.xml=fmureader.FMUReader");
 			args.add("-Dfmureader.noschema=true");
 			args.add("-Dfmureader.vdmfile=" + vdmOUT);
 			args.add("-cp");