Skip to content

Commit

Permalink
Merge pull request #31 from INTO-CPS-Association/VDMCheck3.sh-windows…
Browse files Browse the repository at this point in the history
…-fix

VDMCheck3.sh semicolon class path separator on Windows
  • Loading branch information
nickbattle authored Jan 7, 2024
2 parents 3d87f7f + d7194e1 commit c92baba
Showing 1 changed file with 7 additions and 2 deletions.
9 changes: 7 additions & 2 deletions fmi3/vdmcheck/src/main/scripts/VDMCheck3.sh
Original file line number Diff line number Diff line change
Expand Up @@ -79,13 +79,18 @@ SCRIPT=$0

XSD="schema/fmi3.xsd"
MODEL="model model/Rules/*.adoc"


# Fix Class Path Separator - Default to colon for Unix-like systems, , semicolon for msys
CLASSPATH_SEPARATOR=":"
if [ $OSTYPE == "msys" ]; then
CLASSPATH_SEPARATOR=";"
fi
java -Xmx1g \
-Dvdmj.parser.merge_comments=true \
-Dvdmj.parser.external_readers=.fmu=fmureader.FMUReader,.xml=fmureader.FMUReader \
-Dfmureader.noschema=true \
-Dfmureader.vdmfile="$SAVE" \
-cp vdmj.jar:annotations.jar:xsd2vdm.jar:fmuReader.jar com.fujitsu.vdmj.VDMJ \
-cp vdmj.jar${CLASSPATH_SEPARATOR}annotations.jar${CLASSPATH_SEPARATOR}xsd2vdm.jar${CLASSPATH_SEPARATOR}fmuReader.jar com.fujitsu.vdmj.VDMJ \
-vdmsl -q -annotations -e "isValidFMIConfiguration(modelDescription, buildDescription, terminalsAndIcons)" \
$MODEL "$FILE" |
sed -e "s+<FMI3_STANDARD>+$LINK+" |
Expand Down

0 comments on commit c92baba

Please sign in to comment.