diff --git a/.CI/installLibraries.mos b/.CI/installLibraries.mos index 56ed137..d9606f9 100644 --- a/.CI/installLibraries.mos +++ b/.CI/installLibraries.mos @@ -2,6 +2,10 @@ // usually the newest version will be loaded instead if you remove them! // SO: first remove them from configs/conf* then remove them from here. updatePackageIndex(); +if not installPackage(Modelica, "3.1.0", exactMatch=true) then + print("Modelica 3.1.0 " + getErrorString() + "\n"); + exit(1); +end if; if not installPackage(Modelica, "4.1.0-beta.om", exactMatch=true) then print("Modelica 4.1.0-beta.om" + getErrorString() + "\n"); exit(1); @@ -10,17 +14,13 @@ if not installPackage(ModelicaServices, "4.1.0-beta.om", exactMatch=true) then print("ModelicaServices 4.1.0-beta.om" + getErrorString() + "\n"); exit(1); end if; -if not installPackage(ModelicaServices, "trunk", exactMatch=true) then - print("ModelicaServices trunk" + getErrorString() + "\n"); - exit(1); -end if; -for v in {"3.2.3","4.1.0-beta.om"} loop +for v in {"3.2.1","3.2.2","3.2.3","4.0.0","4.1.0-beta.om","trunk"} loop if not installPackage(ModelicaTest, v, exactMatch=true) then print("ModelicaTest " + v + " " + getErrorString() + "\n"); exit(1); end if; end for; -for v in {"maint.11.x", "maint.12.x", "master"} loop +for v in {"1.6", "3.0.0", "maint.7.0.x", "maint.8.1.x", "maint.9.1.x", "maint.10.0.x", "maint.11.x", "maint.12.x", "master"} loop if not installPackage(Buildings, v) then print("Buildings " + v + " " + getErrorString() + "\n"); exit(1); @@ -90,11 +90,9 @@ end for; print("Did install:" + getErrorString() + "\n"); -/* do not upgrade as it will reinstall libs! if not upgradeInstalledPackages() then print("Failed upgrade:\n" + getErrorString() + "\n"); exit(1); end if; print("Did upgrade:\n" + getErrorString() + "\n"); -*/ \ No newline at end of file diff --git a/configs/conf.json b/configs/conf.json index 9f65087..51dce44 100644 --- a/configs/conf.json +++ b/configs/conf.json @@ -1,4 +1,14 @@ [ + { + "library":"Modelica", + "libraryVersion":"trunk", + "referenceFileExtension":"csv", + "referenceFileNameDelimiter":"/", + "referenceFileNameExtraName":"$ClassName", + "referenceFiles":"$MSLREFERENCE/MAP-LIB_ReferenceResults/v4.1.0", + "extraCustomCommands":["if not setCommandLineOptions(\"--std=3.3\") then exit(1); end if;"], + "optlevel":"-Os -march=native" + }, { "library":"Modelica", "libraryVersion":"4.1.0-beta.om", @@ -9,6 +19,16 @@ "extraCustomCommands":["if not setCommandLineOptions(\"--std=3.3\") then exit(1); end if;"], "optlevel":"-Os -march=native" }, + { + "library":"Modelica", + "libraryVersion":"4.0.0", + "referenceFileExtension":"csv", + "referenceFileNameDelimiter":"/", + "referenceFileNameExtraName":"$ClassName", + "allReferenceFilesExist":false, + "referenceFiles":"$MSLREFERENCE/MAP-LIB_ReferenceResults/v4.0.0", + "optlevel":"-Os -march=native" + }, { "library":"Modelica", "libraryVersion":"3.2.3",